From 62c67bcc35967a3628ff9c09f7c8c77144dd4b6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 26 Sep 2012 01:17:07 +0900 Subject: Make gtk-doc not a hard dependency of gobject-introspection Fixes https://bugzilla.gnome.org/show_bug.cgi?id=684795 --- autogen.sh | 13 +++++++++---- configure.ac | 8 +++++++- docs/Makefile.am | 2 ++ 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/autogen.sh b/autogen.sh index 0eac5f59..51f51c40 100755 --- a/autogen.sh +++ b/autogen.sh @@ -7,10 +7,16 @@ test -n "$srcdir" || srcdir=. olddir=`pwd` cd "$srcdir" -GTKDOCIZE=`which gtkdocize` +GTKDOCIZE=$(which gtkdocize 2>/dev/null) if test -z $GTKDOCIZE; then - echo "*** No GTK-Doc found, please install it ***" - exit 1 + echo "You don't have gtk-doc installed, and thus won't be able to generate the documentation." + rm -f gtk-doc.make + cat > gtk-doc.make < Date: Thu, 11 Oct 2012 16:05:37 +0200 Subject: gimarshallingtests: Add array/GList uint32/64 in/out API Add in/out API for testing arrays containing uint64, as well as GList containing uint32 (GList and GHash can't contain 64 bit values as they store them in pointers). https://bugzilla.gnome.org/show_bug.cgi?id=685860 --- tests/gimarshallingtests.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++ tests/gimarshallingtests.h | 4 +++ 2 files changed, 68 insertions(+) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index 3eb6e075..3d6e3453 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -1728,6 +1728,28 @@ gi_marshalling_tests_garray_int_none_return (void) return array; } +/** + * gi_marshalling_tests_garray_uint64_none_return: + * + * Returns: (element-type guint64) (transfer none): + */ +GArray * +gi_marshalling_tests_garray_uint64_none_return (void) +{ + static GArray *array = NULL; + guint64 i; + + if (array == NULL) { + array = g_array_new (TRUE, TRUE, sizeof (guint64)); + i = 0; + g_array_append_val (array, i); + i = G_MAXUINT64; + g_array_append_val (array, i); + } + + return array; +} + /** * gi_marshalling_tests_garray_utf8_none_return: * @@ -1803,6 +1825,18 @@ gi_marshalling_tests_garray_int_none_in (GArray *array_) g_assert_cmpint(g_array_index (array_, gint, 3), ==, 2); } +/** + * gi_marshalling_tests_garray_uint64_none_in: + * @array_: (element-type guint64) (transfer none): + */ +void +gi_marshalling_tests_garray_uint64_none_in (GArray *array_) +{ + g_assert_cmpint(array_->len, ==, 2); + g_assert_cmpint(g_array_index (array_, guint64, 0), ==, 0); + g_assert_cmpint(g_array_index (array_, guint64, 1), ==, G_MAXUINT64); +} + /** * gi_marshalling_tests_garray_utf8_none_in: * @array_: (element-type utf8) (transfer none): @@ -2275,6 +2309,24 @@ gi_marshalling_tests_glist_int_none_return (void) return list; } +/** + * gi_marshalling_tests_glist_uint32_none_return: + * + * Returns: (element-type guint32) (transfer none): + */ +GList * +gi_marshalling_tests_glist_uint32_none_return (void) +{ + static GList *list = NULL; + + if (list == NULL) { + list = g_list_append(list, GUINT_TO_POINTER(0)); + list = g_list_append(list, GUINT_TO_POINTER(G_MAXUINT32)); + } + + return list; +} + /** * gi_marshalling_tests_glist_utf8_none_return: * @@ -2342,6 +2394,18 @@ gi_marshalling_tests_glist_int_none_in (GList *list) g_assert_cmpint(GPOINTER_TO_INT(g_list_nth_data(list, 3)), ==, 2); } +/** + * gi_marshalling_tests_glist_uint32_none_in: + * @list: (element-type guint32) (transfer none): + */ +void +gi_marshalling_tests_glist_uint32_none_in (GList *list) +{ + g_assert_cmpint(g_list_length(list), ==, 2); + g_assert_cmpint(GPOINTER_TO_UINT(g_list_nth_data(list, 0)), ==, 0); + g_assert_cmpint(GPOINTER_TO_UINT(g_list_nth_data(list, 1)), ==, G_MAXUINT32); +} + /** * gi_marshalling_tests_glist_utf8_none_in: * @list: (element-type utf8) (transfer none): diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index cdcb08e6..7768a881 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -422,11 +422,13 @@ GVariant **gi_marshalling_tests_array_gvariant_full_in (GVariant **variants); /* GArray */ GArray *gi_marshalling_tests_garray_int_none_return (void); +GArray *gi_marshalling_tests_garray_uint64_none_return (void); GArray *gi_marshalling_tests_garray_utf8_none_return (void); GArray *gi_marshalling_tests_garray_utf8_container_return (void); GArray *gi_marshalling_tests_garray_utf8_full_return (void); void gi_marshalling_tests_garray_int_none_in (GArray *array_); +void gi_marshalling_tests_garray_uint64_none_in (GArray *array_); void gi_marshalling_tests_garray_utf8_none_in (GArray *array_); void gi_marshalling_tests_garray_utf8_none_out (GArray **array_); @@ -467,11 +469,13 @@ void gi_marshalling_tests_gstrv_inout (GStrv *g_strv); /* GList */ GList *gi_marshalling_tests_glist_int_none_return (void); +GList *gi_marshalling_tests_glist_uint32_none_return (void); GList *gi_marshalling_tests_glist_utf8_none_return (void); GList *gi_marshalling_tests_glist_utf8_container_return (void); GList *gi_marshalling_tests_glist_utf8_full_return (void); void gi_marshalling_tests_glist_int_none_in (GList *list); +void gi_marshalling_tests_glist_uint32_none_in (GList *list); void gi_marshalling_tests_glist_utf8_none_in (GList *list); void gi_marshalling_tests_glist_utf8_none_out (GList **list); -- cgit v1.2.1 From d86fc68738bb31e1ed26680ca5d1548721bc9de8 Mon Sep 17 00:00:00 2001 From: Simon Feltman Date: Wed, 10 Oct 2012 16:20:50 -0700 Subject: [gobject-introspection] Add test method for GDestroy with no user data Added regress_test_callback_destroy_notify_no_user_data. Updated Regress-1.0-expected.gir https://bugzilla.gnome.org/show_bug.cgi?id=685922 --- tests/scanner/Regress-1.0-expected.gir | 20 ++++++++++++++++++++ tests/scanner/regress.c | 14 ++++++++++++++ tests/scanner/regress.h | 2 ++ 3 files changed, 36 insertions(+) diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index a3e77db1..8d123f7a 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -2307,6 +2307,26 @@ is invoked. + + Adds a scope notified callback with no user data. This can invoke an error +condition in bindings which needs to be tested. + + + + + + + + + + + + diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c index 2fba9fd5..c6ca6b74 100644 --- a/tests/scanner/regress.c +++ b/tests/scanner/regress.c @@ -3323,6 +3323,20 @@ regress_test_callback_destroy_notify (RegressTestCallbackUserData callback, return retval; } +/** + * regress_test_callback_destroy_notify_no_user_data: + * @callback: (scope notified): + * + * Adds a scope notified callback with no user data. This can invoke an error + * condition in bindings which needs to be tested. + **/ +int +regress_test_callback_destroy_notify_no_user_data (RegressTestCallbackUserData callback, + GDestroyNotify notify) +{ + return regress_test_callback_destroy_notify(callback, NULL, notify); +} + /** * regress_test_callback_thaw_notifications: * diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h index f2dae494..635ea7bd 100644 --- a/tests/scanner/regress.h +++ b/tests/scanner/regress.h @@ -677,6 +677,8 @@ int regress_test_callback_user_data (RegressTestCallbackUserData callback, int regress_test_callback_destroy_notify (RegressTestCallbackUserData callback, gpointer user_data, GDestroyNotify notify); +int regress_test_callback_destroy_notify_no_user_data (RegressTestCallbackUserData callback, + GDestroyNotify notify); int regress_test_callback_thaw_notifications (void); void regress_test_callback_async (RegressTestCallbackUserData callback, gpointer user_data); -- cgit v1.2.1 From 448230b381a6ba0394962ca73f35af563b5de4c9 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 16 Oct 2012 10:58:08 -0400 Subject: Drop calls to g_type_init() And bump our GLib requirement. --- configure.ac | 2 +- examples/glib-print.c | 2 -- girepository/cmph-bdz-test.c | 1 - girepository/gi-dump-types.c | 2 -- girepository/gthash-test.c | 1 - giscanner/dumper.py | 2 ++ giscanner/giscannermodule.c | 2 -- tests/repository/gitestrepo.c | 2 -- tests/repository/gitestthrows.c | 2 -- tests/repository/gitypelibtest.c | 2 -- tests/scanner/barapp.c | 1 - tools/compiler.c | 2 -- tools/generate.c | 2 -- 13 files changed, 3 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index 775b50a0..e488cea9 100644 --- a/configure.ac +++ b/configure.ac @@ -123,7 +123,7 @@ GIR_DIR="$EXPANDED_DATADIR/$GIR_SUFFIX" AC_SUBST(GIR_DIR) AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Director prefix for gir installation]) -PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.29.7]) +PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.35.0]) PKG_CHECK_MODULES(GOBJECT, [gobject-2.0]) PKG_CHECK_MODULES(GMODULE, [gmodule-2.0]) PKG_CHECK_MODULES(GIO, [gio-2.0]) diff --git a/examples/glib-print.c b/examples/glib-print.c index f187f76c..606a29f3 100644 --- a/examples/glib-print.c +++ b/examples/glib-print.c @@ -8,8 +8,6 @@ int main(void) GIArgument in_args[5]; GIArgument retval; - g_type_init(); - repository = g_irepository_get_default(); g_irepository_require(repository, "GLib", "2.0", 0, &error); if (error) { diff --git a/girepository/cmph-bdz-test.c b/girepository/cmph-bdz-test.c index fdff9d17..92c445f8 100644 --- a/girepository/cmph-bdz-test.c +++ b/girepository/cmph-bdz-test.c @@ -128,7 +128,6 @@ main(int argc, char **argv) { gint ret; - g_type_init (); g_test_init (&argc, &argv, NULL); g_test_add_func ("/cmph-bdz/search", test_search); diff --git a/girepository/gi-dump-types.c b/girepository/gi-dump-types.c index 13e7ae68..69d8b12d 100644 --- a/girepository/gi-dump-types.c +++ b/girepository/gi-dump-types.c @@ -10,8 +10,6 @@ main (int argc, GOutputStream *stdout; GModule *self; - g_type_init (); - stdout = g_unix_output_stream_new (1, FALSE); self = g_module_open (NULL, 0); diff --git a/girepository/gthash-test.c b/girepository/gthash-test.c index ea811e35..faeb2dc5 100644 --- a/girepository/gthash-test.c +++ b/girepository/gthash-test.c @@ -56,7 +56,6 @@ test_build_retrieve (void) int main(int argc, char **argv) { - g_type_init (); g_test_init (&argc, &argv, NULL); g_test_add_func ("/gthash/build-retrieve", test_build_retrieve); diff --git a/giscanner/dumper.py b/giscanner/dumper.py index f78d2ae8..04c1f620 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py @@ -45,7 +45,9 @@ main(int argc, char **argv) GError *error = NULL; const char *introspect_dump_prefix = "--introspect-dump="; +#if !GLIB_CHECK_VERSION(2,35,0) g_type_init (); +#endif %(init_sections)s diff --git a/giscanner/giscannermodule.c b/giscanner/giscannermodule.c index 0da20f18..ad8f4bd3 100644 --- a/giscanner/giscannermodule.c +++ b/giscanner/giscannermodule.c @@ -722,8 +722,6 @@ init_giscanner(void) PyObject *m, *d; gboolean is_uninstalled; - g_type_init (); - /* Hack to avoid having to create a fake directory structure; when * running uninstalled, the module will be in the top builddir, * with no _giscanner prefix. diff --git a/tests/repository/gitestrepo.c b/tests/repository/gitestrepo.c index 05ea5d94..b122a63d 100644 --- a/tests/repository/gitestrepo.c +++ b/tests/repository/gitestrepo.c @@ -48,8 +48,6 @@ main(int argc, char **argv) GType gtype; const char *prefix; - g_type_init (); - repo = g_irepository_get_default (); ret = g_irepository_require (repo, "Gio", NULL, 0, &error); diff --git a/tests/repository/gitestthrows.c b/tests/repository/gitestthrows.c index cce06849..a045a817 100644 --- a/tests/repository/gitestthrows.c +++ b/tests/repository/gitestthrows.c @@ -16,8 +16,6 @@ main(int argc, char **argv) GError *error; gboolean invoke_return; - g_type_init (); - repo = g_irepository_get_default (); error = NULL; diff --git a/tests/repository/gitypelibtest.c b/tests/repository/gitypelibtest.c index 7068ef3d..36770738 100644 --- a/tests/repository/gitypelibtest.c +++ b/tests/repository/gitypelibtest.c @@ -183,8 +183,6 @@ main(int argc, char **argv) { GIRepository *repo; - g_type_init (); - repo = g_irepository_get_default (); /* do tests */ diff --git a/tests/scanner/barapp.c b/tests/scanner/barapp.c index db4be8db..ed391204 100644 --- a/tests/scanner/barapp.c +++ b/tests/scanner/barapp.c @@ -54,7 +54,6 @@ main(int argc, char **argv) g_printerr ("usage: barapp --introspect-dump=types.txt,out.xml\\n"); return 1; } - g_type_init (); if (!g_irepository_dump (argv[1] + strlen (prefix), &error)) { diff --git a/tools/compiler.c b/tools/compiler.c index 7e17f1bd..f8e8a90c 100644 --- a/tools/compiler.c +++ b/tools/compiler.c @@ -174,8 +174,6 @@ main (int argc, char ** argv) g_debug ("[parsing] start, %d includes", includedirs ? g_strv_length (includedirs) : 0); - g_type_init (); - if (includedirs != NULL) for (i = 0; includedirs[i]; i++) g_irepository_prepend_search_path (includedirs[i]); diff --git a/tools/generate.c b/tools/generate.c index 0426512f..3e310978 100644 --- a/tools/generate.c +++ b/tools/generate.c @@ -52,8 +52,6 @@ main (int argc, char *argv[]) g_log_set_always_fatal (G_LOG_LEVEL_WARNING | G_LOG_LEVEL_CRITICAL); - g_type_init (); - g_typelib_check_sanity (); context = g_option_context_new (""); -- cgit v1.2.1 From 72472408669305a2056d0a83c73a3dc186056067 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Wed, 17 Oct 2012 07:58:03 +0200 Subject: Update annotations from glib git --- gir/gio-2.0.c | 1181 +++++++++++++++++++++++++++++++++++++++++++++++++++-- gir/glib-2.0.c | 48 +-- gir/gobject-2.0.c | 51 +-- 3 files changed, 1158 insertions(+), 122 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 3f3b2222..a3eb8b10 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -2391,6 +2391,41 @@ */ +/** + * GTask: + * + * The opaque object representing a synchronous or asynchronous task + * and its result. + */ + + +/** + * GTaskThreadFunc: + * @task: the #GTask + * @source_object: @task's source object + * @task_data: @task's task data + * @cancellable: @task's #GCancellable, or %NULL + * + * The prototype for a task function to be run in a thread via + * g_task_run_in_thread() or g_task_run_in_thread_sync(). + * + * If the return-on-cancel flag is set on @task, and @cancellable gets + * cancelled, then the #GTask will be completed immediately (as though + * g_task_return_error_if_cancelled() had been called), without + * waiting for the task function to complete. However, the task + * function will continue running in its thread in the background. The + * function therefore needs to be careful about how it uses + * externally-visible state in this case. See + * g_task_set_return_on_cancel() for more details. + * + * Other than in that case, @task will be completed when the + * #GTaskThreadFunc returns, not when it calls + * a g_task_return_ function. + * + * Since: 2.36 + */ + + /** * GTestDBus: * @@ -3698,13 +3733,13 @@ * * for (l = self->priv->init_results; l != NULL; l = l->next) * { - * GSimpleAsyncResult *simple = l->data; + * GTask *task = l->data; * - * if (!self->priv->success) - * g_simple_async_result_set_error (simple, ...); - * - * g_simple_async_result_complete (simple); - * g_object_unref (simple); + * if (self->priv->success) + * g_task_return_boolean (task, TRUE); + * else + * g_task_return_new_error (task, ...); + * g_object_unref (task); * } * * g_list_free (self->priv->init_results); @@ -3719,31 +3754,28 @@ * gpointer user_data) * { * Foo *self = FOO (initable); - * GSimpleAsyncResult *simple; + * GTask *task; * - * simple = g_simple_async_result_new (G_OBJECT (initable) - * callback, - * user_data, - * foo_init_async); + * task = g_task_new (initable, cancellable, callback, user_data); * * switch (self->priv->state) * { * case NOT_INITIALIZED: * _foo_get_ready (self); * self->priv->init_results = g_list_append (self->priv->init_results, - * simple); + * task); * self->priv->state = INITIALIZING; * break; * case INITIALIZING: * self->priv->init_results = g_list_append (self->priv->init_results, - * simple); + * task); * break; * case INITIALIZED: * if (!self->priv->success) - * g_simple_async_result_set_error (simple, ...); - * - * g_simple_async_result_complete_in_idle (simple); - * g_object_unref (simple); + * g_task_return_new_error (task, ...); + * else + * g_task_return_boolean (task, TRUE); + * g_object_unref (task); * break; * } * } @@ -3753,14 +3785,9 @@ * GAsyncResult *result, * GError **error) * { - * g_return_val_if_fail (g_simple_async_result_is_valid (result, - * G_OBJECT (initable), foo_init_async), FALSE); - * - * if (g_simple_async_result_propagate_error (G_SIMPLE_ASYNC_RESULT (result), - * error)) - * return FALSE; + * g_return_val_if_fail (g_task_is_valid (result, initable), FALSE); * - * return TRUE; + * return g_task_propagate_boolean (G_TASK (result), error); * } * * static void @@ -3780,7 +3807,7 @@ * SECTION:gasyncresult * @short_description: Asynchronous Function Results * @include: gio/gio.h - * @see_also: #GSimpleAsyncResult + * @see_also: #GTask * * Provides a base class for implementing asynchronous function results. * @@ -3853,6 +3880,16 @@ * The callback for an asynchronous operation is called only once, and is * always called, even in the case of a cancelled operation. On cancellation * the result is a %G_IO_ERROR_CANCELLED error. + * + * I/O + * priority Many I/O-related asynchronous + * operations have a priority parameter, which is used in certain + * cases to determine the order in which operations are executed. They + * are not used to determine system-wide I/O + * scheduling. Priorities are integers, with lower numbers indicating + * higher priority. It is recommended to choose priorities between + * %G_PRIORITY_LOW and %G_PRIORITY_HIGH, with %G_PRIORITY_DEFAULT as a + * default. */ @@ -5249,17 +5286,13 @@ * @short_description: I/O Scheduler * @include: gio/gio.h * + * + * As of GLib 2.36, the g_io_scheduler methods + * are deprecated in favor of #GThreadPool and #GTask. + * + * * Schedules asynchronous I/O operations. #GIOScheduler integrates * into the main event loop (#GMainLoop) and uses threads. - * - * I/O priority - * Each I/O operation has a priority, and the scheduler uses the priorities - * to determine the order in which operations are executed. They are - * not used to determine system-wide I/O scheduling. - * Priorities are integers, with lower numbers indicating higher priority. - * It is recommended to choose priorities between %G_PRIORITY_LOW and - * %G_PRIORITY_HIGH, with %G_PRIORITY_DEFAULT as a default. - * */ @@ -6221,10 +6254,12 @@ * @include: gio/gio.h * @see_also: #GAsyncResult * - * Implements #GAsyncResult for simple cases. Most of the time, this - * will be all an application needs, and will be used transparently. - * Because of this, #GSimpleAsyncResult is used throughout GIO for - * handling asynchronous functions. + * + * As of GLib 2.36, #GSimpleAsyncResult is deprecated in favor of + * #GTask, which provides a simpler API. + * + * + * #GSimpleAsyncResult implements #GAsyncResult. * * GSimpleAsyncResult handles #GAsyncReadyCallbacks, error * reporting, operation cancellation and the final state of an operation, @@ -6695,6 +6730,534 @@ */ +/** + * SECTION:gtask + * @short_description: Cancellable synchronous or asynchronous task and result + * @include: gio/gio.h + * @see_also: #GAsyncResult + * + * + * A #GTask represents and manages a cancellable "task". + * + * + * Asynchronous operations + * + * The most common usage of #GTask is as a #GAsyncResult, to + * manage data during an asynchronous operation. You call + * g_task_new() in the "start" method, followed by + * g_task_set_task_data() and the like if you need to keep some + * additional data associated with the task, and then pass the + * task object around through your asynchronous operation. + * Eventually, you will call a method such as + * g_task_return_pointer() or g_task_return_error(), which will + * save the value you give it and then invoke the task's callback + * function (waiting until the next next iteration of the main + * loop first, if necessary). The caller will pass the #GTask back + * to the operation's finish function (as a #GAsyncResult), and + * you can use g_task_propagate_pointer() or the like to extract + * the return value. + * + * GTask as a GAsyncResult + * + * typedef struct { + * CakeFrostingType frosting; + * char *message; + * } DecorationData; + * + * static void + * decoration_data_free (DecorationData *decoration) + * { + * g_free (decoration->message); + * g_slice_free (DecorationData, decoration); + * } + * + * static void + * baked_cb (Cake *cake, + * gpointer user_data) + * { + * GTask *task = user_data; + * DecorationData *decoration = g_task_get_task_data (task); + * GError *error = NULL; + * + * if (cake == NULL) + * { + * g_task_return_new_error (task, BAKER_ERROR, BAKER_ERROR_NO_FLOUR, + * "Go to the supermarket"); + * g_object_unref (task); + * return; + * } + * + * if (!cake_decorate (cake, decoration->frosting, decoration->message, &error)) + * { + * g_object_unref (cake); + * /* g_task_return_error() takes ownership of error */ + * g_task_return_error (task, error); + * g_object_unref (task); + * return; + * } + * + * g_task_return_pointer (result, cake, g_object_unref); + * g_object_unref (task); + * } + * + * void + * baker_bake_cake_async (Baker *self, + * guint radius, + * CakeFlavor flavor, + * CakeFrostingType frosting, + * const char *message, + * GCancellable *cancellable, + * GAsyncReadyCallback callback, + * gpointer user_data) + * { + * GTask *task; + * DecorationData *decoration; + * Cake *cake; + * + * task = g_task_new (self, cancellable, callback, user_data); + * if (radius < 3) + * { + * g_task_return_new_error (task, BAKER_ERROR, BAKER_ERROR_TOO_SMALL, + * "%ucm radius cakes are silly", + * radius); + * g_object_unref (task); + * return; + * } + * + * cake = _baker_get_cached_cake (self, radius, flavor, frosting, message); + * if (cake != NULL) + * { + * /* _baker_get_cached_cake() returns a reffed cake */ + * g_task_return_pointer (task, cake, g_object_unref); + * g_object_unref (task); + * return; + * } + * + * decoration = g_slice_new (DecorationData); + * decoration->frosting = frosting; + * decoration->message = g_strdup (message); + * g_task_set_task_data (task, decoration, (GDestroyNotify) decoration_data_free); + * + * _baker_begin_cake (self, radius, flavor, cancellable, baked_cb, task); + * } + * + * Cake * + * baker_bake_cake_finish (Baker *self, + * GAsyncResult *result, + * GError **error) + * { + * g_return_val_if_fail (g_task_is_valid (result, self), NULL); + * + * return g_task_propagate_pointer (G_TASK (result), error); + * } + * + * + * + * + * Chained asynchronous operations + * + * #GTask also tries to simplify asynchronous operations that + * internally chain together several smaller asynchronous + * operations. g_task_get_cancellable(), g_task_get_context(), and + * g_task_get_priority() allow you to get back the task's + * #GCancellable, #GMainContext, and I/O priority when starting a new + * subtask, so you don't have to keep track of them yourself. + * g_task_attach_source() simplifies the case of waiting for a + * source to fire (automatically using the correct #GMainContext + * and priority). + * + * Chained asynchronous operations + * + * typedef struct { + * Cake *cake; + * CakeFrostingType frosting; + * char *message; + * } BakingData; + * + * static void + * decoration_data_free (BakingData *bd) + * { + * if (bd->cake) + * g_object_unref (bd->cake); + * g_free (bd->message); + * g_slice_free (BakingData, bd); + * } + * + * static void + * decorated_cb (Cake *cake, + * GAsyncResult *result, + * gpointer user_data) + * { + * GTask *task = user_data; + * GError *error = NULL; + * + * if (!cake_decorate_finish (cake, result, &error)) + * { + * g_object_unref (cake); + * g_task_return_error (task, error); + * g_object_unref (task); + * return; + * } + * + * /* baking_data_free() will drop its ref on the cake, so + * * we have to take another here to give to the caller. + * */ + * g_task_return_pointer (result, g_object_ref (cake), g_object_unref); + * g_object_unref (task); + * } + * + * static void + * decorator_ready (gpointer user_data) + * { + * GTask *task = user_data; + * BakingData *bd = g_task_get_task_data (task); + * + * cake_decorate_async (bd->cake, bd->frosting, bd->message, + * g_task_get_cancellable (task), + * decorated_cb, task); + * } + * + * static void + * baked_cb (Cake *cake, + * gpointer user_data) + * { + * GTask *task = user_data; + * BakingData *bd = g_task_get_task_data (task); + * GError *error = NULL; + * + * if (cake == NULL) + * { + * g_task_return_new_error (task, BAKER_ERROR, BAKER_ERROR_NO_FLOUR, + * "Go to the supermarket"); + * g_object_unref (task); + * return; + * } + * + * bd->cake = cake; + * + * /* Bail out now if the user has already cancelled */ + * if (g_task_return_error_if_cancelled (g_task_get_cancellable (task))) + * { + * g_object_unref (task); + * return; + * } + * + * if (cake_decorator_available (cake)) + * decorator_ready (task); + * else + * { + * GSource *source; + * + * source = cake_decorator_wait_source_new (cake); + * /* Attach @source to @task's GMainContext and have it call + * * decorator_ready() when it is ready. + * */ + * g_task_attach_source (task, source, + * G_CALLBACK (decorator_ready)); + * g_source_unref (source); + * } + * } + * + * void + * baker_bake_cake_async (Baker *self, + * guint radius, + * CakeFlavor flavor, + * CakeFrostingType frosting, + * const char *message, + * gint priority, + * GCancellable *cancellable, + * GAsyncReadyCallback callback, + * gpointer user_data) + * { + * GTask *task; + * BakingData *bd; + * + * task = g_task_new (self, cancellable, callback, user_data); + * g_task_set_priority (task, priority); + * + * bd = g_slice_new0 (BakingData); + * bd->frosting = frosting; + * bd->message = g_strdup (message); + * g_task_set_task_data (task, bd, (GDestroyNotify) baking_data_free); + * + * _baker_begin_cake (self, radius, flavor, cancellable, baked_cb, task); + * } + * + * Cake * + * baker_bake_cake_finish (Baker *self, + * GAsyncResult *result, + * GError **error) + * { + * g_return_val_if_fail (g_task_is_valid (result, self), NULL); + * + * return g_task_propagate_pointer (G_TASK (result), error); + * } + * + * + * + * + * Asynchronous operations from synchronous ones + * + * You can use g_task_run_in_thread() to turn a synchronous + * operation into an asynchronous one, by running it in a thread + * which will then dispatch the result back to the caller's + * #GMainContext when it completes. + * + * g_task_run_in_thread() + * + * typedef struct { + * guint radius; + * CakeFlavor flavor; + * CakeFrostingType frosting; + * char *message; + * } CakeData; + * + * static void + * cake_data_free (CakeData *cake_data) + * { + * g_free (cake_data->message); + * g_slice_free (CakeData, cake_data); + * } + * + * static void + * bake_cake_thread (GTask *task, + * gpointer source_object, + * gpointer task_data, + * GCancellable *cancellable) + * { + * Baker *self = source_object; + * CakeData *cake_data = task_data; + * Cake *cake; + * GError *error = NULL; + * + * cake = bake_cake (baker, cake_data->radius, cake_data->flavor, + * cake_data->frosting, cake_data->message, + * cancellable, &error); + * if (cake) + * g_task_return_pointer (task, cake, g_object_unref); + * else + * g_task_return_error (task, error); + * } + * + * void + * baker_bake_cake_async (Baker *self, + * guint radius, + * CakeFlavor flavor, + * CakeFrostingType frosting, + * const char *message, + * GCancellable *cancellable, + * GAsyncReadyCallback callback, + * gpointer user_data) + * { + * CakeData *cake_data; + * GTask *task; + * + * cake_data = g_slice_new (CakeData); + * cake_data->radius = radius; + * cake_data->flavor = flavor; + * cake_data->frosting = frosting; + * cake_data->message = g_strdup (message); + * task = g_task_new (self, cancellable, callback, user_data); + * g_task_set_task_data (task, cake_data, (GDestroyNotify) cake_data_free); + * g_task_run_in_thread (task, bake_cake_thread); + * } + * + * Cake * + * baker_bake_cake_finish (Baker *self, + * GAsyncResult *result, + * GError **error) + * { + * g_return_val_if_fail (g_task_is_valid (result, self), NULL); + * + * return g_task_propagate_pointer (G_TASK (result), error); + * } + * + * + * + * + * Adding cancellability to uncancellable tasks + * + * Finally, g_task_run_in_thread() and g_task_run_in_thread_sync() + * can be used to turn an uncancellable operation into a + * cancellable one. If you call g_task_set_return_on_cancel(), + * passing %TRUE, then if the task's #GCancellable is cancelled, + * it will return control back to the caller immediately, while + * allowing the task thread to continue running in the background + * (and simply discarding its result when it finally does finish). + * Provided that the task thread is careful about how it uses + * locks and other externally-visible resources, this allows you + * to make "GLib-friendly" asynchronous and cancellable + * synchronous variants of blocking APIs. + * + * g_task_set_return_on_cancel() + * + * static void + * bake_cake_thread (GTask *task, + * gpointer source_object, + * gpointer task_data, + * GCancellable *cancellable) + * { + * Baker *self = source_object; + * CakeData *cake_data = task_data; + * Cake *cake; + * GError *error = NULL; + * + * cake = bake_cake (baker, cake_data->radius, cake_data->flavor, + * cake_data->frosting, cake_data->message, + * &error); + * if (error) + * { + * g_task_return_error (task, error); + * return; + * } + * + * /* If the task has already been cancelled, then we don't + * * want to add the cake to the cake cache. Likewise, we don't + * * want to have the task get cancelled in the middle of + * * updating the cache. g_task_set_return_on_cancel() will + * * return %TRUE here if it managed to disable return-on-cancel, + * * or %FALSE if the task was cancelled before it could. + * */ + * if (g_task_set_return_on_cancel (task, FALSE)) + * { + * /* If the caller cancels at this point, their + * * GAsyncReadyCallback won't be invoked until we return, + * * so we don't have to worry that this code will run at + * * the same time as that code does. But if there were + * * other functions that might look at the cake cache, + * * then we'd probably need a GMutex here as well. + * */ + * baker_add_cake_to_cache (baker, cake); + * g_task_return_pointer (task, cake, g_object_unref); + * } + * } + * + * void + * baker_bake_cake_async (Baker *self, + * guint radius, + * CakeFlavor flavor, + * CakeFrostingType frosting, + * const char *message, + * GCancellable *cancellable, + * GAsyncReadyCallback callback, + * gpointer user_data) + * { + * CakeData *cake_data; + * GTask *task; + * + * cake_data = g_slice_new (CakeData); + * /* ... */ + * + * task = g_task_new (self, cancellable, callback, user_data); + * g_task_set_task_data (task, cake_data, (GDestroyNotify) cake_data_free); + * g_task_set_return_on_cancel (task, TRUE); + * g_task_run_in_thread (task, bake_cake_thread); + * } + * + * Cake * + * baker_bake_cake_sync (Baker *self, + * guint radius, + * CakeFlavor flavor, + * CakeFrostingType frosting, + * const char *message, + * GCancellable *cancellable, + * GError **error) + * { + * CakeData *cake_data; + * GTask *task; + * Cake *cake; + * + * cake_data = g_slice_new (CakeData); + * /* ... */ + * + * task = g_task_new (self, cancellable, NULL, NULL); + * g_task_set_task_data (task, cake_data, (GDestroyNotify) cake_data_free); + * g_task_set_return_on_cancel (task, TRUE); + * g_task_run_in_thread_sync (task, bake_cake_thread); + * + * cake = g_task_propagate_pointer (task, error); + * g_object_unref (task); + * return cake; + * } + * + * + * + * + * Porting from <literal>GSimpleAsyncResult</literal> + * + * #GTask's API attempts to be simpler than #GSimpleAsyncResult's + * in several ways: + * + * + * + * You can save task-specific data with g_task_set_task_data(), and + * retrieve it later with g_task_get_task_data(). This replaces the + * abuse of g_simple_async_result_set_op_res_gpointer() for the same + * purpose with #GSimpleAsyncResult. + * + * + * In addition to the task data, #GTask also keeps track of the + * priority, #GCancellable, and + * #GMainContext associated with the task, so tasks that consist of + * a chain of simpler asynchronous operations will have easy access + * to those values when starting each sub-task. + * + * + * g_task_return_error_if_cancelled() provides simplified + * handling for cancellation. In addition, cancellation + * overrides any other #GTask return value by default, like + * #GSimpleAsyncResult does when + * g_simple_async_result_set_check_cancellable() is called. + * (You can use g_task_set_check_cancellable() to turn off that + * behavior.) On the other hand, g_task_run_in_thread() + * guarantees that it will always run your + * task_func, even if the task's #GCancellable + * is already cancelled before the task gets a chance to run; + * you can start your task_func with a + * g_task_return_error_if_cancelled() check if you need the + * old behavior. + * + * + * The "return" methods (eg, g_task_return_pointer()) + * automatically cause the task to be "completed" as well, and + * there is no need to worry about the "complete" vs "complete + * in idle" distinction. (#GTask automatically figures out + * whether the task's callback can be invoked directly, or + * if it needs to be sent to another #GMainContext, or delayed + * until the next iteration of the current #GMainContext.) + * + * + * The "finish" functions for #GTask-based operations are generally + * much simpler than #GSimpleAsyncResult ones, normally consisting + * of only a single call to g_task_propagate_pointer() or the like. + * Since g_task_propagate_pointer() "steals" the return value from + * the #GTask, it is not necessary to juggle pointers around to + * prevent it from being freed twice. + * + * + * With #GSimpleAsyncResult, it was common to call + * g_simple_async_result_propagate_error() from the + * _finish() wrapper function, and have + * virtual method implementations only deal with successful + * returns. This behavior is deprecated, because it makes it + * difficult for a subclass to chain to a parent class's async + * methods. Instead, the wrapper function should just be a + * simple wrapper, and the virtual method should call an + * appropriate g_task_propagate_ function. + * Note that wrapper methods can now use + * g_async_result_legacy_propagate_error() to do old-style + * #GSimpleAsyncResult error-returning behavior, and + * g_async_result_is_tagged() to check if a result is tagged as + * having come from the _async() wrapper + * function (for "short-circuit" results, such as when passing + * 0 to g_input_stream_read_async()). + * + * + * + */ + + /** * SECTION:gtcpconnection * @title: GTcpConnection @@ -6729,7 +7292,8 @@ * @short_description: D-Bus testing helper * @include: gio/gio.h * - * Helper to test D-Bus code wihtout messing up with user' session bus. + * A helper class for testing code which uses D-Bus without touching the user's + * session bus. */ @@ -10117,8 +10681,6 @@ * * Creates a new #GApplication instance. * - * This function calls g_type_init() for you. - * * If non-%NULL, the application id must be valid. See * g_application_id_is_valid(). * @@ -14209,7 +14771,7 @@ * @interface_: A #GDBusInterfaceSkeleton. * @connection: A #GDBusConnection. * - * Checks if @interface_ is export on @connection. + * Checks if @interface_ is exported on @connection. * * Returns: %TRUE if @interface_ is exported on @connection, %FALSE otherwise. * Since: 2.32 @@ -17918,7 +18480,7 @@ * g_file_enumerator_next_files_async: * @enumerator: a #GFileEnumerator. * @num_files: the number of file info objects to request - * @io_priority: the io priority of the request. + * @io_priority: the io priority of the request. * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): a #GAsyncReadyCallback to call when the request is satisfied * @user_data: (closure): the data to pass to callback function @@ -22030,6 +22592,8 @@ * * A job is cancellable if a #GCancellable was passed into * g_io_scheduler_push_job(). + * + * Deprecated: You should never call this function, since you don't know how other libraries in your program might be making use of gioscheduler. */ @@ -22045,6 +22609,7 @@ * blocking the I/O job). * * Returns: The return value of @func + * Deprecated: Use g_main_context_invoke(). */ @@ -22064,6 +22629,8 @@ * on to this function you have to ensure that it is not freed before * @func is called, either by passing %NULL as @notify to * g_io_scheduler_push_job() or by using refcounting for @user_data. + * + * Deprecated: Use g_main_context_invoke(). */ @@ -22072,7 +22639,7 @@ * @job_func: a #GIOSchedulerJobFunc. * @user_data: data to pass to @job_func * @notify: (allow-none): a #GDestroyNotify for @user_data, or %NULL - * @io_priority: the I/O priority of the request. + * @io_priority: the I/O priority of the request. * @cancellable: optional #GCancellable object, %NULL to ignore. * * Schedules the I/O job to run in another thread. @@ -22083,6 +22650,8 @@ * If @cancellable is not %NULL, it can be used to cancel the I/O job * by calling g_cancellable_cancel() or by calling * g_io_scheduler_cancel_all_jobs(). + * + * Deprecated: use #GThreadPool or g_task_run_in_thread() */ @@ -30255,6 +30824,528 @@ */ +/** + * g_task_attach_source: + * @task: a #GTask + * @source: the source to attach + * @callback: the callback to invoke when @source triggers + * + * A utility function for dealing with async operations where you need + * to wait for a #GSource to trigger. Attaches @source to @task's + * #GMainContext with @task's priority, and sets @source's callback + * to @callback, with @task as the callback's + * user_data. + * + * This takes a reference on @task until @source is destroyed. + * + * Since: 2.36 + */ + + +/** + * g_task_get_cancellable: + * @task: a #GTask + * + * Gets @task's #GCancellable + * + * Returns: (transfer none): @task's #GCancellable + * Since: 2.36 + */ + + +/** + * g_task_get_check_cancellable: + * @task: the #GTask + * + * Gets @task's check-cancellable flag. See + * g_task_set_check_cancellable() for more details. + * + * Since: 2.36 + */ + + +/** + * g_task_get_context: + * @task: a #GTask + * + * Gets the #GMainContext that @task will return its result in (that + * is, the context that was the thread-default main + * context at the point when @task was created). + * + * This will always return a non-%NULL value, even if the task's + * context is the default #GMainContext. + * + * Returns: (transfer none): @task's #GMainContext + * Since: 2.36 + */ + + +/** + * g_task_get_priority: + * @task: a #GTask + * + * Gets @task's priority + * + * Returns: @task's priority + * Since: 2.36 + */ + + +/** + * g_task_get_return_on_cancel: + * @task: the #GTask + * + * Gets @task's return-on-cancel flag. See + * g_task_set_return_on_cancel() for more details. + * + * Since: 2.36 + */ + + +/** + * g_task_get_source_object: + * @task: a #GTask + * + * Gets the source object from @task. Like + * g_async_result_get_source_object(), but does not ref the object. + * + * Returns: (transfer none): @task's source object, or %NULL + * Since: 2.36 + */ + + +/** + * g_task_get_source_tag: + * @task: a #GTask + * + * Gets @task's source tag. See g_task_set_source_tag(). + * + * Returns: (transfer none): @task's source tag + * Since: 2.36 + */ + + +/** + * g_task_get_task_data: + * @task: a #GTask + * + * Gets @task's task_data. + * + * Returns: (transfer none): @task's task_data. + * Since: 2.36 + */ + + +/** + * g_task_had_error: + * @task: a #GTask. + * + * Tests if @task resulted in an error. + * + * Returns: %TRUE if the task resulted in an error, %FALSE otherwise. + * Since: 2.36 + */ + + +/** + * g_task_is_valid: + * @result: (type Gio.AsyncResult): A #GAsyncResult + * @source_object: (allow-none): the source object expected to be associated with the task + * + * Checks that @result is a #GTask, and that @source_object is its + * source object (or that @source_object is %NULL and @result has no + * source object). This can be used in g_return_if_fail() checks. + * + * Returns: %TRUE if @result and @source_object are valid, %FALSE if not + * Since: 2.36 + */ + + +/** + * g_task_new: + * @source_object: (allow-none): the #GObject that owns this task, or %NULL. + * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. + * @callback: (scope async): a #GAsyncReadyCallback. + * @callback_data: (closure): user data passed to @callback. + * + * Creates a #GTask acting on @source_object, which will eventually be + * used to invoke @callback in the current thread-default main + * context. + * + * Call this in the "start" method of your asynchronous method, and + * pass the #GTask around throughout the asynchronous operation. You + * can use g_task_set_task_data() to attach task-specific data to the + * object, which you can retrieve later via g_task_get_task_data(). + * + * By default, if @cancellable is cancelled, then the return value of + * the task will always be %G_IO_ERROR_CANCELLED, even if the task had + * already completed before the cancellation. This allows for + * simplified handling in cases where cancellation may imply that + * other objects that the task depends on have been destroyed. If you + * do not want this behavior, you can use + * g_task_set_check_cancellable() to change it. + * + * Returns: a #GTask. + * Since: 2.36 + */ + + +/** + * g_task_propagate_boolean: + * @task: a #GTask. + * @error: return location for a #GError + * + * Gets the result of @task as a #gboolean. + * + * If the task resulted in an error, or was cancelled, then this will + * instead return %FALSE and set @error. + * + * Since this method transfers ownership of the return value (or + * error) to the caller, you may only call it once. + * + * Returns: the task result, or %FALSE on error + * Since: 2.36 + */ + + +/** + * g_task_propagate_int: + * @task: a #GTask. + * @error: return location for a #GError + * + * Gets the result of @task as an integer (#gssize). + * + * If the task resulted in an error, or was cancelled, then this will + * instead return -1 and set @error. + * + * Since this method transfers ownership of the return value (or + * error) to the caller, you may only call it once. + * + * Returns: the task result, or -1 on error + * Since: 2.36 + */ + + +/** + * g_task_propagate_pointer: + * @task: a #GTask + * @error: return location for a #GError + * + * Gets the result of @task as a pointer, and transfers ownership + * of that value to the caller. + * + * If the task resulted in an error, or was cancelled, then this will + * instead return %NULL and set @error. + * + * Since this method transfers ownership of the return value (or + * error) to the caller, you may only call it once. + * + * Returns: (transfer full): the task result, or %NULL on error + * Since: 2.36 + */ + + +/** + * g_task_report_error: + * @source_object: (allow-none): the #GObject that owns this task, or %NULL. + * @callback: (scope async): a #GAsyncReadyCallback. + * @callback_data: (closure): user data passed to @callback. + * @source_tag: an opaque pointer indicating the source of this task + * @error: (transfer full): error to report + * + * Creates a #GTask and then immediately calls g_task_return_error() + * on it. Use this in the wrapper function of an asynchronous method + * when you want to avoid even calling the virtual method. You can + * then use g_async_result_is_tagged() in the finish method wrapper to + * check if the result there is tagged as having been created by the + * wrapper method, and deal with it appropriately if so. + * + * See also g_task_report_new_error(). + * + * Since: 2.36 + */ + + +/** + * g_task_report_new_error: + * @source_object: (allow-none): the #GObject that owns this task, or %NULL. + * @callback: (scope async): a #GAsyncReadyCallback. + * @callback_data: (closure): user data passed to @callback. + * @source_tag: an opaque pointer indicating the source of this task + * @domain: a #GQuark. + * @code: an error code. + * @format: a string with format characters. + * @...: a list of values to insert into @format. + * + * Creates a #GTask and then immediately calls + * g_task_return_new_error() on it. Use this in the wrapper function + * of an asynchronous method when you want to avoid even calling the + * virtual method. You can then use g_async_result_is_tagged() in the + * finish method wrapper to check if the result there is tagged as + * having been created by the wrapper method, and deal with it + * appropriately if so. + * + * See also g_task_report_error(). + * + * Since: 2.36 + */ + + +/** + * g_task_return_boolean: + * @task: a #GTask. + * @result: the #gboolean result of a task function. + * + * Sets @task's result to @result and completes the task (see + * g_task_return_pointer() for more discussion of exactly what this + * means). + * + * Since: 2.36 + */ + + +/** + * g_task_return_error: + * @task: a #GTask. + * @error: (transfer full): the #GError result of a task function. + * + * Sets @task's result to @error (which @task assumes ownership of) + * and completes the task (see g_task_return_pointer() for more + * discussion of exactly what this means). + * + * Note that since the task takes ownership of @error, and since the + * task may be completed before returning from g_task_return_error(), + * you cannot assume that @error is still valid after calling this. + * Call g_error_copy() on the error if you need to keep a local copy + * as well. + * + * See also g_task_return_new_error(). + * + * Since: 2.36 + */ + + +/** + * g_task_return_error_if_cancelled: + * @task: a #GTask + * + * Checks if @task's #GCancellable has been cancelled, and if so, sets + * @task's error accordingly and completes the task (see + * g_task_return_pointer() for more discussion of exactly what this + * means). + * + * Returns: %TRUE if @task has been cancelled, %FALSE if not + * Since: 2.36 + */ + + +/** + * g_task_return_int: + * @task: a #GTask. + * @result: the integer (#gssize) result of a task function. + * + * Sets @task's result to @result and completes the task (see + * g_task_return_pointer() for more discussion of exactly what this + * means). + * + * Since: 2.36 + */ + + +/** + * g_task_return_new_error: + * @task: a #GTask. + * @domain: a #GQuark. + * @code: an error code. + * @format: a string with format characters. + * @...: a list of values to insert into @format. + * + * Sets @task's result to a new #GError created from @domain, @code, + * @format, and the remaining arguments, and completes the task (see + * g_task_return_pointer() for more discussion of exactly what this + * means). + * + * See also g_task_return_error(). + * + * Since: 2.36 + */ + + +/** + * g_task_return_pointer: + * @task: a #GTask + * @result: (allow-none) (transfer full): the pointer result of a task function + * @result_destroy: (allow-none): a #GDestroyNotify function. + * + * Sets @task's result to @result and completes the task. If @result + * is not %NULL, then @result_destroy will be used to free @result if + * the caller does not take ownership of it with + * g_task_propagate_pointer(). + * + * "Completes the task" means that for an ordinary asynchronous task + * it will either invoke the task's callback, or else queue that + * callback to be invoked in the proper #GMainContext, or in the next + * iteration of the current #GMainContext. For a task run via + * g_task_run_in_thread() or g_task_run_in_thread_sync(), calling this + * method will save @result to be returned to the caller later, but + * the task will not actually be completed until the #GTaskThreadFunc + * exits. + * + * Note that since the task may be completed before returning from + * g_task_return_pointer(), you cannot assume that @result is still + * valid after calling this, unless you are still holding another + * reference on it. + * + * Since: 2.36 + */ + + +/** + * g_task_run_in_thread: + * @task: a #GTask + * @task_func: a #GTaskThreadFunc + * + * Runs @task_func in another thread. When @task_func returns, @task's + * #GAsyncReadyCallback will be invoked in @task's #GMainContext. + * + * This takes a ref on @task until the task completes. + * + * See #GTaskThreadFunc for more details about how @task_func is handled. + * + * Since: 2.36 + */ + + +/** + * g_task_run_in_thread_sync: + * @task: a #GTask + * @task_func: a #GTaskThreadFunc + * + * Runs @task_func in another thread, and waits for it to return or be + * cancelled. You can use g_task_propagate_pointer(), etc, afterward + * to get the result of @task_func. + * + * See #GTaskThreadFunc for more details about how @task_func is handled. + * + * Normally this is used with tasks created with a %NULL + * callback, but note that even if the task does + * have a callback, it will not be invoked when @task_func returns. + * + * Since: 2.36 + */ + + +/** + * g_task_set_check_cancellable: + * @task: the #GTask + * @check_cancellable: whether #GTask will check the state of its #GCancellable for you. + * + * Sets or clears @task's check-cancellable flag. If this is %TRUE + * (the default), then g_task_propagate_pointer(), etc, and + * g_task_had_error() will check the task's #GCancellable first, and + * if it has been cancelled, then they will consider the task to have + * returned an "Operation was cancelled" error + * (%G_IO_ERROR_CANCELLED), regardless of any other error or return + * value the task may have had. + * + * If @check_cancellable is %FALSE, then the #GTask will not check the + * cancellable itself, and it is up to @task's owner to do this (eg, + * via g_task_return_error_if_cancelled()). + * + * If you are using g_task_set_return_on_cancel() as well, then + * you must leave check-cancellable set %TRUE. + * + * Since: 2.36 + */ + + +/** + * g_task_set_priority: + * @task: the #GTask + * @priority: the priority of the request. + * + * Sets @task's priority. If you do not call this, it will default to + * %G_PRIORITY_DEFAULT. + * + * This will affect the priority of #GSources created with + * g_task_attach_source() and the scheduling of tasks run in threads, + * and can also be explicitly retrieved later via + * g_task_get_priority(). + * + * Since: 2.36 + */ + + +/** + * g_task_set_return_on_cancel: + * @task: the #GTask + * @return_on_cancel: whether the task returns automatically when it is cancelled. + * + * Sets or clears @task's return-on-cancel flag. This is only + * meaningful for tasks run via g_task_run_in_thread() or + * g_task_run_in_thread_sync(). + * + * If @return_on_cancel is %TRUE, then cancelling @task's + * #GCancellable will immediately cause it to return, as though the + * task's #GTaskThreadFunc had called + * g_task_return_error_if_cancelled() and then returned. + * + * This allows you to create a cancellable wrapper around an + * uninterruptable function. The #GTaskThreadFunc just needs to be + * careful that it does not modify any externally-visible state after + * it has been cancelled. To do that, the thread should call + * g_task_set_return_on_cancel() again to (atomically) set + * return-on-cancel %FALSE before making externally-visible changes; + * if the task gets cancelled before the return-on-cancel flag could + * be changed, g_task_set_return_on_cancel() will indicate this by + * returning %FALSE. + * + * You can disable and re-enable this flag multiple times if you wish. + * If the task's #GCancellable is cancelled while return-on-cancel is + * %FALSE, then calling g_task_set_return_on_cancel() to set it %TRUE + * again will cause the task to be cancelled at that point. + * + * If the task's #GCancellable is already cancelled before you call + * g_task_run_in_thread()/g_task_run_in_thread_sync(), then the + * #GTaskThreadFunc will still be run (for consistency), but the task + * will also be completed right away. + * + * Returns: %TRUE if @task's return-on-cancel flag was changed to match @return_on_cancel. %FALSE if @task has already been cancelled. + * Since: 2.36 + */ + + +/** + * g_task_set_source_tag: + * @task: the #GTask + * @source_tag: an opaque pointer indicating the source of this task + * + * Sets @task's source tag. You can use this to tag a task return + * value with a particular pointer (usually a pointer to the function + * doing the tagging) and then later check it using + * g_task_get_source_tag() (or g_async_result_is_tagged()) in the + * task's "finish" function, to figure out if the response came from a + * particular place. + * + * Since: 2.36 + */ + + +/** + * g_task_set_task_data: + * @task: the #GTask + * @task_data: (allow-none): task-specific data + * @task_data_destroy: (allow-none): #GDestroyNotify for @task_data + * + * Sets @task's task data (freeing the existing task data, if any). + * + * Since: 2.36 + */ + + /** * g_tcp_connection_get_graceful_disconnect: * @connection: a #GTcpConnection @@ -30392,7 +31483,7 @@ * @self: a #GTestDBus * * Start a dbus-daemon instance and set DBUS_SESSION_BUS_ADDRESS. After this - * call, it is safe for unit tests to start sending messages on the session bug. + * call, it is safe for unit tests to start sending messages on the session bus. * * If this function is called from setup callback of g_test_add(), * g_test_dbus_down() must be called in its teardown callback. diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 90ec0003..85399cac 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -6434,50 +6434,14 @@ * * To destroy a #GHashTable use g_hash_table_destroy(). * - * - * Using a GHashTable as a set - * - * A common use-case for hash tables is to store information about - * a set of keys, without associating any particular value with each + * A common use-case for hash tables is to store information about a + * set of keys, without associating any particular value with each * key. GHashTable optimizes one way of doing so: If you store only * key-value pairs where key == value, then GHashTable does not * allocate memory to store the values, which can be a considerable - * space saving, if your set is large. - * - * - * GHashTable * - * set_new (GHashFunc hash_func, - * GEqualFunc equal_func, - * GDestroyNotify destroy) - * { - * return g_hash_table_new_full (hash_func, equal_func, destroy, NULL); - * } - * - * void - * set_add (GHashTable *set, - * gpointer element) - * { - * g_hash_table_replace (set, element, element); - * } - * - * gboolean - * set_contains (GHashTable *set, - * gpointer element) - * { - * return g_hash_table_lookup_extended (set, element, NULL, NULL); - * } - * - * gboolean - * set_remove (GHashTable *set, - * gpointer element) - * { - * return g_hash_table_remove (set, element); - * } - * - * - * - * As of version 2.32, there is also a g_hash_table_add() function to - * add a key to a #GHashTable that is being used as a set. + * space saving, if your set is large. The functions + * g_hash_table_add() and g_hash_table_contains() are designed to be + * used when using #GHashTable this way. */ @@ -25975,7 +25939,7 @@ * gracefully by sorting it before non-%NULL strings. * Comparing two %NULL pointers returns 0. * - * Returns: -1, 0 or 1, if @str1 is <, == or > than @str2. + * Returns: an integer less than, equal to, or greater than zero, if @str1 is <, == or > than @str2. * Since: 2.16 */ diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c index 81e65a32..755f4c24 100644 --- a/gir/gobject-2.0.c +++ b/gir/gobject-2.0.c @@ -328,8 +328,6 @@ * GValue b = G_VALUE_INIT; * const gchar *message; * - * g_type_init (); - * * /* The GValue starts empty */ * g_assert (!G_VALUE_HOLDS_STRING (&a)); * @@ -391,9 +389,7 @@ * * The GType API is the foundation of the GObject system. It provides the * facilities for registering and managing all fundamental data types, - * user-defined object and interface types. Before using any GType - * or GObject functions, g_type_init() must be called to initialize the - * type system. + * user-defined object and interface types. * * For type creation and registration purposes, all types fall into one of * two categories: static or dynamic. Static types are never loaded or @@ -3591,24 +3587,10 @@ * ensures that the @gobject stays alive during the call to @c_handler * by temporarily adding a reference count to @gobject. * - * Note that there is a bug in GObject that makes this function - * much less useful than it might seem otherwise. Once @gobject is - * disposed, the callback will no longer be called, but, the signal - * handler is not currently disconnected. If the - * @instance is itself being freed at the same time than this doesn't - * matter, since the signal will automatically be removed, but - * if @instance persists, then the signal handler will leak. You - * should not remove the signal yourself because in a future versions of - * GObject, the handler will automatically - * be disconnected. - * - * It's possible to work around this problem in a way that will - * continue to work with future versions of GObject by checking - * that the signal handler is still connected before disconnected it: - * - * if (g_signal_handler_is_connected (instance, id)) - * g_signal_handler_disconnect (instance, id); - * + * When the object is destroyed the signal handler will be automatically + * disconnected. Note that this is not currently threadsafe (ie: + * emitting a signal while @gobject is being destroyed in another thread + * is not safe). * * Returns: the handler id. */ @@ -4594,17 +4576,11 @@ /** * g_type_init: * - * Prior to any use of the type system, g_type_init() has to be called - * to initialize the type system and assorted other code portions - * (such as the various fundamental type implementations or the signal - * system). - * - * This function is idempotent: If you call it multiple times, all but - * the first calls will be silently ignored. + * This function used to initialise the type system. Since GLib 2.36, + * the type system is initialised automatically and this function does + * nothing. * - * There is no way to undo the effect of g_type_init(). - * - * Since version 2.24 this also initializes the thread system + * Deprecated: 2.36: the type system is now initialised automatically */ @@ -4612,9 +4588,14 @@ * g_type_init_with_debug_flags: * @debug_flags: Bitwise combination of #GTypeDebugFlags values for debugging purposes. * - * Similar to g_type_init(), but additionally sets debug flags. + * This function used to initialise the type system with debugging + * flags. Since GLib 2.36, the type system is initialised automatically + * and this function does nothing. + * + * If you need to enable debugging features, use the GOBJECT_DEBUG + * environment variable. * - * This function is idempotent. + * Deprecated: 2.36: the type system is now initialised automatically */ -- cgit v1.2.1 From 08e6f9308fed377f2dcfcdf726e82066ca1fa8ea Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 20 Oct 2012 21:10:45 +0200 Subject: scanner: Deprecate using identifier prefixes in GINames Instead of crashing. For more details, see the attached bug. Based on a patch by Stef Walter . https://bugzilla.gnome.org/show_bug.cgi?id=684370 --- giscanner/transformer.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/giscanner/transformer.py b/giscanner/transformer.py index 6afad889..dfd25507 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -151,11 +151,15 @@ namespaces.""" if '.' not in name: return self._namespace.get(name) else: - (ns, name) = name.split('.', 1) + (ns, giname) = name.split('.', 1) if ns == self._namespace.name: - return self._namespace.get(name) + return self._namespace.get(giname) + if ns in self._namespace.identifier_prefixes: + message.warn(("Deprecated reference to identifier " + + "prefix %s in GIName %s") % (ns, name)) + return self._namespace.get(giname) include = self._includes[ns] - return include.get(name) + return include.get(giname) def lookup_typenode(self, typeobj): """Given a Type object, if it points to a giname, -- cgit v1.2.1 From 451488516e3526e905f1ceb127e89321db91b3ef Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Tue, 23 Oct 2012 21:38:48 +0200 Subject: giscanner: Don't prefer identifier prefixes over namespaces in deps Use namespaces in dependencies before falling back to the deprecated --identifier-prefix prefixes. --- giscanner/transformer.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/giscanner/transformer.py b/giscanner/transformer.py index dfd25507..b96e1417 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -154,7 +154,8 @@ namespaces.""" (ns, giname) = name.split('.', 1) if ns == self._namespace.name: return self._namespace.get(giname) - if ns in self._namespace.identifier_prefixes: + # Fallback to the main namespace if not a dependency and matches a prefix + if ns in self._namespace.identifier_prefixes and not ns in self._includes: message.warn(("Deprecated reference to identifier " + "prefix %s in GIName %s") % (ns, name)) return self._namespace.get(giname) -- cgit v1.2.1 From ba5f94ec8c70699792ee573962c794904510298c Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 25 Oct 2012 07:59:31 +0200 Subject: Update annotations from glib git --- gir/gio-2.0.c | 10 +++++----- gir/glib-2.0.c | 35 +++++++++++++++++++++++++++++++++-- 2 files changed, 38 insertions(+), 7 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index a3eb8b10..d037c548 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -13023,7 +13023,7 @@ * * Looks up the value of an annotation. * - * This cost of this function is O(n) in number of annotations. + * The cost of this function is O(n) in number of annotations. * * Returns: The value or %NULL if not found. Do not free, it is owned by @annotations. * Since: 2.26 @@ -14573,7 +14573,7 @@ * * Looks up information about a method. * - * This cost of this function is O(n) in number of methods unless + * The cost of this function is O(n) in number of methods unless * g_dbus_interface_info_cache_build() has been used on @info. * * Returns: (transfer none): A #GDBusMethodInfo or %NULL if not found. Do not free, it is owned by @info. @@ -14588,7 +14588,7 @@ * * Looks up information about a property. * - * This cost of this function is O(n) in number of properties unless + * The cost of this function is O(n) in number of properties unless * g_dbus_interface_info_cache_build() has been used on @info. * * Returns: (transfer none): A #GDBusPropertyInfo or %NULL if not found. Do not free, it is owned by @info. @@ -14603,7 +14603,7 @@ * * Looks up information about a signal. * - * This cost of this function is O(n) in number of signals unless + * The cost of this function is O(n) in number of signals unless * g_dbus_interface_info_cache_build() has been used on @info. * * Returns: (transfer none): A #GDBusSignalInfo or %NULL if not found. Do not free, it is owned by @info. @@ -15833,7 +15833,7 @@ * * Looks up information about an interface. * - * This cost of this function is O(n) in number of interfaces. + * The cost of this function is O(n) in number of interfaces. * * Returns: (transfer none): A #GDBusInterfaceInfo or %NULL if not found. Do not free, it is owned by @info. * Since: 2.26 diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 85399cac..582acbcd 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -16386,7 +16386,7 @@ /** * g_io_channel_set_encoding: * @channel: a #GIOChannel - * @encoding: the encoding type + * @encoding: (allow-none): the encoding type * @error: location to store an error of type #GConvertError * * Sets the encoding for the input/output of the channel. @@ -16452,7 +16452,7 @@ /** * g_io_channel_set_line_term: * @channel: a #GIOChannel - * @line_term: The line termination string. Use %NULL for autodetect. Autodetection breaks on "\n", "\r\n", "\r", "\0", and the Unicode paragraph separator. Autodetection should not be used for anything other than file-based channels. + * @line_term: (allow-none): The line termination string. Use %NULL for autodetect. Autodetection breaks on "\n", "\r\n", "\r", "\0", and the Unicode paragraph separator. Autodetection should not be used for anything other than file-based channels. * @length: The length of the termination string. If -1 is passed, the string is assumed to be nul-terminated. This option allows termination strings with embedded nuls. * * This sets the string that #GIOChannel uses to determine @@ -31001,6 +31001,20 @@ */ +/** + * g_variant_get_data_as_bytes: + * @value: a #GVariant + * + * Returns a pointer to the serialised form of a #GVariant instance. + * The semantics of this function are exactly the same as + * g_variant_get_data(), except that the returned #GBytes holds + * a reference to the variant data. + * + * Returns: (transfer full): A new #GBytes representing the variant data + * Since: 2.36 + */ + + /** * g_variant_get_double: * @value: a double #GVariant instance @@ -31974,6 +31988,23 @@ */ +/** + * g_variant_new_from_bytes: + * @type: a #GVariantType + * @bytes: a #GBytes + * @trusted: if the contents of @bytes are trusted + * + * Constructs a new serialised-mode #GVariant instance. This is the + * inner interface for creation of new serialised values that gets + * called from various functions in gvariant.c. + * + * A reference is taken on @bytes. + * + * Returns: a new #GVariant with a floating reference + * Since: 2.36 + */ + + /** * g_variant_new_from_data: * @type: a definite #GVariantType -- cgit v1.2.1 From f9e760cdef4eaf06495da048513f825aaf95a10d Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Thu, 25 Oct 2012 15:17:10 +0200 Subject: Update annotations from glib git --- gir/glib-2.0.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 582acbcd..a9fc456e 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -16233,9 +16233,9 @@ /** * g_io_channel_read_chars: * @channel: a #GIOChannel - * @buf: a buffer to read data into - * @count: the size of the buffer. Note that the buffer may not be complelely filled even if there is data in the buffer if the remaining data is not a complete character. - * @bytes_read: (allow-none): The number of bytes read. This may be zero even on success if count < 6 and the channel's encoding is non-%NULL. This indicates that the next UTF-8 character is too wide for the buffer. + * @buf: (out caller-allocates) (array length=count) (element-type guint8): a buffer to read data into + * @count: (in): the size of the buffer. Note that the buffer may not be complelely filled even if there is data in the buffer if the remaining data is not a complete character. + * @bytes_read: (allow-none) (out): The number of bytes read. This may be zero even on success if count < 6 and the channel's encoding is non-%NULL. This indicates that the next UTF-8 character is too wide for the buffer. * @error: a location to return an error of type #GConvertError or #GIOChannelError. * * Replacement for g_io_channel_read() with the new API. @@ -16247,9 +16247,9 @@ /** * g_io_channel_read_line: * @channel: a #GIOChannel - * @str_return: The line read from the #GIOChannel, including the line terminator. This data should be freed with g_free() when no longer needed. This is a nul-terminated string. If a @length of zero is returned, this will be %NULL instead. - * @length: (allow-none): location to store length of the read data, or %NULL - * @terminator_pos: (allow-none): location to store position of line terminator, or %NULL + * @str_return: (out): The line read from the #GIOChannel, including the line terminator. This data should be freed with g_free() when no longer needed. This is a nul-terminated string. If a @length of zero is returned, this will be %NULL instead. + * @length: (allow-none) (out): location to store length of the read data, or %NULL + * @terminator_pos: (allow-none) (out): location to store position of line terminator, or %NULL * @error: A location to return an error of type #GConvertError or #GIOChannelError * * Reads a line, including the terminating character(s), @@ -16277,8 +16277,8 @@ /** * g_io_channel_read_to_end: * @channel: a #GIOChannel - * @str_return: Location to store a pointer to a string holding the remaining data in the #GIOChannel. This data should be freed with g_free() when no longer needed. This data is terminated by an extra nul character, but there may be other nuls in the intervening data. - * @length: location to store length of the data + * @str_return: (out) (array length=length) (element-type guint8): Location to store a pointer to a string holding the remaining data in the #GIOChannel. This data should be freed with g_free() when no longer needed. This data is terminated by an extra nul character, but there may be other nuls in the intervening data. + * @length: (out): location to store length of the data * @error: location to return an error of type #GConvertError or #GIOChannelError * * Reads all the remaining data from the file. @@ -16602,9 +16602,9 @@ /** * g_io_channel_write_chars: * @channel: a #GIOChannel - * @buf: a buffer to write data from + * @buf: (array) (element-type guint8): a buffer to write data from * @count: the size of the buffer. If -1, the buffer is taken to be a nul-terminated string. - * @bytes_written: The number of bytes written. This can be nonzero even if the return value is not %G_IO_STATUS_NORMAL. If the return value is %G_IO_STATUS_NORMAL and the channel is blocking, this will always be equal to @count if @count >= 0. + * @bytes_written: (out): The number of bytes written. This can be nonzero even if the return value is not %G_IO_STATUS_NORMAL. If the return value is %G_IO_STATUS_NORMAL and the channel is blocking, this will always be equal to @count if @count >= 0. * @error: a location to return an error of type #GConvertError or #GIOChannelError * * Replacement for g_io_channel_write() with the new API. -- cgit v1.2.1 From 7b639e21fc285fdf46bd5f890f7911619d71d232 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 26 Oct 2012 14:55:54 -0400 Subject: common: Ensure we use $(CC) from environment when compiling scanned binaries GNU make will default to "gcc" if "cc" isn't found; we need to replicate that behavior here. Patch-suggested-by: ojab https://bugzilla.gnome.org/show_bug.cgi?id=678678 --- common.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/common.mk b/common.mk index 052d5b4b..f67b2e83 100644 --- a/common.mk +++ b/common.mk @@ -9,6 +9,7 @@ INTROSPECTION_SCANNER = \ env PATH=.libs:$(PATH) \ LPATH=.libs \ + CC=$(CC) \ PYTHONPATH=$(top_builddir):$(top_srcdir) \ UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \ -- cgit v1.2.1 From 0f923410a4106fc8e2c67ef7515e7f23a344121a Mon Sep 17 00:00:00 2001 From: Joanmarie Diggs Date: Sun, 24 Jun 2012 14:09:23 -0400 Subject: Python3-friendly python.m4 https://bugzilla.gnome.org/show_bug.cgi?id=678728 --- m4/python.m4 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/m4/python.m4 b/m4/python.m4 index 74ac6ee9..69557b66 100644 --- a/m4/python.m4 +++ b/m4/python.m4 @@ -43,8 +43,8 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS], [AC_REQUIRE([AM_PATH_PYTHON]) AC_MSG_CHECKING(for headers required to compile python extensions) dnl deduce PYTHON_INCLUDES -py_prefix=`$PYTHON -c "import sys; print sys.prefix"` -py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` +py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"` +py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"` if test "x$PYTHON_INCLUDES" == x; then PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" if test "$py_prefix" != "$py_exec_prefix"; then -- cgit v1.2.1 From 7f10346a378b2f33bf87730cce43c8b85e565952 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 13 Apr 2012 15:28:49 -0400 Subject: scanner: Ignore #defines starting with _ This matches our behavior for symbols (and we should probably fix this more globally...I think we still scan _-prefixed enums). Noticed from gudev which had #define _GUDEV_INSIDE_H 1 https://bugzilla.gnome.org/show_bug.cgi?id=674072 --- giscanner/transformer.py | 3 +++ tests/scanner/regress.h | 6 +++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/giscanner/transformer.py b/giscanner/transformer.py index b96e1417..e4938b93 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -710,6 +710,9 @@ raise ValueError.""" return ast.Return(typeval) def _create_const(self, symbol): + if symbol.ident.startswith('_'): + return None + # Don't create constants for non-public things # http://bugzilla.gnome.org/show_bug.cgi?id=572790 if (symbol.source_filename is None or diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h index 635ea7bd..b55c463b 100644 --- a/tests/scanner/regress.h +++ b/tests/scanner/regress.h @@ -888,7 +888,6 @@ void regress_test_struct_fixed_array_frob (RegressTestStructFixedArray *str); void regress_has_parameter_named_attrs (int foo, gpointer attributes); - typedef struct { int dummy; struct { @@ -899,4 +898,9 @@ typedef struct { double dummy2; } RegressLikeGnomeKeyringPasswordSchema; +/* Ensure we ignore symbols that start with _; in particular we don't + * want to issue a namespace warning. + */ +#define _DONTSCANTHIS 1 + #endif /* __GITESTTYPES_H__ */ -- cgit v1.2.1 From 04d10dce6f2d1d7ddb4ec9b3ecd5ef21abda2851 Mon Sep 17 00:00:00 2001 From: Pierre-Louis Bonicoli Date: Wed, 18 Jan 2012 17:18:58 +0100 Subject: docs: Show correct path used by g-ir-scanner Signed-off-by: Colin Walters https://bugzilla.gnome.org/show_bug.cgi?id=668193 --- docs/g-ir-scanner.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/g-ir-scanner.1 b/docs/g-ir-scanner.1 index 847c78b8..23773695 100644 --- a/docs/g-ir-scanner.1 +++ b/docs/g-ir-scanner.1 @@ -131,7 +131,7 @@ Be verbose, include some debugging information. .TP .SH ENVIRONMENT VARIABLES The g-ir-scanner uses the XDG_DATA_DIRS variable to check for dirs, -the gir's are located in XDG_DATA_DIRS/share/gir-1.0. It is normally +the gir's are located in XDG_DATA_DIRS/gir-1.0. It is normally set on a distribution so you shouldn't need to set it yourself. The variable GI_SCANNER_DISABLE_CACHE ensures that the scanner will -- cgit v1.2.1 From eccd4e379ac345cbf6f67b8b764491bf8e756e10 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 10 Aug 2012 11:43:02 +0800 Subject: cmph: Remove C99ism and other fixes ...So that it will compile on non-C99 compilers. The changes are mainly moving the variable declarations to the start of the resecptive blocks. Also, replace the use of buflen in chd.c as it might not be defined for all platforms, instead using packed_cr_size as it seems to represent the value that is to be printed/displayed by the debugging output. https://bugzilla.gnome.org/show_bug.cgi?id=681820 --- girepository/cmph/bdz.c | 19 ++-- girepository/cmph/bdz_ph.c | 12 ++- girepository/cmph/bmz.c | 29 +++--- girepository/cmph/bmz8.c | 24 +++-- girepository/cmph/brz.c | 174 ++++++++++++++++++++++-------------- girepository/cmph/chd.c | 8 +- girepository/cmph/chd_ph.c | 11 ++- girepository/cmph/chm.c | 26 +++--- girepository/cmph/compressed_rank.c | 16 ++-- girepository/cmph/compressed_seq.c | 42 +++++---- girepository/cmph/fch.c | 43 +++++---- 11 files changed, 252 insertions(+), 152 deletions(-) diff --git a/girepository/cmph/bdz.c b/girepository/cmph/bdz.c index a385b152..81cd7151 100755 --- a/girepository/cmph/bdz.c +++ b/girepository/cmph/bdz.c @@ -489,6 +489,10 @@ int bdz_dump(cmph_t *mphf, FILE *fd) cmph_uint32 buflen; register size_t nbytes; bdz_data_t *data = (bdz_data_t *)mphf->data; + cmph_uint32 sizeg; +#ifdef DEBUG + cmph_uint32 i; +#endif __cmph_dump(mphf, fd); hash_state_dump(data->hl, &buf, &buflen); @@ -501,7 +505,7 @@ int bdz_dump(cmph_t *mphf, FILE *fd) nbytes = fwrite(&(data->m), sizeof(cmph_uint32), (size_t)1, fd); nbytes = fwrite(&(data->r), sizeof(cmph_uint32), (size_t)1, fd); - cmph_uint32 sizeg = (cmph_uint32)ceil(data->n/4.0); + sizeg = (cmph_uint32)ceil(data->n/4.0); nbytes = fwrite(data->g, sizeof(cmph_uint8)*sizeg, (size_t)1, fd); nbytes = fwrite(&(data->k), sizeof(cmph_uint32), (size_t)1, fd); @@ -509,12 +513,11 @@ int bdz_dump(cmph_t *mphf, FILE *fd) nbytes = fwrite(&(data->ranktablesize), sizeof(cmph_uint32), (size_t)1, fd); nbytes = fwrite(data->ranktable, sizeof(cmph_uint32)*(data->ranktablesize), (size_t)1, fd); - if (nbytes == 0 && ferror(fd)) { + if (nbytes == 0 && ferror(fd)) { fprintf(stderr, "ERROR: %s\n", strerror(errno)); return 0; } #ifdef DEBUG - cmph_uint32 i; fprintf(stderr, "G: "); for (i = 0; i < data->n; ++i) fprintf(stderr, "%u ", GETVALUE(data->g, i)); fprintf(stderr, "\n"); @@ -528,6 +531,9 @@ void bdz_load(FILE *f, cmph_t *mphf) cmph_uint32 buflen, sizeg; register size_t nbytes; bdz_data_t *bdz = (bdz_data_t *)malloc(sizeof(bdz_data_t)); +#ifdef DEBUG + cmph_uint32 i = 0; +#endif DEBUGP("Loading bdz mphf\n"); mphf->data = bdz; @@ -554,13 +560,13 @@ void bdz_load(FILE *f, cmph_t *mphf) bdz->ranktable = (cmph_uint32 *)calloc((size_t)bdz->ranktablesize, sizeof(cmph_uint32)); nbytes = fread(bdz->ranktable, sizeof(cmph_uint32)*(bdz->ranktablesize), (size_t)1, f); - if (nbytes == 0 && ferror(f)) { + if (nbytes == 0 && ferror(f)) { fprintf(stderr, "ERROR: %s\n", strerror(errno)); return; } #ifdef DEBUG - cmph_uint32 i = 0; + i = 0; fprintf(stderr, "G: "); for (i = 0; i < bdz->n; ++i) fprintf(stderr, "%u ", GETVALUE(bdz->g,i)); fprintf(stderr, "\n"); @@ -639,6 +645,7 @@ void bdz_pack(cmph_t *mphf, void *packed_mphf) { bdz_data_t *data = (bdz_data_t *)mphf->data; cmph_uint8 * ptr = packed_mphf; + cmph_uint32 sizeg; // packing hl type CMPH_HASH hl_type = hash_get_type(data->hl); @@ -665,7 +672,7 @@ void bdz_pack(cmph_t *mphf, void *packed_mphf) *ptr++ = data->b; // packing g - cmph_uint32 sizeg = (cmph_uint32)ceil(data->n/4.0); + sizeg = (cmph_uint32)ceil(data->n/4.0); memcpy(ptr, data->g, sizeof(cmph_uint8)*sizeg); } diff --git a/girepository/cmph/bdz_ph.c b/girepository/cmph/bdz_ph.c index 2e986071..2095f116 100755 --- a/girepository/cmph/bdz_ph.c +++ b/girepository/cmph/bdz_ph.c @@ -452,6 +452,10 @@ int bdz_ph_dump(cmph_t *mphf, FILE *fd) cmph_uint32 sizeg = 0; register size_t nbytes; bdz_ph_data_t *data = (bdz_ph_data_t *)mphf->data; +#ifdef DEBUG + cmph_uint32 i; +#endif + __cmph_dump(mphf, fd); hash_state_dump(data->hl, &buf, &buflen); @@ -466,12 +470,11 @@ int bdz_ph_dump(cmph_t *mphf, FILE *fd) sizeg = (cmph_uint32)ceil(data->n/5.0); nbytes = fwrite(data->g, sizeof(cmph_uint8)*sizeg, (size_t)1, fd); - if (nbytes == 0 && ferror(fd)) { + if (nbytes == 0 && ferror(fd)) { fprintf(stderr, "ERROR: %s\n", strerror(errno)); return 0; } #ifdef DEBUG - cmph_uint32 i; fprintf(stderr, "G: "); for (i = 0; i < data->n; ++i) fprintf(stderr, "%u ", GETVALUE(data->g, i)); fprintf(stderr, "\n"); @@ -506,7 +509,7 @@ void bdz_ph_load(FILE *f, cmph_t *mphf) bdz_ph->g = (cmph_uint8 *)calloc((size_t)sizeg, sizeof(cmph_uint8)); nbytes = fread(bdz_ph->g, sizeg*sizeof(cmph_uint8), (size_t)1, f); - if (nbytes == 0 && ferror(f)) { + if (nbytes == 0 && ferror(f)) { fprintf(stderr, "ERROR: %s\n", strerror(errno)); } return; @@ -556,6 +559,7 @@ void bdz_ph_pack(cmph_t *mphf, void *packed_mphf) { bdz_ph_data_t *data = (bdz_ph_data_t *)mphf->data; cmph_uint8 * ptr = packed_mphf; + cmph_uint32 sizeg; // packing hl type CMPH_HASH hl_type = hash_get_type(data->hl); @@ -571,7 +575,7 @@ void bdz_ph_pack(cmph_t *mphf, void *packed_mphf) ptr += sizeof(data->r); // packing g - cmph_uint32 sizeg = (cmph_uint32)ceil(data->n/5.0); + sizeg = (cmph_uint32)ceil(data->n/5.0); memcpy(ptr, data->g, sizeof(cmph_uint8)*sizeg); } diff --git a/girepository/cmph/bmz.c b/girepository/cmph/bmz.c index 9c6cea00..9573825a 100644 --- a/girepository/cmph/bmz.c +++ b/girepository/cmph/bmz.c @@ -450,6 +450,10 @@ int bmz_dump(cmph_t *mphf, FILE *fd) cmph_uint32 two = 2; //number of hash functions bmz_data_t *data = (bmz_data_t *)mphf->data; register size_t nbytes; +#ifdef DEBUG + cmph_uint32 i; +#endif + __cmph_dump(mphf, fd); nbytes = fwrite(&two, sizeof(cmph_uint32), (size_t)1, fd); @@ -470,12 +474,11 @@ int bmz_dump(cmph_t *mphf, FILE *fd) nbytes = fwrite(&(data->m), sizeof(cmph_uint32), (size_t)1, fd); nbytes = fwrite(data->g, sizeof(cmph_uint32)*(data->n), (size_t)1, fd); - if (nbytes == 0 && ferror(fd)) { + if (nbytes == 0 && ferror(fd)) { fprintf(stderr, "ERROR: %s\n", strerror(errno)); return 0; } #ifdef DEBUG - cmph_uint32 i; fprintf(stderr, "G: "); for (i = 0; i < data->n; ++i) fprintf(stderr, "%u ", data->g[i]); fprintf(stderr, "\n"); @@ -515,10 +518,11 @@ void bmz_load(FILE *f, cmph_t *mphf) bmz->g = (cmph_uint32 *)malloc(sizeof(cmph_uint32)*bmz->n); nbytes = fread(bmz->g, bmz->n*sizeof(cmph_uint32), (size_t)1, f); - if (nbytes == 0 && ferror(f)) { + if (nbytes == 0 && ferror(f)) { fprintf(stderr, "ERROR: %s\n", strerror(errno)); return; } + #ifdef DEBUG fprintf(stderr, "G: "); for (i = 0; i < bmz->n; ++i) fprintf(stderr, "%u ", bmz->g[i]); @@ -559,6 +563,7 @@ void bmz_pack(cmph_t *mphf, void *packed_mphf) bmz_data_t *data = (bmz_data_t *)mphf->data; cmph_uint8 * ptr = packed_mphf; + CMPH_HASH h2_type; // packing h1 type CMPH_HASH h1_type = hash_get_type(data->hashes[0]); @@ -570,7 +575,7 @@ void bmz_pack(cmph_t *mphf, void *packed_mphf) ptr += hash_state_packed_size(h1_type); // packing h2 type - CMPH_HASH h2_type = hash_get_type(data->hashes[1]); + h2_type = hash_get_type(data->hashes[1]); *((cmph_uint32 *) ptr) = h2_type; ptr += sizeof(cmph_uint32); @@ -612,18 +617,22 @@ cmph_uint32 bmz_search_packed(void *packed_mphf, const char *key, cmph_uint32 ke { register cmph_uint8 *h1_ptr = packed_mphf; register CMPH_HASH h1_type = *((cmph_uint32 *)h1_ptr); + register cmph_uint8 *h2_ptr; + register CMPH_HASH h2_type; + register cmph_uint32 *g_ptr, n, h1, h2; + h1_ptr += 4; - register cmph_uint8 *h2_ptr = h1_ptr + hash_state_packed_size(h1_type); - register CMPH_HASH h2_type = *((cmph_uint32 *)h2_ptr); + h2_ptr = h1_ptr + hash_state_packed_size(h1_type); + h2_type = *((cmph_uint32 *)h2_ptr); h2_ptr += 4; - register cmph_uint32 *g_ptr = (cmph_uint32 *)(h2_ptr + hash_state_packed_size(h2_type)); + g_ptr = (cmph_uint32 *)(h2_ptr + hash_state_packed_size(h2_type)); - register cmph_uint32 n = *g_ptr++; + n = *g_ptr++; - register cmph_uint32 h1 = hash_packed(h1_ptr, h1_type, key, keylen) % n; - register cmph_uint32 h2 = hash_packed(h2_ptr, h2_type, key, keylen) % n; + h1 = hash_packed(h1_ptr, h1_type, key, keylen) % n; + h2 = hash_packed(h2_ptr, h2_type, key, keylen) % n; if (h1 == h2 && ++h2 > n) h2 = 0; return (g_ptr[h1] + g_ptr[h2]); } diff --git a/girepository/cmph/bmz8.c b/girepository/cmph/bmz8.c index 206c48c4..15853c00 100644 --- a/girepository/cmph/bmz8.c +++ b/girepository/cmph/bmz8.c @@ -483,7 +483,7 @@ int bmz8_dump(cmph_t *mphf, FILE *fd) nbytes = fwrite(&(data->m), sizeof(cmph_uint8), (size_t)1, fd); nbytes = fwrite(data->g, sizeof(cmph_uint8)*(data->n), (size_t)1, fd); - if (nbytes == 0 && ferror(fd)) { + if (nbytes == 0 && ferror(fd)) { fprintf(stderr, "ERROR: %s\n", strerror(errno)); return 0; } @@ -528,10 +528,11 @@ void bmz8_load(FILE *f, cmph_t *mphf) bmz8->g = (cmph_uint8 *)malloc(sizeof(cmph_uint8)*bmz8->n); nbytes = fread(bmz8->g, bmz8->n*sizeof(cmph_uint8), (size_t)1, f); - if (nbytes == 0 && ferror(f)) { + if (nbytes == 0 && ferror(f)) { fprintf(stderr, "ERROR: %s\n", strerror(errno)); return; } + #ifdef DEBUG fprintf(stderr, "G: "); for (i = 0; i < bmz8->n; ++i) fprintf(stderr, "%u ", bmz8->g[i]); @@ -571,6 +572,7 @@ void bmz8_pack(cmph_t *mphf, void *packed_mphf) { bmz8_data_t *data = (bmz8_data_t *)mphf->data; cmph_uint8 * ptr = packed_mphf; + CMPH_HASH h2_type; // packing h1 type CMPH_HASH h1_type = hash_get_type(data->hashes[0]); @@ -582,7 +584,7 @@ void bmz8_pack(cmph_t *mphf, void *packed_mphf) ptr += hash_state_packed_size(h1_type); // packing h2 type - CMPH_HASH h2_type = hash_get_type(data->hashes[1]); + h2_type = hash_get_type(data->hashes[1]); *((cmph_uint32 *) ptr) = h2_type; ptr += sizeof(cmph_uint32); @@ -623,18 +625,22 @@ cmph_uint8 bmz8_search_packed(void *packed_mphf, const char *key, cmph_uint32 ke { register cmph_uint8 *h1_ptr = packed_mphf; register CMPH_HASH h1_type = *((cmph_uint32 *)h1_ptr); + register cmph_uint8 *h2_ptr; + register CMPH_HASH h2_type; + register cmph_uint8 *g_ptr, n, h1, h2; + h1_ptr += 4; - register cmph_uint8 *h2_ptr = h1_ptr + hash_state_packed_size(h1_type); - register CMPH_HASH h2_type = *((cmph_uint32 *)h2_ptr); + h2_ptr = h1_ptr + hash_state_packed_size(h1_type); + h2_type = *((cmph_uint32 *)h2_ptr); h2_ptr += 4; - register cmph_uint8 *g_ptr = h2_ptr + hash_state_packed_size(h2_type); + g_ptr = h2_ptr + hash_state_packed_size(h2_type); - register cmph_uint8 n = *g_ptr++; + n = *g_ptr++; - register cmph_uint8 h1 = (cmph_uint8)(hash_packed(h1_ptr, h1_type, key, keylen) % n); - register cmph_uint8 h2 = (cmph_uint8)(hash_packed(h2_ptr, h2_type, key, keylen) % n); + h1 = (cmph_uint8)(hash_packed(h1_ptr, h1_type, key, keylen) % n); + h2 = (cmph_uint8)(hash_packed(h2_ptr, h2_type, key, keylen) % n); DEBUGP("key: %s h1: %u h2: %u\n", key, h1, h2); if (h1 == h2 && ++h2 > n) h2 = 0; return (cmph_uint8)(g_ptr[h1] + g_ptr[h2]); diff --git a/girepository/cmph/brz.c b/girepository/cmph/brz.c index f0c91c4b..d1079c22 100755 --- a/girepository/cmph/brz.c +++ b/girepository/cmph/brz.c @@ -128,9 +128,10 @@ cmph_t *brz_new(cmph_config_t *mph, double c) brz_data_t *brzf = NULL; cmph_uint32 i; cmph_uint32 iterations = 20; + brz_config_data_t *brz; DEBUGP("c: %f\n", c); - brz_config_data_t *brz = (brz_config_data_t *)mph->data; + brz = (brz_config_data_t *)mph->data; switch(brz->algo) // validating restrictions over parameter c. { case CMPH_BMZ8: @@ -252,13 +253,14 @@ static int brz_gen_mphf(cmph_config_t *mph) /* Buffers management */ if (memory_usage + keylen + sizeof(keylen) > brz->memory_availability) // flush buffers { + cmph_uint32 value, sum, keylen1; if(mph->verbosity) { fprintf(stderr, "Flushing %u\n", nkeys_in_buffer); } - cmph_uint32 value = buckets_size[0]; - cmph_uint32 sum = 0; - cmph_uint32 keylen1 = 0; + value = buckets_size[0]; + sum = 0; + keylen1 = 0; buckets_size[0] = 0; for(i = 1; i < brz->k; i++) { @@ -312,14 +314,16 @@ static int brz_gen_mphf(cmph_config_t *mph) mph->key_source->dispose(mph->key_source->data, key, keylen); } if (memory_usage != 0) // flush buffers - { + { + cmph_uint32 value; + cmph_uint32 sum, keylen1; if(mph->verbosity) { fprintf(stderr, "Flushing %u\n", nkeys_in_buffer); } - cmph_uint32 value = buckets_size[0]; - cmph_uint32 sum = 0; - cmph_uint32 keylen1 = 0; + value = buckets_size[0]; + sum = 0; + keylen1 = 0; buckets_size[0] = 0; for(i = 1; i < brz->k; i++) { @@ -371,7 +375,7 @@ static int brz_gen_mphf(cmph_config_t *mph) nbytes = fwrite(&(brz->algo), sizeof(brz->algo), (size_t)1, brz->mphf_fd); nbytes = fwrite(&(brz->k), sizeof(cmph_uint32), (size_t)1, brz->mphf_fd); // number of MPHFs nbytes = fwrite(brz->size, sizeof(cmph_uint8)*(brz->k), (size_t)1, brz->mphf_fd); - if (nbytes == 0 && ferror(brz->mphf_fd)) { + if (nbytes == 0 && ferror(brz->mphf_fd)) { fprintf(stderr, "ERROR: %s\n", strerror(errno)); return 0; } @@ -579,7 +583,7 @@ int brz_dump(cmph_t *mphf, FILE *fd) // Dumping m and the vector offset. nbytes = fwrite(&(data->m), sizeof(cmph_uint32), (size_t)1, fd); nbytes = fwrite(data->offset, sizeof(cmph_uint32)*(data->k), (size_t)1, fd); - if (nbytes == 0 && ferror(fd)) { + if (nbytes == 0 && ferror(fd)) { fprintf(stderr, "ERROR: %s\n", strerror(errno)); return 0; } @@ -648,24 +652,27 @@ void brz_load(FILE *f, cmph_t *mphf) nbytes = fread(&(brz->m), sizeof(cmph_uint32), (size_t)1, f); brz->offset = (cmph_uint32 *)malloc(sizeof(cmph_uint32)*brz->k); nbytes = fread(brz->offset, sizeof(cmph_uint32)*(brz->k), (size_t)1, f); - if (nbytes == 0 && ferror(f)) { + if (nbytes == 0 && ferror(f)) { fprintf(stderr, "ERROR: %s\n", strerror(errno)); } + return; } static cmph_uint32 brz_bmz8_search(brz_data_t *brz, const char *key, cmph_uint32 keylen, cmph_uint32 * fingerprint) { register cmph_uint32 h0; + register cmph_uint32 m, n, h1, h2; + register cmph_uint8 mphf_bucket; hash_vector(brz->h0, key, keylen, fingerprint); h0 = fingerprint[2] % brz->k; - register cmph_uint32 m = brz->size[h0]; - register cmph_uint32 n = (cmph_uint32)ceil(brz->c * m); - register cmph_uint32 h1 = hash(brz->h1[h0], key, keylen) % n; - register cmph_uint32 h2 = hash(brz->h2[h0], key, keylen) % n; - register cmph_uint8 mphf_bucket; + m = brz->size[h0]; + n = (cmph_uint32)ceil(brz->c * m); + h1 = hash(brz->h1[h0], key, keylen) % n; + h2 = hash(brz->h2[h0], key, keylen) % n; + mphf_bucket; if (h1 == h2 && ++h2 >= n) h2 = 0; mphf_bucket = (cmph_uint8)(brz->g[h0][h1] + brz->g[h0][h2]); @@ -678,17 +685,20 @@ static cmph_uint32 brz_bmz8_search(brz_data_t *brz, const char *key, cmph_uint32 static cmph_uint32 brz_fch_search(brz_data_t *brz, const char *key, cmph_uint32 keylen, cmph_uint32 * fingerprint) { register cmph_uint32 h0; + register cmph_uint32 m, b, h1, h2; + register double p1, p2; + register cmph_uint8 mphf_bucket; hash_vector(brz->h0, key, keylen, fingerprint); h0 = fingerprint[2] % brz->k; - register cmph_uint32 m = brz->size[h0]; - register cmph_uint32 b = fch_calc_b(brz->c, m); - register double p1 = fch_calc_p1(m); - register double p2 = fch_calc_p2(b); - register cmph_uint32 h1 = hash(brz->h1[h0], key, keylen) % m; - register cmph_uint32 h2 = hash(brz->h2[h0], key, keylen) % m; - register cmph_uint8 mphf_bucket = 0; + m = brz->size[h0]; + b = fch_calc_b(brz->c, m); + p1 = fch_calc_p1(m); + p2 = fch_calc_p2(b); + h1 = hash(brz->h1[h0], key, keylen) % m; + h2 = hash(brz->h2[h0], key, keylen) % m; + mphf_bucket = 0; h1 = mixh10h11h12(b, p1, p2, h1); mphf_bucket = (cmph_uint8)((h2 + brz->g[h0][h1]) % m); return (mphf_bucket + brz->offset[h0]); @@ -741,13 +751,20 @@ void brz_pack(cmph_t *mphf, void *packed_mphf) brz_data_t *data = (brz_data_t *)mphf->data; cmph_uint8 * ptr = packed_mphf; cmph_uint32 i,n; + CMPH_HASH h0_type, h1_type, h2_type; +#if defined (__ia64) || defined (__x86_64__) + cmph_uint64 * g_is_ptr; +#else + cmph_uint32 * g_is_ptr; +#endif + cmph_uint8 * g_i; // packing internal algo type memcpy(ptr, &(data->algo), sizeof(data->algo)); ptr += sizeof(data->algo); // packing h0 type - CMPH_HASH h0_type = hash_get_type(data->h0); + h0_type = hash_get_type(data->h0); memcpy(ptr, &h0_type, sizeof(h0_type)); ptr += sizeof(h0_type); @@ -764,12 +781,12 @@ void brz_pack(cmph_t *mphf, void *packed_mphf) ptr += sizeof(data->c); // packing h1 type - CMPH_HASH h1_type = hash_get_type(data->h1[0]); + h1_type = hash_get_type(data->h1[0]); memcpy(ptr, &h1_type, sizeof(h1_type)); ptr += sizeof(h1_type); // packing h2 type - CMPH_HASH h2_type = hash_get_type(data->h2[0]); + h2_type = hash_get_type(data->h2[0]); memcpy(ptr, &h2_type, sizeof(h2_type)); ptr += sizeof(h2_type); @@ -782,12 +799,12 @@ void brz_pack(cmph_t *mphf, void *packed_mphf) ptr += sizeof(cmph_uint32)*data->k; #if defined (__ia64) || defined (__x86_64__) - cmph_uint64 * g_is_ptr = (cmph_uint64 *)ptr; + g_is_ptr = (cmph_uint64 *)ptr; #else - cmph_uint32 * g_is_ptr = (cmph_uint32 *)ptr; + g_is_ptr = (cmph_uint32 *)ptr; #endif - cmph_uint8 * g_i = (cmph_uint8 *) (g_is_ptr + data->k); + g_i = (cmph_uint8 *) (g_is_ptr + data->k); for(i = 0; i < data->k; i++) { @@ -835,6 +852,7 @@ cmph_uint32 brz_packed_size(cmph_t *mphf) CMPH_HASH h0_type = hash_get_type(data->h0); CMPH_HASH h1_type = hash_get_type(data->h1[0]); CMPH_HASH h2_type = hash_get_type(data->h2[0]); + cmph_uint32 n; size = (cmph_uint32)(2*sizeof(CMPH_ALGO) + 3*sizeof(CMPH_HASH) + hash_state_packed_size(h0_type) + sizeof(cmph_uint32) + sizeof(double) + sizeof(cmph_uint8)*data->k + sizeof(cmph_uint32)*data->k); // pointers to g_is @@ -847,7 +865,7 @@ cmph_uint32 brz_packed_size(cmph_t *mphf) size += hash_state_packed_size(h1_type) * data->k; size += hash_state_packed_size(h2_type) * data->k; - cmph_uint32 n = 0; + n = 0; for(i = 0; i < data->k; i++) { switch(data->algo) @@ -871,47 +889,57 @@ static cmph_uint32 brz_bmz8_search_packed(cmph_uint32 *packed_mphf, const char * { register CMPH_HASH h0_type = *packed_mphf++; register cmph_uint32 *h0_ptr = packed_mphf; + register cmph_uint32 k, h0, m, n, h1, h2; + register cmph_uint32 *offset; + register double c; + register CMPH_HASH h1_type, h2_type; + register cmph_uint8 * size; +#if defined (__ia64) || defined (__x86_64__) + register cmph_uint64 * g_is_ptr; +#else + register cmph_uint32 * g_is_ptr; +#endif + register cmph_uint8 *h1_ptr, *h2_ptr, *g; + register cmph_uint8 mphf_bucket; + packed_mphf = (cmph_uint32 *)(((cmph_uint8 *)packed_mphf) + hash_state_packed_size(h0_type)); - register cmph_uint32 k = *packed_mphf++; + k = *packed_mphf++; - register double c = (double)(*((cmph_uint64*)packed_mphf)); + c = (double)(*((cmph_uint64*)packed_mphf)); packed_mphf += 2; - register CMPH_HASH h1_type = *packed_mphf++; + h1_type = *packed_mphf++; - register CMPH_HASH h2_type = *packed_mphf++; + h2_type = *packed_mphf++; - register cmph_uint8 * size = (cmph_uint8 *) packed_mphf; + size = (cmph_uint8 *) packed_mphf; packed_mphf = (cmph_uint32 *)(size + k); - register cmph_uint32 * offset = packed_mphf; + offset = packed_mphf; packed_mphf += k; - register cmph_uint32 h0; hash_vector_packed(h0_ptr, h0_type, key, keylen, fingerprint); h0 = fingerprint[2] % k; - register cmph_uint32 m = size[h0]; - register cmph_uint32 n = (cmph_uint32)ceil(c * m); + m = size[h0]; + n = (cmph_uint32)ceil(c * m); #if defined (__ia64) || defined (__x86_64__) - register cmph_uint64 * g_is_ptr = (cmph_uint64 *)packed_mphf; + g_is_ptr = (cmph_uint64 *)packed_mphf; #else - register cmph_uint32 * g_is_ptr = packed_mphf; + g_is_ptr = packed_mphf; #endif - register cmph_uint8 * h1_ptr = (cmph_uint8 *) g_is_ptr[h0]; + h1_ptr = (cmph_uint8 *) g_is_ptr[h0]; - register cmph_uint8 * h2_ptr = h1_ptr + hash_state_packed_size(h1_type); + h2_ptr = h1_ptr + hash_state_packed_size(h1_type); - register cmph_uint8 * g = h2_ptr + hash_state_packed_size(h2_type); + g = h2_ptr + hash_state_packed_size(h2_type); - register cmph_uint32 h1 = hash_packed(h1_ptr, h1_type, key, keylen) % n; - register cmph_uint32 h2 = hash_packed(h2_ptr, h2_type, key, keylen) % n; - - register cmph_uint8 mphf_bucket; + h1 = hash_packed(h1_ptr, h1_type, key, keylen) % n; + h2 = hash_packed(h2_ptr, h2_type, key, keylen) % n; if (h1 == h2 && ++h2 >= n) h2 = 0; mphf_bucket = (cmph_uint8)(g[h1] + g[h2]); @@ -925,49 +953,59 @@ static cmph_uint32 brz_fch_search_packed(cmph_uint32 *packed_mphf, const char *k register CMPH_HASH h0_type = *packed_mphf++; register cmph_uint32 *h0_ptr = packed_mphf; + register cmph_uint32 k, h0, m, b, h1, h2; + register double c, p1, p2; + register CMPH_HASH h1_type, h2_type; + register cmph_uint8 *size, *h1_ptr, *h2_ptr, *g; + register cmph_uint32 *offset; +#if defined (__ia64) || defined (__x86_64__) + register cmph_uint64 * g_is_ptr; +#else + register cmph_uint32 * g_is_ptr; +#endif + register cmph_uint8 mphf_bucket; + packed_mphf = (cmph_uint32 *)(((cmph_uint8 *)packed_mphf) + hash_state_packed_size(h0_type)); - register cmph_uint32 k = *packed_mphf++; + k = *packed_mphf++; - register double c = (double)(*((cmph_uint64*)packed_mphf)); + c = (double)(*((cmph_uint64*)packed_mphf)); packed_mphf += 2; - register CMPH_HASH h1_type = *packed_mphf++; + h1_type = *packed_mphf++; - register CMPH_HASH h2_type = *packed_mphf++; + h2_type = *packed_mphf++; - register cmph_uint8 * size = (cmph_uint8 *) packed_mphf; + size = (cmph_uint8 *) packed_mphf; packed_mphf = (cmph_uint32 *)(size + k); - register cmph_uint32 * offset = packed_mphf; + offset = packed_mphf; packed_mphf += k; - register cmph_uint32 h0; - hash_vector_packed(h0_ptr, h0_type, key, keylen, fingerprint); h0 = fingerprint[2] % k; - register cmph_uint32 m = size[h0]; - register cmph_uint32 b = fch_calc_b(c, m); - register double p1 = fch_calc_p1(m); - register double p2 = fch_calc_p2(b); + m = size[h0]; + b = fch_calc_b(c, m); + p1 = fch_calc_p1(m); + p2 = fch_calc_p2(b); #if defined (__ia64) || defined (__x86_64__) - register cmph_uint64 * g_is_ptr = (cmph_uint64 *)packed_mphf; + g_is_ptr = (cmph_uint64 *)packed_mphf; #else - register cmph_uint32 * g_is_ptr = packed_mphf; + g_is_ptr = packed_mphf; #endif - register cmph_uint8 * h1_ptr = (cmph_uint8 *) g_is_ptr[h0]; + h1_ptr = (cmph_uint8 *) g_is_ptr[h0]; - register cmph_uint8 * h2_ptr = h1_ptr + hash_state_packed_size(h1_type); + h2_ptr = h1_ptr + hash_state_packed_size(h1_type); - register cmph_uint8 * g = h2_ptr + hash_state_packed_size(h2_type); + g = h2_ptr + hash_state_packed_size(h2_type); - register cmph_uint32 h1 = hash_packed(h1_ptr, h1_type, key, keylen) % m; - register cmph_uint32 h2 = hash_packed(h2_ptr, h2_type, key, keylen) % m; + h1 = hash_packed(h1_ptr, h1_type, key, keylen) % m; + h2 = hash_packed(h2_ptr, h2_type, key, keylen) % m; - register cmph_uint8 mphf_bucket = 0; + mphf_bucket = 0; h1 = mixh10h11h12(b, p1, p2, h1); mphf_bucket = (cmph_uint8)((h2 + g[h1]) % m); return (mphf_bucket + offset[h0]); diff --git a/girepository/cmph/chd.c b/girepository/cmph/chd.c index 71579ee3..46aec52d 100644 --- a/girepository/cmph/chd.c +++ b/girepository/cmph/chd.c @@ -190,9 +190,10 @@ void chd_load(FILE *fd, cmph_t *mphf) DEBUGP("Loading Compressed rank structure, which has %u bytes\n", chd->packed_cr_size); chd->packed_cr = (cmph_uint8 *) calloc((size_t)chd->packed_cr_size, (size_t)1); nbytes = fread(chd->packed_cr, chd->packed_cr_size, (size_t)1, fd); - if (nbytes == 0 && ferror(fd)) { + if (nbytes == 0 && ferror(fd)) { fprintf(stderr, "ERROR: %s\n", strerror(errno)); } + } int chd_dump(cmph_t *mphf, FILE *fd) @@ -207,13 +208,14 @@ int chd_dump(cmph_t *mphf, FILE *fd) nbytes = fwrite(&data->packed_chd_phf_size, sizeof(cmph_uint32), (size_t)1, fd); nbytes = fwrite(data->packed_chd_phf, data->packed_chd_phf_size, (size_t)1, fd); - DEBUGP("Dumping compressed rank structure with %u bytes to disk\n", buflen); + DEBUGP("Dumping compressed rank structure with %u bytes to disk\n", data->packed_cr_size); nbytes = fwrite(&data->packed_cr_size, sizeof(cmph_uint32), (size_t)1, fd); nbytes = fwrite(data->packed_cr, data->packed_cr_size, (size_t)1, fd); - if (nbytes == 0 && ferror(fd)) { + if (nbytes == 0 && ferror(fd)) { fprintf(stderr, "ERROR: %s\n", strerror(errno)); return 0; } + return 1; } diff --git a/girepository/cmph/chd_ph.c b/girepository/cmph/chd_ph.c index 6cd9437a..8356bded 100644 --- a/girepository/cmph/chd_ph.c +++ b/girepository/cmph/chd_ph.c @@ -193,8 +193,9 @@ void chd_ph_config_set_hashfuncs(cmph_config_t *mph, CMPH_HASH *hashfuncs) void chd_ph_config_set_b(cmph_config_t *mph, cmph_uint32 keys_per_bucket) { + chd_ph_config_data_t *chd_ph; assert(mph); - chd_ph_config_data_t *chd_ph = (chd_ph_config_data_t *)mph->data; + chd_ph = (chd_ph_config_data_t *)mph->data; if(keys_per_bucket < 1 || keys_per_bucket >= 15) { keys_per_bucket = 4; @@ -205,8 +206,9 @@ void chd_ph_config_set_b(cmph_config_t *mph, cmph_uint32 keys_per_bucket) void chd_ph_config_set_keys_per_bin(cmph_config_t *mph, cmph_uint32 keys_per_bin) { + chd_ph_config_data_t *chd_ph; assert(mph); - chd_ph_config_data_t *chd_ph = (chd_ph_config_data_t *)mph->data; + chd_ph = (chd_ph_config_data_t *)mph->data; if(keys_per_bin <= 1 || keys_per_bin >= 128) { keys_per_bin = 1; @@ -860,9 +862,10 @@ void chd_ph_load(FILE *fd, cmph_t *mphf) DEBUGP("Reading n and nbuckets\n"); nbytes = fread(&(chd_ph->n), sizeof(cmph_uint32), (size_t)1, fd); nbytes = fread(&(chd_ph->nbuckets), sizeof(cmph_uint32), (size_t)1, fd); - if (nbytes == 0 && ferror(fd)) { + if (nbytes == 0 && ferror(fd)) { fprintf(stderr, "ERROR: %s\n", strerror(errno)); } + } int chd_ph_dump(cmph_t *mphf, FILE *fd) @@ -889,7 +892,7 @@ int chd_ph_dump(cmph_t *mphf, FILE *fd) // dumping n and nbuckets nbytes = fwrite(&(data->n), sizeof(cmph_uint32), (size_t)1, fd); nbytes = fwrite(&(data->nbuckets), sizeof(cmph_uint32), (size_t)1, fd); - if (nbytes == 0 && ferror(fd)) { + if (nbytes == 0 && ferror(fd)) { fprintf(stderr, "ERROR: %s\n", strerror(errno)); return 0; } diff --git a/girepository/cmph/chm.c b/girepository/cmph/chm.c index 3af8c806..36a07a0d 100644 --- a/girepository/cmph/chm.c +++ b/girepository/cmph/chm.c @@ -226,7 +226,7 @@ int chm_dump(cmph_t *mphf, FILE *fd) nbytes = fwrite(&(data->m), sizeof(cmph_uint32), (size_t)1, fd); nbytes = fwrite(data->g, sizeof(cmph_uint32)*data->n, (size_t)1, fd); - if (nbytes == 0 && ferror(fd)) { + if (nbytes == 0 && ferror(fd)) { fprintf(stderr, "ERROR: %s\n", strerror(errno)); return 0; } @@ -270,7 +270,7 @@ void chm_load(FILE *f, cmph_t *mphf) chm->g = (cmph_uint32 *)malloc(sizeof(cmph_uint32)*chm->n); nbytes = fread(chm->g, chm->n*sizeof(cmph_uint32), (size_t)1, f); - if (nbytes == 0 && ferror(f)) { + if (nbytes == 0 && ferror(f)) { fprintf(stderr, "ERROR: %s\n", strerror(errno)); return; } @@ -313,6 +313,7 @@ void chm_pack(cmph_t *mphf, void *packed_mphf) { chm_data_t *data = (chm_data_t *)mphf->data; cmph_uint8 * ptr = packed_mphf; + CMPH_HASH h2_type; // packing h1 type CMPH_HASH h1_type = hash_get_type(data->hashes[0]); @@ -324,7 +325,7 @@ void chm_pack(cmph_t *mphf, void *packed_mphf) ptr += hash_state_packed_size(h1_type); // packing h2 type - CMPH_HASH h2_type = hash_get_type(data->hashes[1]); + h2_type = hash_get_type(data->hashes[1]); *((cmph_uint32 *) ptr) = h2_type; ptr += sizeof(cmph_uint32); @@ -370,19 +371,24 @@ cmph_uint32 chm_search_packed(void *packed_mphf, const char *key, cmph_uint32 ke { register cmph_uint8 *h1_ptr = packed_mphf; register CMPH_HASH h1_type = *((cmph_uint32 *)h1_ptr); + register cmph_uint8 *h2_ptr; + register CMPH_HASH h2_type; + register cmph_uint32 *g_ptr; + register cmph_uint32 n, m, h1, h2; + h1_ptr += 4; - register cmph_uint8 *h2_ptr = h1_ptr + hash_state_packed_size(h1_type); - register CMPH_HASH h2_type = *((cmph_uint32 *)h2_ptr); + h2_ptr = h1_ptr + hash_state_packed_size(h1_type); + h2_type = *((cmph_uint32 *)h2_ptr); h2_ptr += 4; - register cmph_uint32 *g_ptr = (cmph_uint32 *)(h2_ptr + hash_state_packed_size(h2_type)); + g_ptr = (cmph_uint32 *)(h2_ptr + hash_state_packed_size(h2_type)); - register cmph_uint32 n = *g_ptr++; - register cmph_uint32 m = *g_ptr++; + n = *g_ptr++; + m = *g_ptr++; - register cmph_uint32 h1 = hash_packed(h1_ptr, h1_type, key, keylen) % n; - register cmph_uint32 h2 = hash_packed(h2_ptr, h2_type, key, keylen) % n; + h1 = hash_packed(h1_ptr, h1_type, key, keylen) % n; + h2 = hash_packed(h2_ptr, h2_type, key, keylen) % n; DEBUGP("key: %s h1: %u h2: %u\n", key, h1, h2); if (h1 == h2 && ++h2 >= n) h2 = 0; DEBUGP("key: %s g[h1]: %u g[h2]: %u edges: %u\n", key, g_ptr[h1], g_ptr[h2], m); diff --git a/girepository/cmph/compressed_rank.c b/girepository/cmph/compressed_rank.c index 822b2e15..8019dbe5 100644 --- a/girepository/cmph/compressed_rank.c +++ b/girepository/cmph/compressed_rank.c @@ -83,9 +83,9 @@ cmph_uint32 compressed_rank_query(compressed_rank_t * cr, cmph_uint32 idx) return cr->n; } - val_quot = idx >> cr->rem_r; - rems_mask = (1U << cr->rem_r) - 1U; - val_rem = idx & rems_mask; + val_quot = idx >> cr->rem_r; + rems_mask = (1U << cr->rem_r) - 1U; + val_rem = idx & rems_mask; if(val_quot == 0) { rank = sel_res = 0; @@ -128,6 +128,9 @@ void compressed_rank_dump(compressed_rank_t * cr, char **buf, cmph_uint32 *bufle register cmph_uint32 pos = 0; char * buf_sel = 0; cmph_uint32 buflen_sel = 0; +#ifdef DEBUG + cmph_uint32 i; +#endif *buflen = 4*(cmph_uint32)sizeof(cmph_uint32) + sel_size + vals_rems_size; @@ -164,7 +167,7 @@ void compressed_rank_dump(compressed_rank_t * cr, char **buf, cmph_uint32 *bufle memcpy(*buf + pos, buf_sel, buflen_sel); #ifdef DEBUG - cmph_uint32 i = 0; + i = 0; for(i = 0; i < buflen_sel; i++) { DEBUGP("pos = %u -- buf_sel[%u] = %u\n", pos, i, *(*buf + pos + i)); @@ -192,6 +195,9 @@ void compressed_rank_load(compressed_rank_t * cr, const char *buf, cmph_uint32 b register cmph_uint32 pos = 0; cmph_uint32 buflen_sel = 0; register cmph_uint32 vals_rems_size = 0; +#ifdef DEBUG + cmph_uint32 i; +#endif // loading max_val, n, and rem_r memcpy(&(cr->max_val), buf, sizeof(cmph_uint32)); @@ -213,7 +219,7 @@ void compressed_rank_load(compressed_rank_t * cr, const char *buf, cmph_uint32 b select_load(&cr->sel, buf + pos, buflen_sel); #ifdef DEBUG - cmph_uint32 i = 0; + i = 0; for(i = 0; i < buflen_sel; i++) { DEBUGP("pos = %u -- buf_sel[%u] = %u\n", pos, i, *(buf + pos + i)); diff --git a/girepository/cmph/compressed_seq.c b/girepository/cmph/compressed_seq.c index e558196d..e5191fd5 100644 --- a/girepository/cmph/compressed_seq.c +++ b/girepository/cmph/compressed_seq.c @@ -167,6 +167,9 @@ void compressed_seq_dump(compressed_seq_t * cs, char ** buf, cmph_uint32 * bufle register cmph_uint32 pos = 0; char * buf_sel = 0; cmph_uint32 buflen_sel = 0; +#ifdef DEBUG + cmph_uint32 i; +#endif *buflen = 4*(cmph_uint32)sizeof(cmph_uint32) + sel_size + length_rems_size + store_table_size; @@ -202,8 +205,8 @@ void compressed_seq_dump(compressed_seq_t * cs, char ** buf, cmph_uint32 * bufle DEBUGP("buflen_sel = %u\n", buflen_sel); memcpy(*buf + pos, buf_sel, buflen_sel); - #ifdef DEBUG - cmph_uint32 i = 0; + #ifdef DEBUG + i = 0; for(i = 0; i < buflen_sel; i++) { DEBUGP("pos = %u -- buf_sel[%u] = %u\n", pos, i, *(*buf + pos + i)); @@ -215,7 +218,7 @@ void compressed_seq_dump(compressed_seq_t * cs, char ** buf, cmph_uint32 * bufle // dumping length_rems memcpy(*buf + pos, cs->length_rems, length_rems_size); - #ifdef DEBUG + #ifdef DEBUG for(i = 0; i < length_rems_size; i++) { DEBUGP("pos = %u -- length_rems_size = %u -- length_rems[%u] = %u\n", pos, length_rems_size, i, *(*buf + pos + i)); @@ -226,7 +229,7 @@ void compressed_seq_dump(compressed_seq_t * cs, char ** buf, cmph_uint32 * bufle // dumping store_table memcpy(*buf + pos, cs->store_table, store_table_size); - #ifdef DEBUG + #ifdef DEBUG for(i = 0; i < store_table_size; i++) { DEBUGP("pos = %u -- store_table_size = %u -- store_table[%u] = %u\n", pos, store_table_size, i, *(*buf + pos + i)); @@ -241,6 +244,9 @@ void compressed_seq_load(compressed_seq_t * cs, const char * buf, cmph_uint32 bu cmph_uint32 buflen_sel = 0; register cmph_uint32 length_rems_size = 0; register cmph_uint32 store_table_size = 0; +#ifdef DEBUG + cmph_uint32 i; +#endif // loading n, rem_r and total_length memcpy(&(cs->n), buf, sizeof(cmph_uint32)); @@ -261,8 +267,8 @@ void compressed_seq_load(compressed_seq_t * cs, const char * buf, cmph_uint32 bu DEBUGP("buflen_sel = %u\n", buflen_sel); select_load(&cs->sel, buf + pos, buflen_sel); - #ifdef DEBUG - cmph_uint32 i = 0; + #ifdef DEBUG + i = 0; for(i = 0; i < buflen_sel; i++) { DEBUGP("pos = %u -- buf_sel[%u] = %u\n", pos, i, *(buf + pos + i)); @@ -280,7 +286,7 @@ void compressed_seq_load(compressed_seq_t * cs, const char * buf, cmph_uint32 bu length_rems_size *= 4; memcpy(cs->length_rems, buf + pos, length_rems_size); - #ifdef DEBUG + #ifdef DEBUG for(i = 0; i < length_rems_size; i++) { DEBUGP("pos = %u -- length_rems_size = %u -- length_rems[%u] = %u\n", pos, length_rems_size, i, *(buf + pos + i)); @@ -298,7 +304,7 @@ void compressed_seq_load(compressed_seq_t * cs, const char * buf, cmph_uint32 bu store_table_size *= 4; memcpy(cs->store_table, buf + pos, store_table_size); - #ifdef DEBUG + #ifdef DEBUG for(i = 0; i < store_table_size; i++) { DEBUGP("pos = %u -- store_table_size = %u -- store_table[%u] = %u\n", pos, store_table_size, i, *(buf + pos + i)); @@ -336,19 +342,19 @@ cmph_uint32 compressed_seq_query_packed(void * cs_packed, cmph_uint32 idx) register cmph_uint32 *ptr = (cmph_uint32 *)cs_packed; register cmph_uint32 n = *ptr++; register cmph_uint32 rem_r = *ptr++; + register cmph_uint32 buflen_sel, length_rems_size, enc_idx, enc_length; + // compressed sequence query computation + register cmph_uint32 rems_mask, stored_value, sel_res; + register cmph_uint32 *sel_packed, *length_rems, *store_table; + ptr++; // skipping total_length // register cmph_uint32 total_length = *ptr++; - register cmph_uint32 buflen_sel = *ptr++; - register cmph_uint32 * sel_packed = ptr; - register cmph_uint32 * length_rems = (ptr += (buflen_sel >> 2)); - register cmph_uint32 length_rems_size = BITS_TABLE_SIZE(n, rem_r); - register cmph_uint32 * store_table = (ptr += length_rems_size); + buflen_sel = *ptr++; + sel_packed = ptr; + length_rems = (ptr += (buflen_sel >> 2)); + length_rems_size = BITS_TABLE_SIZE(n, rem_r); + store_table = (ptr += length_rems_size); - // compressed sequence query computation - register cmph_uint32 enc_idx, enc_length; - register cmph_uint32 rems_mask; - register cmph_uint32 stored_value; - register cmph_uint32 sel_res; rems_mask = (1U << rem_r) - 1U; diff --git a/girepository/cmph/fch.c b/girepository/cmph/fch.c index f6e16e34..33b959e2 100644 --- a/girepository/cmph/fch.c +++ b/girepository/cmph/fch.c @@ -10,6 +10,7 @@ #include #include #include + #define INDEX 0 /* alignment index within a bucket */ //#define DEBUG #include "debug.h" @@ -320,6 +321,10 @@ int fch_dump(cmph_t *mphf, FILE *fd) register size_t nbytes; fch_data_t *data = (fch_data_t *)mphf->data; + +#ifdef DEBUG + cmph_uint32 i; +#endif __cmph_dump(mphf, fd); hash_state_dump(data->h1, &buf, &buflen); @@ -340,12 +345,11 @@ int fch_dump(cmph_t *mphf, FILE *fd) nbytes = fwrite(&(data->p1), sizeof(double), (size_t)1, fd); nbytes = fwrite(&(data->p2), sizeof(double), (size_t)1, fd); nbytes = fwrite(data->g, sizeof(cmph_uint32)*(data->b), (size_t)1, fd); - if (nbytes == 0 && ferror(fd)) { + if (nbytes == 0 && ferror(fd)) { fprintf(stderr, "ERROR: %s\n", strerror(errno)); return 0; } #ifdef DEBUG - cmph_uint32 i; fprintf(stderr, "G: "); for (i = 0; i < data->b; ++i) fprintf(stderr, "%u ", data->g[i]); fprintf(stderr, "\n"); @@ -359,6 +363,9 @@ void fch_load(FILE *f, cmph_t *mphf) cmph_uint32 buflen; register size_t nbytes; fch_data_t *fch = (fch_data_t *)malloc(sizeof(fch_data_t)); +#ifdef DEBUG + cmph_uint32 i; +#endif //DEBUGP("Loading fch mphf\n"); mphf->data = fch; @@ -392,12 +399,12 @@ void fch_load(FILE *f, cmph_t *mphf) fch->g = (cmph_uint32 *)malloc(sizeof(cmph_uint32)*fch->b); nbytes = fread(fch->g, fch->b*sizeof(cmph_uint32), (size_t)1, f); - if (nbytes == 0 && ferror(f)) { + if (nbytes == 0 && ferror(f)) { fprintf(stderr, "ERROR: %s\n", strerror(errno)); return; } + #ifdef DEBUG - cmph_uint32 i; fprintf(stderr, "G: "); for (i = 0; i < fch->b; ++i) fprintf(stderr, "%u ", fch->g[i]); fprintf(stderr, "\n"); @@ -436,6 +443,7 @@ void fch_pack(cmph_t *mphf, void *packed_mphf) // packing h1 type CMPH_HASH h1_type = hash_get_type(data->h1); + CMPH_HASH h2_type; *((cmph_uint32 *) ptr) = h1_type; ptr += sizeof(cmph_uint32); @@ -444,7 +452,7 @@ void fch_pack(cmph_t *mphf, void *packed_mphf) ptr += hash_state_packed_size(h1_type); // packing h2 type - CMPH_HASH h2_type = hash_get_type(data->h2); + h2_type = hash_get_type(data->h2); *((cmph_uint32 *) ptr) = h2_type; ptr += sizeof(cmph_uint32); @@ -499,27 +507,32 @@ cmph_uint32 fch_search_packed(void *packed_mphf, const char *key, cmph_uint32 ke { register cmph_uint8 *h1_ptr = packed_mphf; register CMPH_HASH h1_type = *((cmph_uint32 *)h1_ptr); + register cmph_uint8 *h2_ptr; + register CMPH_HASH h2_type; + register cmph_uint32 *g_ptr; + register cmph_uint32 m, b, h1, h2; + register double p1, p2; + h1_ptr += 4; - register cmph_uint8 *h2_ptr = h1_ptr + hash_state_packed_size(h1_type); - register CMPH_HASH h2_type = *((cmph_uint32 *)h2_ptr); + h2_ptr = h1_ptr + hash_state_packed_size(h1_type); + h2_type = *((cmph_uint32 *)h2_ptr); h2_ptr += 4; - register cmph_uint32 *g_ptr = (cmph_uint32 *)(h2_ptr + hash_state_packed_size(h2_type)); + g_ptr = (cmph_uint32 *)(h2_ptr + hash_state_packed_size(h2_type)); - register cmph_uint32 m = *g_ptr++; + m = *g_ptr++; - register cmph_uint32 b = *g_ptr++; + b = *g_ptr++; - register double p1 = (double)(*((cmph_uint64 *)g_ptr)); + p1 = (double)(*((cmph_uint64 *)g_ptr)); g_ptr += 2; - register double p2 = (double)(*((cmph_uint64 *)g_ptr)); + p2 = (double)(*((cmph_uint64 *)g_ptr)); g_ptr += 2; - register cmph_uint32 h1 = hash_packed(h1_ptr, h1_type, key, keylen) % m; - register cmph_uint32 h2 = hash_packed(h2_ptr, h2_type, key, keylen) % m; - + h1 = hash_packed(h1_ptr, h1_type, key, keylen) % m; + h2 = hash_packed(h2_ptr, h2_type, key, keylen) % m; h1 = mixh10h11h12 (b, p1, p2, h1); return (h2 + g_ptr[h1]) % m; } -- cgit v1.2.1 From b28cf37dbfe2182dd18daaccc1f6bda66dd92560 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 24 Jul 2012 15:56:59 +0800 Subject: girffi.c: Don't include unistd.h unconditionally It does not exist on all platforms https://bugzilla.gnome.org/show_bug.cgi?id=681820 --- girepository/girffi.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/girepository/girffi.c b/girepository/girffi.c index ec710c37..f4c80eaa 100644 --- a/girepository/girffi.c +++ b/girepository/girffi.c @@ -26,7 +26,9 @@ #include #include +#ifdef HAVE_UNISTD_H #include +#endif #include "girffi.h" #include "girepository.h" #include "girepository-private.h" -- cgit v1.2.1 From f2e54769ca9f72401d438b66fd6144986ee288f3 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 10 Aug 2012 12:26:29 +0800 Subject: giscanner/scannerparser.y: Avoid C99ism Move variable declarations to the start of block. https://bugzilla.gnome.org/show_bug.cgi?id=681820 --- giscanner/scannerparser.y | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/giscanner/scannerparser.y b/giscanner/scannerparser.y index 06a10efa..81a9374f 100644 --- a/giscanner/scannerparser.y +++ b/giscanner/scannerparser.y @@ -814,11 +814,12 @@ type_specifier struct_or_union_specifier : struct_or_union identifier_or_typedef_name '{' struct_declaration_list '}' { + GISourceSymbol *sym; $$ = $1; $$->name = $2; $$->child_list = $4; - GISourceSymbol *sym = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_filename, lineno); + sym = gi_source_symbol_new (CSYMBOL_TYPE_INVALID, scanner->current_filename, lineno); if ($$->type == CTYPE_STRUCT) { sym->type = CSYMBOL_TYPE_STRUCT; } else if ($$->type == CTYPE_UNION) { @@ -1468,9 +1469,9 @@ gi_source_scanner_parse_macros (GISourceScanner *scanner, GList *filenames) FILE *fmacros = fdopen (g_file_open_tmp ("gen-introspect-XXXXXX.h", &tmp_name, &error), "w+"); + GList *l; g_unlink (tmp_name); - GList *l; for (l = filenames; l != NULL; l = l->next) { FILE *f = fopen (l->data, "r"); -- cgit v1.2.1 From af578e81c861cf31f494fc830ba02ca41d7c7613 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 24 Jul 2012 16:09:38 +0800 Subject: girepository: Remove C99ism and other updates -Make code using libgirepository_internals relocatable on Windows, like what is done in the GTK+ stack, and the girepository DLL. -Remove C99isms -"interface" is a reserved keyword on certain compilers, so change that to "giinterface" https://bugzilla.gnome.org/show_bug.cgi?id=681820 --- girepository/girmodule.c | 3 ++- girepository/girnode.c | 15 ++++++++++----- girepository/girnode.h | 2 +- girepository/giroffsets.c | 4 ++-- girepository/girparser.c | 33 +++++++++++++++++++++++++++------ 5 files changed, 42 insertions(+), 15 deletions(-) diff --git a/girepository/girmodule.c b/girepository/girmodule.c index af71f369..05c8987f 100644 --- a/girepository/girmodule.c +++ b/girepository/girmodule.c @@ -261,8 +261,9 @@ add_directory_index_section (guint8 *data, GIrModule *module, guint32 *offset2) for (i = 0; i < n_interfaces; i++) { + const char *str; entry = (DirEntry *)&data[header->directory + (i * header->entry_blob_size)]; - const char *str = (const char *) (&data[entry->name]); + str = (const char *) (&data[entry->name]); _gi_typelib_hash_builder_add_string (dirindex_builder, str, i); } diff --git a/girepository/girnode.c b/girepository/girnode.c index 881aa9be..afb71e57 100644 --- a/girepository/girnode.c +++ b/girepository/girnode.c @@ -28,6 +28,11 @@ #include "girnode.h" #include "gitypelib-internal.h" +#ifdef _MSC_VER +#define strtoll _strtoi64 +#define strtoull _strtoui64 +#endif + static gulong string_count = 0; static gulong unique_string_count = 0; static gulong string_size = 0; @@ -228,7 +233,7 @@ _g_ir_node_free (GIrNode *node) _g_ir_node_free ((GIrNode *)type->parameter_type1); _g_ir_node_free ((GIrNode *)type->parameter_type2); - g_free (type->interface); + g_free (type->giinterface); g_strfreev (type->errors); } @@ -1244,7 +1249,7 @@ serialize_type (GIrTypelibBuild *build, GIrNode *iface; gchar *name; - iface = find_entry_node (build, node->interface, NULL); + iface = find_entry_node (build, node->giinterface, NULL); if (iface) { if (iface->type == G_IR_NODE_XREF) @@ -1253,8 +1258,8 @@ serialize_type (GIrTypelibBuild *build, } else { - g_warning ("Interface for type reference %s not found", node->interface); - name = node->interface; + g_warning ("Interface for type reference %s not found", node->giinterface); + name = node->giinterface; } g_string_append_printf (str, "%s%s", name, @@ -1483,7 +1488,7 @@ _g_ir_node_build_typelib (GIrNode *node, iface->reserved = 0; iface->tag = type->tag; iface->reserved2 = 0; - iface->interface = find_entry (build, type->interface); + iface->interface = find_entry (build, type->giinterface); } break; diff --git a/girepository/girnode.h b/girepository/girnode.h index d89847ac..07b084c4 100644 --- a/girepository/girnode.h +++ b/girepository/girnode.h @@ -133,7 +133,7 @@ struct _GIrNodeType GIrNodeType *parameter_type1; GIrNodeType *parameter_type2; - gchar *interface; + gchar *giinterface; gchar **errors; }; diff --git a/girepository/giroffsets.c b/girepository/giroffsets.c index e3c9d7f5..368332ea 100644 --- a/girepository/giroffsets.c +++ b/girepository/giroffsets.c @@ -190,10 +190,10 @@ get_interface_size_alignment (GIrTypelibBuild *build, { GIrNode *iface; - iface = _g_ir_find_node (build, ((GIrNode*)type)->module, type->interface); + iface = _g_ir_find_node (build, ((GIrNode*)type)->module, type->giinterface); if (!iface) { - _g_ir_module_fatal (build, 0, "Can't resolve type '%s' for %s", type->interface, who); + _g_ir_module_fatal (build, 0, "Can't resolve type '%s' for %s", type->giinterface, who); *size = -1; *alignment = -1; return FALSE; diff --git a/girepository/girparser.c b/girepository/girparser.c index fa0de1f8..ce88a691 100644 --- a/girepository/girparser.c +++ b/girepository/girparser.c @@ -36,6 +36,24 @@ */ #define SUPPORTED_GIR_VERSION "1.2" +#ifdef G_OS_WIN32 + +#include + +#ifdef GIR_DIR +#undef GIR_DIR +#endif + +/* GIR_DIR is used only in code called just once, + * so no problem leaking this + */ +#define GIR_DIR \ + g_build_filename (g_win32_get_package_installation_directory_of_module(NULL), \ + "share", \ + GIR_SUFFIX, \ + NULL) +#endif + struct _GIrParser { gchar **includes; @@ -329,10 +347,12 @@ state_switch (ParseContext *ctx, ParseState newstate) static GIrNode * pop_node (ParseContext *ctx) { + GSList *top; + GIrNode *node; g_assert (ctx->node_stack != 0); - GSList *top = ctx->node_stack; - GIrNode *node = top->data; + top = ctx->node_stack; + node = top->data; g_debug ("popping node %d %s", node->type, node->name); ctx->node_stack = top->next; @@ -552,8 +572,8 @@ parse_type_internal (GIrModule *module, if (*str == '<') { - (str)++; char *tmp, *end; + (str)++; end = strchr (str, '>'); tmp = g_strndup (str, end - str); @@ -565,9 +585,10 @@ parse_type_internal (GIrModule *module, } else { + const char *start; type->tag = GI_TYPE_TAG_INTERFACE; type->is_interface = TRUE; - const char *start = str; + start = str; /* must be an interface type */ while (g_ascii_isalnum (*str) || @@ -577,7 +598,7 @@ parse_type_internal (GIrModule *module, *str == ':') (str)++; - type->interface = g_strndup (start, str - start); + type->giinterface = g_strndup (start, str - start); } if (next) @@ -1965,7 +1986,7 @@ start_type (GMarkupParseContext *context, * doesn't look like a pointer, but is internally. */ if (typenode->tag == GI_TYPE_TAG_INTERFACE && - is_disguised_structure (ctx, typenode->interface)) + is_disguised_structure (ctx, typenode->giinterface)) pointer_depth++; if (pointer_depth > 0) -- cgit v1.2.1 From 9a1e0c63c13f3567e75553d2d07dd914d5b81287 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 10 Aug 2012 12:41:22 +0800 Subject: giscanner/dumper.py: Use os.name instead of os.uname()[0] os.uname is not available universally, so use something that exists universally. https://bugzilla.gnome.org/show_bug.cgi?id=681820 --- giscanner/shlibs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py index 9579e7e6..2ea34c91 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py @@ -69,7 +69,7 @@ def _resolve_non_libtool(options, binary, libraries): if not libraries: return [] - if os.uname()[0] == 'OpenBSD': + if os.name == 'OpenBSD': # Hack for OpenBSD when using the ports' libtool which uses slightly # different directories to store the libraries in. So rewite binary.args[0] # by inserting '.libs/'. -- cgit v1.2.1 From 569b1aaf133f64541739f52dfc614f64cea2ae6a Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 10 Aug 2012 12:22:16 +0800 Subject: giscannermodule.c: Updates for Windows -Incorporate and extend Dieter's patch regarding possible different CRTs used in Windows Python (msvcrt71.dll for Python 2.5, msvcrt90.dll for Python 2.6- 3.2, and msvcrt100.dll for Python 3.3+) vs. the CRT used to build g-i (msvcrt.dll for MinGW/WinDDK, msvcrt90.dll for stock MSVC 2008 and msvcrt100.dll for stock MSVC 2010) -Avoid C99ism for NEW_CLASS as we are having an array without a pre-determined length. There might be better ways to get around this though. https://bugzilla.gnome.org/show_bug.cgi?id=681820 --- giscanner/giscannermodule.c | 98 +++++++++++++++++++++++++++++++-------------- 1 file changed, 67 insertions(+), 31 deletions(-) diff --git a/giscanner/giscannermodule.c b/giscanner/giscannermodule.c index ad8f4bd3..0f8d6cbb 100644 --- a/giscanner/giscannermodule.c +++ b/giscanner/giscannermodule.c @@ -42,8 +42,8 @@ DL_EXPORT(void) init_giscanner(void); -#define NEW_CLASS(ctype, name, cname) \ -static const PyMethodDef _Py##cname##_methods[]; \ +#define NEW_CLASS(ctype, name, cname, num_methods) \ +static const PyMethodDef _Py##cname##_methods[num_methods]; \ PyTypeObject Py##cname##_Type = { \ PyObject_HEAD_INIT(NULL) \ 0, \ @@ -86,9 +86,9 @@ typedef struct { GISourceScanner *scanner; } PyGISourceScanner; -NEW_CLASS (PyGISourceSymbol, "SourceSymbol", GISourceSymbol); -NEW_CLASS (PyGISourceType, "SourceType", GISourceType); -NEW_CLASS (PyGISourceScanner, "SourceScanner", GISourceScanner); +NEW_CLASS (PyGISourceSymbol, "SourceSymbol", GISourceSymbol, 10); +NEW_CLASS (PyGISourceType, "SourceType", GISourceType, 9); +NEW_CLASS (PyGISourceScanner, "SourceScanner", GISourceScanner, 8); /* Symbol */ @@ -411,43 +411,79 @@ pygi_source_scanner_parse_file (PyGISourceScanner *self, #ifdef _WIN32 /* The file descriptor passed to us is from the C library Python - * uses. That is msvcr71.dll at least for Python 2.5. This code, at - * least if compiled with mingw, uses msvcrt.dll, so we cannot use - * the file descriptor directly. So perform appropriate magic. + * uses. That is msvcr71.dll for Python 2.5 and msvcr90.dll for + * Python 2.6, 2.7, 3.2 etc; and msvcr100.dll for Python 3.3 and later. + * This code, at least if compiled with mingw, uses + * msvcrt.dll, so we cannot use the file descriptor directly. So + * perform appropriate magic. */ + + /* If we are using the following combinations, + * we can use the file descriptors directly + * (Not if a build using WDK is used): + * Python 2.6.x/2.7.x with Visual C++ 2008 + * Python 3.1.x/3.2.x with Visual C++ 2008 + * Python 3.3+ with Visual C++ 2010 + */ + +#if (defined(_MSC_VER) && !defined(USE_WIN_DDK)) +#if (PY_MAJOR_VERSION==2 && PY_MINOR_VERSION>=6 && (_MSC_VER >= 1500 && _MSC_VER < 1600)) +#define MSVC_USE_FD_DIRECTLY 1 +#elif (PY_MAJOR_VERSION==3 && PY_MINOR_VERSION<=2 && (_MSC_VER >= 1500 && _MSC_VER < 1600)) +#define MSVC_USE_FD_DIRECTLY 1 +#elif (PY_MAJOR_VERSION==3 && PY_MINOR_VERSION>=3 && (_MSC_VER >= 1600 && _MSC_VER < 1700)) +#define MSVC_USE_FD_DIRECTLY 1 +#endif +#endif + +#ifndef MSVC_USE_FD_DIRECTLY { - HMODULE msvcr71; - int (*p__get_osfhandle) (int); +#if defined(PY_MAJOR_VERSION) && PY_MAJOR_VERSION==2 && PY_MINOR_VERSION==5 +#define PYTHON_MSVCRXX_DLL "msvcr71.dll" +#elif defined(PY_MAJOR_VERSION) && PY_MAJOR_VERSION==2 && PY_MINOR_VERSION==6 +#define PYTHON_MSVCRXX_DLL "msvcr90.dll" +#elif defined(PY_MAJOR_VERSION) && PY_MAJOR_VERSION==2 && PY_MINOR_VERSION==7 +#define PYTHON_MSVCRXX_DLL "msvcr90.dll" +#elif defined(PY_MAJOR_VERSION) && PY_MAJOR_VERSION==3 && PY_MINOR_VERSION==2 +#define PYTHON_MSVCRXX_DLL "msvcr90.dll" +#elif defined(PY_MAJOR_VERSION) && PY_MAJOR_VERSION==3 && PY_MINOR_VERSION>=3 +#define PYTHON_MSVCRXX_DLL "msvcr100.dll" +#else +#error This Python version not handled +#endif + HMODULE msvcrxx; + intptr_t (*p__get_osfhandle) (int); HANDLE handle; - msvcr71 = GetModuleHandle ("msvcr71.dll"); - if (!msvcr71) - { - g_print ("No msvcr71.dll loaded.\n"); - return NULL; - } + msvcrxx = GetModuleHandle (PYTHON_MSVCRXX_DLL); + if (!msvcrxx) + { + g_print ("No " PYTHON_MSVCRXX_DLL " loaded.\n"); + return NULL; + } - p__get_osfhandle = GetProcAddress (msvcr71, "_get_osfhandle"); + p__get_osfhandle = (intptr_t (*) (int)) GetProcAddress (msvcrxx, "_get_osfhandle"); if (!p__get_osfhandle) - { - g_print ("No _get_osfhandle found in msvcr71.dll.\n"); - return NULL; - } + { + g_print ("No _get_osfhandle found in " PYTHON_MSVCRXX_DLL ".\n"); + return NULL; + } - handle = p__get_osfhandle (fd); + handle = (HANDLE) p__get_osfhandle (fd); if (!p__get_osfhandle) - { - g_print ("Could not get OS handle from msvcr71 fd.\n"); - return NULL; - } + { + g_print ("Could not get OS handle from " PYTHON_MSVCRXX_DLL " fd.\n"); + return NULL; + } - fd = _open_osfhandle (handle, _O_RDONLY); + fd = _open_osfhandle ((intptr_t) handle, _O_RDONLY); if (fd == -1) - { - g_print ("Could not open C fd from OS handle.\n"); - return NULL; - } + { + g_print ("Could not open C fd from OS handle.\n"); + return NULL; + } } +#endif #endif fp = fdopen (fd, "r"); -- cgit v1.2.1 From 4ae09d25b226be70f9a5e18bfc1e1e63c9ff5c66 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 10 Aug 2012 12:56:44 +0800 Subject: Add a pre-configured config.h.(win32.in) This adds a pre-defined config.h for Windows builds, but versioning info are updated by autotools. https://bugzilla.gnome.org/show_bug.cgi?id=681820 --- config.h.win32.in | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 136 insertions(+) create mode 100644 config.h.win32.in diff --git a/config.h.win32.in b/config.h.win32.in new file mode 100644 index 00000000..3bc66f23 --- /dev/null +++ b/config.h.win32.in @@ -0,0 +1,136 @@ +/* config.h.in. Generated from configure.ac by autoheader. */ + +/* Director prefix for gir installation */ +#define GIR_DIR "/some/dynamically/constructed/dir" + +/* Name of the gir directory */ +#define GIR_SUFFIX "@GIR_SUFFIX@" + +/* Directory prefix for typelib installation */ +#define GOBJECT_INTROSPECTION_LIBDIR "/some/dynamically/constructed/dir" + +/* Define to 1 if you have the `backtrace' function. */ +/* #undef HAVE_BACKTRACE */ + +/* Define to 1 if you have the `backtrace_symbols' function. */ +/* #undef HAVE_BACKTRACE_SYMBOLS */ + +/* Define to 1 if you have the header file. */ +/* #undef HAVE_DLFCN_H */ + +/* Define to 1 if you have the header file. */ +#define HAVE_FCNTL_H 1 + +/* Define to 1 if you have the header file. */ +#ifndef _MSC_VER +#define HAVE_INTTYPES_H 1 +#endif + +/* Define to 1 if you have the `dl' library (-ldl). */ +/* #undef HAVE_LIBDL */ + +/* Define to 1 if you have the `memchr' function. */ +#define HAVE_MEMCHR 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_MEMORY_H 1 + +/* Define to 1 if you have the header file. */ +#if (!defined (_MSC_VER) || (_MSC_VER >= 1600)) +#define HAVE_STDINT_H 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_STDLIB_H 1 + +/* Define to 1 if you have the `strchr' function. */ +#define HAVE_STRCHR 1 + +/* Define to 1 if you have the header file. */ +#ifndef _MSC_VER +#define HAVE_STRINGS_H 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_STRING_H 1 + +/* Define to 1 if you have the `strspn' function. */ +#define HAVE_STRSPN 1 + +/* Define to 1 if you have the `strstr' function. */ +#define HAVE_STRSTR 1 + +/* Define to 1 if you have the `strtol' function. */ +#define HAVE_STRTOL 1 + +/* Define to 1 if you have the `strtoull' function. */ +#ifndef _MSC_VER +#define HAVE_STRTOULL 1 +#endif + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_STAT_H 1 + +/* Define to 1 if you have the header file. */ +#define HAVE_SYS_TYPES_H 1 + +/* Define to 1 if you have the header file. */ +#ifndef _MSC_VER +#define HAVE_UNISTD_H 1 +#endif + +/* Define to the sub-directory in which libtool stores uninstalled libraries. + */ +#define LT_OBJDIR ".libs/" + +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +/* #undef NO_MINUS_C_MINUS_O + +/* Name of package */ +#define PACKAGE "gobject-introspection" + +/* Define to the address where bug reports for this package should be sent. */ +#define PACKAGE_BUGREPORT "@PACKAGE_BUGREPORT@" + +/* Define to the full name of this package. */ +#define PACKAGE_NAME "gobject-introspection" + +/* Define to the full name and version of this package. */ +#define PACKAGE_STRING "gojbect-introspection @PACKAGE_VERSION@" + +/* Define to the one symbol short name of this package. */ +#define PACKAGE_TARNAME "gobject-introspection" + +/* Define to the home page for this package. */ +#define PACKAGE_URL "" + +/* Define to the version of this package. */ +#define PACKAGE_VERSION "@PACKAGE_VERSION@" + +/* Define to the platform's shared library suffix */ +#define SHLIB_SUFFIX ".dll" + +/* The size of `char', as computed by sizeof. */ +#define SIZEOF_CHAR 1 + +/* The size of `int', as computed by sizeof. */ +#define SIZEOF_INT 4 + +/* The size of `long', as computed by sizeof. */ +#define SIZEOF_LONG 4 + +/* The size of `short', as computed by sizeof. */ +#define SIZEOF_SHORT 2 + +/* Define to 1 if you have the ANSI C header files. */ +#define STDC_HEADERS 1 + +/* Version number of package */ +#define VERSION "@PACKAGE_VERSION@" + +/* Define to 1 if `lex' declares `yytext' as a `char *' by default, not a + `char[]'. */ +#define YYTEXT_POINTER 1 + +/* Define to empty if `const' does not conform to ANSI C. */ +/* #undef const */ -- cgit v1.2.1 From ee5b994062d32faa58bdc9017cddb0d9468bf4e4 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 10 Aug 2012 10:47:56 +0800 Subject: Add girepository.symbols This is the listing of symbols to export from the main libgirepository .dll/.so. This is used for example to generate the .lib file from the Windows DLL. https://bugzilla.gnome.org/show_bug.cgi?id=681820 --- girepository/girepository.symbols | 229 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 229 insertions(+) create mode 100644 girepository/girepository.symbols diff --git a/girepository/girepository.symbols b/girepository/girepository.symbols new file mode 100644 index 00000000..c6dd1034 --- /dev/null +++ b/girepository/girepository.symbols @@ -0,0 +1,229 @@ +/* giarginfo.h */ +g_arg_info_get_closure +g_arg_info_get_destroy +g_arg_info_get_direction +g_arg_info_get_ownership_transfer +g_arg_info_get_scope +g_arg_info_get_type +g_arg_info_is_caller_allocates +g_arg_info_is_optional +g_arg_info_is_return_value +g_arg_info_is_skip +g_arg_info_load_type +g_arg_info_may_be_null + +/* gibaseinfo.h */ +g_base_info_equal +g_base_info_get_attribute +g_base_info_get_container +g_base_info_get_name +g_base_info_get_namespace +g_base_info_get_type +g_base_info_get_typelib +g_base_info_gtype_get_type +g_base_info_is_deprecated +g_base_info_iterate_attributes +g_base_info_ref +g_base_info_unref +g_info_new + +/* gicallableinfo.h */ +g_callable_info_get_arg +g_callable_info_get_caller_owns +g_callable_info_get_n_args +g_callable_info_get_return_attribute +g_callable_info_get_return_type +g_callable_info_invoke +g_callable_info_iterate_return_attributes +g_callable_info_load_arg +g_callable_info_load_return_type +g_callable_info_may_return_null +g_callable_info_skip_return + +/* giconstantinfo.h */ +g_constant_info_free_value +g_constant_info_get_type +g_constant_info_get_value + +/* gienuminfo.h */ +g_enum_info_get_error_domain +g_enum_info_get_method +g_enum_info_get_n_methods +g_enum_info_get_n_values +g_enum_info_get_storage_type +g_enum_info_get_value +g_value_info_get_value + +/* gifieldinfo.h */ +g_field_info_get_field +g_field_info_get_flags +g_field_info_get_offset +g_field_info_get_size +g_field_info_get_type +g_field_info_set_field + +/* gifunctioninfo.h */ +g_function_info_get_flags +g_function_info_get_property +g_function_info_get_symbol +g_function_info_get_vfunc +g_function_info_invoke +g_invoke_error_quark + +/* giinterfaceinfo.h */ +g_interface_info_find_method +g_interface_info_find_vfunc +g_interface_info_get_constant +g_interface_info_get_iface_struct +g_interface_info_get_method +g_interface_info_get_n_constants +g_interface_info_get_n_methods +g_interface_info_get_n_prerequisites +g_interface_info_get_n_properties +g_interface_info_get_prerequisite +g_interface_info_get_n_signals +g_interface_info_get_n_vfuncs +g_interface_info_get_property +g_interface_info_get_signal +g_interface_info_get_vfunc + +/* giobjectinfo.h */ +g_object_info_find_method +g_object_info_find_method_using_interfaces +g_object_info_find_signal +g_object_info_find_vfunc +g_object_info_find_vfunc_using_interfaces +g_object_info_get_abstract +g_object_info_get_class_struct +g_object_info_get_constant +g_object_info_get_field +g_object_info_get_fundamental +g_object_info_get_get_value_function +g_object_info_get_get_value_function_pointer +g_object_info_get_interface +g_object_info_get_method +g_object_info_get_n_constants +g_object_info_get_n_fields +g_object_info_get_n_interfaces +g_object_info_get_n_methods +g_object_info_get_n_properties +g_object_info_get_n_signals +g_object_info_get_n_vfuncs +g_object_info_get_parent +g_object_info_get_property +g_object_info_get_ref_function +g_object_info_get_ref_function_pointer +g_object_info_get_set_value_function +g_object_info_get_set_value_function_pointer +g_object_info_get_signal +g_object_info_get_type_init +g_object_info_get_type_name +g_object_info_get_unref_function +g_object_info_get_unref_function_pointer +g_object_info_get_vfunc + +/* gipropertyinfo.h */ +g_property_info_get_flags +g_property_info_get_ownership_transfer +g_property_info_get_type + +/* giregisteredtypeinfo.h */ +g_registered_type_info_get_g_type +g_registered_type_info_get_type_init +g_registered_type_info_get_type_name + +/* girepository.h */ +gi_cclosure_marshal_generic +g_irepository_dump +g_irepository_enumerate_versions +g_irepository_error_quark +g_irepository_find_by_error_domain +g_irepository_find_by_gtype +g_irepository_find_by_name +g_irepository_get_c_prefix +g_irepository_get_default +g_irepository_get_dependencies +g_irepository_get_info +g_irepository_get_loaded_namespaces +g_irepository_get_n_infos +g_irepository_get_option_group +g_irepository_get_search_path +g_irepository_get_shared_library +g_irepository_get_type +g_irepository_get_typelib_path +g_irepository_get_version +g_irepository_is_registered +g_irepository_load_typelib +g_irepository_prepend_search_path +g_irepository_require +g_irepository_require_private + +/* girffi.h */ +gi_type_info_extract_ffi_return_value +gi_type_tag_get_ffi_type +g_callable_info_free_closure +g_callable_info_prepare_closure +g_function_info_prep_invoker +g_function_invoker_destroy +g_function_invoker_new_for_address +g_type_info_get_ffi_type + +/*gisignalinfo.h */ +g_signal_info_get_class_closure +g_signal_info_get_flags +g_signal_info_true_stops_emit + +/* gustructinfo.h */ +g_struct_info_find_method +g_struct_info_get_alignment +g_struct_info_get_field +g_struct_info_get_method +g_struct_info_get_n_fields +g_struct_info_get_n_methods +g_struct_info_get_size +g_struct_info_is_foreign +g_struct_info_is_gtype_struct + +/* gitypeinfo.h */ +g_type_info_is_pointer +g_type_info_is_zero_terminated +g_type_info_get_array_fixed_size +g_type_info_get_array_length +g_type_info_get_array_type +g_type_info_get_interface +g_type_info_get_param_type +g_type_info_get_tag +g_type_tag_to_string +g_info_type_to_string + +/* gitypelib.h */ +g_typelib_check_sanity +g_typelib_error_quark +g_typelib_free +g_typelib_get_namespace +g_typelib_new_from_const_memory +g_typelib_new_from_mapped_file +g_typelib_new_from_memory +g_typelib_symbol +g_typelib_validate + +/* giunioninfo.h */ +g_union_info_find_method +g_union_info_get_alignment +g_union_info_get_discriminator +g_union_info_get_discriminator_offset +g_union_info_get_discriminator_type +g_union_info_get_field +g_union_info_get_method +g_union_info_get_n_fields +g_union_info_get_n_methods +g_union_info_get_size +g_union_info_is_discriminated + +/* givfuncinfo.h */ +g_vfunc_info_get_address +g_vfunc_info_get_invoker +g_vfunc_info_get_flags +g_vfunc_info_get_offset +g_vfunc_info_get_signal +g_vfunc_info_invoke -- cgit v1.2.1 From 5655519b2c8f0f6d2d2a9c5ca12176e2fb948bcd Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 14 Aug 2012 15:33:38 +0800 Subject: Add .def files for building the various DLLs (.la's) in test\ This will enable the exports of functions to create the .lib files needed to create the .gir files. https://bugzilla.gnome.org/show_bug.cgi?id=681820 --- build/win32/Regress.def | 255 +++++++++++++++++ build/win32/annotation.def | 48 ++++ build/win32/everything.def | 106 +++++++ build/win32/foo.def | 49 ++++ build/win32/gettype.def | 6 + build/win32/gimarshallingtests.def | 550 +++++++++++++++++++++++++++++++++++++ build/win32/gtkfrob.def | 2 + build/win32/sletter.def | 4 + build/win32/testinherit.def | 6 + build/win32/utility.def | 4 + 10 files changed, 1030 insertions(+) create mode 100644 build/win32/Regress.def create mode 100644 build/win32/annotation.def create mode 100644 build/win32/everything.def create mode 100644 build/win32/foo.def create mode 100644 build/win32/gettype.def create mode 100644 build/win32/gimarshallingtests.def create mode 100644 build/win32/gtkfrob.def create mode 100644 build/win32/sletter.def create mode 100644 build/win32/testinherit.def create mode 100644 build/win32/utility.def diff --git a/build/win32/Regress.def b/build/win32/Regress.def new file mode 100644 index 00000000..ebef4e0d --- /dev/null +++ b/build/win32/Regress.def @@ -0,0 +1,255 @@ +EXPORTS +regress_set_abort_on_error +regress_test_boolean +regress_test_boolean_true +regress_test_boolean_false +regress_test_int8 +regress_test_uint8 +regress_test_int16 +regress_test_uint16 +regress_test_int32 +regress_test_uint32 +regress_test_int64 +regress_test_uint64 +regress_test_short +regress_test_ushort +regress_test_int +regress_test_uint +regress_test_long +regress_test_ulong +regress_test_ssize +regress_test_size +regress_test_float +regress_test_double +regress_test_unichar +regress_test_timet +regress_test_gtype +regress_test_utf8_const_return +regress_test_utf8_nonconst_return +regress_test_utf8_const_in +regress_test_utf8_out +regress_test_utf8_inout +regress_test_filename_return +regress_test_utf8_null_in +regress_test_utf8_null_out + +regress_test_int_out_utf8 + + +regress_test_multi_double_args +regress_test_utf8_out_out +regress_test_utf8_out_nonconst_return + + +regress_test_strv_in +regress_test_array_int_in +regress_test_array_int_out +regress_test_array_int_inout +regress_test_array_gint8_in +regress_test_array_gint16_in +regress_test_array_gint32_in +regress_test_array_gint64_in +regress_test_array_gtype_in +regress_test_strv_out_container +regress_test_strv_out +regress_test_strv_out_c +regress_test_strv_outarg +regress_test_array_fixed_size_int_in +regress_test_array_fixed_size_int_out +regress_test_array_fixed_size_int_return + + +regress_test_array_int_full_out +regress_test_array_int_none_out +regress_test_array_int_null_in +regress_test_array_int_null_out + + +regress_test_glist_nothing_return +regress_test_glist_nothing_return2 +regress_test_glist_container_return +regress_test_glist_everything_return +regress_test_glist_nothing_in +regress_test_glist_nothing_in2 +regress_test_glist_null_in +regress_test_glist_null_out + + +regress_test_gslist_nothing_return +regress_test_gslist_nothing_return2 +regress_test_gslist_container_return +regress_test_gslist_everything_return +regress_test_gslist_nothing_in +regress_test_gslist_nothing_in2 +regress_test_gslist_null_in +regress_test_gslist_null_out + + +regress_test_ghash_null_return +regress_test_ghash_nothing_return +regress_test_ghash_nothing_return2 +regress_test_ghash_gvalue_return +regress_test_ghash_gvalue_in +regress_test_ghash_container_return +regress_test_ghash_everything_return +regress_test_ghash_null_in +regress_test_ghash_null_out +regress_test_ghash_nothing_in +regress_test_ghash_nothing_in2 +regress_test_ghash_nested_everything_return +regress_test_ghash_nested_everything_return2 + + +regress_test_garray_container_return +regress_test_garray_full_return + + + + +regress_test_closure +regress_test_closure_one_arg +regress_test_closure_variant + + +regress_test_int_value_arg +regress_test_value_return + + +regress_test_cairo_context_full_return +regress_test_cairo_context_none_in + +regress_test_cairo_surface_none_return +regress_test_cairo_surface_full_return +regress_test_cairo_surface_none_in +regress_test_cairo_surface_full_out + +regress_test_gvariant_i +regress_test_gvariant_s +regress_test_gvariant_asv +regress_test_gvariant_v +regress_test_gvariant_as +regress_test_enum_get_type +regress_test_enum_unsigned_get_type +regress_test_flags_get_type + + +regress_test_enum_param +regress_test_unsigned_enum_param + +regress_global_get_flags_out +regress_test_struct_a_clone + +regress_test_struct_b_clone + + +regress_test_simple_boxed_a_get_gtype +regress_test_simple_boxed_a_copy +regress_test_simple_boxed_a_equals +regress_test_simple_boxed_a_const_return + +regress_test_simple_boxed_b_get_type +regress_test_simple_boxed_b_copy + +regress_test_boxed_get_type +regress_test_boxed_new +regress_test_boxed_new_alternative_constructor1 +regress_test_boxed_new_alternative_constructor2 +regress_test_boxed_new_alternative_constructor3 + +regress_test_boxed_copy + + +regress_test_boxed_b_get_type +regress_test_boxed_b_new +regress_test_boxed_b_copy + + +regress_test_obj_get_type +regress_test_obj_new +regress_constructor +regress_test_obj_new_from_file +regress_test_obj_set_bare +regress_test_obj_emit_sig_with_obj +regress_test_obj_instance_method +regress_test_obj_static_method +regress_forced_method + +regress_test_array_fixed_out_objects +regress_test_obj_torture_signature_0 +regress_test_obj_torture_signature_1 +regress_test_obj_skip_return_val +regress_test_obj_skip_return_val_no_out +regress_test_obj_skip_param +regress_test_obj_skip_out_param +regress_test_obj_skip_inout_param +regress_test_obj_do_matrix +regress_func_obj_null_in +regress_test_obj_null_out +regress_test_sub_obj_get_type +regress_test_sub_obj_new +regress_test_sub_obj_unset_bare +regress_test_sub_obj_instance_method + +regress_test_fundamental_object_get_type +regress_test_fundamental_object_ref +regress_test_fundamental_object_unref +regress_test_value_set_fundamental_object +regress_test_value_get_fundamental_object +regress_test_fundamental_sub_object_get_type + +regress_test_fundamental_sub_object_new + + +regress_test_simple_callback +regress_test_callback +regress_test_multi_callback +regress_test_array_callback +regress_test_callback_user_data +regress_test_callback_destroy_notify +regress_test_callback_thaw_notifications + +regress_test_callback_async +regress_test_callback_thaw_async + +regress_test_async_ready_callback + +regress_test_obj_instance_method_callback +regress_test_obj_static_method_callback +regress_test_obj_new_callback +regress_test_hash_table_callback +regress_test_gerror_callback +regress_test_null_gerror_callback +regress_test_owned_gerror_callback +regress_test_interface_get_type + +regress_test_wi_802_1x_get_type +regress_test_wi_802_1x_new +regress_test_wi_802_1x_get_testbool +regress_test_wi_802_1x_set_testbool +regress_test_wi_802_1x_static_method + +regress_test_floating_get_type +regress_test_floating_new + +regress_test_torture_signature_0 +regress_test_torture_signature_1 +regress_test_torture_signature_2 +regress_test_date_in_gvalue +regress_test_strv_in_gvalue + +regress_test_multiline_doc_comments +regress_test_nested_parameter + +regress_introspectable_via_alias +regress_not_introspectable_via_alias +regress_aliased_caller_alloc + +regress_atest_error_quark +regress_test_def_error_quark +regress_test_unconventional_error_quark +regress_test_abc_error_quark +regress_test_error_quark +regress_test_boxed_c_get_type +regress_test_unconventional_error_get_type +regress_test_abc_error_get_type +regress_test_error_get_type diff --git a/build/win32/annotation.def b/build/win32/annotation.def new file mode 100644 index 00000000..c4e45945 --- /dev/null +++ b/build/win32/annotation.def @@ -0,0 +1,48 @@ +EXPORTS +annotation_object_get_type +annotation_object_method +annotation_object_out +annotation_object_create_object +annotation_object_allow_none +annotation_object_notrans +annotation_object_inout +annotation_object_inout2 +annotation_object_inout3 +annotation_object_in +annotation_object_calleeowns +annotation_object_calleesowns +annotation_object_get_strings +annotation_object_get_hash +annotation_object_with_voidp +annotation_object_get_objects +annotation_object_use_buffer +annotation_object_compute_sum +annotation_object_compute_sum_n +annotation_object_compute_sum_nz +annotation_object_parse_args +annotation_object_string_out +annotation_object_foreach +annotation_object_set_data +annotation_object_set_data2 +annotation_object_set_data3 +annotation_object_do_not_use +annotation_object_watch +annotation_object_watch_full +annotation_object_hidden_self +annotation_init +annotation_return_array +annotation_versioned +annotation_string_zero_terminated +annotation_string_zero_terminated_out +annotation_string_array_length +annotation_object_extra_annos +annotation_custom_destroy +annotation_get_source_file +annotation_set_source_file +annotation_attribute_func +annotation_invalid_annotation +annotation_ptr_array +annotation_test_parsing_bug630862 +annotation_space_after_comment_bug631690 +annotation_return_filename +annotation_transfer_floating diff --git a/build/win32/everything.def b/build/win32/everything.def new file mode 100644 index 00000000..e15f2fdc --- /dev/null +++ b/build/win32/everything.def @@ -0,0 +1,106 @@ +EXPORTS +everything_nullfunc +everything_const_return_gboolean +everything_const_return_gint8 +everything_const_return_guint8 +everything_const_return_gint16 +everything_const_return_guint16 +everything_const_return_gint32 +everything_const_return_guint32 +everything_const_return_gint64 +everything_const_return_guint64 +everything_const_return_gchar +everything_const_return_gshort +everything_const_return_gushort +everything_const_return_gint +everything_const_return_guint +everything_const_return_glong +everything_const_return_gulong +everything_const_return_gsize +everything_const_return_gssize +everything_const_return_gintptr +everything_const_return_guintptr +everything_const_return_gfloat +everything_const_return_gdouble +everything_const_return_gunichar +everything_const_return_GType +everything_const_return_utf8 +everything_const_return_filename +everything_oneparam_gboolean +everything_oneparam_gint8 +everything_oneparam_guint8 +everything_oneparam_gint16 +everything_oneparam_guint16 +everything_oneparam_gint32 +everything_oneparam_guint32 +everything_oneparam_gint64 +everything_oneparam_guint64 +everything_oneparam_gchar +everything_oneparam_gshort +everything_oneparam_gushort +everything_oneparam_gint +everything_oneparam_guint +everything_oneparam_glong +everything_oneparam_gulong +everything_oneparam_gsize +everything_oneparam_gssize +everything_oneparam_gintptr +everything_oneparam_guintptr +everything_oneparam_gfloat +everything_oneparam_gdouble +everything_oneparam_gunichar +everything_oneparam_GType +everything_oneparam_utf8 +everything_oneparam_filename +everything_one_outparam_gboolean +everything_one_outparam_gint8 +everything_one_outparam_guint8 +everything_one_outparam_gint16 +everything_one_outparam_guint16 +everything_one_outparam_gint32 +everything_one_outparam_guint32 +everything_one_outparam_gint64 +everything_one_outparam_guint64 +everything_one_outparam_gchar +everything_one_outparam_gshort +everything_one_outparam_gushort +everything_one_outparam_gint +everything_one_outparam_guint +everything_one_outparam_glong +everything_one_outparam_gulong +everything_one_outparam_gsize +everything_one_outparam_gssize +everything_one_outparam_gintptr +everything_one_outparam_guintptr +everything_one_outparam_gfloat +everything_one_outparam_gdouble +everything_one_outparam_gunichar +everything_one_outparam_GType +everything_one_outparam_utf8 +everything_one_outparam_filename +everything_passthrough_one_gboolean +everything_passthrough_one_gint8 +everything_passthrough_one_guint8 +everything_passthrough_one_gint16 +everything_passthrough_one_guint16 +everything_passthrough_one_gint32 +everything_passthrough_one_guint32 +everything_passthrough_one_gint64 +everything_passthrough_one_guint64 +everything_passthrough_one_gchar +everything_passthrough_one_gshort +everything_passthrough_one_gushort +everything_passthrough_one_gint +everything_passthrough_one_guint +everything_passthrough_one_glong +everything_passthrough_one_gulong +everything_passthrough_one_gsize +everything_passthrough_one_gssize +everything_passthrough_one_gintptr +everything_passthrough_one_guintptr +everything_passthrough_one_gfloat +everything_passthrough_one_gdouble +everything_passthrough_one_gunichar +everything_passthrough_one_GType +everything_passthrough_one_utf8 +everything_passthrough_one_filename diff --git a/build/win32/foo.def b/build/win32/foo.def new file mode 100644 index 00000000..afa66ae9 --- /dev/null +++ b/build/win32/foo.def @@ -0,0 +1,49 @@ +EXPORTS +foo_interface_do_foo +foo_interface_static_method +foo_sub_interface_get_type +foo_sub_interface_do_bar +foo_sub_interface_do_moo +foo_sub_interface_do_baz +foo_init +foo_object_get_type +foo_object_new +foo_object_external_type +foo_object_new_as_super +foo_object_take_all +foo_object_new_cookie +foo_object_is_it_time_yet +foo_object_get_name +foo_object_dup_name +foo_object_read +foo_object_skipped_method +foo_subobject_get_type +foo_object_get_default +foo_buffer_get_type +foo_buffer_some_method +foo_other_object_get_type +foo_not_a_constructor_new +foo_enum_type_get_type +foo_flags_type_get_type +foo_boxed_get_type +foo_boxed_new +foo_boxed_method +foo_dbus_data_get_type +foo_rectangle_add +foo_rectangle_new +foo_brect_get_type +foo_bunion_get_type +foo_test_string_array +foo_test_string_array_with_g +foo_test_array +foo_test_varargs_callback +foo_test_varargs_callback2 +foo_test_varargs_callback3 +foo_error_get_type +foo_error_quark +foo_some_variant +foo_skip_me +foo_foreign_struct_new +foo_foreign_struct_copy +foo_object_append_new_stack_layer +foo_interface_get_type diff --git a/build/win32/gettype.def b/build/win32/gettype.def new file mode 100644 index 00000000..401cb333 --- /dev/null +++ b/build/win32/gettype.def @@ -0,0 +1,6 @@ +EXPORTS +gettype_object_get_type +gettype_object_new +gettype_object_nonmeta1_get_type +gettype_object_nonmeta2_get_type +gettype_object_nonmeta_get_gtype diff --git a/build/win32/gimarshallingtests.def b/build/win32/gimarshallingtests.def new file mode 100644 index 00000000..f957b5aa --- /dev/null +++ b/build/win32/gimarshallingtests.def @@ -0,0 +1,550 @@ +EXPORTS +gi_marshalling_tests_boolean_return_true +gi_marshalling_tests_boolean_return_false +gi_marshalling_tests_boolean_in_true +gi_marshalling_tests_boolean_in_false +gi_marshalling_tests_boolean_out_true +gi_marshalling_tests_boolean_out_false +gi_marshalling_tests_boolean_inout_true_false +gi_marshalling_tests_boolean_inout_false_true + +gi_marshalling_tests_int8_return_max +gi_marshalling_tests_int8_return_min +gi_marshalling_tests_int8_in_max +gi_marshalling_tests_int8_in_min +gi_marshalling_tests_int8_out_max +gi_marshalling_tests_int8_out_min +gi_marshalling_tests_int8_inout_max_min +gi_marshalling_tests_int8_inout_min_max +gi_marshalling_tests_uint8_return +gi_marshalling_tests_uint8_in +gi_marshalling_tests_uint8_out +gi_marshalling_tests_uint8_inout +gi_marshalling_tests_int16_return_max +gi_marshalling_tests_int16_return_min +gi_marshalling_tests_int16_in_max +gi_marshalling_tests_int16_in_min +gi_marshalling_tests_int16_out_max +gi_marshalling_tests_int16_out_min +gi_marshalling_tests_int16_inout_max_min +gi_marshalling_tests_int16_inout_min_max +gi_marshalling_tests_uint16_return +gi_marshalling_tests_uint16_in +gi_marshalling_tests_uint16_out +gi_marshalling_tests_uint16_inout +gi_marshalling_tests_int32_return_max +gi_marshalling_tests_int32_return_min + +gi_marshalling_tests_int32_in_max +gi_marshalling_tests_int32_in_min + +gi_marshalling_tests_int32_out_max +gi_marshalling_tests_int32_out_min + +gi_marshalling_tests_int32_inout_max_min +gi_marshalling_tests_int32_inout_min_max + + +gi_marshalling_tests_uint32_return + +gi_marshalling_tests_uint32_in + +gi_marshalling_tests_uint32_out +gi_marshalling_tests_uint32_inout + + +gi_marshalling_tests_int64_return_max +gi_marshalling_tests_int64_return_min + +gi_marshalling_tests_int64_in_max +gi_marshalling_tests_int64_in_min + +gi_marshalling_tests_int64_out_max +gi_marshalling_tests_int64_out_min + +gi_marshalling_tests_int64_inout_max_min +gi_marshalling_tests_int64_inout_min_max + + +gi_marshalling_tests_uint64_return + +gi_marshalling_tests_uint64_in + +gi_marshalling_tests_uint64_out +gi_marshalling_tests_uint64_inout + + +gi_marshalling_tests_short_return_max +gi_marshalling_tests_short_return_min + +gi_marshalling_tests_short_in_max +gi_marshalling_tests_short_in_min + +gi_marshalling_tests_short_out_max +gi_marshalling_tests_short_out_min + +gi_marshalling_tests_short_inout_max_min +gi_marshalling_tests_short_inout_min_max + + +gi_marshalling_tests_ushort_return + +gi_marshalling_tests_ushort_in + +gi_marshalling_tests_ushort_out +gi_marshalling_tests_ushort_inout + + +gi_marshalling_tests_int_return_max +gi_marshalling_tests_int_return_min + +gi_marshalling_tests_int_in_max +gi_marshalling_tests_int_in_min + +gi_marshalling_tests_int_out_max +gi_marshalling_tests_int_out_min + +gi_marshalling_tests_int_inout_max_min +gi_marshalling_tests_int_inout_min_max + + +gi_marshalling_tests_uint_return + +gi_marshalling_tests_uint_in + +gi_marshalling_tests_uint_out +gi_marshalling_tests_uint_inout + + +gi_marshalling_tests_long_return_max +gi_marshalling_tests_long_return_min + +gi_marshalling_tests_long_in_max +gi_marshalling_tests_long_in_min + +gi_marshalling_tests_long_out_max +gi_marshalling_tests_long_out_min + +gi_marshalling_tests_long_inout_max_min +gi_marshalling_tests_long_inout_min_max + + +gi_marshalling_tests_ulong_return + +gi_marshalling_tests_ulong_in + +gi_marshalling_tests_ulong_out +gi_marshalling_tests_ulong_inout + + +gi_marshalling_tests_ssize_return_max +gi_marshalling_tests_ssize_return_min + +gi_marshalling_tests_ssize_in_max +gi_marshalling_tests_ssize_in_min + +gi_marshalling_tests_ssize_out_max +gi_marshalling_tests_ssize_out_min + +gi_marshalling_tests_ssize_inout_max_min +gi_marshalling_tests_ssize_inout_min_max + + +gi_marshalling_tests_size_return + +gi_marshalling_tests_size_in + +gi_marshalling_tests_size_out +gi_marshalling_tests_size_inout +gi_marshalling_tests_float_return + +gi_marshalling_tests_float_in + +gi_marshalling_tests_float_out + +gi_marshalling_tests_float_inout + + +gi_marshalling_tests_double_return + +gi_marshalling_tests_double_in + +gi_marshalling_tests_double_out + +gi_marshalling_tests_double_inout + +gi_marshalling_tests_time_t_return + +gi_marshalling_tests_time_t_in + +gi_marshalling_tests_time_t_out + +gi_marshalling_tests_time_t_inout + +gi_marshalling_tests_gtype_return + +gi_marshalling_tests_gtype_string_return + +gi_marshalling_tests_gtype_in + +gi_marshalling_tests_gtype_string_in + +gi_marshalling_tests_gtype_out + +gi_marshalling_tests_gtype_string_out + +gi_marshalling_tests_gtype_inout + +gi_marshalling_tests_utf8_none_return +gi_marshalling_tests_utf8_full_return + +gi_marshalling_tests_utf8_none_in +gi_marshalling_tests_utf8_none_out +gi_marshalling_tests_utf8_full_out + +gi_marshalling_tests_utf8_dangling_out + +gi_marshalling_tests_utf8_none_inout +gi_marshalling_tests_utf8_full_inout + +gi_marshalling_tests_filename_list_return + + +gi_marshalling_tests_enum_returnv + +gi_marshalling_tests_enum_in + +gi_marshalling_tests_enum_out + +gi_marshalling_tests_enum_inout + + +gi_marshalling_tests_genum_get_type +gi_marshalling_tests_genum_returnv + +gi_marshalling_tests_genum_in + +gi_marshalling_tests_genum_out + +gi_marshalling_tests_genum_inout + +gi_marshalling_tests_flags_get_type + +gi_marshalling_tests_flags_returnv + +gi_marshalling_tests_flags_in +gi_marshalling_tests_flags_in_zero + +gi_marshalling_tests_flags_out + +gi_marshalling_tests_flags_inout + +gi_marshalling_tests_no_type_flags_returnv + +gi_marshalling_tests_no_type_flags_in +gi_marshalling_tests_no_type_flags_in_zero + +gi_marshalling_tests_no_type_flags_out + +gi_marshalling_tests_no_type_flags_inout + +gi_marshalling_tests_init_function + +gi_marshalling_tests_array_fixed_int_return +gi_marshalling_tests_array_fixed_short_return + +gi_marshalling_tests_array_fixed_int_in +gi_marshalling_tests_array_fixed_short_in + +gi_marshalling_tests_array_fixed_out + +gi_marshalling_tests_array_fixed_out_struct + +gi_marshalling_tests_array_fixed_inout + +gi_marshalling_tests_array_return +gi_marshalling_tests_array_return_etc + +gi_marshalling_tests_array_in +gi_marshalling_tests_array_in_len_before +gi_marshalling_tests_array_in_len_zero_terminated +gi_marshalling_tests_array_string_in +gi_marshalling_tests_array_uint8_in +gi_marshalling_tests_array_struct_in +gi_marshalling_tests_array_struct_take_in +gi_marshalling_tests_array_simple_struct_in +gi_marshalling_tests_multi_array_key_value_in +gi_marshalling_tests_array_enum_in +gi_marshalling_tests_array_in_guint64_len +gi_marshalling_tests_array_in_guint8_len + +gi_marshalling_tests_array_out +gi_marshalling_tests_array_out_etc + +gi_marshalling_tests_array_inout +gi_marshalling_tests_array_inout_etc + + +gi_marshalling_tests_array_zero_terminated_return +gi_marshalling_tests_array_zero_terminated_return_null +gi_marshalling_tests_array_zero_terminated_return_struct + +gi_marshalling_tests_array_zero_terminated_in + +gi_marshalling_tests_array_zero_terminated_out + +gi_marshalling_tests_array_zero_terminated_inout + +gi_marshalling_tests_array_gvariant_none_in + +gi_marshalling_tests_array_gvariant_container_in + +gi_marshalling_tests_array_gvariant_full_in + + +gi_marshalling_tests_garray_int_none_return +gi_marshalling_tests_garray_utf8_none_return +gi_marshalling_tests_garray_utf8_container_return +gi_marshalling_tests_garray_utf8_full_return + +gi_marshalling_tests_garray_int_none_in +gi_marshalling_tests_garray_utf8_none_in + +gi_marshalling_tests_garray_utf8_none_out +gi_marshalling_tests_garray_utf8_container_out +gi_marshalling_tests_garray_utf8_full_out + +gi_marshalling_tests_garray_utf8_none_inout +gi_marshalling_tests_garray_utf8_container_inout +gi_marshalling_tests_garray_utf8_full_inout + + +gi_marshalling_tests_gptrarray_utf8_none_return +gi_marshalling_tests_gptrarray_utf8_container_return +gi_marshalling_tests_gptrarray_utf8_full_return + +gi_marshalling_tests_gptrarray_utf8_none_in + +gi_marshalling_tests_gptrarray_utf8_none_out +gi_marshalling_tests_gptrarray_utf8_container_out +gi_marshalling_tests_gptrarray_utf8_full_out + +gi_marshalling_tests_gptrarray_utf8_none_inout +gi_marshalling_tests_gptrarray_utf8_container_inout +gi_marshalling_tests_gptrarray_utf8_full_inout + + +gi_marshalling_tests_bytearray_full_return +gi_marshalling_tests_bytearray_none_in + + +gi_marshalling_tests_gstrv_return +gi_marshalling_tests_gstrv_in +gi_marshalling_tests_gstrv_out +gi_marshalling_tests_gstrv_inout + + + +gi_marshalling_tests_glist_int_none_return +gi_marshalling_tests_glist_utf8_none_return +gi_marshalling_tests_glist_utf8_container_return +gi_marshalling_tests_glist_utf8_full_return + +gi_marshalling_tests_glist_int_none_in +gi_marshalling_tests_glist_utf8_none_in + +gi_marshalling_tests_glist_utf8_none_out +gi_marshalling_tests_glist_utf8_container_out +gi_marshalling_tests_glist_utf8_full_out + +gi_marshalling_tests_glist_utf8_none_inout +gi_marshalling_tests_glist_utf8_container_inout +gi_marshalling_tests_glist_utf8_full_inout + + + +gi_marshalling_tests_gslist_int_none_return +gi_marshalling_tests_gslist_utf8_none_return +gi_marshalling_tests_gslist_utf8_container_return +gi_marshalling_tests_gslist_utf8_full_return + +gi_marshalling_tests_gslist_int_none_in +gi_marshalling_tests_gslist_utf8_none_in + +gi_marshalling_tests_gslist_utf8_none_out +gi_marshalling_tests_gslist_utf8_container_out +gi_marshalling_tests_gslist_utf8_full_out + +gi_marshalling_tests_gslist_utf8_none_inout +gi_marshalling_tests_gslist_utf8_container_inout +gi_marshalling_tests_gslist_utf8_full_inout + + + +gi_marshalling_tests_ghashtable_int_none_return +gi_marshalling_tests_ghashtable_utf8_none_return +gi_marshalling_tests_ghashtable_utf8_container_return +gi_marshalling_tests_ghashtable_utf8_full_return + +gi_marshalling_tests_ghashtable_int_none_in +gi_marshalling_tests_ghashtable_utf8_none_in + +gi_marshalling_tests_ghashtable_utf8_none_out +gi_marshalling_tests_ghashtable_utf8_container_out +gi_marshalling_tests_ghashtable_utf8_full_out + +gi_marshalling_tests_ghashtable_utf8_none_inout +gi_marshalling_tests_ghashtable_utf8_container_inout +gi_marshalling_tests_ghashtable_utf8_full_inout + +gi_marshalling_tests_gvalue_return + +gi_marshalling_tests_gvalue_in +gi_marshalling_tests_gvalue_in_with_type + +gi_marshalling_tests_gvalue_in_enum + +gi_marshalling_tests_gvalue_out + +gi_marshalling_tests_gvalue_inout + +gi_marshalling_tests_gvalue_flat_array + +gi_marshalling_tests_return_gvalue_flat_array + +gi_marshalling_tests_gvalue_flat_array_round_trip +gi_marshalling_tests_gclosure_in +gi_marshalling_tests_gclosure_return + + +gi_marshalling_tests_callback_return_value_only + + +gi_marshalling_tests_callback_one_out_parameter + + +gi_marshalling_tests_callback_multiple_out_parameters + + +gi_marshalling_tests_callback_return_value_and_one_out_parameter + +gi_marshalling_tests_callback_return_value_and_multiple_out_parameters +gi_marshalling_tests_pointer_in_return + + +gi_marshalling_tests_simple_struct_returnv + +gi_marshalling_tests_simple_struct_inv + +gi_marshalling_tests_simple_struct_method + +gi_marshalling_tests_pointer_struct_get_type + +gi_marshalling_tests_pointer_struct_returnv + +gi_marshalling_tests_pointer_struct_inv + +gi_marshalling_tests_boxed_struct_get_type + +gi_marshalling_tests_boxed_struct_new + +gi_marshalling_tests_boxed_struct_returnv + +gi_marshalling_tests_boxed_struct_inv + +gi_marshalling_tests_boxed_struct_out + +gi_marshalling_tests_boxed_struct_inout +gi_marshalling_tests_union_get_type + +gi_marshalling_tests_union_returnv + +gi_marshalling_tests_union_inv + + +gi_marshalling_tests_union_method +gi_marshalling_tests_object_get_type +gi_marshalling_tests_object_static_method +gi_marshalling_tests_object_method +gi_marshalling_tests_object_overridden_method +gi_marshalling_tests_object_new + +gi_marshalling_tests_object_method_array_in +gi_marshalling_tests_object_method_array_out +gi_marshalling_tests_object_method_array_inout +gi_marshalling_tests_object_method_array_return + +gi_marshalling_tests_object_method_int8_in +gi_marshalling_tests_object_method_int8_out +gi_marshalling_tests_object_method_with_default_implementation + +gi_marshalling_tests_object_vfunc_return_value_only +gi_marshalling_tests_object_vfunc_one_out_parameter +gi_marshalling_tests_object_vfunc_multiple_out_parameters +gi_marshalling_tests_object_vfunc_return_value_and_one_out_parameter +gi_marshalling_tests_object_vfunc_return_value_and_multiple_out_parameters +gi_marshalling_tests_object_vfunc_meth_with_error + +gi_marshalling_tests_object_none_return +gi_marshalling_tests_object_full_return + +gi_marshalling_tests_object_none_in + + +gi_marshalling_tests_object_none_out +gi_marshalling_tests_object_full_out + +gi_marshalling_tests_object_none_inout +gi_marshalling_tests_object_full_inout + +gi_marshalling_tests_object_int8_in +gi_marshalling_tests_object_int8_out + +gi_marshalling_tests_object_vfunc_with_callback +gi_marshalling_tests_object_call_vfunc_with_callback + + + + +gi_marshalling_tests_sub_object_get_type + +gi_marshalling_tests_sub_object_sub_method +gi_marshalling_tests_sub_object_overwritten_method +gi_marshalling_tests_sub_sub_object_get_type +gi_marshalling_tests_interface_get_type + +gi_marshalling_tests_interface_test_int8_in + +gi_marshalling_tests_test_interface_test_int8_in + +gi_marshalling_tests_interface2_get_type + + +gi_marshalling_tests_int_out_out +gi_marshalling_tests_int_three_in_three_out +gi_marshalling_tests_int_return_out + + +gi_marshalling_tests_gerror +gi_marshalling_tests_gerror_array_in +gi_marshalling_tests_gerror_out +gi_marshalling_tests_gerror_out_transfer_none +gi_marshalling_tests_gerror_return + +gi_marshalling_tests_overrides_struct_get_type + +gi_marshalling_tests_overrides_struct_new + +gi_marshalling_tests_overrides_struct_method + +gi_marshalling_tests_overrides_struct_returnv +gi_marshalling_tests_overrides_object_get_type + +gi_marshalling_tests_overrides_object_new + +gi_marshalling_tests_overrides_object_method + +gi_marshalling_tests_overrides_object_returnv +gi_marshalling_tests_properties_object_get_type +gi_marshalling_tests_properties_object_new +gi_marshalling_tests_interface3_get_type diff --git a/build/win32/gtkfrob.def b/build/win32/gtkfrob.def new file mode 100644 index 00000000..79dce040 --- /dev/null +++ b/build/win32/gtkfrob.def @@ -0,0 +1,2 @@ +EXPORTS +gtk_frob_language_manager_get_default diff --git a/build/win32/sletter.def b/build/win32/sletter.def new file mode 100644 index 00000000..a4a547e8 --- /dev/null +++ b/build/win32/sletter.def @@ -0,0 +1,4 @@ +EXPORTS +s_hello +s_spawn_error_quark +s_dbus_error_quark diff --git a/build/win32/testinherit.def b/build/win32/testinherit.def new file mode 100644 index 00000000..633a4e3c --- /dev/null +++ b/build/win32/testinherit.def @@ -0,0 +1,6 @@ +EXPORTS +test_inherit_drawable_get_type +test_inherit_drawable_do_foo +test_inherit_drawable_get_origin +test_inherit_drawable_get_size +test_inherit_drawable_do_foo_maybe_throw diff --git a/build/win32/utility.def b/build/win32/utility.def new file mode 100644 index 00000000..e0614fe6 --- /dev/null +++ b/build/win32/utility.def @@ -0,0 +1,4 @@ +EXPORTS +utility_object_get_type +utility_object_watch_dir +utility_dir_foreach -- cgit v1.2.1 From fe669d9c2d76a369161633ae43b3147ce369aaec Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 14 Aug 2012 15:37:14 +0800 Subject: giscanner/sourcescanner.py: Update for Visual C++ usage Since the Visual C++ (cl.exe) preprocessor does not accept source input from stdin (the '-' preprocessor flag, we need to use the GCC preprocessor as a helper here. Note that the generated dumper program is still compiled and run by Visual C++. https://bugzilla.gnome.org/show_bug.cgi?id=681820 --- giscanner/sourcescanner.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py index db282f84..9eb4ab4f 100644 --- a/giscanner/sourcescanner.py +++ b/giscanner/sourcescanner.py @@ -274,7 +274,16 @@ class SourceScanner(object): defines = ['__GI_SCANNER__'] undefs = [] - cpp_args = os.environ.get('CC', 'cc').split() + cpp_exec = os.environ.get('CC', 'cc').split() + # The Microsoft compiler/preprocessor (cl) does not accept + # source input from stdin (the '-' flag), so we need + # some help from gcc from MinGW/Cygwin or so. + # Note that the generated dumper program is + # still built and linked by Visual C++. + if 'cl' in cpp_exec: + cpp_args = 'gcc'.split() + else: + cpp_args = cpp_exec cpp_args += ['-E', '-C', '-I.', '-'] cpp_args += self._cpp_options -- cgit v1.2.1 From 5c70ef2eb32949f8889e9ae654d50bfbf838951f Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 10 Aug 2012 12:40:10 +0800 Subject: sourcescannermain.py: Add --filelist option Add a function to put the files to pass to g-ir-scanner in a filelist file, with one source/header file on a single line. This is done to work around the limitation of Windows cmd.exe (and MSYS) where the command line cannot exceed 8192 characters. When this option is used, g-ir-scanner will only look for the header/source files that are specified in the filelist file, which is not too hard to generate. https://bugzilla.gnome.org/show_bug.cgi?id=681820 --- giscanner/scannermain.py | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py index 794cede3..6efd291a 100755 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -158,6 +158,9 @@ match the namespace prefix.""") parser.add_option("", "--c-include", action="append", dest="c_includes", default=[], help="headers which should be included in C programs") + parser.add_option("", "--filelist", + action="store", dest="filelist", default=[], + help="file containing headers and sources to be scanned") group = get_preprocessor_option_group(parser) parser.add_option_group(group) @@ -250,6 +253,27 @@ def extract_filenames(args): filenames.append(os.path.abspath(arg)) return filenames +def extract_filelist(options): + filenames = [] + if not os.path.exists(options.filelist): + _error('%s: no such filelist file' % (options.filelist, )) + filelist_file = open(options.filelist, "r") + lines = filelist_file.readlines() + for line in lines: + # We don't support real C++ parsing yet, but we should be able + # to understand C API implemented in C++ files. + filename = line.strip() + if (filename.endswith('.c') or filename.endswith('.cpp') or + filename.endswith('.cc') or filename.endswith('.cxx') or + filename.endswith('.h') or filename.endswith('.hpp') or + filename.endswith('.hxx')): + if not os.path.exists(filename): + _error('%s: Invalid filelist entry-no such file or directory' % (line, )) + # Make absolute, because we do comparisons inside scannerparser.c + # against the absolute path that cpp will give us + filenames.append(os.path.abspath(filename)) + return filenames + def create_namespace(options): if options.strip_prefix: print """g-ir-scanner: warning: Option --strip-prefix has been deprecated; @@ -324,7 +348,10 @@ def create_binary(transformer, options, args): return shlibs def create_source_scanner(options, args): - filenames = extract_filenames(args) + if options.filelist: + filenames = extract_filelist(options) + else: + filenames = extract_filenames(args) # Run the preprocessor, tokenize and construct simple # objects representing the raw C symbols @@ -381,8 +408,9 @@ def scanner_main(args): if options.test_codegen: return test_codegen(options.test_codegen) - if len(args) <= 1: - _error('Need at least one filename') + if not options.filelist: + if len(args) <= 1: + _error('Need at least one filename') if not options.namespace_name: _error('Namespace name missing') -- cgit v1.2.1 From 510ea113c9b1c4de77cc7bc3f9c0c3bd1ecb7a03 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 14 Aug 2012 15:57:07 +0800 Subject: Add a test_gir_cmd.txt file This is to show how one may be able to generate the .gir files from the various DLL files in tests\ in a standard Windows cmd.exe prompt, which will also attempt to demonstrate how .gir files are generated without a shell. https://bugzilla.gnome.org/show_bug.cgi?id=681820 --- build/win32/test_gir_cmd.txt | 117 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) create mode 100644 build/win32/test_gir_cmd.txt diff --git a/build/win32/test_gir_cmd.txt b/build/win32/test_gir_cmd.txt new file mode 100644 index 00000000..1db732cf --- /dev/null +++ b/build/win32/test_gir_cmd.txt @@ -0,0 +1,117 @@ +These are command lines that can be used to generate the .gir files for the various test DLLs +(paste and run each line in the cmd.exe window that you used to launch the Visual C++ projects). + +Run each line in the root folder of the gobject-introspection sources after you have successfully +built the projects corresponding to your Visual C++ version and configuration. + +-------------------------------- +------ Visual Studio 2008 ------ +-------------------------------- + +------------------ +--- 32-bit/x86 --- +------------------ + +python tools\g-ir-scanner --verbose --add-include-path=..\vs9\Win32\share\gir-1.0 --namespace=Utility --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --library=utility-1-vs9 --c-include="utility.h" --warn-error -I.\tests\scanner .\tests\scanner\utility.c .\tests\scanner\utility.h -o Utility-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs9\Win32\share\gir-1.0 --namespace=Annotation --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --include=Utility-1.0 --library=annotation-1-vs9 --c-include="annotation.h" --warn-error -I.\tests\scanner .\tests\scanner\annotation.c .\tests\scanner\annotation.h -o Annotation-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs9\Win32\share\gir-1.0 --namespace=Foo --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --include=Gio-2.0 --include=Utility-1.0 --library=foo-1-vs9 --c-include="foo.h" --warn-error -I.\tests\scanner .\tests\scanner\foo.c .\tests\scanner\foo.h -o Foo-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs9\Win32\share\gir-1.0 --namespace=TestInherit --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --include=Utility-1.0 --library=testinherit-1-vs9 --c-include="drawable.h" --warn-error -I.\tests\scanner .\tests\scanner\drawable.c .\tests\scanner\drawable.h -o TestInherit-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs9\Win32\share\gir-1.0 --namespace=GetType --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --library=gettype-1-vs9 --c-include="gettype.h" --identifier-prefix=GetType --symbol-prefix=gettype -I.\tests\scanner .\tests\scanner\gettype.c .\tests\scanner\gettype.h -o GetType-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs9\Win32\share\gir-1.0 --namespace=GtkFrob --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --library=gtkfrob-1-vs9 --identifier-prefix=Gtk --symbol-prefix=gtk_frob --warn-error -I.\tests\scanner .\tests\scanner\gtkfrob.c .\tests\scanner\gtkfrob.h -o GtkFrob-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=.\gir --add-include-path=..\vs9\Win32\share\gir-1.0 --namespace=Regress --nsversion=1.0 --no-libtool --include=cairo-1.0 --include=Gio-2.0 --library=regress-1-vs9 --c-include="regress.h" --warn-error -I.\tests\scanner -Ic:\progra~2\micros~1.0\vc\include .\tests\scanner\regress.c .\tests\scanner\regress.h -o Regress-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs9\Win32\share\gir-1.0 --namespace=SLetter --nsversion=1.0 --no-libtool --include=Gio-2.0 --library=sletter-1-vs9 --identifier-prefix=S --c-include="sletter.h" --warn-error -I.\tests\scanner .\tests\scanner\sletter.c .\tests\scanner\sletter.h -o SLetter-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs9\Win32\share\gir-1.0 --warn-all --warn-error --reparse-validate --namespace=Everything --nsversion=1.0 --no-libtool --add-include-path=$(top_builddir) --include=Gio-2.0 --library=everything-1-vs9 --output=Everything-1.0.gir .\tests\everything.h .\tests\everything.c + +python tools\g-ir-scanner --verbose --add-include-path=..\vs9\Win32\share\gir-1.0 --warn-all --warn-error --reparse-validate --namespace=GIMarshallingTests --symbol-prefix=gi_marshalling_tests --nsversion=1.0 --no-libtool --include=Gio-2.0 --library=gimarshallingtests-1-vs9 --output=GIMarshallingTests-1.0.gir --c-include="tests/gimarshallingtests.h" .\tests\gimarshallingtests.h .\tests\gimarshallingtests.c + +python tools\g-ir-scanner --verbose --add-include-path=..\vs9\Win32\share\gir-1.0 --warn-all --warn-error --reparse-validate --namespace=Everything --nsversion=1.0 --no-libtool --include=Gio-2.0 --library=everything-1-vs9 --output=Everything-1.0.gir --c-include="tests/everything.h" .\tests\everything.h .\tests\everything.c + +--------------------- +--- 64-bit/x86-64 --- +--------------------- + +python tools\g-ir-scanner --verbose --add-include-path=..\vs9\x64\share\gir-1.0 --namespace=Utility --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --library=utility-1-vs9 --c-include="utility.h" --warn-error -I.\tests\scanner .\tests\scanner\utility.c .\tests\scanner\utility.h -o Utility-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs9\x64\share\gir-1.0 --namespace=Annotation --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --include=Utility-1.0 --library=annotation-1-vs9 --c-include="annotation.h" --warn-error -I.\tests\scanner .\tests\scanner\annotation.c .\tests\scanner\annotation.h -o Annotation-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs9\x64\share\gir-1.0 --namespace=Foo --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --include=Gio-2.0 --include=Utility-1.0 --library=foo-1-vs9 --c-include="foo.h" --warn-error -I.\tests\scanner .\tests\scanner\foo.c .\tests\scanner\foo.h -o Foo-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs9\x64\share\gir-1.0 --namespace=TestInherit --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --include=Utility-1.0 --library=testinherit-1-vs9 --c-include="drawable.h" --warn-error -I.\tests\scanner .\tests\scanner\drawable.c .\tests\scanner\drawable.h -o TestInherit-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs9\x64\share\gir-1.0 --namespace=GetType --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --library=gettype-1-vs9 --c-include="gettype.h" --identifier-prefix=GetType --symbol-prefix=gettype -I.\tests\scanner .\tests\scanner\gettype.c .\tests\scanner\gettype.h -o GetType-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs9\x64\share\gir-1.0 --namespace=GtkFrob --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --library=gtkfrob-1-vs9 --identifier-prefix=Gtk --symbol-prefix=gtk_frob --warn-error -I.\tests\scanner .\tests\scanner\gtkfrob.c .\tests\scanner\gtkfrob.h -o GtkFrob-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=.\gir --add-include-path=..\vs9\x64\share\gir-1.0 --namespace=Regress --nsversion=1.0 --no-libtool --include=cairo-1.0 --include=Gio-2.0 --library=regress-1-vs9 --c-include="regress.h" --warn-error -I.\tests\scanner -Ic:\progra~2\micros~1.0\vc\include .\tests\scanner\regress.c .\tests\scanner\regress.h -o Regress-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs9\x64\share\gir-1.0 --namespace=SLetter --nsversion=1.0 --no-libtool --include=Gio-2.0 --library=sletter-1-vs9 --identifier-prefix=S --c-include="sletter.h" --warn-error -I.\tests\scanner .\tests\scanner\sletter.c .\tests\scanner\sletter.h -o SLetter-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs9\x64\share\gir-1.0 --warn-all --warn-error --reparse-validate --namespace=Everything --nsversion=1.0 --no-libtool --add-include-path=$(top_builddir) --include=Gio-2.0 --library=everything-1-vs9 --output=Everything-1.0.gir .\tests\everything.h .\tests\everything.c + +python tools\g-ir-scanner --verbose --add-include-path=..\vs9\x64\share\gir-1.0 --warn-all --warn-error --reparse-validate --namespace=GIMarshallingTests --symbol-prefix=gi_marshalling_tests --nsversion=1.0 --no-libtool --include=Gio-2.0 --library=gimarshallingtests-1-vs9 --output=GIMarshallingTests-1.0.gir --c-include="tests/gimarshallingtests.h" .\tests\gimarshallingtests.h .\tests\gimarshallingtests.c + +python tools\g-ir-scanner --verbose --add-include-path=..\vs9\x64\share\gir-1.0 --warn-all --warn-error --reparse-validate --namespace=Everything --nsversion=1.0 --no-libtool --include=Gio-2.0 --library=everything-1-vs9 --output=Everything-1.0.gir --c-include="tests/everything.h" .\tests\everything.h .\tests\everything.c + +-------------------------------- +------ Visual Studio 2010 ------ +-------------------------------- + +------------------ +--- 32-bit/x86 --- +------------------ + +python tools\g-ir-scanner --verbose --add-include-path=..\vs10\Win32\share\gir-1.0 --namespace=Utility --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --library=utility-1-vs10 --c-include="utility.h" --warn-error -I.\tests\scanner .\tests\scanner\utility.c .\tests\scanner\utility.h -o Utility-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs10\Win32\share\gir-1.0 --namespace=Annotation --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --include=Utility-1.0 --library=annotation-1-vs10 --c-include="annotation.h" --warn-error -I.\tests\scanner .\tests\scanner\annotation.c .\tests\scanner\annotation.h -o Annotation-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs10\Win32\share\gir-1.0 --namespace=Foo --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --include=Gio-2.0 --include=Utility-1.0 --library=foo-1-vs10 --c-include="foo.h" --warn-error -I.\tests\scanner .\tests\scanner\foo.c .\tests\scanner\foo.h -o Foo-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs10\Win32\share\gir-1.0 --namespace=TestInherit --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --include=Utility-1.0 --library=testinherit-1-vs10 --c-include="drawable.h" --warn-error -I.\tests\scanner .\tests\scanner\drawable.c .\tests\scanner\drawable.h -o TestInherit-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs10\Win32\share\gir-1.0 --namespace=GetType --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --library=gettype-1-vs10 --c-include="gettype.h" --identifier-prefix=GetType --symbol-prefix=gettype -I.\tests\scanner .\tests\scanner\gettype.c .\tests\scanner\gettype.h -o GetType-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs10\Win32\share\gir-1.0 --namespace=GtkFrob --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --library=gtkfrob-1-vs10 --identifier-prefix=Gtk --symbol-prefix=gtk_frob --warn-error -I.\tests\scanner .\tests\scanner\gtkfrob.c .\tests\scanner\gtkfrob.h -o GtkFrob-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=.\gir --add-include-path=..\vs10\Win32\share\gir-1.0 --namespace=Regress --nsversion=1.0 --no-libtool --include=cairo-1.0 --include=Gio-2.0 --library=regress-1-vs10 --c-include="regress.h" --warn-error -I.\tests\scanner -Ic:\progra~2\micros~1.0\vc\include .\tests\scanner\regress.c .\tests\scanner\regress.h -o Regress-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs10\Win32\share\gir-1.0 --namespace=SLetter --nsversion=1.0 --no-libtool --include=Gio-2.0 --library=sletter-1-vs10 --identifier-prefix=S --c-include="sletter.h" --warn-error -I.\tests\scanner .\tests\scanner\sletter.c .\tests\scanner\sletter.h -o SLetter-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs10\Win32\share\gir-1.0 --warn-all --warn-error --reparse-validate --namespace=Everything --nsversion=1.0 --no-libtool --add-include-path=$(top_builddir) --include=Gio-2.0 --library=everything-1-vs10 --output=Everything-1.0.gir .\tests\everything.h .\tests\everything.c + +python tools\g-ir-scanner --verbose --add-include-path=..\vs10\Win32\share\gir-1.0 --warn-all --warn-error --reparse-validate --namespace=GIMarshallingTests --symbol-prefix=gi_marshalling_tests --nsversion=1.0 --no-libtool --include=Gio-2.0 --library=gimarshallingtests-1-vs10 --output=GIMarshallingTests-1.0.gir --c-include="tests/gimarshallingtests.h" .\tests\gimarshallingtests.h .\tests\gimarshallingtests.c + +python tools\g-ir-scanner --verbose --add-include-path=..\vs10\Win32\share\gir-1.0 --warn-all --warn-error --reparse-validate --namespace=Everything --nsversion=1.0 --no-libtool --include=Gio-2.0 --library=everything-1-vs10 --output=Everything-1.0.gir --c-include="tests/everything.h" .\tests\everything.h .\tests\everything.c + +--------------------- +--- 64-bit/x86-64 --- +--------------------- + +python tools\g-ir-scanner --verbose --add-include-path=..\vs10\x64\share\gir-1.0 --namespace=Utility --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --library=utility-1-vs10 --c-include="utility.h" --warn-error -I.\tests\scanner .\tests\scanner\utility.c .\tests\scanner\utility.h -o Utility-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs10\x64\share\gir-1.0 --namespace=Annotation --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --include=Utility-1.0 --library=annotation-1-vs10 --c-include="annotation.h" --warn-error -I.\tests\scanner .\tests\scanner\annotation.c .\tests\scanner\annotation.h -o Annotation-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs10\x64\share\gir-1.0 --namespace=Foo --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --include=Gio-2.0 --include=Utility-1.0 --library=foo-1-vs10 --c-include="foo.h" --warn-error -I.\tests\scanner .\tests\scanner\foo.c .\tests\scanner\foo.h -o Foo-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs10\x64\share\gir-1.0 --namespace=TestInherit --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --include=Utility-1.0 --library=testinherit-1-vs10 --c-include="drawable.h" --warn-error -I.\tests\scanner .\tests\scanner\drawable.c .\tests\scanner\drawable.h -o TestInherit-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs10\x64\share\gir-1.0 --namespace=GetType --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --library=gettype-1-vs10 --c-include="gettype.h" --identifier-prefix=GetType --symbol-prefix=gettype -I.\tests\scanner .\tests\scanner\gettype.c .\tests\scanner\gettype.h -o GetType-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs10\x64\share\gir-1.0 --namespace=GtkFrob --nsversion=1.0 --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 --library=gtkfrob-1-vs10 --identifier-prefix=Gtk --symbol-prefix=gtk_frob --warn-error -I.\tests\scanner .\tests\scanner\gtkfrob.c .\tests\scanner\gtkfrob.h -o GtkFrob-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=.\gir --add-include-path=..\vs10\x64\share\gir-1.0 --namespace=Regress --nsversion=1.0 --no-libtool --include=cairo-1.0 --include=Gio-2.0 --library=regress-1-vs10 --c-include="regress.h" --warn-error -I.\tests\scanner -Ic:\progra~2\micros~1.0\vc\include .\tests\scanner\regress.c .\tests\scanner\regress.h -o Regress-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs10\x64\share\gir-1.0 --namespace=SLetter --nsversion=1.0 --no-libtool --include=Gio-2.0 --library=sletter-1-vs10 --identifier-prefix=S --c-include="sletter.h" --warn-error -I.\tests\scanner .\tests\scanner\sletter.c .\tests\scanner\sletter.h -o SLetter-1.0.gir + +python tools\g-ir-scanner --verbose --add-include-path=..\vs10\x64\share\gir-1.0 --warn-all --warn-error --reparse-validate --namespace=Everything --nsversion=1.0 --no-libtool --add-include-path=$(top_builddir) --include=Gio-2.0 --library=everything-1-vs10 --output=Everything-1.0.gir .\tests\everything.h .\tests\everything.c + +python tools\g-ir-scanner --verbose --add-include-path=..\vs10\x64\share\gir-1.0 --warn-all --warn-error --reparse-validate --namespace=GIMarshallingTests --symbol-prefix=gi_marshalling_tests --nsversion=1.0 --no-libtool --include=Gio-2.0 --library=gimarshallingtests-1-vs10 --output=GIMarshallingTests-1.0.gir --c-include="tests/gimarshallingtests.h" .\tests\gimarshallingtests.h .\tests\gimarshallingtests.c + +python tools\g-ir-scanner --verbose --add-include-path=..\vs10\x64\share\gir-1.0 --warn-all --warn-error --reparse-validate --namespace=Everything --nsversion=1.0 --no-libtool --include=Gio-2.0 --library=everything-1-vs10 --output=Everything-1.0.gir --c-include="tests/everything.h" .\tests\everything.h .\tests\everything.c -- cgit v1.2.1 From 7ff50ac3eb91c1bddb9e4f16f39af9c9ad96a739 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 13 Aug 2012 16:14:29 +0800 Subject: Add README.txt files for Visual C++ builds Add instructions to tell people how to build gobject-introspection with Visual C++, especially as there are special steps and additional requirements for a successful build. https://bugzilla.gnome.org/show_bug.cgi?id=681820 --- build/win32/vs10/README.txt | 86 +++++++++++++++++++++++++++++++++++++++++++++ build/win32/vs9/README.txt | 86 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 172 insertions(+) create mode 100644 build/win32/vs10/README.txt create mode 100644 build/win32/vs9/README.txt diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt new file mode 100644 index 00000000..a3d97061 --- /dev/null +++ b/build/win32/vs10/README.txt @@ -0,0 +1,86 @@ +Please do not compile this package (gobject-introspection) in paths that contain +spaces in them-as strange problems may occur during compilation or during +the use of the library. + +Please refer to the following GNOME Live! page for more detailed +instructions on building gobject-introsecption and its dependencies +with Visual C++: + +https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack + +This VS10 solution and the projects it includes are intented to be used +in a gobject-introspection source tree unpacked from a tarball. In a git checkout you +first need to use some Unix-like environment, which will do the work for you. + +The required dependencies are Python 2.6 or later, GLib and LibFFI. It is recommended +that GLib is built with Visual C++ 2010 to avoid problems cause by usage of different CRTs + +Please refer to the README.txt file in $(GLib_src_root)\build\win32\vs10 on how to build +GLib using Visual C++ 2010 + +For LibFFI, please get version 3.0.10 or later, as Visual C++ build support +was added in the 3.0.10 release series. Please see the README file that +comes with the LibFFI source package for more details on how to build LibFFI +on Visual C++-please note that the mozilla-build package from Mozilla is needed +in order to build LibFFI on Windows. + +For Python, retrieving the official Windows binaries for 2.6 or later from +http://www.python.org will do the job-be sure that the Python version that +you downloaded matches the configuration of your build (win32 or x64/amd64). + +For building the Regress test project, cairo (and possibly cairo-gobject support) +is needed. + +Set up the source tree as follows under some arbitrary top +folder : + +\ +\vs10\ + +*this* file you are now reading is thus located at +\\build\win32\vs10\README. + + is either Win32 or x64, as in VS10 project files. + +For LibFFI, one should also put the generated ffi.h and ffitarget.h +into \vs10\\include\ and the compiled static libffi.lib +(or copy libffi-convenience.lib into libffi.lib) into +\vs10\\lib\. + +The libintl.h that is used for building GLib needs to be in +\vs10\\include, if not already done so + +You will also need a working GCC/MinGW compiler installation +in order to generate the .gir and .typelib files. One may be +obtained from the mingw or the mingw64 project. + +A working pkg-config tool is also required-it may be obtained from +http://www.gtk.org/download/win32.php [32-bit] +http://www.gtk.org/download/win64.php [64-bit] + +*** Note! *** +Please note that due to numerous possible configurations on Python, some environmental +variables need to be set before launching the gobject-introsection.sln solution file. + +These variables are namely: +PYTHONDIR: Root installation folder of your Python interpretor. + It must match your build configuration (Win32 or x64/amd64) +PKG_CONFIG_PATH: Location of the .pc (pkg-config) files, especially for the GLib .pc files. +MINGWDIR: Root installation folder for your Windows GCC (such as MinGW). +*** End of Note! *** + +The "install" project will copy build results and headers into their +appropriate location under \vs10\. For instance, +built DLLs go into \vs10\\bin, built LIBs into +\vs10\\lib and gobject-introspection headers into +\vs10\\include\gobject-introsection-1.0. + +The generated .gir files will end up in \vs10\\share\gir-1.0 +and .typelib files will end up in \vs10\\lib\girepository-1.0 + +This is then from where +project files higher in the stack are supposed to look for them, not +from a specific gobject-introspection source tree. + +--Tor Lillqvist +--Updated by Chun-wei Fan diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt new file mode 100644 index 00000000..6872a236 --- /dev/null +++ b/build/win32/vs9/README.txt @@ -0,0 +1,86 @@ +Please do not compile this package (gobject-introspection) in paths that contain +spaces in them-as strange problems may occur during compilation or during +the use of the library. + +Please refer to the following GNOME Live! page for more detailed +instructions on building gobject-introsecption and its dependencies +with Visual C++: + +https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack + +This VS9 solution and the projects it includes are intented to be used +in a gobject-introspection source tree unpacked from a tarball. In a git checkout you +first need to use some Unix-like environment, which will do the work for you. + +The required dependencies are Python 2.6 or later, GLib and LibFFI. It is recommended +that GLib is built with Visual C++ 2008 to avoid problems cause by usage of different CRTs + +Please refer to the README.txt file in $(GLib_src_root)\build\win32\vs9 on how to build +GLib using Visual C++ 2008 + +For LibFFI, please get version 3.0.10 or later, as Visual C++ build support +was added in the 3.0.10 release series. Please see the README file that +comes with the LibFFI source package for more details on how to build LibFFI +on Visual C++-please note that the mozilla-build package from Mozilla is needed +in order to build LibFFI on Windows. + +For Python, retrieving the official Windows binaries for 2.6 or later from +http://www.python.org will do the job-be sure that the Python version that +you downloaded matches the configuration of your build (win32 or x64/amd64). + +For building the Regress test project, cairo (and possibly cairo-gobject support) +is needed. + +Set up the source tree as follows under some arbitrary top +folder : + +\ +\vs9\ + +*this* file you are now reading is thus located at +\\build\win32\vs9\README. + + is either Win32 or x64, as in VS9 project files. + +For LibFFI, one should also put the generated ffi.h and ffitarget.h +into \vs9\\include\ and the compiled static libffi.lib +(or copy libffi-convenience.lib into libffi.lib) into +\vs9\\lib\. + +The libintl.h that is used for building GLib needs to be in +\vs9\\include, if not already done so + +You will also need a working GCC/MinGW compiler installation +in order to generate the .gir and .typelib files. One may be +obtained from the mingw or the mingw64 project. + +A working pkg-config tool is also required-it may be obtained from +http://www.gtk.org/download/win32.php [32-bit] +http://www.gtk.org/download/win64.php [64-bit] + +*** Note! *** +Please note that due to numerous possible configurations on Python, some environmental +variables need to be set before launching the gobject-introsection.sln solution file. + +These variables are namely: +PYTHONDIR: Root installation folder of your Python interpretor. + It must match your build configuration (Win32 or x64/amd64) +PKG_CONFIG_PATH: Location of the .pc (pkg-config) files, especially for the GLib .pc files. +MINGWDIR: Root installation folder for your Windows GCC (such as MinGW). +*** End of Note! *** + +The "install" project will copy build results and headers into their +appropriate location under \vs9\. For instance, +built DLLs go into \vs9\\bin, built LIBs into +\vs9\\lib and gobject-introspection headers into +\vs9\\include\gobject-introsection-1.0. + +The generated .gir files will end up in \vs9\\share\gir-1.0 +and .typelib files will end up in \vs9\\lib\girepository-1.0 + +This is then from where +project files higher in the stack are supposed to look for them, not +from a specific gobject-introspection source tree. + +--Tor Lillqvist +--Updated by Chun-wei Fan -- cgit v1.2.1 From 807a16f1375ece564426709e6f7033beb83f2389 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 14 Aug 2012 16:05:44 +0800 Subject: Add Visual Studio projects These are the Visual C++ 2008/2010 project files that can be used to build gobject-introspection. The main girepository dll (along with cmph), tools (in C), certain test/sample programs dlls are built with this project file set. Due to a bug in the Visual C++ 2008 linker, the g-ir-compiler and g-ir-generator tools have the libgirepository-internals sources built along side with the sources of these respective tool programs. In order to ease future maintenance, the cmph, girepository, g-ir-compiler and property sheets (for the "install" part) are done as templates where header/source listings are filled in during "make dist", so that the headers/sources listings are kept up to date between releases. The GLib and girepository .gir and .typelib files are also generated and "compiled" as part of the build process, using gengir.bat that was committed earlier. https://bugzilla.gnome.org/show_bug.cgi?id=681820 --- build/win32/vs10/_giscanner.vcxproj | 174 +++++++++++++++ build/win32/vs10/_giscanner.vcxproj.filters | 31 +++ build/win32/vs10/annotation.vcxproj | 171 +++++++++++++++ build/win32/vs10/annotation.vcxproj.filters | 22 ++ build/win32/vs10/cmph-bdz-test.vcxproj | 170 +++++++++++++++ build/win32/vs10/cmph-bdz-test.vcxproj.filters | 22 ++ build/win32/vs10/cmph.vcxproj.filtersin | 20 ++ build/win32/vs10/cmph.vcxprojin | 131 ++++++++++++ build/win32/vs10/everything.vcxproj | 197 +++++++++++++++++ build/win32/vs10/everything.vcxproj.filters | 22 ++ build/win32/vs10/foo.vcxproj | 177 ++++++++++++++++ build/win32/vs10/foo.vcxproj.filters | 22 ++ build/win32/vs10/g-ir-compiler.vcxproj.filtersin | 21 ++ build/win32/vs10/g-ir-compiler.vcxprojin | 180 ++++++++++++++++ build/win32/vs10/g-ir-generate.vcxproj | 166 +++++++++++++++ build/win32/vs10/g-ir-generate.vcxproj.filters | 25 +++ build/win32/vs10/generate_typelibs.vcxproj | 99 +++++++++ build/win32/vs10/gettype.vcxproj | 171 +++++++++++++++ build/win32/vs10/gettype.vcxproj.filters | 22 ++ build/win32/vs10/gimarshallingtests.vcxproj | 171 +++++++++++++++ .../win32/vs10/gimarshallingtests.vcxproj.filters | 22 ++ build/win32/vs10/gir.propsin | 224 ++++++++++++++++++++ build/win32/vs10/girepository.vcxproj.filtersin | 20 ++ build/win32/vs10/girepository.vcxprojin | 197 +++++++++++++++++ build/win32/vs10/glib-print.vcxproj | 165 +++++++++++++++ build/win32/vs10/glib-print.vcxproj.filters | 22 ++ build/win32/vs10/gtkfrob.vcxproj | 171 +++++++++++++++ build/win32/vs10/gtkfrob.vcxproj.filters | 22 ++ build/win32/vs10/install.vcxproj | 120 +++++++++++ build/win32/vs10/regress.vcxproj | 175 +++++++++++++++ build/win32/vs10/regress.vcxproj.filters | 22 ++ build/win32/vs10/sletter.vcxproj | 171 +++++++++++++++ build/win32/vs10/sletter.vcxproj.filters | 22 ++ build/win32/vs10/testinherit.vcxproj | 171 +++++++++++++++ build/win32/vs10/testinherit.vcxproj.filters | 22 ++ build/win32/vs10/utility.vcxproj | 171 +++++++++++++++ build/win32/vs10/utility.vcxproj.filters | 22 ++ build/win32/vs9/_giscanner.vcproj | 189 +++++++++++++++++ build/win32/vs9/annotation.vcproj | 186 ++++++++++++++++ build/win32/vs9/cmph-bdz-test.vcproj | 179 ++++++++++++++++ build/win32/vs9/cmph.vcprojin | 143 +++++++++++++ build/win32/vs9/everything.vcproj | 190 +++++++++++++++++ build/win32/vs9/foo.vcproj | 186 ++++++++++++++++ build/win32/vs9/g-ir-compiler.vcprojin | 185 ++++++++++++++++ build/win32/vs9/g-ir-generate.vcproj | 175 +++++++++++++++ build/win32/vs9/generate_typelibs.vcproj | 74 +++++++ build/win32/vs9/gettype.vcproj | 186 ++++++++++++++++ build/win32/vs9/gimarshallingtests.vcproj | 186 ++++++++++++++++ build/win32/vs9/gir.vspropsin | 167 +++++++++++++++ build/win32/vs9/girepository.vcprojin | 234 +++++++++++++++++++++ build/win32/vs9/glib-print.vcproj | 174 +++++++++++++++ build/win32/vs9/gtkfrob.vcproj | 186 ++++++++++++++++ build/win32/vs9/install.vcproj | 77 +++++++ build/win32/vs9/regress.vcproj | 190 +++++++++++++++++ build/win32/vs9/sletter.vcproj | 186 ++++++++++++++++ build/win32/vs9/testinherit.vcproj | 186 ++++++++++++++++ build/win32/vs9/utility.vcproj | 186 ++++++++++++++++ 57 files changed, 7218 insertions(+) create mode 100644 build/win32/vs10/_giscanner.vcxproj create mode 100644 build/win32/vs10/_giscanner.vcxproj.filters create mode 100644 build/win32/vs10/annotation.vcxproj create mode 100644 build/win32/vs10/annotation.vcxproj.filters create mode 100644 build/win32/vs10/cmph-bdz-test.vcxproj create mode 100644 build/win32/vs10/cmph-bdz-test.vcxproj.filters create mode 100644 build/win32/vs10/cmph.vcxproj.filtersin create mode 100644 build/win32/vs10/cmph.vcxprojin create mode 100644 build/win32/vs10/everything.vcxproj create mode 100644 build/win32/vs10/everything.vcxproj.filters create mode 100644 build/win32/vs10/foo.vcxproj create mode 100644 build/win32/vs10/foo.vcxproj.filters create mode 100644 build/win32/vs10/g-ir-compiler.vcxproj.filtersin create mode 100644 build/win32/vs10/g-ir-compiler.vcxprojin create mode 100644 build/win32/vs10/g-ir-generate.vcxproj create mode 100644 build/win32/vs10/g-ir-generate.vcxproj.filters create mode 100644 build/win32/vs10/generate_typelibs.vcxproj create mode 100644 build/win32/vs10/gettype.vcxproj create mode 100644 build/win32/vs10/gettype.vcxproj.filters create mode 100644 build/win32/vs10/gimarshallingtests.vcxproj create mode 100644 build/win32/vs10/gimarshallingtests.vcxproj.filters create mode 100644 build/win32/vs10/gir.propsin create mode 100644 build/win32/vs10/girepository.vcxproj.filtersin create mode 100644 build/win32/vs10/girepository.vcxprojin create mode 100644 build/win32/vs10/glib-print.vcxproj create mode 100644 build/win32/vs10/glib-print.vcxproj.filters create mode 100644 build/win32/vs10/gtkfrob.vcxproj create mode 100644 build/win32/vs10/gtkfrob.vcxproj.filters create mode 100644 build/win32/vs10/install.vcxproj create mode 100644 build/win32/vs10/regress.vcxproj create mode 100644 build/win32/vs10/regress.vcxproj.filters create mode 100644 build/win32/vs10/sletter.vcxproj create mode 100644 build/win32/vs10/sletter.vcxproj.filters create mode 100644 build/win32/vs10/testinherit.vcxproj create mode 100644 build/win32/vs10/testinherit.vcxproj.filters create mode 100644 build/win32/vs10/utility.vcxproj create mode 100644 build/win32/vs10/utility.vcxproj.filters create mode 100644 build/win32/vs9/_giscanner.vcproj create mode 100644 build/win32/vs9/annotation.vcproj create mode 100644 build/win32/vs9/cmph-bdz-test.vcproj create mode 100644 build/win32/vs9/cmph.vcprojin create mode 100644 build/win32/vs9/everything.vcproj create mode 100644 build/win32/vs9/foo.vcproj create mode 100644 build/win32/vs9/g-ir-compiler.vcprojin create mode 100644 build/win32/vs9/g-ir-generate.vcproj create mode 100644 build/win32/vs9/generate_typelibs.vcproj create mode 100644 build/win32/vs9/gettype.vcproj create mode 100644 build/win32/vs9/gimarshallingtests.vcproj create mode 100644 build/win32/vs9/gir.vspropsin create mode 100644 build/win32/vs9/girepository.vcprojin create mode 100644 build/win32/vs9/glib-print.vcproj create mode 100644 build/win32/vs9/gtkfrob.vcproj create mode 100644 build/win32/vs9/install.vcproj create mode 100644 build/win32/vs9/regress.vcproj create mode 100644 build/win32/vs9/sletter.vcproj create mode 100644 build/win32/vs9/testinherit.vcproj create mode 100644 build/win32/vs9/utility.vcproj diff --git a/build/win32/vs10/_giscanner.vcxproj b/build/win32/vs10/_giscanner.vcxproj new file mode 100644 index 00000000..91b28511 --- /dev/null +++ b/build/win32/vs10/_giscanner.vcxproj @@ -0,0 +1,174 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {8311394F-9114-4C97-80F2-51BCABA054C9} + _giscanner + Win32Proj + + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + ..\..\..\giscanner;$(PYTHONDIR)\include;%(AdditionalIncludeDirectories) + _DEBUG;YY_NO_UNISTD_H;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + $(OutDir)$(ProjectName).pyd + $(PYTHONDIR)\libs;%(AdditionalLibraryDirectories) + true + Windows + MachineX86 + + + + + MaxSpeed + true + ..\..\..\giscanner;$(PYTHONDIR)\include;%(AdditionalIncludeDirectories) + YY_NO_UNISTD_H;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).pyd + $(PYTHONDIR)\libs;%(AdditionalLibraryDirectories) + true + Windows + true + true + MachineX86 + + + + + X64 + + + Disabled + ..\..\..\giscanner;$(PYTHONDIR)\include;%(AdditionalIncludeDirectories) + _DEBUG;YY_NO_UNISTD_H;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).pyd + $(PYTHONDIR)\libs;%(AdditionalLibraryDirectories) + true + Windows + MachineX64 + + + + + X64 + + + MaxSpeed + true + ..\..\..\giscanner;$(PYTHONDIR)\include;%(AdditionalIncludeDirectories) + YY_NO_UNISTD_H;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)$(ProjectName).pyd + $(PYTHONDIR)\libs;%(AdditionalLibraryDirectories) + true + Windows + true + true + MachineX64 + + + + + + + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/_giscanner.vcxproj.filters b/build/win32/vs10/_giscanner.vcxproj.filters new file mode 100644 index 00000000..5a17d2d7 --- /dev/null +++ b/build/win32/vs10/_giscanner.vcxproj.filters @@ -0,0 +1,31 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Sources + + + Sources + + + Sources + + + Sources + + + \ No newline at end of file diff --git a/build/win32/vs10/annotation.vcxproj b/build/win32/vs10/annotation.vcxproj new file mode 100644 index 00000000..1e9f9834 --- /dev/null +++ b/build/win32/vs10/annotation.vcxproj @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {A70C7D31-0019-45D9-9537-BB1DB5F31886} + annotation + Win32Proj + + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + X64 + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/annotation.vcxproj.filters b/build/win32/vs10/annotation.vcxproj.filters new file mode 100644 index 00000000..42779bd6 --- /dev/null +++ b/build/win32/vs10/annotation.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Sources + + + \ No newline at end of file diff --git a/build/win32/vs10/cmph-bdz-test.vcxproj b/build/win32/vs10/cmph-bdz-test.vcxproj new file mode 100644 index 00000000..8271966f --- /dev/null +++ b/build/win32/vs10/cmph-bdz-test.vcxproj @@ -0,0 +1,170 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A} + cmphbdztest + Win32Proj + + + + Application + MultiByte + true + + + Application + MultiByte + + + Application + MultiByte + true + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + ..\..\..\girepository\cmph;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + MaxSpeed + true + ..\..\..\girepository\cmph;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MultiThreadedDLL + true + false + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + X64 + + + Disabled + ..\..\..\girepository\cmph;%(AdditionalIncludeDirectories) + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + true + ..\..\..\girepository\cmph;%(AdditionalIncludeDirectories) + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX64 + + + + + + + + {442c007e-d901-41da-9706-5db4afb4c06b} + false + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/cmph-bdz-test.vcxproj.filters b/build/win32/vs10/cmph-bdz-test.vcxproj.filters new file mode 100644 index 00000000..40858f29 --- /dev/null +++ b/build/win32/vs10/cmph-bdz-test.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Sources + + + \ No newline at end of file diff --git a/build/win32/vs10/cmph.vcxproj.filtersin b/build/win32/vs10/cmph.vcxproj.filtersin new file mode 100644 index 00000000..072d32ac --- /dev/null +++ b/build/win32/vs10/cmph.vcxproj.filtersin @@ -0,0 +1,20 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + +#include "cmph.vs10.sourcefiles.filters" + + \ No newline at end of file diff --git a/build/win32/vs10/cmph.vcxprojin b/build/win32/vs10/cmph.vcxprojin new file mode 100644 index 00000000..9e8d2b88 --- /dev/null +++ b/build/win32/vs10/cmph.vcxprojin @@ -0,0 +1,131 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {442C007E-D901-41DA-9706-5DB4AFB4C06B} + cmph + Win32Proj + + + + StaticLibrary + MultiByte + true + + + StaticLibrary + MultiByte + + + StaticLibrary + MultiByte + true + + + StaticLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + + + X64 + + + Disabled + _DEBUG;__x86_64__;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + + + X64 + + + MaxSpeed + true + __x86_64__;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + +#include "cmph.vs10.sourcefiles" + + + + + \ No newline at end of file diff --git a/build/win32/vs10/everything.vcxproj b/build/win32/vs10/everything.vcxproj new file mode 100644 index 00000000..5ef60b24 --- /dev/null +++ b/build/win32/vs10/everything.vcxproj @@ -0,0 +1,197 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {2986281A-BD41-4BD1-8B43-25B7D7E7F234} + everything + Win32Proj + + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + + $(GenEverythingH) + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + + $(GenEverythingH) + + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + + $(GenEverythingH) + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + + $(GenEverythingH) + + + + X64 + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + + + + {8311394f-9114-4c97-80f2-51bcaba054c9} + false + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/everything.vcxproj.filters b/build/win32/vs10/everything.vcxproj.filters new file mode 100644 index 00000000..c284b239 --- /dev/null +++ b/build/win32/vs10/everything.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Sources + + + \ No newline at end of file diff --git a/build/win32/vs10/foo.vcxproj b/build/win32/vs10/foo.vcxproj new file mode 100644 index 00000000..f2317f71 --- /dev/null +++ b/build/win32/vs10/foo.vcxproj @@ -0,0 +1,177 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1} + foo + Win32Proj + + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + X64 + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + + + + {23e28245-8fc7-4b41-b1c5-8785bd4366a7} + false + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/foo.vcxproj.filters b/build/win32/vs10/foo.vcxproj.filters new file mode 100644 index 00000000..df097fef --- /dev/null +++ b/build/win32/vs10/foo.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Sources + + + \ No newline at end of file diff --git a/build/win32/vs10/g-ir-compiler.vcxproj.filtersin b/build/win32/vs10/g-ir-compiler.vcxproj.filtersin new file mode 100644 index 00000000..0e1860d2 --- /dev/null +++ b/build/win32/vs10/g-ir-compiler.vcxproj.filtersin @@ -0,0 +1,21 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + +#include "g-ir-compiler.vs10.sourcefiles.filters" + Sources + + diff --git a/build/win32/vs10/g-ir-compiler.vcxprojin b/build/win32/vs10/g-ir-compiler.vcxprojin new file mode 100644 index 00000000..dcaa46a2 --- /dev/null +++ b/build/win32/vs10/g-ir-compiler.vcxprojin @@ -0,0 +1,180 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774} + gircompiler + Win32Proj + + + + Application + MultiByte + true + + + Application + MultiByte + + + Application + MultiByte + true + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + true + false + false + + + + Disabled + _DEBUG;FFI_BUILDING;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + libffi.lib;%(AdditionalDependencies) + true + Console + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;FFI_BUILDING;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + libffi.lib;%(AdditionalDependencies) + true + Console + + + MachineX64 + + + + + MaxSpeed + true + FFI_BUILDING;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + libffi.lib;%(AdditionalDependencies) + true + Console + true + true + MachineX86 + + + + + X64 + + + MinSpace + true + false + FFI_BUILDING;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + libffi.lib;%(AdditionalDependencies) + true + Console + true + true + UseLinkTimeCodeGeneration + + + MachineX64 + + + +#include "g-ir-compiler.vs10.sourcefiles" + + + + + {442c007e-d901-41da-9706-5db4afb4c06b} + false + + + {23e28245-8fc7-4b41-b1c5-8785bd4366a7} + false + + + + + + diff --git a/build/win32/vs10/g-ir-generate.vcxproj b/build/win32/vs10/g-ir-generate.vcxproj new file mode 100644 index 00000000..bc75531c --- /dev/null +++ b/build/win32/vs10/g-ir-generate.vcxproj @@ -0,0 +1,166 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3} + girgenerate + Win32Proj + + + + Application + MultiByte + true + + + Application + MultiByte + + + Application + MultiByte + true + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX64 + + + + + + + + + {23e28245-8fc7-4b41-b1c5-8785bd4366a7} + false + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/g-ir-generate.vcxproj.filters b/build/win32/vs10/g-ir-generate.vcxproj.filters new file mode 100644 index 00000000..db77dd15 --- /dev/null +++ b/build/win32/vs10/g-ir-generate.vcxproj.filters @@ -0,0 +1,25 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Sources + + + Sources + + + \ No newline at end of file diff --git a/build/win32/vs10/generate_typelibs.vcxproj b/build/win32/vs10/generate_typelibs.vcxproj new file mode 100644 index 00000000..b284551e --- /dev/null +++ b/build/win32/vs10/generate_typelibs.vcxproj @@ -0,0 +1,99 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {BE771349-F11E-42AE-A23F-DA083FDC6FB8} + generate_typelibs + + + + Utility + MultiByte + true + + + Utility + MultiByte + + + Utility + MultiByte + true + + + Utility + MultiByte + + + + + + + + + + + + + + + + + + + + + + + + + + $(GenerateGIR) + + + + + $(GenerateGIR) + + + + + $(GenerateGIR) + + + + + $(GenerateGIR) + + + + + {5dcb55ce-f32c-4c77-8bf4-b4dad3ec7774} + false + + + {8311394f-9114-4c97-80f2-51bcaba054c9} + false + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/gettype.vcxproj b/build/win32/vs10/gettype.vcxproj new file mode 100644 index 00000000..a1126e81 --- /dev/null +++ b/build/win32/vs10/gettype.vcxproj @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA} + gettype + Win32Proj + + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + X64 + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/gettype.vcxproj.filters b/build/win32/vs10/gettype.vcxproj.filters new file mode 100644 index 00000000..5f0fb5bf --- /dev/null +++ b/build/win32/vs10/gettype.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Sources + + + \ No newline at end of file diff --git a/build/win32/vs10/gimarshallingtests.vcxproj b/build/win32/vs10/gimarshallingtests.vcxproj new file mode 100644 index 00000000..2849e439 --- /dev/null +++ b/build/win32/vs10/gimarshallingtests.vcxproj @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203} + gimarshallingtests + Win32Proj + + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + X64 + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/gimarshallingtests.vcxproj.filters b/build/win32/vs10/gimarshallingtests.vcxproj.filters new file mode 100644 index 00000000..5da4a33a --- /dev/null +++ b/build/win32/vs10/gimarshallingtests.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Sources + + + \ No newline at end of file diff --git a/build/win32/vs10/gir.propsin b/build/win32/vs10/gir.propsin new file mode 100644 index 00000000..d957b5a9 --- /dev/null +++ b/build/win32/vs10/gir.propsin @@ -0,0 +1,224 @@ + + + + $(SolutionDir)\..\..\..\..\vs10\$(Platform) + 10 + $(SolutionDir)\..\..\.. + $(GlibEtcInstallRoot) + 1.0 + $(SolutionDir)$(Configuration)\$(Platform)\obj\$(ProjectName) + + echo EXPORTS > $(DefDir)\girepository.def + + cl -EP ..\..\..\girepository\girepository.symbols >> $(DefDir)\girepository.def + + +if exist ..\..\..\tests\everything.h goto DONE_GEN_EVERYTHING_C + +cd ..\..\..\tests + +set PATH=$(GlibEtcInstallRoot)\bin;$(SolutionDir)$(Configuration)\$(PlatformName)\bin;%PYTHONDIR%;%PATH% + +set PYTHONPATH=$(SolutionDir)$(Configuration)\$(PlatformName)\bin;$(BASE_GI_DIR) + +set UNINSTALLED_INTROSPECTION_SRCDIR=$(BASE_GI_DIR) + +python ..\tools\g-ir-scanner --verbose -I. --add-include-path=..\ --add-include-path=..\gir --generate-typelib-tests=Everything,everything.h,everything.c + +cd $(SolutionDir) + +:DONE_GEN_EVERYTHING_C + + +@echo off + +set CC=cl + +if "$(MINGWDIR)" == "" goto ERR_NOGCC + +if "$(PYTHONDIR)" == "" goto ERR_NOPYPATH + +if "$(PKG_CONFIG_PATH)" == "" goto ERR_NOPKGCONFIG + + +set PYTHONPATH=$(SolutionDir)$(Configuration)\$(PlatformName)\bin\;$(BASE_GI_DIR) + +set UNINSTALLED_INTROSPECTION_SRCDIR=$(BASE_GI_DIR) + +set PATH=$(GlibEtcInstallRoot)\bin;$(SolutionDir)$(Configuration)\$(PlatformName)\bin\;$(PATH);$(PYTHONDIR);$(MINGWDIR)\bin + +set LIB=$(GlibEtcInstallRoot)\lib;$(SolutionDir)$(Configuration)\$(PlatformName)\bin\;$(LIB);$(PYTHONDIR)\libs + +set INCLUDE=$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(INCLUDE);$(PYTHONDIR)\include + + +set PLAT=$(Platform) + +set CONF=$(Configuration) + +set BASEDIR=$(GlibEtcInstallRoot) + +set VSVER=$(VSVER) + + +cd .. + +call gengir.bat + +cd .\vs$(VSVER) + +goto DONE + + +:ERR_NOGCC + +echo You need a Windows GCC installation to preprocess the headers to generate .gir files + +echo Please set MINGWDIR accordingly before launching the Project + +goto DONE + + +:ERR_NOPYPATH + +echo You need a Python installation to build the Python module and run the Python scripts to generate .gir files + +echo The Python installation needs to correspond to the configuration of your build, i.e. Win32 or x64 + +echo Please set PYTHONDIR accordingly before launching the Project + +goto DONE + + +:ERR_NOPKGCONFIG + +echo You need pkg-config and need to set PKG_CONFIG_PATH to point to pkgconfig (.pc) files to generate .gir files + +echo Please set PKG_CONFIG_PATH accordingly before launching the Project + +goto DONE + + +:DONE + + + lib + -$(GIApiVersion)-0 + + -1-vs10 + $(LibGISeparateVS10DllPrefix) + $(LibGISeparateVS10DllSuffix) + +mkdir $(CopyDir) + +mkdir $(CopyDir)\bin + +copy $(SolutionDir)$(Configuration)\$(Platform)\bin\$(LibGIDllPrefix)girepository$(LibGIDllSuffix).dll $(CopyDir)\bin + +copy $(SolutionDir)$(Configuration)\$(Platform)\bin\g-ir-compiler.exe $(CopyDir)\bin + +copy $(SolutionDir)$(Configuration)\$(Platform)\bin\g-ir-generate.exe $(CopyDir)\bin + +copy ..\..\..\tools\g-ir-annotation-tool $(CopyDir)\bin + +copy ..\..\..\tools\g-ir-doc-tool $(CopyDir)\bin + +copy ..\..\..\tools\g-ir-scanner $(CopyDir)\bin + + +#include "gir.vs10.install" + +copy $(SolutionDir)$(Configuration)\$(Platform)\bin\_giscanner.pyd $(CopyDir)\lib\gobject-introspection\giscanner + + +mkdir $(CopyDir)\share\gir-$(GIApiVersion) + +copy $(SolutionDir)$(Configuration)\$(Platform)\share\gir-$(GIApiVersion)\*.gir $(CopyDir)\share\gir-$(GIApiVersion) + + +mkdir $(CopyDir)\lib\girepository-$(GIApiVersion) + +copy $(SolutionDir)$(Configuration)\$(Platform)\bin\girepository-$(GIApiVersion).lib $(CopyDir)\lib + +copy $(SolutionDir)$(Configuration)\$(Platform)\lib\girepository-$(GIApiVersion)\*.typelib $(CopyDir)\lib\girepository-$(GIApiVersion) + + + + + <_PropertySheetDisplayName>giprops + $(SolutionDir)$(Configuration)\$(PlatformName)\bin\ + $(SolutionDir)$(Configuration)\$(PlatformName)\obj\$(ProjectName)\ + + + + ..\..\..;..\..\..\girepository;$(GlibEtcInstallRoot)\include;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;%(AdditionalIncludeDirectories) + HAVE_CONFIG_H;WIN32;%(PreprocessorDefinitions) + msvc_recommended_pragmas.h;%(ForcedIncludeFiles) + + + gio-2.0.lib;gobject-2.0.lib;gmodule-2.0.lib;gthread-2.0.lib;glib-2.0.lib;%(AdditionalDependencies) + $(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories) + + + +if not exist ..\..\..\config.h copy ..\..\..\config.h.win32 ..\..\..\config.h + +if not exist ..\..\..\tools\g-ir-scanner copy ..\..\..\tools\g-ir-scanner.in ..\..\..\tools\g-ir-scanner + +if not exist ..\..\..\tools\g-ir-doc-tool copy ..\..\..\tools\g-ir-doc-tool.in ..\..\..\tools\g-ir-doc-tool + +if not exist ..\..\..\tools\g-ir-annotation-tool copy ..\..\..\tools\g-ir-annotation-tool.in ..\..\..\tools\g-ir-annotation-tool + + + + + + $(GlibEtcInstallRoot) + + + $(VSVER) + + + $(BASE_GI_DIR) + + + $(CopyDir) + + + $(GIApiVersion) + + + $(DefDir) + + + $(GenerateGIRDef) + + + $(GenEverythingH) + + + $(GenerateGIR) + + + $(LibGILibtoolCompatibleDllPrefix) + + + $(LibGILibtoolCompatibleDllSuffix) + + + $(LibGISeparateVS10DllPrefix) + + + $(LibGISeparateVS10DllSuffix) + + + $(LibGIDllPrefix) + + + $(LibGIDllSuffix) + + + $(GIDoInstall) + + + diff --git a/build/win32/vs10/girepository.vcxproj.filtersin b/build/win32/vs10/girepository.vcxproj.filtersin new file mode 100644 index 00000000..ccc6895c --- /dev/null +++ b/build/win32/vs10/girepository.vcxproj.filtersin @@ -0,0 +1,20 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + +#include "girepository.vs10.sourcefiles.filters" + + \ No newline at end of file diff --git a/build/win32/vs10/girepository.vcxprojin b/build/win32/vs10/girepository.vcxprojin new file mode 100644 index 00000000..85aecd73 --- /dev/null +++ b/build/win32/vs10/girepository.vcxprojin @@ -0,0 +1,197 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {23E28245-8FC7-4B41-B1C5-8785BD4366A7} + girepository + Win32Proj + + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + ..\..\..\girepository;%(AdditionalIncludeDirectories) + _DEBUG;G_IREPOSITORY_COMPILATION;FFI_BUILDING;DLL_EXPORT;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + $(GenerateGIRDef) + + + libffi.lib;%(AdditionalDependencies) + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + $(IntDir)girepository.def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + MaxSpeed + true + ..\..\..\girepository;%(AdditionalIncludeDirectories) + G_IREPOSITORY_COMPILATION;FFI_BUILDING;DLL_EXPORT;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(GenerateGIRDef) + + + libffi.lib;%(AdditionalDependencies) + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + $(IntDir)girepository.def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + X64 + + + Disabled + ..\..\..\girepository;%(AdditionalIncludeDirectories) + _DEBUG;G_IREPOSITORY_COMPILATION;FFI_BUILDING;DLL_EXPORT;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + $(GenerateGIRDef) + + + libffi.lib;%(AdditionalDependencies) + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + $(IntDir)girepository.def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + X64 + + + MaxSpeed + true + ..\..\..\girepository;%(AdditionalIncludeDirectories) + G_IREPOSITORY_COMPILATION;FFI_BUILDING;DLL_EXPORT;%(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(GenerateGIRDef) + + + libffi.lib;%(AdditionalDependencies) + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + $(IntDir)girepository.def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + +#include "girepository.vs10.sourcefiles" + + + + {442c007e-d901-41da-9706-5db4afb4c06b} + false + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/glib-print.vcxproj b/build/win32/vs10/glib-print.vcxproj new file mode 100644 index 00000000..706e777f --- /dev/null +++ b/build/win32/vs10/glib-print.vcxproj @@ -0,0 +1,165 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B} + glibprint + Win32Proj + + + + Application + MultiByte + true + + + Application + MultiByte + + + Application + MultiByte + true + + + Application + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + true + Console + MachineX86 + + + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + true + Console + MachineX64 + + + + + X64 + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + true + Console + true + true + MachineX64 + + + + + + + + {23e28245-8fc7-4b41-b1c5-8785bd4366a7} + false + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/glib-print.vcxproj.filters b/build/win32/vs10/glib-print.vcxproj.filters new file mode 100644 index 00000000..124e6781 --- /dev/null +++ b/build/win32/vs10/glib-print.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Sources + + + \ No newline at end of file diff --git a/build/win32/vs10/gtkfrob.vcxproj b/build/win32/vs10/gtkfrob.vcxproj new file mode 100644 index 00000000..f21723e7 --- /dev/null +++ b/build/win32/vs10/gtkfrob.vcxproj @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {95C833D3-6EC2-493D-969A-6082E5495F66} + gtkfrob + Win32Proj + + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + X64 + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/gtkfrob.vcxproj.filters b/build/win32/vs10/gtkfrob.vcxproj.filters new file mode 100644 index 00000000..16be2b88 --- /dev/null +++ b/build/win32/vs10/gtkfrob.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Sources + + + \ No newline at end of file diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj new file mode 100644 index 00000000..541a4efb --- /dev/null +++ b/build/win32/vs10/install.vcxproj @@ -0,0 +1,120 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {2093D218-190E-4194-9421-3BA7CBF33B10} + install + Win32Proj + + + + Utility + MultiByte + true + + + Utility + MultiByte + + + Utility + MultiByte + true + + + Utility + MultiByte + + + + + + + + + + + + + + + + + + + + + + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + $(GlibEtcInstallRoot)\ + + + + + $(GIDoInstall) + + + + + $(GIDoInstall) + + + + + $(GIDoInstall) + + + + + $(GIDoInstall) + + + + + {5dcb55ce-f32c-4c77-8bf4-b4dad3ec7774} + false + + + {f4e6621f-a7dd-4863-8ccf-ba04dfc601e3} + false + + + {be771349-f11e-42ae-a23f-da083fdc6fb8} + false + + + {23e28245-8fc7-4b41-b1c5-8785bd4366a7} + false + + + {8311394f-9114-4c97-80f2-51bcaba054c9} + false + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/regress.vcxproj b/build/win32/vs10/regress.vcxproj new file mode 100644 index 00000000..870f93ad --- /dev/null +++ b/build/win32/vs10/regress.vcxproj @@ -0,0 +1,175 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60} + regress + Win32Proj + + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + cairo-gobject.lib;cairo.lib;%(AdditionalDependencies) + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + cairo-gobject.lib;cairo.lib;%(AdditionalDependencies) + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + cairo-gobject.lib;cairo.lib;%(AdditionalDependencies) + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + X64 + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + cairo-gobject.lib;cairo.lib;%(AdditionalDependencies) + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/regress.vcxproj.filters b/build/win32/vs10/regress.vcxproj.filters new file mode 100644 index 00000000..2d6a34e3 --- /dev/null +++ b/build/win32/vs10/regress.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Sources + + + \ No newline at end of file diff --git a/build/win32/vs10/sletter.vcxproj b/build/win32/vs10/sletter.vcxproj new file mode 100644 index 00000000..d0185e92 --- /dev/null +++ b/build/win32/vs10/sletter.vcxproj @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {86A35E44-E4C8-4628-87E9-942D136D72BC} + sletter + Win32Proj + + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + X64 + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/sletter.vcxproj.filters b/build/win32/vs10/sletter.vcxproj.filters new file mode 100644 index 00000000..3d42dfa4 --- /dev/null +++ b/build/win32/vs10/sletter.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Sources + + + \ No newline at end of file diff --git a/build/win32/vs10/testinherit.vcxproj b/build/win32/vs10/testinherit.vcxproj new file mode 100644 index 00000000..9006818e --- /dev/null +++ b/build/win32/vs10/testinherit.vcxproj @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {3F2C9F08-7FB7-4465-BF24-84E083EC4913} + testinherit + Win32Proj + + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + X64 + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/testinherit.vcxproj.filters b/build/win32/vs10/testinherit.vcxproj.filters new file mode 100644 index 00000000..d001332c --- /dev/null +++ b/build/win32/vs10/testinherit.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Sources + + + \ No newline at end of file diff --git a/build/win32/vs10/utility.vcxproj b/build/win32/vs10/utility.vcxproj new file mode 100644 index 00000000..a73d7097 --- /dev/null +++ b/build/win32/vs10/utility.vcxproj @@ -0,0 +1,171 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214} + utility + Win32Proj + + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + DynamicLibrary + MultiByte + true + + + DynamicLibrary + MultiByte + + + + + + + + + + + + + + + + + + + + + + + true + false + true + false + + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + EditAndContinue + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX86 + + + + + X64 + + + Disabled + _DEBUG;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + X64 + + + MaxSpeed + true + %(PreprocessorDefinitions) + MultiThreadedDLL + true + + + Level3 + ProgramDatabase + + + $(OutDir)$(LibGIDllPrefix)$(ProjectName)$(LibGIDllSuffix).dll + ..\$(ProjectName).def + true + Windows + true + true + $(TargetDir)$(ProjectName)-$(GIApiVersion).lib + MachineX64 + + + + + + + + + \ No newline at end of file diff --git a/build/win32/vs10/utility.vcxproj.filters b/build/win32/vs10/utility.vcxproj.filters new file mode 100644 index 00000000..fbd9b657 --- /dev/null +++ b/build/win32/vs10/utility.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav + + + + + Sources + + + \ No newline at end of file diff --git a/build/win32/vs9/_giscanner.vcproj b/build/win32/vs9/_giscanner.vcproj new file mode 100644 index 00000000..8b0aa79a --- /dev/null +++ b/build/win32/vs9/_giscanner.vcproj @@ -0,0 +1,189 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/annotation.vcproj b/build/win32/vs9/annotation.vcproj new file mode 100644 index 00000000..81045941 --- /dev/null +++ b/build/win32/vs9/annotation.vcproj @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/cmph-bdz-test.vcproj b/build/win32/vs9/cmph-bdz-test.vcproj new file mode 100644 index 00000000..0bd8106b --- /dev/null +++ b/build/win32/vs9/cmph-bdz-test.vcproj @@ -0,0 +1,179 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/cmph.vcprojin b/build/win32/vs9/cmph.vcprojin new file mode 100644 index 00000000..ff56d375 --- /dev/null +++ b/build/win32/vs9/cmph.vcprojin @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "cmph.sourcefiles" + + + + + + + + + diff --git a/build/win32/vs9/everything.vcproj b/build/win32/vs9/everything.vcproj new file mode 100644 index 00000000..c8f1eace --- /dev/null +++ b/build/win32/vs9/everything.vcproj @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/foo.vcproj b/build/win32/vs9/foo.vcproj new file mode 100644 index 00000000..3a2aeef2 --- /dev/null +++ b/build/win32/vs9/foo.vcproj @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/g-ir-compiler.vcprojin b/build/win32/vs9/g-ir-compiler.vcprojin new file mode 100644 index 00000000..f08b9195 --- /dev/null +++ b/build/win32/vs9/g-ir-compiler.vcprojin @@ -0,0 +1,185 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "g-ir-compiler.sourcefiles" + + + + + + + + + + diff --git a/build/win32/vs9/g-ir-generate.vcproj b/build/win32/vs9/g-ir-generate.vcproj new file mode 100644 index 00000000..0e5973a4 --- /dev/null +++ b/build/win32/vs9/g-ir-generate.vcproj @@ -0,0 +1,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/generate_typelibs.vcproj b/build/win32/vs9/generate_typelibs.vcproj new file mode 100644 index 00000000..e8b0059e --- /dev/null +++ b/build/win32/vs9/generate_typelibs.vcproj @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/gettype.vcproj b/build/win32/vs9/gettype.vcproj new file mode 100644 index 00000000..5806277c --- /dev/null +++ b/build/win32/vs9/gettype.vcproj @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/gimarshallingtests.vcproj b/build/win32/vs9/gimarshallingtests.vcproj new file mode 100644 index 00000000..eb970926 --- /dev/null +++ b/build/win32/vs9/gimarshallingtests.vcproj @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/gir.vspropsin b/build/win32/vs9/gir.vspropsin new file mode 100644 index 00000000..60db0e6c --- /dev/null +++ b/build/win32/vs9/gir.vspropsin @@ -0,0 +1,167 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/girepository.vcprojin b/build/win32/vs9/girepository.vcprojin new file mode 100644 index 00000000..12436213 --- /dev/null +++ b/build/win32/vs9/girepository.vcprojin @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#include "girepository.sourcefiles" + + + + + + + + + diff --git a/build/win32/vs9/glib-print.vcproj b/build/win32/vs9/glib-print.vcproj new file mode 100644 index 00000000..0491ebac --- /dev/null +++ b/build/win32/vs9/glib-print.vcproj @@ -0,0 +1,174 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/gtkfrob.vcproj b/build/win32/vs9/gtkfrob.vcproj new file mode 100644 index 00000000..c9cc0727 --- /dev/null +++ b/build/win32/vs9/gtkfrob.vcproj @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/install.vcproj b/build/win32/vs9/install.vcproj new file mode 100644 index 00000000..04cda9c7 --- /dev/null +++ b/build/win32/vs9/install.vcproj @@ -0,0 +1,77 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/regress.vcproj b/build/win32/vs9/regress.vcproj new file mode 100644 index 00000000..6f557353 --- /dev/null +++ b/build/win32/vs9/regress.vcproj @@ -0,0 +1,190 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/sletter.vcproj b/build/win32/vs9/sletter.vcproj new file mode 100644 index 00000000..706166b2 --- /dev/null +++ b/build/win32/vs9/sletter.vcproj @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/testinherit.vcproj b/build/win32/vs9/testinherit.vcproj new file mode 100644 index 00000000..fd62b906 --- /dev/null +++ b/build/win32/vs9/testinherit.vcproj @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/win32/vs9/utility.vcproj b/build/win32/vs9/utility.vcproj new file mode 100644 index 00000000..7d510324 --- /dev/null +++ b/build/win32/vs9/utility.vcproj @@ -0,0 +1,186 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.1 From 181a88e95dd0981e5d76d6226818983ea74a042a Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 14 Aug 2012 16:07:22 +0800 Subject: Add Visual Studio 2008/2010 Solution files These are the master solution files that will load the Visual C++ projects for building/generating gobject-introspection and its related tools and files. https://bugzilla.gnome.org/show_bug.cgi?id=681820 --- build/win32/vs10/gobject-introspection.sln | 206 +++++++++++++++++++++++++ build/win32/vs9/gobject-introspection.sln | 239 +++++++++++++++++++++++++++++ 2 files changed, 445 insertions(+) create mode 100644 build/win32/vs10/gobject-introspection.sln create mode 100644 build/win32/vs9/gobject-introspection.sln diff --git a/build/win32/vs10/gobject-introspection.sln b/build/win32/vs10/gobject-introspection.sln new file mode 100644 index 00000000..9088324e --- /dev/null +++ b/build/win32/vs10/gobject-introspection.sln @@ -0,0 +1,206 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph", "cmph.vcxproj", "{442C007E-D901-41DA-9706-5DB4AFB4C06B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph-bdz-test", "cmph-bdz-test.vcxproj", "{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "girepository", "girepository.vcxproj", "{23E28245-8FC7-4B41-B1C5-8785BD4366A7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_giscanner", "_giscanner.vcxproj", "{8311394F-9114-4C97-80F2-51BCABA054C9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-print", "glib-print.vcxproj", "{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-generate", "g-ir-generate.vcxproj", "{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-compiler", "g-ir-compiler.vcxproj", "{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gimarshallingtests", "gimarshallingtests.vcxproj", "{E2F8D205-0A53-4D40-9169-CE1EF2AAF203}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regress", "regress.vcxproj", "{0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utility", "utility.vcxproj", "{A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "annotation", "annotation.vcxproj", "{A70C7D31-0019-45D9-9537-BB1DB5F31886}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "foo", "foo.vcxproj", "{CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testinherit", "testinherit.vcxproj", "{3F2C9F08-7FB7-4465-BF24-84E083EC4913}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gettype", "gettype.vcxproj", "{F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkfrob", "gtkfrob.vcxproj", "{95C833D3-6EC2-493D-969A-6082E5495F66}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sletter", "sletter.vcxproj", "{86A35E44-E4C8-4628-87E9-942D136D72BC}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "everything", "everything.vcxproj", "{2986281A-BD41-4BD1-8B43-25B7D7E7F234}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate_typelibs", "generate_typelibs.vcxproj", "{BE771349-F11E-42AE-A23F-DA083FDC6FB8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.ActiveCfg = Debug|Win32 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.Build.0 = Debug|Win32 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.ActiveCfg = Debug|x64 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.Build.0 = Debug|x64 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.ActiveCfg = Release|Win32 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.Build.0 = Release|Win32 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.ActiveCfg = Release|x64 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.Build.0 = Release|x64 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.ActiveCfg = Debug|Win32 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.Build.0 = Debug|Win32 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.ActiveCfg = Debug|x64 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.Build.0 = Debug|x64 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.ActiveCfg = Release|Win32 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.Build.0 = Release|Win32 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.ActiveCfg = Release|x64 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.Build.0 = Release|x64 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.ActiveCfg = Debug|Win32 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.Build.0 = Debug|Win32 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.ActiveCfg = Debug|x64 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.Build.0 = Debug|x64 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.ActiveCfg = Release|Win32 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.Build.0 = Release|Win32 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.ActiveCfg = Release|x64 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.Build.0 = Release|x64 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.ActiveCfg = Debug|Win32 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.Build.0 = Debug|Win32 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.ActiveCfg = Debug|x64 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.Build.0 = Debug|x64 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.ActiveCfg = Release|Win32 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.Build.0 = Release|Win32 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.ActiveCfg = Release|x64 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.Build.0 = Release|x64 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.ActiveCfg = Debug|Win32 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.Build.0 = Debug|Win32 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.ActiveCfg = Debug|x64 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.Build.0 = Debug|x64 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.ActiveCfg = Release|Win32 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.Build.0 = Release|Win32 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.ActiveCfg = Release|x64 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.Build.0 = Release|x64 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.ActiveCfg = Debug|Win32 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.Build.0 = Debug|Win32 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.ActiveCfg = Debug|x64 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.Build.0 = Debug|x64 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.ActiveCfg = Release|Win32 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.Build.0 = Release|Win32 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.ActiveCfg = Release|x64 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.Build.0 = Release|x64 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.ActiveCfg = Debug|Win32 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.Build.0 = Debug|Win32 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.ActiveCfg = Debug|x64 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.Build.0 = Debug|x64 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.ActiveCfg = Release|Win32 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.Build.0 = Release|Win32 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.ActiveCfg = Release|x64 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.Build.0 = Release|x64 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|Win32.ActiveCfg = Debug|Win32 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|Win32.Build.0 = Debug|Win32 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|x64.ActiveCfg = Debug|x64 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|x64.Build.0 = Debug|x64 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|Win32.ActiveCfg = Release|Win32 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|Win32.Build.0 = Release|Win32 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|x64.ActiveCfg = Release|x64 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|x64.Build.0 = Release|x64 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|Win32.ActiveCfg = Debug|Win32 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|Win32.Build.0 = Debug|Win32 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|x64.ActiveCfg = Debug|x64 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|x64.Build.0 = Debug|x64 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|Win32.ActiveCfg = Release|Win32 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|Win32.Build.0 = Release|Win32 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|x64.ActiveCfg = Release|x64 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|x64.Build.0 = Release|x64 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|Win32.Build.0 = Debug|Win32 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|x64.ActiveCfg = Debug|x64 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|x64.Build.0 = Debug|x64 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|Win32.ActiveCfg = Release|Win32 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|Win32.Build.0 = Release|Win32 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|x64.ActiveCfg = Release|x64 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|x64.Build.0 = Release|x64 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|Win32.ActiveCfg = Debug|Win32 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|Win32.Build.0 = Debug|Win32 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|x64.ActiveCfg = Debug|x64 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|x64.Build.0 = Debug|x64 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|Win32.ActiveCfg = Release|Win32 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|Win32.Build.0 = Release|Win32 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|x64.ActiveCfg = Release|x64 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|x64.Build.0 = Release|x64 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|Win32.ActiveCfg = Debug|Win32 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|Win32.Build.0 = Debug|Win32 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|x64.ActiveCfg = Debug|x64 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|x64.Build.0 = Debug|x64 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|Win32.ActiveCfg = Release|Win32 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|Win32.Build.0 = Release|Win32 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|x64.ActiveCfg = Release|x64 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|x64.Build.0 = Release|x64 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|Win32.ActiveCfg = Debug|Win32 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|Win32.Build.0 = Debug|Win32 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|x64.ActiveCfg = Debug|x64 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|x64.Build.0 = Debug|x64 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|Win32.ActiveCfg = Release|Win32 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|Win32.Build.0 = Release|Win32 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|x64.ActiveCfg = Release|x64 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|x64.Build.0 = Release|x64 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|Win32.ActiveCfg = Debug|Win32 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|Win32.Build.0 = Debug|Win32 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|x64.ActiveCfg = Debug|x64 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|x64.Build.0 = Debug|x64 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|Win32.ActiveCfg = Release|Win32 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|Win32.Build.0 = Release|Win32 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|x64.ActiveCfg = Release|x64 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|x64.Build.0 = Release|x64 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|Win32.ActiveCfg = Debug|Win32 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|Win32.Build.0 = Debug|Win32 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|x64.ActiveCfg = Debug|x64 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|x64.Build.0 = Debug|x64 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|Win32.ActiveCfg = Release|Win32 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|Win32.Build.0 = Release|Win32 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|x64.ActiveCfg = Release|x64 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|x64.Build.0 = Release|x64 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|Win32.ActiveCfg = Debug|Win32 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|Win32.Build.0 = Debug|Win32 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|x64.ActiveCfg = Debug|x64 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|x64.Build.0 = Debug|x64 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|Win32.ActiveCfg = Release|Win32 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|Win32.Build.0 = Release|Win32 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|x64.ActiveCfg = Release|x64 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|x64.Build.0 = Release|x64 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|Win32.ActiveCfg = Debug|Win32 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|Win32.Build.0 = Debug|Win32 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|x64.ActiveCfg = Debug|x64 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|x64.Build.0 = Debug|x64 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|Win32.ActiveCfg = Release|Win32 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|Win32.Build.0 = Release|Win32 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|x64.ActiveCfg = Release|x64 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|x64.Build.0 = Release|x64 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|Win32.ActiveCfg = Debug|Win32 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|Win32.Build.0 = Debug|Win32 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|x64.ActiveCfg = Debug|x64 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|x64.Build.0 = Debug|x64 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|Win32.ActiveCfg = Release|Win32 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|Win32.Build.0 = Release|Win32 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|x64.ActiveCfg = Release|x64 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|x64.Build.0 = Release|x64 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/build/win32/vs9/gobject-introspection.sln b/build/win32/vs9/gobject-introspection.sln new file mode 100644 index 00000000..7f129c47 --- /dev/null +++ b/build/win32/vs9/gobject-introspection.sln @@ -0,0 +1,239 @@ + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph", "cmph.vcproj", "{442C007E-D901-41DA-9706-5DB4AFB4C06B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph-bdz-test", "cmph-bdz-test.vcproj", "{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}" + ProjectSection(ProjectDependencies) = postProject + {442C007E-D901-41DA-9706-5DB4AFB4C06B} = {442C007E-D901-41DA-9706-5DB4AFB4C06B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "girepository", "girepository.vcproj", "{23E28245-8FC7-4B41-B1C5-8785BD4366A7}" + ProjectSection(ProjectDependencies) = postProject + {442C007E-D901-41DA-9706-5DB4AFB4C06B} = {442C007E-D901-41DA-9706-5DB4AFB4C06B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_giscanner", "_giscanner.vcproj", "{8311394F-9114-4C97-80F2-51BCABA054C9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-print", "glib-print.vcproj", "{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}" + ProjectSection(ProjectDependencies) = postProject + {23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-generate", "g-ir-generate.vcproj", "{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}" + ProjectSection(ProjectDependencies) = postProject + {23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-compiler", "g-ir-compiler.vcproj", "{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}" + ProjectSection(ProjectDependencies) = postProject + {23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7} + {442C007E-D901-41DA-9706-5DB4AFB4C06B} = {442C007E-D901-41DA-9706-5DB4AFB4C06B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gimarshallingtests", "gimarshallingtests.vcproj", "{E2F8D205-0A53-4D40-9169-CE1EF2AAF203}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regress", "regress.vcproj", "{0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utility", "utility.vcproj", "{A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "annotation", "annotation.vcproj", "{A70C7D31-0019-45D9-9537-BB1DB5F31886}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "foo", "foo.vcproj", "{CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}" + ProjectSection(ProjectDependencies) = postProject + {23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testinherit", "testinherit.vcproj", "{3F2C9F08-7FB7-4465-BF24-84E083EC4913}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gettype", "gettype.vcproj", "{F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkfrob", "gtkfrob.vcproj", "{95C833D3-6EC2-493D-969A-6082E5495F66}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sletter", "sletter.vcproj", "{86A35E44-E4C8-4628-87E9-942D136D72BC}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "everything", "everything.vcproj", "{2986281A-BD41-4BD1-8B43-25B7D7E7F234}" + ProjectSection(ProjectDependencies) = postProject + {8311394F-9114-4C97-80F2-51BCABA054C9} = {8311394F-9114-4C97-80F2-51BCABA054C9} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate_typelibs", "generate_typelibs.vcproj", "{BE771349-F11E-42AE-A23F-DA083FDC6FB8}" + ProjectSection(ProjectDependencies) = postProject + {8311394F-9114-4C97-80F2-51BCABA054C9} = {8311394F-9114-4C97-80F2-51BCABA054C9} + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774} = {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}" + ProjectSection(ProjectDependencies) = postProject + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3} = {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3} + {23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7} + {BE771349-F11E-42AE-A23F-DA083FDC6FB8} = {BE771349-F11E-42AE-A23F-DA083FDC6FB8} + {8311394F-9114-4C97-80F2-51BCABA054C9} = {8311394F-9114-4C97-80F2-51BCABA054C9} + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774} = {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.ActiveCfg = Debug|Win32 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.Build.0 = Debug|Win32 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.ActiveCfg = Debug|x64 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.Build.0 = Debug|x64 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.ActiveCfg = Release|Win32 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.Build.0 = Release|Win32 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.ActiveCfg = Release|x64 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.Build.0 = Release|x64 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.ActiveCfg = Debug|Win32 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.Build.0 = Debug|Win32 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.ActiveCfg = Debug|x64 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.Build.0 = Debug|x64 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.ActiveCfg = Release|Win32 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.Build.0 = Release|Win32 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.ActiveCfg = Release|x64 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.Build.0 = Release|x64 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.ActiveCfg = Debug|Win32 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.Build.0 = Debug|Win32 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.ActiveCfg = Debug|x64 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.Build.0 = Debug|x64 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.ActiveCfg = Release|Win32 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.Build.0 = Release|Win32 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.ActiveCfg = Release|x64 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.Build.0 = Release|x64 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.ActiveCfg = Debug|Win32 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.Build.0 = Debug|Win32 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.ActiveCfg = Debug|x64 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.Build.0 = Debug|x64 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.ActiveCfg = Release|Win32 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.Build.0 = Release|Win32 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.ActiveCfg = Release|x64 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.Build.0 = Release|x64 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.ActiveCfg = Debug|Win32 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.Build.0 = Debug|Win32 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.ActiveCfg = Debug|x64 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.Build.0 = Debug|x64 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.ActiveCfg = Release|Win32 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.Build.0 = Release|Win32 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.ActiveCfg = Release|x64 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.Build.0 = Release|x64 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.ActiveCfg = Debug|Win32 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.Build.0 = Debug|Win32 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.ActiveCfg = Debug|x64 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.Build.0 = Debug|x64 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.ActiveCfg = Release|Win32 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.Build.0 = Release|Win32 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.ActiveCfg = Release|x64 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.Build.0 = Release|x64 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.ActiveCfg = Debug|Win32 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.Build.0 = Debug|Win32 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.ActiveCfg = Debug|x64 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.Build.0 = Debug|x64 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.ActiveCfg = Release|Win32 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.Build.0 = Release|Win32 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.ActiveCfg = Release|x64 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.Build.0 = Release|x64 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|Win32.ActiveCfg = Debug|Win32 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|Win32.Build.0 = Debug|Win32 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|x64.ActiveCfg = Debug|x64 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|x64.Build.0 = Debug|x64 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|Win32.ActiveCfg = Release|Win32 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|Win32.Build.0 = Release|Win32 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|x64.ActiveCfg = Release|x64 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|x64.Build.0 = Release|x64 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|Win32.ActiveCfg = Debug|Win32 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|Win32.Build.0 = Debug|Win32 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|x64.ActiveCfg = Debug|x64 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|x64.Build.0 = Debug|x64 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|Win32.ActiveCfg = Release|Win32 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|Win32.Build.0 = Release|Win32 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|x64.ActiveCfg = Release|x64 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|x64.Build.0 = Release|x64 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|Win32.Build.0 = Debug|Win32 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|x64.ActiveCfg = Debug|x64 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|x64.Build.0 = Debug|x64 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|Win32.ActiveCfg = Release|Win32 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|Win32.Build.0 = Release|Win32 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|x64.ActiveCfg = Release|x64 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|x64.Build.0 = Release|x64 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|Win32.ActiveCfg = Debug|Win32 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|Win32.Build.0 = Debug|Win32 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|x64.ActiveCfg = Debug|x64 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|x64.Build.0 = Debug|x64 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|Win32.ActiveCfg = Release|Win32 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|Win32.Build.0 = Release|Win32 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|x64.ActiveCfg = Release|x64 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|x64.Build.0 = Release|x64 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|Win32.ActiveCfg = Debug|Win32 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|Win32.Build.0 = Debug|Win32 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|x64.ActiveCfg = Debug|x64 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|x64.Build.0 = Debug|x64 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|Win32.ActiveCfg = Release|Win32 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|Win32.Build.0 = Release|Win32 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|x64.ActiveCfg = Release|x64 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|x64.Build.0 = Release|x64 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|Win32.ActiveCfg = Debug|Win32 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|Win32.Build.0 = Debug|Win32 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|x64.ActiveCfg = Debug|x64 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|x64.Build.0 = Debug|x64 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|Win32.ActiveCfg = Release|Win32 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|Win32.Build.0 = Release|Win32 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|x64.ActiveCfg = Release|x64 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|x64.Build.0 = Release|x64 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|Win32.ActiveCfg = Debug|Win32 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|Win32.Build.0 = Debug|Win32 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|x64.ActiveCfg = Debug|x64 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|x64.Build.0 = Debug|x64 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|Win32.ActiveCfg = Release|Win32 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|Win32.Build.0 = Release|Win32 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|x64.ActiveCfg = Release|x64 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|x64.Build.0 = Release|x64 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|Win32.ActiveCfg = Debug|Win32 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|Win32.Build.0 = Debug|Win32 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|x64.ActiveCfg = Debug|x64 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|x64.Build.0 = Debug|x64 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|Win32.ActiveCfg = Release|Win32 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|Win32.Build.0 = Release|Win32 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|x64.ActiveCfg = Release|x64 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|x64.Build.0 = Release|x64 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|Win32.ActiveCfg = Debug|Win32 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|Win32.Build.0 = Debug|Win32 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|x64.ActiveCfg = Debug|x64 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|x64.Build.0 = Debug|x64 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|Win32.ActiveCfg = Release|Win32 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|Win32.Build.0 = Release|Win32 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|x64.ActiveCfg = Release|x64 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|x64.Build.0 = Release|x64 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|Win32.ActiveCfg = Debug|Win32 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|Win32.Build.0 = Debug|Win32 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|x64.ActiveCfg = Debug|x64 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|x64.Build.0 = Debug|x64 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|Win32.ActiveCfg = Release|Win32 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|Win32.Build.0 = Release|Win32 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|x64.ActiveCfg = Release|x64 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|x64.Build.0 = Release|x64 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|Win32.ActiveCfg = Debug|Win32 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|Win32.Build.0 = Debug|Win32 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|x64.ActiveCfg = Debug|x64 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|x64.Build.0 = Debug|x64 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|Win32.ActiveCfg = Release|Win32 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|Win32.Build.0 = Release|Win32 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|x64.ActiveCfg = Release|x64 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|x64.Build.0 = Release|x64 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal -- cgit v1.2.1 From 75b61c34fad2a907becb2ab6367e6b9571091c64 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 14 Aug 2012 16:17:31 +0800 Subject: Update autotools for Visual C++ projects creation -Add Makefile-msvcproj.am to fill in the cmph, girepository and g-ir-compiler projects -Add various Makefile.am's under build/ to distribute the Visual C++-related files. https://bugzilla.gnome.org/show_bug.cgi?id=681820 --- Makefile-msvcproj.am | 176 +++++++++++++++++++++++++++++++++++++++++++ Makefile.am | 3 +- build/Makefile.am | 1 + build/win32/Makefile.am | 15 ++++ build/win32/vs10/Makefile.am | 47 ++++++++++++ build/win32/vs9/Makefile.am | 30 ++++++++ configure.ac | 7 +- 7 files changed, 277 insertions(+), 2 deletions(-) create mode 100644 Makefile-msvcproj.am create mode 100644 build/Makefile.am create mode 100644 build/win32/Makefile.am create mode 100644 build/win32/vs10/Makefile.am create mode 100644 build/win32/vs9/Makefile.am diff --git a/Makefile-msvcproj.am b/Makefile-msvcproj.am new file mode 100644 index 00000000..ccc7faf5 --- /dev/null +++ b/Makefile-msvcproj.am @@ -0,0 +1,176 @@ +# This is to fill in Visual C++ projects for projects which add/remove +# sources from them every now and then. + +# -------------------------- +# cmph (static lib) projects +# -------------------------- +./build/win32/vs9/cmph.vcproj: $(top_srcdir)/build/win32/vs9/cmph.vcprojin + for F in `echo $(libcmph_la_SOURCES) | tr '/' '\\'`; do \ + case $$F in \ + *.c) echo ' ' \ + ;; \ + esac; \ + done >cmph.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs9/cmph.vcprojin >$@ + rm cmph.sourcefiles + +./build/win32/vs10/cmph.vcxproj: $(top_srcdir)/build/win32/vs10/cmph.vcxprojin + for F in `echo $(libcmph_la_SOURCES) | tr '/' '\\'`; do \ + case $$F in \ + *.c) echo ' ' \ + ;; \ + esac; \ + done >cmph.vs10.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/cmph.vcxprojin >$@ + rm cmph.vs10.sourcefiles + +./build/win32/vs10/cmph.vcxproj.filters: $(top_srcdir)/build/win32/vs10/cmph.vcxproj.filtersin + for F in `echo $(libcmph_la_SOURCES) | tr '/' '\\'`; do \ + case $$F in \ + *.c) echo ' Sources' \ + ;; \ + esac; \ + done >cmph.vs10.sourcefiles.filters + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/cmph.vcxproj.filtersin >$@ + rm cmph.vs10.sourcefiles.filters + +# ------------------------- +# girepository DLL projects +# ------------------------- +./build/win32/vs9/girepository.vcproj: $(top_srcdir)/build/win32/vs9/girepository.vcprojin ./build/win32/vs9/gir.vs9.install + for F in `echo $(libgirepository_1_0_la_SOURCES) $(libgirepository_gthash_la_SOURCES) | tr '/' '\\'`; do \ + case $$F in \ + *.c) echo ' ' \ + ;; \ + esac; \ + done >girepository.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs9/girepository.vcprojin >$@ + rm girepository.sourcefiles + +./build/win32/vs10/girepository.vcxproj: $(top_srcdir)/build/win32/vs10/girepository.vcxprojin ./build/win32/vs10/gir.vs10.install + for F in `echo $(libgirepository_1_0_la_SOURCES) $(libgirepository_gthash_la_SOURCES) | tr '/' '\\'`; do \ + case $$F in \ + *.c) echo ' ' \ + ;; \ + esac; \ + done >girepository.vs10.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/girepository.vcxprojin >$@ + rm girepository.vs10.sourcefiles + +./build/win32/vs10/girepository.vcxproj.filters: $(top_srcdir)/build/win32/vs10/girepository.vcxproj.filtersin + for F in `echo $(libgirepository_1_0_la_SOURCES) $(libgirepository_gthash_la_SOURCES) | tr '/' '\\'`; do \ + case $$F in \ + *.c) echo ' Sources' \ + ;; \ + esac; \ + done >girepository.vs10.sourcefiles.filters + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/girepository.vcxproj.filtersin >$@ + rm girepository.vs10.sourcefiles.filters + +# ------------------------------------ +# g-ir-compiler.exe projects +# (We integrate the +# libgirepository_internals_la_SOURCES +# and +# libgirepository_gthash_la_SOURCES +# here) +# ------------------------------------ +./build/win32/vs9/g-ir-compiler.vcproj: $(top_srcdir)/build/win32/vs9/g-ir-compiler.vcprojin + for F in `echo $(libgirepository_gthash_la_SOURCES) $(libgirepository_internals_la_SOURCES) | tr '/' '\\'`; do \ + case $$F in \ + *.c) echo ' ' \ + ;; \ + esac; \ + done >g-ir-compiler.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs9/g-ir-compiler.vcprojin >$@ + rm g-ir-compiler.sourcefiles + +./build/win32/vs10/g-ir-compiler.vcxproj: $(top_srcdir)/build/win32/vs10/g-ir-compiler.vcxprojin + for F in `echo $(libgirepository_gthash_la_SOURCES) $(libgirepository_internals_la_SOURCES) | tr '/' '\\'`; do \ + case $$F in \ + *.c) echo ' ' \ + ;; \ + esac; \ + done >g-ir-compiler.vs10.sourcefiles + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/g-ir-compiler.vcxprojin >$@ + rm g-ir-compiler.vs10.sourcefiles + +./build/win32/vs10/g-ir-compiler.vcxproj.filters: $(top_srcdir)/build/win32/vs10/g-ir-compiler.vcxproj.filtersin + for F in `echo $(libgirepository_gthash_la_SOURCES) $(libgirepository_internals_la_SOURCES) | tr '/' '\\'`; do \ + case $$F in \ + *.c) echo ' Sources' \ + ;; \ + esac; \ + done >g-ir-compiler.vs10.sourcefiles.filters + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/g-ir-compiler.vcxproj.filtersin >$@ + rm g-ir-compiler.vs10.sourcefiles.filters + +#-------------------------------- +# Generate the "lists" of headers +# and Python scripts to install +#-------------------------------- +./build/win32/vs9/gir.vs9.install: + echo 'mkdir $$(CopyDir)\include\gobject-introspection-$$(GIApiVersion)\girepository ' >./build/win32/vs9/gir.vs9.install + echo '' >>./build/win32/vs9/gir.vs9.install + for F in `echo $(girepo_HEADERS) | tr '/' '\\'`; do \ + case $$F in \ + *.h) echo 'copy ..\..\..\'$$F' $$(CopyDir)\include\gobject-introspection-$$(GIApiVersion)\girepository ' \ + ;; \ + esac; \ + done >>./build/win32/vs9/gir.vs9.install + echo '' >>./build/win32/vs9/gir.vs9.install + echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner ' >>./build/win32/vs9/gir.vs9.install + echo '' >>./build/win32/vs9/gir.vs9.install + for F in `echo $(pkgpyexec_PYTHON) | tr '/' '\\'`; do \ + case $$F in \ + *.py|*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner ' \ + ;; \ + esac; \ + done >>./build/win32/vs9/gir.vs9.install + +./build/win32/vs10/gir.vs10.install: + echo 'mkdir $$(CopyDir)\include\gobject-introspection-$$(GIApiVersion)\girepository' >./build/win32/vs10/gir.vs10.install + echo '' >>./build/win32/vs10/gir.vs10.install + for F in `echo $(girepo_HEADERS) | tr '/' '\\'`; do \ + case $$F in \ + *.h) echo 'copy ..\..\..\'$$F' $$(CopyDir)\include\gobject-introspection-$$(GIApiVersion)\girepository' && \ + echo '' \ + ;; \ + esac; \ + done >>./build/win32/vs10/gir.vs10.install + echo '' >>./build/win32/vs10/gir.vs10.install + echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner' >>./build/win32/vs10/gir.vs10.install + echo '' >>./build/win32/vs10/gir.vs10.install + for F in `echo $(pkgpyexec_PYTHON) | tr '/' '\\'`; do \ + case $$F in \ + *.py|*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner' && \ + echo '' \ + ;; \ + esac; \ + done >>./build/win32/vs10/gir.vs10.install + +./build/win32/vs9/gir.vsprops: ./build/win32/vs9/gir.vs9.install $(top_srcdir)/build/win32/vs9/gir.vspropsin + $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gir.vspropsin >$@ + rm ./build/win32/vs9/gir.vs9.install + +./build/win32/vs10/gir.props: ./build/win32/vs10/gir.vs10.install $(top_srcdir)/build/win32/vs10/gir.propsin + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gir.propsin >$@ + rm ./build/win32/vs10/gir.vs10.install + +GENERATED_MSVC_FILES = \ + ./build/win32/vs9/girepository.vcproj \ + ./build/win32/vs10/girepository.vcxproj \ + ./build/win32/vs10/girepository.vcxproj.filters \ + ./build/win32/vs9/g-ir-compiler.vcproj \ + ./build/win32/vs10/g-ir-compiler.vcxproj \ + ./build/win32/vs10/g-ir-compiler.vcxproj.filters \ + ./build/win32/vs9/cmph.vcproj \ + ./build/win32/vs10/cmph.vcxproj \ + ./build/win32/vs10/cmph.vcxproj.filters \ + config.h.win32 + +EXTRA_DIST += \ + ./girepository/girepository.symbols \ + $(GENERATED_MSVC_FILES) + +CLEANFILES += $(GENERATED_MSVC_FILES) diff --git a/Makefile.am b/Makefile.am index a36c200a..2059b989 100644 --- a/Makefile.am +++ b/Makefile.am @@ -21,11 +21,12 @@ include Makefile-giscanner.am include Makefile-examples.am include Makefile-gir.am include Makefile-tools.am +include Makefile-msvcproj.am ## Process this file with automake to produce Makefile.in ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} -SUBDIRS = . docs tests +SUBDIRS = . docs tests build DIST_SUBDIRS = m4 $(SUBDIRS) DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc diff --git a/build/Makefile.am b/build/Makefile.am new file mode 100644 index 00000000..0f81afe3 --- /dev/null +++ b/build/Makefile.am @@ -0,0 +1 @@ +SUBDIRS = win32 diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am new file mode 100644 index 00000000..499c5cff --- /dev/null +++ b/build/win32/Makefile.am @@ -0,0 +1,15 @@ +SUBDIRS = vs9 vs10 + +EXTRA_DIST = \ + annotation.def \ + everything.def \ + foo.def \ + gengir.bat \ + gettype.def \ + gimarshallingtests.def \ + gtkfrob.def \ + Regress.def \ + sletter.def \ + testinherit.def \ + test_gir_cmd.txt \ + utility.def diff --git a/build/win32/vs10/Makefile.am b/build/win32/vs10/Makefile.am new file mode 100644 index 00000000..0046bc44 --- /dev/null +++ b/build/win32/vs10/Makefile.am @@ -0,0 +1,47 @@ +EXTRA_DIST = \ + gobject-introspection.sln \ + girepository.vcxprojin \ + girepository.vcxproj.filtersin \ + gir.propsin \ + gir.props \ + annotation.vcxproj \ + annotation.vcxproj.filters \ + cmph-bdz-test.vcxproj \ + cmph-bdz-test.vcxproj.filters \ + cmph.vcxprojin \ + cmph.vcxproj.filtersin \ + everything.vcxproj \ + everything.vcxproj.filters \ + foo.vcxproj \ + foo.vcxproj.filters \ + g-ir-compiler.vcxprojin \ + g-ir-compiler.vcxproj.filtersin \ + g-ir-generate.vcxproj \ + g-ir-generate.vcxproj.filters \ + gettype.vcxproj \ + gettype.vcxproj.filters \ + gimarshallingtests.vcxproj \ + gimarshallingtests.vcxproj.filters \ + glib-print.vcxproj \ + glib-print.vcxproj.filters \ + gtkfrob.vcxproj \ + gtkfrob.vcxproj.filters \ + regress.vcxproj \ + regress.vcxproj.filters \ + sletter.vcxproj \ + sletter.vcxproj.filters \ + testinherit.vcxproj \ + testinherit.vcxproj.filters \ + utility.vcxproj \ + utility.vcxproj.filters \ + _giscanner.vcxproj \ + _giscanner.vcxproj.filters \ + generate_typelibs.vcxproj \ + install.vcxproj \ + README.txt + +gir.props: $(top_srcdir)/build/win32/vs10/gir.propsin gir.vs10.install + $(CPP) -P - <$(top_srcdir)/build/win32/vs10/gir.propsin >$@ + rm gir.vs10.install + +CLEANFILES = gir.props diff --git a/build/win32/vs9/Makefile.am b/build/win32/vs9/Makefile.am new file mode 100644 index 00000000..ed82cbca --- /dev/null +++ b/build/win32/vs9/Makefile.am @@ -0,0 +1,30 @@ +EXTRA_DIST = \ + gobject-introspection.sln \ + girepository.vcprojin \ + gir.vspropsin \ + gir.vsprops \ + annotation.vcproj \ + cmph-bdz-test.vcproj \ + cmph.vcprojin \ + everything.vcproj \ + foo.vcproj \ + g-ir-compiler.vcprojin \ + g-ir-generate.vcproj \ + generate_typelibs.vcproj \ + gettype.vcproj \ + gimarshallingtests.vcproj \ + glib-print.vcproj \ + gtkfrob.vcproj \ + install.vcproj \ + regress.vcproj \ + sletter.vcproj \ + testinherit.vcproj \ + utility.vcproj \ + _giscanner.vcproj \ + README.txt + +gir.vsprops: $(top_srcdir)/build/win32/vs9/gir.vspropsin gir.vs9.install + $(CPP) -P - <$(top_srcdir)/build/win32/vs9/gir.vspropsin >$@ + rm gir.vs9.install + +CLEANFILES = gir.vsprops diff --git a/configure.ac b/configure.ac index e488cea9..ca783155 100644 --- a/configure.ac +++ b/configure.ac @@ -300,7 +300,12 @@ tests/doctool/Makefile docs/Makefile docs/reference/Makefile gobject-introspection-1.0.pc -gobject-introspection-no-export-1.0.pc]) +gobject-introspection-no-export-1.0.pc +config.h.win32 +build/Makefile +build/win32/Makefile +build/win32/vs9/Makefile +build/win32/vs10/Makefile]) AC_OUTPUT echo " -- cgit v1.2.1 From 36687f4836b90c4c7b9616a541cd07c805e4ac4f Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 27 Aug 2012 18:31:33 +0800 Subject: giscanner/dumper.py: Support Visual C++ -Pass the --msvc-syntax flag to pkg-config when Visual C++ is used. -Use .obj instead of .o filename extension when running on Visual C++, as that is the default object file name extension on visual C++. -Specify compiler output flags for Visual C++. -Avoid using -Wl and -rpath on Visual C++, and link to .lib files instead when generating a .gir file within the package. -Avoid unecessary linking under Visual C++ to the .dll files since we already linked to the corresponding .lib files. https://bugzilla.gnome.org/show_bug.cgi?id=681820 --- giscanner/dumper.py | 94 ++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 72 insertions(+), 22 deletions(-) diff --git a/giscanner/dumper.py b/giscanner/dumper.py index 04c1f620..24ab3ce1 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py @@ -85,7 +85,12 @@ class DumpCompiler(object): self._compiler_cmd = os.environ.get('CC', 'gcc') self._linker_cmd = os.environ.get('CC', self._compiler_cmd) self._pkgconfig_cmd = os.environ.get('PKG_CONFIG', 'pkg-config') - + self._pkgconfig_msvc_flags = '' + # Enable the --msvc-syntax pkg-config flag when + # the Microsoft compiler is used + # (This is the other way to check whether Visual C++ is used subsequently) + if 'cl' in self._compiler_cmd: + self._pkgconfig_msvc_flags = '--msvc-syntax' self._uninst_srcdir = os.environ.get( 'UNINSTALLED_INTROSPECTION_SRCDIR') self._packages = ['gio-2.0 gmodule-2.0'] @@ -145,7 +150,12 @@ class DumpCompiler(object): f.write("\n};\n") f.close() - o_path = self._generate_tempfile(tmpdir, '.o') + # Microsoft compilers generate intermediate .obj files + # during compilation, unlike .o files like GCC and others + if self._pkgconfig_msvc_flags: + o_path = self._generate_tempfile(tmpdir, '.obj') + else: + o_path = self._generate_tempfile(tmpdir, '.o') if os.name == 'nt': ext = 'exe' @@ -178,8 +188,14 @@ class DumpCompiler(object): return os.path.join(tmpdir, tmpl) def _run_pkgconfig(self, flag): + # Enable the --msvc-syntax pkg-config flag when + # the Microsoft compiler is used + if self._pkgconfig_msvc_flags: + cmd = [self._pkgconfig_cmd, self._pkgconfig_msvc_flags, flag] + else: + cmd = [self._pkgconfig_cmd, flag] proc = subprocess.Popen( - [self._pkgconfig_cmd, flag] + self._packages, + cmd + self._packages, stdout=subprocess.PIPE) return proc.communicate()[0].split() @@ -197,7 +213,12 @@ class DumpCompiler(object): args.append(cflag) for include in self._options.cpp_includes: args.append('-I' + include) - args.extend(['-c', '-o', output]) + # The Microsoft compiler uses different option flags for + # compilation result output + if self._pkgconfig_msvc_flags: + args.extend(['-c', '-Fe'+output, '-Fo'+output]) + else: + args.extend(['-c', '-o', output]) for source in sources: if not os.path.exists(source): raise CompilerError( @@ -223,7 +244,12 @@ class DumpCompiler(object): args.append('--silent') args.extend(self._linker_cmd.split()) - args.extend(['-o', output]) + # We can use -o for the Microsoft compiler/linker, + # but it is considered deprecated usage with that + if self._pkgconfig_msvc_flags: + args.extend(['-Fe'+output]) + else: + args.extend(['-o', output]) if libtool: if os.name == 'nt': args.append('-export-all-symbols') @@ -266,26 +292,47 @@ class DumpCompiler(object): # is being built in the current directory. # Search the current directory first - args.append('-L.') + # (This flag is not supported nor needed for Visual C++) + if self._pkgconfig_msvc_flags == '': + args.append('-L.') # https://bugzilla.gnome.org/show_bug.cgi?id=625195 if not libtool: - args.append('-Wl,-rpath=.') + # We don't have -Wl,-rpath for Visual C++, and that's + # going to cause a problem. Instead, link to internal + # libraries by deducing the .lib file name using + # the namespace name and version + if self._pkgconfig_msvc_flags: + if self._options.namespace_version: + args.append(str.lower(self._options.namespace_name) + + '-' + + self._options.namespace_version+'.lib') + else: + args.append(str.lower(self._options.namespace_name)+'.lib') + else: + args.append('-Wl,-rpath=.') for library in self._options.libraries: - if library.endswith(".la"): # explicitly specified libtool library - args.append(library) - else: - args.append('-l' + library) + # Visual C++: We have the needed .lib files now, and we need to link + # to .lib files, not the .dll as the --library option specifies the + # .dll(s) the .gir file refers to + if self._pkgconfig_msvc_flags == '': + if library.endswith(".la"): # explicitly specified libtool library + args.append(library) + else: + args.append('-l' + library) for library_path in self._options.library_paths: - args.append('-L' + library_path) - if os.path.isabs(library_path): - if libtool: - args.append('-rpath') - args.append(library_path) - else: - args.append('-Wl,-rpath=' + library_path) + # Not used/needed on Visual C++, and -Wl,-rpath options + # will cause grief + if self._pkgconfig_msvc_flags == '': + args.append('-L' + library_path) + if os.path.isabs(library_path): + if libtool: + args.append('-rpath') + args.append(library_path) + else: + args.append('-Wl,-rpath=' + library_path) args.extend(self._run_pkgconfig('--libs')) @@ -296,10 +343,13 @@ class DumpCompiler(object): args.extend(self._run_pkgconfig('--libs')) for library in self._options.libraries: - if library.endswith(".la"): # explicitly specified libtool library - args.append(library) - else: - args.append('-l' + library) + # The --library option on Windows pass in the .dll file(s) the + # .gir files refer to, so don't link to them on Visual C++ + if self._pkgconfig_msvc_flags == '': + if library.endswith(".la"): # explicitly specified libtool library + args.append(library) + else: + args.append('-l' + library) def compile_introspection_binary(options, get_type_functions, error_quark_functions): -- cgit v1.2.1 From 713bd78c989c752ac35f1040da99c6a2fa1b8acb Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 27 Aug 2012 18:32:42 +0800 Subject: Add a Windows .bat to generate typelibs This will enable one to generate the .gir and .typelib files for GLib, GModule, GObject, GIO and G-I without using a bash-style shell on Windows. This is also the .bat that is used during the Visual C++ build process to generate the .gir and .typelib files https://bugzilla.gnome.org/show_bug.cgi?id=681820 --- build/win32/gengir.bat | 267 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 267 insertions(+) create mode 100644 build/win32/gengir.bat diff --git a/build/win32/gengir.bat b/build/win32/gengir.bat new file mode 100644 index 00000000..ee61da3b --- /dev/null +++ b/build/win32/gengir.bat @@ -0,0 +1,267 @@ +@echo off + +setlocal EnableDelayedExpansion + +rem Needed environmental variables: +rem PLAT: Windows platform-Win32 (i.e. x86) or x64 (i.e. x86-64) +rem CONF: Configuration Type, Release or Debug +rem VSVER: Visual C++ version used + +rem Check the environemental variables... +if /i "%PLAT%" == "Win32" goto PLAT_OK +if /i "%PLAT%" == "x64" goto PLAT_OK +if /i "%PLAT%" == "x86" ( + set PLAT=Win32 + goto PLAT_OK +) +if /i "%PLAT%" == "x86-64" ( + set PLAT=x64 + goto PLAT_OK +) +goto ERR_PLAT +:PLAT_OK +if %VSVER% == 9 goto VSVER_OK +if %VSVER% == 10 goto VSVER_OK +if %VSVER% == 11 goto VSVER_OK +goto ERR_VSVER +:VSVER_OK +if /i "%CONF%" == "Release" goto CONF_OK +if /i "%CONF%" == "Debug" goto CONF_OK +goto ERR_CONF +:CONF_OK +if "%BASEDIR%" == "" goto ERR_BASEDIR +if not exist %BASEDIR% goto ERR_BASEDIR + + +set BINDIR=..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\bin +set PATH=%BINDIR%;%PATH% +set PYTHONPATH=..\..;%BINDIR% + +set UNINSTALLED_INTROSPECTION_SRCDIR=..\.. +echo Setup .bat for generating GLib .gir's... + +rem ===================================================== +rem Feed the "installed" GLib headers into a listing file +rem ===================================================== +echo %BASEDIR%\lib\glib-2.0\include\glibconfig.h> glib_list +for /f %%a in ('dir /b %BASEDIR%\include\glib-2.0\glib\*.h') do ( + echo %BASEDIR%\include\glib-2.0\glib\%%a>> glib_list +) +echo %BASEDIR%\include\glib-2.0\gobject\glib-types.h>> glib_list +echo ..\..\gir\glib-2.0.c>> glib_list + +rem ======================================================== +rem Feed the "installed" GObject headers into a listing file +rem ======================================================== + +if exist gobject_list del gobject_list +for /f %%a in ('dir /b %BASEDIR%\include\glib-2.0\gobject\*.h') do ( + if not %%a == glib-types.h ( + echo %BASEDIR%\include\glib-2.0\gobject\%%a>> gobject_list + ) +) +echo ..\..\gir\gobject-2.0.c>> gobject_list + +rem ===================================================== +rem Feed the "installed" Gio headers into a listing file +rem ===================================================== + +for /f %%a in ('dir /b %BASEDIR%\include\gio-win32-2.0\gio\*.h') do ( + echo %BASEDIR%\include\gio-win32-2.0\gio\%%a> gio_list +) + +for /f %%a in ('dir /b %BASEDIR%\include\glib-2.0\gio\*.h') do ( + if not %%a == gsettingsbackend.h ( + echo %BASEDIR%\include\glib-2.0\gio\%%a>> gio_list + ) +) +echo ..\..\gir\gio-2.0.c>> gio_list + +rem ================================================================================================= +rem Begin setup of glib_gir.bat to create GLib-2.0.gir +rem (The ^^ is necessary to span the command to multiple lines on Windows cmd.exe!) +rem ================================================================================================= + +echo echo Generating GLib-2.0.gir...> glib_gir.bat +echo @echo on>> glib_gir.bat +echo.>> glib_gir.bat +rem ================================================================ +rem Setup the command line flags to g-ir-scanner for GLib-2.0.gir... +rem ================================================================ +echo python ..\..\tools\g-ir-scanner --verbose -I..\.. --add-include-path=..\.. ^^>> glib_gir.bat +echo --add-include-path=..\..\gir --add-include-path=. --namespace=GLib --nsversion=2.0 ^^>> glib_gir.bat +echo --no-libtool --pkg=glib-2.0 --library=glib-2-vs%VSVER% --library=gobject-2-vs%VSVER% ^^>> glib_gir.bat +echo --external-library --reparse-validate --identifier-prefix=G --symbol-prefix=g ^^>> glib_gir.bat +echo --symbol-prefix=glib --c-include="glib.h" -I%BASEDIR%\include\glib-2.0 ^^>> glib_gir.bat +echo -I%BASEDIR%\lib\glib-2.0\include -I%BASEDIR%\include -DGETTEXT_PACKAGE=Dummy ^^>> glib_gir.bat +echo -DGLIB_COMPILATION -D__G_I18N_LIB_H__ ^^>> glib_gir.bat +echo --filelist=glib_list ^^>> glib_gir.bat +echo -o GLib-2.0.gir>> glib_gir.bat +echo.>> glib_gir.bat + +echo Completed setup of .bat for generating GLib-2.0.gir. +echo.>> glib_gir.bat + +rem =================================================== +rem Finish setup of glib_gir.bat to create GLib-2.0.gir +rem =================================================== + +rem ==================================================================== +rem Next, begin the setup for the glib_gir.bat to create GModule-2.0.gir +rem ==================================================================== +echo echo Generating GModule-2.0.gir...>> glib_gir.bat +echo.>> glib_gir.bat + +rem =================================================================== +rem Setup the command line flags to g-ir-scanner for GModule-2.0.gir... +rem =================================================================== + +echo python ..\..\tools\g-ir-scanner --verbose -I..\.. --add-include-path=..\.. ^^>> glib_gir.bat +echo --add-include-path=..\..\gir --add-include-path=. --namespace=GModule --nsversion=2.0 ^^>> glib_gir.bat +echo --no-libtool --include=GLib-2.0 --pkg=gmodule-2.0 --library=gmodule-2-vs%VSVER% ^^>> glib_gir.bat +echo --external-library --reparse-validate --identifier-prefix=G --c-include="gmodule.h" ^^>> glib_gir.bat +echo -I%BASEDIR%\include\glib-2.0 -I%BASEDIR%\lib\glib-2.0\include -I%BASEDIR%\include ^^>> glib_gir.bat +echo %BASEDIR%\include\glib-2.0\gmodule.h -o GModule-2.0.gir>> glib_gir.bat +echo.>> glib_gir.bat + +echo Completed setup of .bat for generating GModule-2.0.gir. +echo.>> glib_gir.bat + +rem ====================================================== +rem Finish setup of glib_gir.bat to create GModule-2.0.gir +rem ====================================================== + +rem ==================================================================== +rem Next, begin the setup for the glib_gir.bat to create GObject-2.0.gir +rem ==================================================================== + +echo echo Generating GObject-2.0.gir...>> glib_gir.bat +echo.>> glib_gir.bat + +rem =================================================================== +rem Setup the command line flags to g-ir-scanner for GObject-2.0.gir... +rem =================================================================== + +echo python ..\..\tools\g-ir-scanner --verbose -I..\.. --add-include-path=..\.. ^^>> glib_gir.bat +echo --add-include-path=..\..\gir --add-include-path=. --namespace=GObject --nsversion=2.0 ^^>> glib_gir.bat +echo --no-libtool --include=GLib-2.0 --pkg=gobject-2.0 --library=gobject-2-vs%VSVER% ^^>> glib_gir.bat +echo --external-library --reparse-validate --identifier-prefix=G --c-include="glib-gobject.h" ^^>> glib_gir.bat +echo -I%BASEDIR%/include/glib-2.0 -I%BASEDIR%/lib/glib-2.0/include -I%BASEDIR%/include ^^>> glib_gir.bat +echo -DGOBJECT_COMPILATION ^^>> glib_gir.bat +echo --filelist=gobject_list -o GObject-2.0.gir>> glib_gir.bat +echo.>> glib_gir.bat + +echo Completed setup of .bat for generating GObject-2.0.gir. +echo.>> glib_gir.bat +rem ====================================================== +rem Finish setup of glib_gir.bat to create GObject-2.0.gir +rem ====================================================== + +rem ================================================================ +rem Next, begin the setup for the glib_gir.bat to create Gio-2.0.gir +rem ================================================================ +echo echo Generating Gio-2.0.gir...>> glib_gir.bat +echo.>> glib_gir.bat + +rem =============================================================== +rem Setup the command line flags to g-ir-scanner for Gio-2.0.gir... +rem =============================================================== +echo python ..\..\tools\g-ir-scanner --verbose -I..\.. --add-include-path=..\.. ^^>> glib_gir.bat +echo --add-include-path=..\..\gir --add-include-path=. --namespace=Gio --nsversion=2.0 ^^>> glib_gir.bat +echo --no-libtool --pkg=gio-2.0 --pkg=gio-windows-2.0 --include=GObject-2.0 ^^>> glib_gir.bat +echo --library=gio-2-vs%VSVER% --external-library --reparse-validate --warn-all ^^>> glib_gir.bat +echo --identifier-prefix=G --include=GLib-2.0 --c-include="gio/gio.h" -DGIO_COMPILATION ^^>> glib_gir.bat +echo -I%BASEDIR%\include\glib-2.0 -I%BASEDIR%\lib\glib-2.0\include ^^>> glib_gir.bat +echo -I%BASEDIR%\include ^^>> glib_gir.bat +echo --filelist=gio_list ^^>> glib_gir.bat +echo -o Gio-2.0.gir>> glib_gir.bat +echo.>> glib_gir.bat + +echo Completed setup of .bat for generating Gio-2.0.gir. +echo.>> glib_gir.bat +rem ================================================== +rem Finish setup of glib_gir.bat to create Gio-2.0.gir +rem ================================================== + +rem ========================================================================= +rem Next, begin the setup for the glib_gir.bat to create GIRepository-2.0.gir +rem ========================================================================= +copy /b %BINDIR%\girepository-1.0.lib %BINDIR%\girepository-2.0.lib +echo echo Generating GIRepository-2.0.gir...>> glib_gir.bat +echo.>> glib_gir.bat + +rem ======================================================================== +rem Setup the command line flags to g-ir-scanner for GIRepository-2.0.gir... +rem ======================================================================== +echo python ..\..\tools\g-ir-scanner --verbose --warn-all ^^>> glib_gir.bat +echo --add-include-path=..\..\gir --add-include-path=. --namespace=GIRepository --nsversion=2.0 ^^>> glib_gir.bat +echo --identifier-prefix=GI --symbol-prefix=g --c-include="girepository.h" --add-include-path=. ^^>> glib_gir.bat +echo --no-libtool --pkg=gobject-2.0 --include=GObject-2.0 ^^>> glib_gir.bat +echo --library=girepository-1-vs%VSVER% -I..\..\girepository -I..\.. -I%BASEDIR%\include ^^>> glib_gir.bat +echo -I%BASEDIR%\include\glib-2.0 -I%BASEDIR%\lib\glib-2.0\include -DGI_COMPILATION ^^>> glib_gir.bat +echo ..\..\girepository\girepository.h ^^>> glib_gir.bat +echo ..\..\girepository\girepository.c ^^>> glib_gir.bat + +for /f %%a in ('dir /b ..\..\girepository\gi*info.c') do ( + echo ..\..\girepository\%%a ^^>> glib_gir.bat +) + +for /f %%a in ('dir /b ..\..\girepository\gi*info.h') do ( + echo ..\..\girepository\%%a ^^>> glib_gir.bat +) + +echo ..\..\girepository\gitypelib.h ^^>> glib_gir.bat +echo ..\..\girepository\gitypes.h ^^>> glib_gir.bat +echo -o GIRepository-2.0.gir>> glib_gir.bat +echo.>> glib_gir.bat + +echo Completed setup of .bat for generating GIRepository-2.0.gir. +echo.>> glib_gir.bat +rem =========================================================== +rem Finish setup of glib_gir.bat to create GIRepository-2.0.gir +rem =========================================================== + +rem ======================= +rem Now generate the .gir's +rem ======================= +CALL glib_gir.bat + +@echo off +rem ======= +rem Cleanup +rem ======= +rem del %BINDIR%\girepository-2.0.lib +del gio_list +del gobject_list +del glib_list +del glib_gir.bat +goto DO_COMPILE_GIR +:ERR_PLAT +echo You need to specify a valid Platform [set PLAT=Win32 or PLAT=x64] +goto DONE +:ERR_VSVER +echo You need to specify your Visual Studio version [set VSVER=9 or VSVER=10 or VSVER=11] +goto DONE +:ERR_CONF +echo You need to specify a valid Configuration [set CONF=Release or CONF=Debug] +goto DONE +:ERR_BASEDIR +echo You need to specify a valid BASEDIR. +goto DONE +:DO_COMPILE_GIR +rem Now compile the generated .gir files +g-ir-compiler --includedir=. --debug --verbose GLib-2.0.gir -o GLib-2.0.typelib +g-ir-compiler --includedir=. --debug --verbose GModule-2.0.gir -o GModule-2.0.typelib +g-ir-compiler --includedir=. --debug --verbose GObject-2.0.gir -o GObject-2.0.typelib +g-ir-compiler --includedir=. --debug --verbose Gio-2.0.gir -o Gio-2.0.typelib +g-ir-compiler --includedir=. --debug --verbose GIRepository-2.0.gir -o GIRepository-2.0.typelib + +rem Copy the generated .girs and .typelibs to their appropriate places + +mkdir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\share\gir-1.0 +move /y *.gir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\share\gir-1.0\ + +mkdir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\lib\girepository-1.0 +move /y *.typelib ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\lib\girepository-1.0\ +:DONE + -- cgit v1.2.1 From fed09d0b46fb580bf80c267f280ff9b6a5ce5122 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 27 Oct 2012 12:23:56 -0400 Subject: g-ir-scanner.1: English fix --- docs/g-ir-scanner.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/g-ir-scanner.1 b/docs/g-ir-scanner.1 index 23773695..a3726f5c 100644 --- a/docs/g-ir-scanner.1 +++ b/docs/g-ir-scanner.1 @@ -131,7 +131,7 @@ Be verbose, include some debugging information. .TP .SH ENVIRONMENT VARIABLES The g-ir-scanner uses the XDG_DATA_DIRS variable to check for dirs, -the gir's are located in XDG_DATA_DIRS/gir-1.0. It is normally +the girs are located in XDG_DATA_DIRS/gir-1.0. It is normally set on a distribution so you shouldn't need to set it yourself. The variable GI_SCANNER_DISABLE_CACHE ensures that the scanner will -- cgit v1.2.1 From 3ee1c9f984a71903a8eeef693c6c187291f25a0b Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 27 Oct 2012 12:24:12 -0400 Subject: girepository: Use girepository.symbols for Unix builds too Rather than having a regex for both builds, but *also* use a symbol file for the MSVC build which would bitrot quickly, force us to update the .symbols file by using it for Unix too. Add some missing symbols. --- Makefile-girepository.am | 2 +- girepository/girepository.symbols | 39 ++------------------------------------- 2 files changed, 3 insertions(+), 38 deletions(-) diff --git a/Makefile-girepository.am b/Makefile-girepository.am index 2c07b3ab..eb55a548 100644 --- a/Makefile-girepository.am +++ b/Makefile-girepository.am @@ -72,7 +72,7 @@ libgirepository_1_0_la_SOURCES = \ libgirepository_1_0_la_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository -DG_IREPOSITORY_COMPILATION libgirepository_1_0_la_LIBADD = libgirepository-gthash.la $(GIREPO_LIBS) -libgirepository_1_0_la_LDFLAGS = -no-undefined -version-number 1:0:0 -export-symbols-regex '^gi?_' +libgirepository_1_0_la_LDFLAGS = -no-undefined -version-number 1:0:0 -export-symbols $(srcdir)/girepository/girepository.symbols gdumpdir = $(datadir)/gobject-introspection-1.0/ gdump_DATA = girepository/gdump.c diff --git a/girepository/girepository.symbols b/girepository/girepository.symbols index c6dd1034..11d2bb6d 100644 --- a/girepository/girepository.symbols +++ b/girepository/girepository.symbols @@ -1,4 +1,3 @@ -/* giarginfo.h */ g_arg_info_get_closure g_arg_info_get_destroy g_arg_info_get_direction @@ -11,8 +10,6 @@ g_arg_info_is_return_value g_arg_info_is_skip g_arg_info_load_type g_arg_info_may_be_null - -/* gibaseinfo.h */ g_base_info_equal g_base_info_get_attribute g_base_info_get_container @@ -26,8 +23,7 @@ g_base_info_iterate_attributes g_base_info_ref g_base_info_unref g_info_new - -/* gicallableinfo.h */ +g_callable_info_can_throw_gerror g_callable_info_get_arg g_callable_info_get_caller_owns g_callable_info_get_n_args @@ -35,17 +31,14 @@ g_callable_info_get_return_attribute g_callable_info_get_return_type g_callable_info_invoke g_callable_info_iterate_return_attributes +g_callable_info_is_method g_callable_info_load_arg g_callable_info_load_return_type g_callable_info_may_return_null g_callable_info_skip_return - -/* giconstantinfo.h */ g_constant_info_free_value g_constant_info_get_type g_constant_info_get_value - -/* gienuminfo.h */ g_enum_info_get_error_domain g_enum_info_get_method g_enum_info_get_n_methods @@ -53,24 +46,18 @@ g_enum_info_get_n_values g_enum_info_get_storage_type g_enum_info_get_value g_value_info_get_value - -/* gifieldinfo.h */ g_field_info_get_field g_field_info_get_flags g_field_info_get_offset g_field_info_get_size g_field_info_get_type g_field_info_set_field - -/* gifunctioninfo.h */ g_function_info_get_flags g_function_info_get_property g_function_info_get_symbol g_function_info_get_vfunc g_function_info_invoke g_invoke_error_quark - -/* giinterfaceinfo.h */ g_interface_info_find_method g_interface_info_find_vfunc g_interface_info_get_constant @@ -86,8 +73,6 @@ g_interface_info_get_n_vfuncs g_interface_info_get_property g_interface_info_get_signal g_interface_info_get_vfunc - -/* giobjectinfo.h */ g_object_info_find_method g_object_info_find_method_using_interfaces g_object_info_find_signal @@ -121,18 +106,12 @@ g_object_info_get_type_name g_object_info_get_unref_function g_object_info_get_unref_function_pointer g_object_info_get_vfunc - -/* gipropertyinfo.h */ g_property_info_get_flags g_property_info_get_ownership_transfer g_property_info_get_type - -/* giregisteredtypeinfo.h */ g_registered_type_info_get_g_type g_registered_type_info_get_type_init g_registered_type_info_get_type_name - -/* girepository.h */ gi_cclosure_marshal_generic g_irepository_dump g_irepository_enumerate_versions @@ -157,8 +136,6 @@ g_irepository_load_typelib g_irepository_prepend_search_path g_irepository_require g_irepository_require_private - -/* girffi.h */ gi_type_info_extract_ffi_return_value gi_type_tag_get_ffi_type g_callable_info_free_closure @@ -167,13 +144,9 @@ g_function_info_prep_invoker g_function_invoker_destroy g_function_invoker_new_for_address g_type_info_get_ffi_type - -/*gisignalinfo.h */ g_signal_info_get_class_closure g_signal_info_get_flags g_signal_info_true_stops_emit - -/* gustructinfo.h */ g_struct_info_find_method g_struct_info_get_alignment g_struct_info_get_field @@ -183,8 +156,6 @@ g_struct_info_get_n_methods g_struct_info_get_size g_struct_info_is_foreign g_struct_info_is_gtype_struct - -/* gitypeinfo.h */ g_type_info_is_pointer g_type_info_is_zero_terminated g_type_info_get_array_fixed_size @@ -195,8 +166,6 @@ g_type_info_get_param_type g_type_info_get_tag g_type_tag_to_string g_info_type_to_string - -/* gitypelib.h */ g_typelib_check_sanity g_typelib_error_quark g_typelib_free @@ -206,8 +175,6 @@ g_typelib_new_from_mapped_file g_typelib_new_from_memory g_typelib_symbol g_typelib_validate - -/* giunioninfo.h */ g_union_info_find_method g_union_info_get_alignment g_union_info_get_discriminator @@ -219,8 +186,6 @@ g_union_info_get_n_fields g_union_info_get_n_methods g_union_info_get_size g_union_info_is_discriminated - -/* givfuncinfo.h */ g_vfunc_info_get_address g_vfunc_info_get_invoker g_vfunc_info_get_flags -- cgit v1.2.1 From b0fccfbf26536817b39b30b3a5b9c01e2cc2c5c5 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 27 Oct 2012 12:53:52 -0400 Subject: gmarshallingtests: Fix prototype () -> (void) Dear Python programmers, () doesn't mean what you think it means in C. --- tests/gimarshallingtests.c | 4 ++-- tests/gimarshallingtests.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index 3d6e3453..81a6144c 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -4563,9 +4563,9 @@ gi_marshalling_tests_filename_list_return (void) * Returns: (transfer full): a #GParamSpec */ GParamSpec * -gi_marshalling_tests_param_spec_return() +gi_marshalling_tests_param_spec_return (void) { - return g_param_spec_string("test-param", "test", "This is a test", "42", G_PARAM_READABLE); + return g_param_spec_string ("test-param", "test", "This is a test", "42", G_PARAM_READABLE); } /** diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index 7768a881..b1276bb8 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -961,7 +961,7 @@ void gi_marshalling_tests_gerror_out_transfer_none(GError **err, const gchar **d GError *gi_marshalling_tests_gerror_return(void); /* GParamSpec */ -GParamSpec *gi_marshalling_tests_param_spec_return(); +GParamSpec *gi_marshalling_tests_param_spec_return (void); void gi_marshalling_tests_param_spec_out(GParamSpec **param); /* Overrides */ -- cgit v1.2.1 From 13f9d941f5a03c899be2c4c08455f30b8ced9ce2 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 27 Oct 2012 12:54:34 -0400 Subject: gimarshallingtests: Attempt to avoid using reserved words "int8" apparently blows up on AIX. It was kind of lame how we would just ad-hoc append a _. Since we only have one value for a lot of these, let's just go with the couldn't-be-any-simpler "v". https://bugzilla.gnome.org/show_bug.cgi?id=664166 --- tests/gimarshallingtests.c | 420 ++++++++++++++++++++++----------------------- tests/gimarshallingtests.h | 132 +++++++------- 2 files changed, 276 insertions(+), 276 deletions(-) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index 81a6144c..e05f9169 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -6,7 +6,7 @@ #include -static void gi_marshalling_tests_boxed_struct_free (GIMarshallingTestsBoxedStruct *struct_); +static void gi_marshalling_tests_boxed_struct_free (GIMarshallingTestsBoxedStruct *v); /* Booleans */ @@ -23,57 +23,57 @@ gi_marshalling_tests_boolean_return_false (void) } void -gi_marshalling_tests_boolean_in_true (gboolean bool_) +gi_marshalling_tests_boolean_in_true (gboolean v) { - g_assert (bool_ == TRUE); + g_assert (v == TRUE); } void -gi_marshalling_tests_boolean_in_false (gboolean bool_) +gi_marshalling_tests_boolean_in_false (gboolean v) { - g_assert (bool_ == FALSE); + g_assert (v == FALSE); } /** * gi_marshalling_tests_boolean_out_true: - * @bool_: (out): + * @v: (out): */ void -gi_marshalling_tests_boolean_out_true (gboolean *bool_) +gi_marshalling_tests_boolean_out_true (gboolean *v) { - *bool_ = TRUE; + *v = TRUE; } /** * gi_marshalling_tests_boolean_out_false: - * @bool_: (out): + * @v: (out): */ void -gi_marshalling_tests_boolean_out_false (gboolean *bool_) +gi_marshalling_tests_boolean_out_false (gboolean *v) { - *bool_ = FALSE; + *v = FALSE; } /** * gi_marshalling_tests_boolean_inout_true_false: - * @bool_: (inout): + * @v: (inout): */ void -gi_marshalling_tests_boolean_inout_true_false (gboolean *bool_) +gi_marshalling_tests_boolean_inout_true_false (gboolean *v) { - g_assert (*bool_ == TRUE); - *bool_ = FALSE; + g_assert (*v == TRUE); + *v = FALSE; } /** * gi_marshalling_tests_boolean_inout_false_true: - * @bool_: (inout): + * @v: (inout): */ void -gi_marshalling_tests_boolean_inout_false_true (gboolean *bool_) +gi_marshalling_tests_boolean_inout_false_true (gboolean *v) { - g_assert (*bool_ == FALSE); - *bool_ = TRUE; + g_assert (*v == FALSE); + *v = TRUE; } @@ -92,57 +92,57 @@ gi_marshalling_tests_int8_return_min (void) } void -gi_marshalling_tests_int8_in_max (gint8 int8) +gi_marshalling_tests_int8_in_max (gint8 v) { - g_assert_cmpint(int8, ==, G_MAXINT8); + g_assert_cmpint(v, ==, G_MAXINT8); } void -gi_marshalling_tests_int8_in_min (gint8 int8) +gi_marshalling_tests_int8_in_min (gint8 v) { - g_assert_cmpint(int8, ==, G_MININT8); + g_assert_cmpint(v, ==, G_MININT8); } /** * gi_marshalling_tests_int8_out_max: - * @int8: (out): + * @v: (out): */ void -gi_marshalling_tests_int8_out_max (gint8 *int8) +gi_marshalling_tests_int8_out_max (gint8 *v) { - *int8 = G_MAXINT8; + *v = G_MAXINT8; } /** * gi_marshalling_tests_int8_out_min: - * @int8: (out): + * @v: (out): */ void -gi_marshalling_tests_int8_out_min (gint8 *int8) +gi_marshalling_tests_int8_out_min (gint8 *v) { - *int8 = G_MININT8; + *v = G_MININT8; } /** * gi_marshalling_tests_int8_inout_max_min: - * @int8: (inout): + * @v: (inout): */ void -gi_marshalling_tests_int8_inout_max_min (gint8 *int8) +gi_marshalling_tests_int8_inout_max_min (gint8 *v) { - g_assert_cmpint(*int8, ==, G_MAXINT8); - *int8 = G_MININT8; + g_assert_cmpint(*v, ==, G_MAXINT8); + *v = G_MININT8; } /** * gi_marshalling_tests_int8_inout_min_max: - * @int8: (inout): + * @v: (inout): */ void -gi_marshalling_tests_int8_inout_min_max (gint8 *int8) +gi_marshalling_tests_int8_inout_min_max (gint8 *v) { - g_assert_cmpint(*int8, ==, G_MININT8); - *int8 = G_MAXINT8; + g_assert_cmpint(*v, ==, G_MININT8); + *v = G_MAXINT8; } @@ -153,30 +153,30 @@ gi_marshalling_tests_uint8_return (void) } void -gi_marshalling_tests_uint8_in (guint8 uint8) +gi_marshalling_tests_uint8_in (guint8 v) { - g_assert_cmpuint(uint8, ==, G_MAXUINT8); + g_assert_cmpuint(v, ==, G_MAXUINT8); } /** * gi_marshalling_tests_uint8_out: - * @uint8: (out): + * @v: (out): */ void -gi_marshalling_tests_uint8_out (guint8 *uint8) +gi_marshalling_tests_uint8_out (guint8 *v) { - *uint8 = G_MAXUINT8; + *v = G_MAXUINT8; } /** * gi_marshalling_tests_uint8_inout: - * @uint8: (inout): + * @v: (inout): */ void -gi_marshalling_tests_uint8_inout (guint8 *uint8) +gi_marshalling_tests_uint8_inout (guint8 *v) { - g_assert_cmpuint(*uint8, ==, G_MAXUINT8); - *uint8 = 0; + g_assert_cmpuint(*v, ==, G_MAXUINT8); + *v = 0; } @@ -193,57 +193,57 @@ gi_marshalling_tests_int16_return_min (void) } void -gi_marshalling_tests_int16_in_max (gint16 int16) +gi_marshalling_tests_int16_in_max (gint16 v) { - g_assert_cmpint(int16, ==, G_MAXINT16); + g_assert_cmpint(v, ==, G_MAXINT16); } void -gi_marshalling_tests_int16_in_min (gint16 int16) +gi_marshalling_tests_int16_in_min (gint16 v) { - g_assert_cmpint(int16, ==, G_MININT16); + g_assert_cmpint(v, ==, G_MININT16); } /** * gi_marshalling_tests_int16_out_max: - * @int16: (out): + * @v: (out): */ void -gi_marshalling_tests_int16_out_max (gint16 *int16) +gi_marshalling_tests_int16_out_max (gint16 *v) { - *int16 = G_MAXINT16; + *v = G_MAXINT16; } /** * gi_marshalling_tests_int16_out_min: - * @int16: (out): + * @v: (out): */ void -gi_marshalling_tests_int16_out_min (gint16 *int16) +gi_marshalling_tests_int16_out_min (gint16 *v) { - *int16 = G_MININT16; + *v = G_MININT16; } /** * gi_marshalling_tests_int16_inout_max_min: - * @int16: (inout): + * @v: (inout): */ void -gi_marshalling_tests_int16_inout_max_min (gint16 *int16) +gi_marshalling_tests_int16_inout_max_min (gint16 *v) { - g_assert_cmpint(*int16, ==, G_MAXINT16); - *int16 = G_MININT16; + g_assert_cmpint(*v, ==, G_MAXINT16); + *v = G_MININT16; } /** * gi_marshalling_tests_int16_inout_min_max: - * @int16: (inout): + * @v: (inout): */ void -gi_marshalling_tests_int16_inout_min_max (gint16 *int16) +gi_marshalling_tests_int16_inout_min_max (gint16 *v) { - g_assert_cmpint(*int16, ==, G_MININT16); - *int16 = G_MAXINT16; + g_assert_cmpint(*v, ==, G_MININT16); + *v = G_MAXINT16; } @@ -254,30 +254,30 @@ gi_marshalling_tests_uint16_return (void) } void -gi_marshalling_tests_uint16_in (guint16 uint16) +gi_marshalling_tests_uint16_in (guint16 v) { - g_assert_cmpuint(uint16, ==, G_MAXUINT16); + g_assert_cmpuint(v, ==, G_MAXUINT16); } /** * gi_marshalling_tests_uint16_out: - * @uint16: (out): + * @v: (out): */ void -gi_marshalling_tests_uint16_out (guint16 *uint16) +gi_marshalling_tests_uint16_out (guint16 *v) { - *uint16 = G_MAXUINT16; + *v = G_MAXUINT16; } /** * gi_marshalling_tests_uint16_inout: - * @uint16: (inout): + * @v: (inout): */ void -gi_marshalling_tests_uint16_inout (guint16 *uint16) +gi_marshalling_tests_uint16_inout (guint16 *v) { - g_assert_cmpuint(*uint16, ==, G_MAXUINT16); - *uint16 = 0; + g_assert_cmpuint(*v, ==, G_MAXUINT16); + *v = 0; } @@ -294,57 +294,57 @@ gi_marshalling_tests_int32_return_min (void) } void -gi_marshalling_tests_int32_in_max (gint32 int32) +gi_marshalling_tests_int32_in_max (gint32 v) { - g_assert_cmpint(int32, ==, G_MAXINT32); + g_assert_cmpint(v, ==, G_MAXINT32); } void -gi_marshalling_tests_int32_in_min (gint32 int32) +gi_marshalling_tests_int32_in_min (gint32 v) { - g_assert_cmpint(int32, ==, G_MININT32); + g_assert_cmpint(v, ==, G_MININT32); } /** * gi_marshalling_tests_int32_out_max: - * @int32: (out): + * @v: (out): */ void -gi_marshalling_tests_int32_out_max (gint32 *int32) +gi_marshalling_tests_int32_out_max (gint32 *v) { - *int32 = G_MAXINT32; + *v = G_MAXINT32; } /** * gi_marshalling_tests_int32_out_min: - * @int32: (out): + * @v: (out): */ void -gi_marshalling_tests_int32_out_min (gint32 *int32) +gi_marshalling_tests_int32_out_min (gint32 *v) { - *int32 = G_MININT32; + *v = G_MININT32; } /** * gi_marshalling_tests_int32_inout_max_min: - * @int32: (inout): + * @v: (inout): */ void -gi_marshalling_tests_int32_inout_max_min (gint32 *int32) +gi_marshalling_tests_int32_inout_max_min (gint32 *v) { - g_assert_cmpint(*int32, ==, G_MAXINT32); - *int32 = G_MININT32; + g_assert_cmpint(*v, ==, G_MAXINT32); + *v = G_MININT32; } /** * gi_marshalling_tests_int32_inout_min_max: - * @int32: (inout): + * @v: (inout): */ void -gi_marshalling_tests_int32_inout_min_max (gint32 *int32) +gi_marshalling_tests_int32_inout_min_max (gint32 *v) { - g_assert_cmpint(*int32, ==, G_MININT32); - *int32 = G_MAXINT32; + g_assert_cmpint(*v, ==, G_MININT32); + *v = G_MAXINT32; } @@ -355,30 +355,30 @@ gi_marshalling_tests_uint32_return (void) } void -gi_marshalling_tests_uint32_in (guint32 uint32) +gi_marshalling_tests_uint32_in (guint32 v) { - g_assert_cmpuint(uint32, ==, G_MAXUINT32); + g_assert_cmpuint(v, ==, G_MAXUINT32); } /** * gi_marshalling_tests_uint32_out: - * @uint32: (out): + * @v: (out): */ void -gi_marshalling_tests_uint32_out (guint32 *uint32) +gi_marshalling_tests_uint32_out (guint32 *v) { - *uint32 = G_MAXUINT32; + *v = G_MAXUINT32; } /** * gi_marshalling_tests_uint32_inout: - * @uint32: (inout): + * @v: (inout): */ void -gi_marshalling_tests_uint32_inout (guint32 *uint32) +gi_marshalling_tests_uint32_inout (guint32 *v) { - g_assert_cmpuint(*uint32, ==, G_MAXUINT32); - *uint32 = 0; + g_assert_cmpuint(*v, ==, G_MAXUINT32); + *v = 0; } @@ -395,57 +395,57 @@ gi_marshalling_tests_int64_return_min (void) } void -gi_marshalling_tests_int64_in_max (gint64 int64) +gi_marshalling_tests_int64_in_max (gint64 v) { - g_assert_cmpint(int64, ==, G_MAXINT64); + g_assert_cmpint(v, ==, G_MAXINT64); } void -gi_marshalling_tests_int64_in_min (gint64 int64) +gi_marshalling_tests_int64_in_min (gint64 v) { - g_assert_cmpint(int64, ==, G_MININT64); + g_assert_cmpint(v, ==, G_MININT64); } /** * gi_marshalling_tests_int64_out_max: - * @int64: (out): + * @v: (out): */ void -gi_marshalling_tests_int64_out_max (gint64 *int64) +gi_marshalling_tests_int64_out_max (gint64 *v) { - *int64 = G_MAXINT64; + *v = G_MAXINT64; } /** * gi_marshalling_tests_int64_out_min: - * @int64: (out): + * @v: (out): */ void -gi_marshalling_tests_int64_out_min (gint64 *int64) +gi_marshalling_tests_int64_out_min (gint64 *v) { - *int64 = G_MININT64; + *v = G_MININT64; } /** * gi_marshalling_tests_int64_inout_max_min: - * @int64: (inout): + * @v: (inout): */ void -gi_marshalling_tests_int64_inout_max_min (gint64 *int64) +gi_marshalling_tests_int64_inout_max_min (gint64 *v) { - g_assert_cmpint(*int64, ==, G_MAXINT64); - *int64 = G_MININT64; + g_assert_cmpint(*v, ==, G_MAXINT64); + *v = G_MININT64; } /** * gi_marshalling_tests_int64_inout_min_max: - * @int64: (inout): + * @v: (inout): */ void -gi_marshalling_tests_int64_inout_min_max (gint64 *int64) +gi_marshalling_tests_int64_inout_min_max (gint64 *v) { - g_assert_cmpint(*int64, ==, G_MININT64); - *int64 = G_MAXINT64; + g_assert_cmpint(*v, ==, G_MININT64); + *v = G_MAXINT64; } @@ -456,30 +456,30 @@ gi_marshalling_tests_uint64_return (void) } void -gi_marshalling_tests_uint64_in (guint64 uint64) +gi_marshalling_tests_uint64_in (guint64 v) { - g_assert_cmpuint(uint64, ==, G_MAXUINT64); + g_assert_cmpuint(v, ==, G_MAXUINT64); } /** * gi_marshalling_tests_uint64_out: - * @uint64: (out): + * @v: (out): */ void -gi_marshalling_tests_uint64_out (guint64 *uint64) +gi_marshalling_tests_uint64_out (guint64 *v) { - *uint64 = G_MAXUINT64; + *v = G_MAXUINT64; } /** * gi_marshalling_tests_uint64_inout: - * @uint64: (inout): + * @v: (inout): */ void -gi_marshalling_tests_uint64_inout (guint64 *uint64) +gi_marshalling_tests_uint64_inout (guint64 *v) { - g_assert_cmpuint(*uint64, ==, G_MAXUINT64); - *uint64 = 0; + g_assert_cmpuint(*v, ==, G_MAXUINT64); + *v = 0; } @@ -894,30 +894,30 @@ gi_marshalling_tests_float_return (void) } void -gi_marshalling_tests_float_in (gfloat float_) +gi_marshalling_tests_float_in (gfloat v) { - g_assert_cmpfloat(float_, ==, G_MAXFLOAT); + g_assert_cmpfloat(v, ==, G_MAXFLOAT); } /** * gi_marshalling_tests_float_out: - * @float_: (out): + * @v: (out): */ void -gi_marshalling_tests_float_out (gfloat *float_) +gi_marshalling_tests_float_out (gfloat *v) { - *float_ = G_MAXFLOAT; + *v = G_MAXFLOAT; } /** * gi_marshalling_tests_float_inout: - * @float_: (inout): + * @v: (inout): */ void -gi_marshalling_tests_float_inout (gfloat *float_) +gi_marshalling_tests_float_inout (gfloat *v) { - g_assert_cmpfloat(*float_, ==, G_MAXFLOAT); - *float_ = G_MINFLOAT; + g_assert_cmpfloat(*v, ==, G_MAXFLOAT); + *v = G_MINFLOAT; } @@ -928,30 +928,30 @@ gi_marshalling_tests_double_return (void) } void -gi_marshalling_tests_double_in (gdouble double_) +gi_marshalling_tests_double_in (gdouble v) { - g_assert_cmpfloat(double_, ==, G_MAXDOUBLE); + g_assert_cmpfloat(v, ==, G_MAXDOUBLE); } /** * gi_marshalling_tests_double_out: - * @double_: (out): + * @v: (out): */ void -gi_marshalling_tests_double_out (gdouble *double_) +gi_marshalling_tests_double_out (gdouble *v) { - *double_ = G_MAXDOUBLE; + *v = G_MAXDOUBLE; } /** * gi_marshalling_tests_double_inout: - * @double_: (inout): + * @v: (inout): */ void -gi_marshalling_tests_double_inout (gdouble *double_) +gi_marshalling_tests_double_inout (gdouble *v) { - g_assert_cmpfloat(*double_, ==, G_MAXDOUBLE); - *double_ = G_MINDOUBLE; + g_assert_cmpfloat(*v, ==, G_MAXDOUBLE); + *v = G_MINDOUBLE; } @@ -962,30 +962,30 @@ gi_marshalling_tests_time_t_return (void) } void -gi_marshalling_tests_time_t_in (time_t time_t_) +gi_marshalling_tests_time_t_in (time_t v) { - g_assert_cmpuint(time_t_, ==, 1234567890); + g_assert_cmpuint(v, ==, 1234567890); } /** * gi_marshalling_tests_time_t_out: - * @time_t_: (out): + * @v: (out): */ void -gi_marshalling_tests_time_t_out (time_t *time_t_) +gi_marshalling_tests_time_t_out (time_t *v) { - *time_t_ = 1234567890; + *v = 1234567890; } /** * gi_marshalling_tests_time_t_inout: - * @time_t_: (inout): + * @v: (inout): */ void -gi_marshalling_tests_time_t_inout (time_t *time_t_) +gi_marshalling_tests_time_t_inout (time_t *v) { - g_assert_cmpuint(*time_t_, ==, 1234567890); - *time_t_ = 0; + g_assert_cmpuint(*v, ==, 1234567890); + *v = 0; } @@ -1416,12 +1416,12 @@ gi_marshalling_tests_array_struct_take_in (GIMarshallingTestsBoxedStruct **struc * @length: */ void -gi_marshalling_tests_array_enum_in (GIMarshallingTestsEnum *_enum, gint length) +gi_marshalling_tests_array_enum_in (GIMarshallingTestsEnum *v, gint length) { g_assert_cmpint(length, ==, 3); - g_assert_cmpint(_enum[0], ==, GI_MARSHALLING_TESTS_ENUM_VALUE1); - g_assert_cmpint(_enum[1], ==, GI_MARSHALLING_TESTS_ENUM_VALUE2); - g_assert_cmpint(_enum[2], ==, GI_MARSHALLING_TESTS_ENUM_VALUE3); + g_assert_cmpint(v[0], ==, GI_MARSHALLING_TESTS_ENUM_VALUE1); + g_assert_cmpint(v[1], ==, GI_MARSHALLING_TESTS_ENUM_VALUE2); + g_assert_cmpint(v[2], ==, GI_MARSHALLING_TESTS_ENUM_VALUE3); } /** @@ -1716,16 +1716,16 @@ gi_marshalling_tests_array_gvariant_full_in (GVariant **variants) GArray * gi_marshalling_tests_garray_int_none_return (void) { - static GArray *array = NULL; + static GArray *v = NULL; gint i; - if (array == NULL) { - array = g_array_new (TRUE, TRUE, sizeof (gint)); + if (v == NULL) { + v = g_array_new (TRUE, TRUE, sizeof (gint)); for (i = -1; i < 3; i++) - g_array_append_val (array, i); + g_array_append_val (v, i); } - return array; + return v; } /** @@ -2220,16 +2220,16 @@ gi_marshalling_tests_bytearray_full_return (void) /** * gi_marshalling_tests_bytearray_none_in: - * @array_: (element-type gint8) (transfer none): + * @v: (element-type gint8) (transfer none): */ void -gi_marshalling_tests_bytearray_none_in (GByteArray *array_) +gi_marshalling_tests_bytearray_none_in (GByteArray *v) { - g_assert_cmpuint (array_->len, ==, 4); - g_assert_cmpuint (g_array_index (array_, unsigned char, 0), ==, 0); - g_assert_cmpuint (g_array_index (array_, unsigned char, 1), ==, 49); - g_assert_cmpuint (g_array_index (array_, unsigned char, 2), ==, 0xFF); - g_assert_cmpuint (g_array_index (array_, unsigned char, 3), ==, 51); + g_assert_cmpuint (v->len, ==, 4); + g_assert_cmpuint (g_array_index (v, unsigned char, 0), ==, 0); + g_assert_cmpuint (g_array_index (v, unsigned char, 1), ==, 49); + g_assert_cmpuint (g_array_index (v, unsigned char, 2), ==, 0xFF); + g_assert_cmpuint (g_array_index (v, unsigned char, 3), ==, 51); } /** @@ -3316,30 +3316,30 @@ gi_marshalling_tests_genum_returnv (void) } void -gi_marshalling_tests_genum_in (GIMarshallingTestsGEnum enum_) +gi_marshalling_tests_genum_in (GIMarshallingTestsGEnum v) { - g_assert_cmpint(enum_, ==, GI_MARSHALLING_TESTS_GENUM_VALUE3); + g_assert_cmpint(v, ==, GI_MARSHALLING_TESTS_GENUM_VALUE3); } /** * gi_marshalling_tests_genum_out: - * @enum_: (out): + * @v: (out): */ void -gi_marshalling_tests_genum_out (GIMarshallingTestsGEnum *enum_) +gi_marshalling_tests_genum_out (GIMarshallingTestsGEnum *v) { - *enum_ = GI_MARSHALLING_TESTS_GENUM_VALUE3; + *v = GI_MARSHALLING_TESTS_GENUM_VALUE3; } /** * gi_marshalling_tests_genum_inout: - * @enum_: (inout): + * @v: (inout): */ void -gi_marshalling_tests_genum_inout (GIMarshallingTestsGEnum *enum_) +gi_marshalling_tests_genum_inout (GIMarshallingTestsGEnum *v) { - g_assert_cmpint(*enum_, ==, GI_MARSHALLING_TESTS_GENUM_VALUE3); - *enum_ = GI_MARSHALLING_TESTS_GENUM_VALUE1; + g_assert_cmpint(*v, ==, GI_MARSHALLING_TESTS_GENUM_VALUE3); + *v = GI_MARSHALLING_TESTS_GENUM_VALUE1; } @@ -3350,30 +3350,30 @@ gi_marshalling_tests_enum_returnv (void) } void -gi_marshalling_tests_enum_in (GIMarshallingTestsEnum enum_) +gi_marshalling_tests_enum_in (GIMarshallingTestsEnum v) { - g_assert_cmpint(enum_, ==, GI_MARSHALLING_TESTS_ENUM_VALUE3); + g_assert_cmpint(v, ==, GI_MARSHALLING_TESTS_ENUM_VALUE3); } /** * gi_marshalling_tests_enum_out: - * @enum_: (out): + * @v: (out): */ void -gi_marshalling_tests_enum_out (GIMarshallingTestsEnum *enum_) +gi_marshalling_tests_enum_out (GIMarshallingTestsEnum *v) { - *enum_ = GI_MARSHALLING_TESTS_ENUM_VALUE3; + *v = GI_MARSHALLING_TESTS_ENUM_VALUE3; } /** * gi_marshalling_tests_enum_inout: - * @enum_: (inout): + * @v: (inout): */ void -gi_marshalling_tests_enum_inout (GIMarshallingTestsEnum *enum_) +gi_marshalling_tests_enum_inout (GIMarshallingTestsEnum *v) { - g_assert_cmpint(*enum_, ==, GI_MARSHALLING_TESTS_ENUM_VALUE3); - *enum_ = GI_MARSHALLING_TESTS_ENUM_VALUE1; + g_assert_cmpint(*v, ==, GI_MARSHALLING_TESTS_ENUM_VALUE3); + *v = GI_MARSHALLING_TESTS_ENUM_VALUE1; } @@ -3403,36 +3403,36 @@ gi_marshalling_tests_flags_returnv (void) } void -gi_marshalling_tests_flags_in (GIMarshallingTestsFlags flags_) +gi_marshalling_tests_flags_in (GIMarshallingTestsFlags v) { - g_assert(flags_ == GI_MARSHALLING_TESTS_FLAGS_VALUE2); + g_assert(v == GI_MARSHALLING_TESTS_FLAGS_VALUE2); } void -gi_marshalling_tests_flags_in_zero (GIMarshallingTestsFlags flags) +gi_marshalling_tests_flags_in_zero (GIMarshallingTestsFlags v) { - g_assert(flags == 0); + g_assert(v == 0); } /** * gi_marshalling_tests_flags_out: - * @flags_: (out): + * @v: (out): */ void -gi_marshalling_tests_flags_out (GIMarshallingTestsFlags *flags_) +gi_marshalling_tests_flags_out (GIMarshallingTestsFlags *v) { - *flags_ = GI_MARSHALLING_TESTS_FLAGS_VALUE2; + *v = GI_MARSHALLING_TESTS_FLAGS_VALUE2; } /** * gi_marshalling_tests_flags_inout: - * @flags_: (inout): + * @v: (inout): */ void -gi_marshalling_tests_flags_inout (GIMarshallingTestsFlags *flags_) +gi_marshalling_tests_flags_inout (GIMarshallingTestsFlags *v) { - g_assert(*flags_ == GI_MARSHALLING_TESTS_FLAGS_VALUE2); - *flags_ = GI_MARSHALLING_TESTS_FLAGS_VALUE1; + g_assert(*v == GI_MARSHALLING_TESTS_FLAGS_VALUE2); + *v = GI_MARSHALLING_TESTS_FLAGS_VALUE1; } @@ -3443,36 +3443,36 @@ gi_marshalling_tests_no_type_flags_returnv (void) } void -gi_marshalling_tests_no_type_flags_in (GIMarshallingTestsNoTypeFlags flags_) +gi_marshalling_tests_no_type_flags_in (GIMarshallingTestsNoTypeFlags v) { - g_assert(flags_ == GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2); + g_assert(v == GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2); } void -gi_marshalling_tests_no_type_flags_in_zero (GIMarshallingTestsNoTypeFlags flags) +gi_marshalling_tests_no_type_flags_in_zero (GIMarshallingTestsNoTypeFlags v) { - g_assert(flags == 0); + g_assert(v == 0); } /** * gi_marshalling_tests_no_type_flags_out: - * @flags_: (out): + * @v: (out): */ void -gi_marshalling_tests_no_type_flags_out (GIMarshallingTestsNoTypeFlags *flags_) +gi_marshalling_tests_no_type_flags_out (GIMarshallingTestsNoTypeFlags *v) { - *flags_ = GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2; + *v = GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2; } /** * gi_marshalling_tests_no_type_flags_inout: - * @flags_: (inout): + * @v: (inout): */ void -gi_marshalling_tests_no_type_flags_inout (GIMarshallingTestsNoTypeFlags *flags_) +gi_marshalling_tests_no_type_flags_inout (GIMarshallingTestsNoTypeFlags *v) { - g_assert(*flags_ == GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2); - *flags_ = GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE1; + g_assert(*v == GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2); + *v = GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE1; } diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index b1276bb8..73401eee 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -21,14 +21,14 @@ typedef struct _GIMarshallingTestsBoxedStruct GIMarshallingTestsBoxedStruct; gboolean gi_marshalling_tests_boolean_return_true (void); gboolean gi_marshalling_tests_boolean_return_false (void); -void gi_marshalling_tests_boolean_in_true (gboolean bool_); -void gi_marshalling_tests_boolean_in_false (gboolean bool_); +void gi_marshalling_tests_boolean_in_true (gboolean v); +void gi_marshalling_tests_boolean_in_false (gboolean v); -void gi_marshalling_tests_boolean_out_true (gboolean *bool_); -void gi_marshalling_tests_boolean_out_false (gboolean *bool_); +void gi_marshalling_tests_boolean_out_true (gboolean *v); +void gi_marshalling_tests_boolean_out_false (gboolean *v); -void gi_marshalling_tests_boolean_inout_true_false (gboolean *bool_); -void gi_marshalling_tests_boolean_inout_false_true (gboolean *bool_); +void gi_marshalling_tests_boolean_inout_true_false (gboolean *v); +void gi_marshalling_tests_boolean_inout_false_true (gboolean *v); /* Integers */ @@ -36,85 +36,85 @@ void gi_marshalling_tests_boolean_inout_false_true (gboolean *bool_); gint8 gi_marshalling_tests_int8_return_max (void); gint8 gi_marshalling_tests_int8_return_min (void); -void gi_marshalling_tests_int8_in_max (gint8 int8); -void gi_marshalling_tests_int8_in_min (gint8 int8); +void gi_marshalling_tests_int8_in_max (gint8 v); +void gi_marshalling_tests_int8_in_min (gint8 v); -void gi_marshalling_tests_int8_out_max (gint8 *int8); -void gi_marshalling_tests_int8_out_min (gint8 *int8); +void gi_marshalling_tests_int8_out_max (gint8 *v); +void gi_marshalling_tests_int8_out_min (gint8 *v); -void gi_marshalling_tests_int8_inout_max_min (gint8 *int8); -void gi_marshalling_tests_int8_inout_min_max (gint8 *int8); +void gi_marshalling_tests_int8_inout_max_min (gint8 *v); +void gi_marshalling_tests_int8_inout_min_max (gint8 *v); guint8 gi_marshalling_tests_uint8_return (void); -void gi_marshalling_tests_uint8_in (guint8 uint8); +void gi_marshalling_tests_uint8_in (guint8 v); -void gi_marshalling_tests_uint8_out (guint8 *uint8); -void gi_marshalling_tests_uint8_inout (guint8 *uint8); +void gi_marshalling_tests_uint8_out (guint8 *v); +void gi_marshalling_tests_uint8_inout (guint8 *v); gint16 gi_marshalling_tests_int16_return_max (void); gint16 gi_marshalling_tests_int16_return_min (void); -void gi_marshalling_tests_int16_in_max (gint16 int16); -void gi_marshalling_tests_int16_in_min (gint16 int16); +void gi_marshalling_tests_int16_in_max (gint16 v); +void gi_marshalling_tests_int16_in_min (gint16 v); -void gi_marshalling_tests_int16_out_max (gint16 *int16); -void gi_marshalling_tests_int16_out_min (gint16 *int16); +void gi_marshalling_tests_int16_out_max (gint16 *v); +void gi_marshalling_tests_int16_out_min (gint16 *v); -void gi_marshalling_tests_int16_inout_max_min (gint16 *int16); -void gi_marshalling_tests_int16_inout_min_max (gint16 *int16); +void gi_marshalling_tests_int16_inout_max_min (gint16 *v); +void gi_marshalling_tests_int16_inout_min_max (gint16 *v); guint16 gi_marshalling_tests_uint16_return (void); -void gi_marshalling_tests_uint16_in (guint16 uint16); +void gi_marshalling_tests_uint16_in (guint16 v); -void gi_marshalling_tests_uint16_out (guint16 *uint16); -void gi_marshalling_tests_uint16_inout (guint16 *uint16); +void gi_marshalling_tests_uint16_out (guint16 *v); +void gi_marshalling_tests_uint16_inout (guint16 *v); gint32 gi_marshalling_tests_int32_return_max (void); gint32 gi_marshalling_tests_int32_return_min (void); -void gi_marshalling_tests_int32_in_max (gint32 int32); -void gi_marshalling_tests_int32_in_min (gint32 int32); +void gi_marshalling_tests_int32_in_max (gint32 v); +void gi_marshalling_tests_int32_in_min (gint32 v); -void gi_marshalling_tests_int32_out_max (gint32 *int32); -void gi_marshalling_tests_int32_out_min (gint32 *int32); +void gi_marshalling_tests_int32_out_max (gint32 *v); +void gi_marshalling_tests_int32_out_min (gint32 *v); -void gi_marshalling_tests_int32_inout_max_min (gint32 *int32); -void gi_marshalling_tests_int32_inout_min_max (gint32 *int32); +void gi_marshalling_tests_int32_inout_max_min (gint32 *v); +void gi_marshalling_tests_int32_inout_min_max (gint32 *v); guint32 gi_marshalling_tests_uint32_return (void); -void gi_marshalling_tests_uint32_in (guint32 uint32); +void gi_marshalling_tests_uint32_in (guint32 v); -void gi_marshalling_tests_uint32_out (guint32 *uint32); -void gi_marshalling_tests_uint32_inout (guint32 *uint32); +void gi_marshalling_tests_uint32_out (guint32 *v); +void gi_marshalling_tests_uint32_inout (guint32 *v); gint64 gi_marshalling_tests_int64_return_max (void); gint64 gi_marshalling_tests_int64_return_min (void); -void gi_marshalling_tests_int64_in_max (gint64 int64); -void gi_marshalling_tests_int64_in_min (gint64 int64); +void gi_marshalling_tests_int64_in_max (gint64 v); +void gi_marshalling_tests_int64_in_min (gint64 v); -void gi_marshalling_tests_int64_out_max (gint64 *int64); -void gi_marshalling_tests_int64_out_min (gint64 *int64); +void gi_marshalling_tests_int64_out_max (gint64 *v); +void gi_marshalling_tests_int64_out_min (gint64 *v); -void gi_marshalling_tests_int64_inout_max_min (gint64 *int64); -void gi_marshalling_tests_int64_inout_min_max (gint64 *int64); +void gi_marshalling_tests_int64_inout_max_min (gint64 *v); +void gi_marshalling_tests_int64_inout_min_max (gint64 *v); guint64 gi_marshalling_tests_uint64_return (void); -void gi_marshalling_tests_uint64_in (guint64 uint64); +void gi_marshalling_tests_uint64_in (guint64 v); -void gi_marshalling_tests_uint64_out (guint64 *uint64); -void gi_marshalling_tests_uint64_inout (guint64 *uint64); +void gi_marshalling_tests_uint64_out (guint64 *v); +void gi_marshalling_tests_uint64_inout (guint64 *v); gshort gi_marshalling_tests_short_return_max (void); @@ -205,31 +205,31 @@ void gi_marshalling_tests_size_inout (gsize *size); gfloat gi_marshalling_tests_float_return (void); -void gi_marshalling_tests_float_in (gfloat float_); +void gi_marshalling_tests_float_in (gfloat v); -void gi_marshalling_tests_float_out (gfloat *float_); +void gi_marshalling_tests_float_out (gfloat *v); -void gi_marshalling_tests_float_inout (gfloat *float_); +void gi_marshalling_tests_float_inout (gfloat *v); gdouble gi_marshalling_tests_double_return (void); -void gi_marshalling_tests_double_in (gdouble double_); +void gi_marshalling_tests_double_in (gdouble v); -void gi_marshalling_tests_double_out (gdouble *double_); +void gi_marshalling_tests_double_out (gdouble *v); -void gi_marshalling_tests_double_inout (gdouble *double_); +void gi_marshalling_tests_double_inout (gdouble *v); /* Timestamps */ time_t gi_marshalling_tests_time_t_return (void); -void gi_marshalling_tests_time_t_in (time_t time_t_); +void gi_marshalling_tests_time_t_in (time_t v); -void gi_marshalling_tests_time_t_out (time_t *time_t_); +void gi_marshalling_tests_time_t_out (time_t *v); -void gi_marshalling_tests_time_t_inout (time_t *time_t_); +void gi_marshalling_tests_time_t_inout (time_t *v); /* GType */ @@ -284,11 +284,11 @@ typedef enum GIMarshallingTestsEnum gi_marshalling_tests_enum_returnv (void); -void gi_marshalling_tests_enum_in (GIMarshallingTestsEnum enum_); +void gi_marshalling_tests_enum_in (GIMarshallingTestsEnum v); -void gi_marshalling_tests_enum_out (GIMarshallingTestsEnum *enum_); +void gi_marshalling_tests_enum_out (GIMarshallingTestsEnum *v); -void gi_marshalling_tests_enum_inout (GIMarshallingTestsEnum *enum_); +void gi_marshalling_tests_enum_inout (GIMarshallingTestsEnum *v); /* GEnum */ @@ -305,11 +305,11 @@ GType gi_marshalling_tests_genum_get_type (void) G_GNUC_CONST; GIMarshallingTestsEnum gi_marshalling_tests_genum_returnv (void); -void gi_marshalling_tests_genum_in (GIMarshallingTestsGEnum enum_); +void gi_marshalling_tests_genum_in (GIMarshallingTestsGEnum v); -void gi_marshalling_tests_genum_out (GIMarshallingTestsGEnum *enum_); +void gi_marshalling_tests_genum_out (GIMarshallingTestsGEnum *v); -void gi_marshalling_tests_genum_inout (GIMarshallingTestsGEnum *enum_); +void gi_marshalling_tests_genum_inout (GIMarshallingTestsGEnum *v); /* GFlags */ @@ -329,12 +329,12 @@ GType gi_marshalling_tests_flags_get_type (void) G_GNUC_CONST; GIMarshallingTestsFlags gi_marshalling_tests_flags_returnv (void); -void gi_marshalling_tests_flags_in (GIMarshallingTestsFlags flags_); -void gi_marshalling_tests_flags_in_zero (GIMarshallingTestsFlags flags); +void gi_marshalling_tests_flags_in (GIMarshallingTestsFlags v); +void gi_marshalling_tests_flags_in_zero (GIMarshallingTestsFlags v); -void gi_marshalling_tests_flags_out (GIMarshallingTestsFlags *flags_); +void gi_marshalling_tests_flags_out (GIMarshallingTestsFlags *v); -void gi_marshalling_tests_flags_inout (GIMarshallingTestsFlags *flags_); +void gi_marshalling_tests_flags_inout (GIMarshallingTestsFlags *v); /* Flags with no GType */ @@ -350,12 +350,12 @@ typedef enum GIMarshallingTestsNoTypeFlags gi_marshalling_tests_no_type_flags_returnv (void); -void gi_marshalling_tests_no_type_flags_in (GIMarshallingTestsNoTypeFlags flags_); -void gi_marshalling_tests_no_type_flags_in_zero (GIMarshallingTestsNoTypeFlags flags); +void gi_marshalling_tests_no_type_flags_in (GIMarshallingTestsNoTypeFlags v); +void gi_marshalling_tests_no_type_flags_in_zero (GIMarshallingTestsNoTypeFlags v); -void gi_marshalling_tests_no_type_flags_out (GIMarshallingTestsNoTypeFlags *flags_); +void gi_marshalling_tests_no_type_flags_out (GIMarshallingTestsNoTypeFlags *v); -void gi_marshalling_tests_no_type_flags_inout (GIMarshallingTestsNoTypeFlags *flags_); +void gi_marshalling_tests_no_type_flags_inout (GIMarshallingTestsNoTypeFlags *v); /* Arrays */ @@ -457,7 +457,7 @@ void gi_marshalling_tests_gptrarray_utf8_full_inout (GPtrArray **parray_); /* GByteArray */ GByteArray *gi_marshalling_tests_bytearray_full_return (void); -void gi_marshalling_tests_bytearray_none_in (GByteArray* array_); +void gi_marshalling_tests_bytearray_none_in (GByteArray* v); /* GStrv */ -- cgit v1.2.1 From 6fc366a66c58039aec345cc531c329729b6bce18 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 27 Oct 2012 13:54:44 -0400 Subject: regress: Add a test case for skipping a function with an unannotated callback https://bugzilla.gnome.org/show_bug.cgi?id=685399 --- tests/scanner/Regress-1.0-expected.gir | 15 +++++++++++++++ tests/scanner/regress.c | 12 ++++++++++++ tests/scanner/regress.h | 2 ++ 3 files changed, 29 insertions(+) diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 8d123f7a..125a1ea3 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -3125,6 +3125,21 @@ What we're testing here is that the scanner ignores the @a nested inside XML. + + Should not emit a warning: +https://bugzilla.gnome.org/show_bug.cgi?id=685399 + + + + + + No annotation here + + + + diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c index c6ca6b74..bdc1dc3c 100644 --- a/tests/scanner/regress.c +++ b/tests/scanner/regress.c @@ -3514,6 +3514,18 @@ regress_test_owned_gerror_callback (RegressTestCallbackOwnedGError callback) callback (error); } +/** + * regress_test_skip_unannotated_callback: (skip) + * @callback: No annotation here + * + * Should not emit a warning: + * https://bugzilla.gnome.org/show_bug.cgi?id=685399 + */ +void +regress_test_skip_unannotated_callback (RegressTestCallback callback) +{ +} + /* interface */ static void diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h index b55c463b..b1a82868 100644 --- a/tests/scanner/regress.h +++ b/tests/scanner/regress.h @@ -696,6 +696,8 @@ void regress_test_gerror_callback (RegressTestCallbackGError callback); void regress_test_null_gerror_callback (RegressTestCallbackGError callback); void regress_test_owned_gerror_callback (RegressTestCallbackOwnedGError callback); +void regress_test_skip_unannotated_callback (RegressTestCallback callback); + typedef struct _RegressTestInterface RegressTestInterface; /* interface */ -- cgit v1.2.1 From 9ff28e6abab52506933fb560de1360e16d8d3880 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Tue, 28 Aug 2012 02:46:23 +0200 Subject: Namespace: fix appending of nodes Traverse appended nodes for methods, so that namespace.symbols contains all known symbols and not just global functions. Also, ensure that all relevant nodes are appended when parsing GIRs. https://bugzilla.gnome.org/show_bug.cgi?id=683046 --- giscanner/ast.py | 19 +++++++++++++++++++ giscanner/girparser.py | 14 +++++++++++--- 2 files changed, 30 insertions(+), 3 deletions(-) diff --git a/giscanner/ast.py b/giscanner/ast.py index 654c68e2..be974a09 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -20,6 +20,7 @@ # import copy +from itertools import chain from . import message @@ -399,6 +400,21 @@ but adds it to things like ctypes, symbols, and type_names. self.type_names[node.gtype_name] = node elif isinstance(node, Function): self.symbols[node.symbol] = node + if isinstance(node, (Compound, Class, Interface)): + for fn in chain(node.methods, node.static_methods, node.constructors): + if not isinstance(fn, Function): + continue + fn.namespace = self + self.symbols[fn.symbol] = fn + if isinstance(node, (Class, Interface)): + for m in chain(node.signals, node.properties): + m.namespace = self + if isinstance(node, Enum) or isinstance(node, Bitfield): + for fn in node.static_methods: + if not isinstance(fn, Function): + continue + fn.namespace = self + self.symbols[fn.symbol] = fn if hasattr(node, 'ctype'): self.ctypes[node.ctype] = node @@ -990,6 +1006,9 @@ class Interface(Node, Registered): self.properties = [] self.fields = [] self.prerequisites = [] + # Not used yet, exists just to avoid an exception in + # Namespace.append() + self.constructors = [] def _walk(self, callback, chain): for meth in self.methods: diff --git a/giscanner/girparser.py b/giscanner/girparser.py index eb53a3c4..34c9f3e4 100644 --- a/giscanner/girparser.py +++ b/giscanner/girparser.py @@ -247,10 +247,11 @@ class GIRParser(object): 'set-value-func', 'get-value-func']: func_name = node.attrib.get(_glibns(func_id)) obj.__dict__[func_id.replace('-', '_')] = func_name - self._namespace.append(obj) if self._types_only: + self._namespace.append(obj) return + for iface in self._find_children(node, _corens('implements')): obj.interfaces.append(self._namespace.type_from_name(iface.attrib['name'])) for iface in self._find_children(node, _corens('prerequisite')): @@ -278,6 +279,8 @@ class GIRParser(object): for signal in self._find_children(node, _glibns('signal')): obj.signals.append(self._parse_function_common(signal, ast.Signal, obj)) + self._namespace.append(obj) + def _parse_callback(self, node): callback = self._parse_function_common(node, ast.Callback) self._namespace.append(callback) @@ -480,9 +483,11 @@ class GIRParser(object): get_type=node.attrib[_glibns('get-type')], c_symbol_prefix=node.attrib.get(_cns('symbol-prefix'))) self._parse_generic_attribs(node, obj) - self._namespace.append(obj) + if self._types_only: + self._namespace.append(obj) return + for method in self._find_children(node, _corens('method')): func = self._parse_function_common(method, ast.Function, obj) func.is_method = True @@ -493,6 +498,7 @@ class GIRParser(object): for callback in self._find_children(node, _corens('callback')): obj.fields.append( self._parse_function_common(callback, ast.Callback, obj)) + self._namespace.append(obj) def _parse_field(self, node): type_node = None @@ -570,12 +576,14 @@ class GIRParser(object): obj.error_domain = glib_error_domain obj.ctype = ctype self._parse_generic_attribs(node, obj) - self._namespace.append(obj) if self._types_only: + self._namespace.append(obj) return + for member in self._find_children(node, _corens('member')): members.append(self._parse_member(member)) for func_node in self._find_children(node, _corens('function')): func = self._parse_function_common(func_node, ast.Function) obj.static_methods.append(func) + self._namespace.append(obj) -- cgit v1.2.1 From b7e230a61b9f9682c5ee433e24cfb749cec8c9c5 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Tue, 28 Aug 2012 02:55:52 +0200 Subject: Ast: Add parent to Fields Properties have it, there is no reason for Field not to, and in this way mallard docs can treat a field almost like a property. https://bugzilla.gnome.org/show_bug.cgi?id=683046 --- giscanner/ast.py | 1 + giscanner/girparser.py | 21 ++++++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/giscanner/ast.py b/giscanner/ast.py index be974a09..e5c403e1 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -857,6 +857,7 @@ class Field(Annotated): self.bits = bits self.anonymous_node = anonymous_node self.private = False + self.parent = None # a compound def __cmp__(self, other): return cmp(self.name, other.name) diff --git a/giscanner/girparser.py b/giscanner/girparser.py index 34c9f3e4..479eb549 100644 --- a/giscanner/girparser.py +++ b/giscanner/girparser.py @@ -273,7 +273,7 @@ class GIRParser(object): func = self._parse_function_common(ctor, ast.Function, obj) func.is_constructor = True obj.constructors.append(func) - obj.fields.extend(self._parse_fields(node)) + obj.fields.extend(self._parse_fields(node, obj)) for prop in self._find_children(node, _corens('property')): obj.properties.append(self._parse_property(prop, obj)) for signal in self._find_children(node, _glibns('signal')): @@ -359,12 +359,12 @@ class GIRParser(object): self._namespace.track(func) return func - def _parse_fields(self, node): + def _parse_fields(self, node, obj): res = [] names = (_corens('field'), _corens('record'), _corens('union'), _corens('callback')) for child in node.getchildren(): if child.tag in names: - fieldobj = self._parse_field(child) + fieldobj = self._parse_field(child, obj) res.append(fieldobj) return res @@ -379,16 +379,18 @@ class GIRParser(object): compound.foreign = True self._parse_generic_attribs(node, compound) if not self._types_only: - compound.fields.extend(self._parse_fields(node)) + compound.fields.extend(self._parse_fields(node, compound)) for method in self._find_children(node, _corens('method')): - compound.methods.append( - self._parse_function_common(method, ast.Function, compound)) + func = self._parse_function_common(method, ast.Function, compound) + func.is_method = True + compound.methods.append(func) for func in self._find_children(node, _corens('function')): compound.static_methods.append( self._parse_function_common(func, ast.Function, compound)) for ctor in self._find_children(node, _corens('constructor')): - compound.constructors.append( - self._parse_function_common(ctor, ast.Function, compound)) + func = self._parse_function_common(ctor, ast.Function, compound) + func.is_constructor = True + compound.constructors.append(func) return compound def _parse_record(self, node, anonymous=False): @@ -500,7 +502,7 @@ class GIRParser(object): self._parse_function_common(callback, ast.Callback, obj)) self._namespace.append(obj) - def _parse_field(self, node): + def _parse_field(self, node, parent): type_node = None anonymous_node = None if node.tag in map(_corens, ('record', 'union')): @@ -526,6 +528,7 @@ class GIRParser(object): node.attrib.get('bits'), anonymous_node=anonymous_node) field.private = node.attrib.get('private') == '1' + field.parent = parent self._parse_generic_attribs(node, field) return field -- cgit v1.2.1 From d893890d1098953d6740d5c8114d278b6d9875fc Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Tue, 28 Aug 2012 00:11:40 +0200 Subject: Add documentation for enumeration members Enum members were Annotated in the AST, and most code already assumed they could have docs. What was missing was reading the docs from the comment blocks and writing them in the XML. https://bugzilla.gnome.org/show_bug.cgi?id=683046 --- giscanner/girwriter.py | 3 +- giscanner/maintransformer.py | 11 ++++ tests/scanner/Annotation-1.0-expected.gir | 6 +- tests/scanner/Foo-1.0-expected.gir | 104 ++++++++++++++++++++---------- tests/scanner/Regress-1.0-expected.gir | 90 +++++++++++++++++--------- tests/scanner/SLetter-1.0-expected.gir | 18 ++++-- tests/scanner/Utility-1.0-expected.gir | 18 ++++-- tests/scanner/regress.h | 7 ++ 8 files changed, 179 insertions(+), 78 deletions(-) diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py index 97f81616..7344488b 100644 --- a/giscanner/girwriter.py +++ b/giscanner/girwriter.py @@ -363,7 +363,8 @@ and/or use gtk-doc annotations. ''') ('c:identifier', member.symbol)] if member.nick is not None: attrs.append(('glib:nick', member.nick)) - self.write_tag('member', attrs) + with self.tagcontext('member', attrs): + self._write_generic(member) def _write_constant(self, constant): attrs = [('name', constant.name), diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py index d4163fae..bf276c06 100644 --- a/giscanner/maintransformer.py +++ b/giscanner/maintransformer.py @@ -215,6 +215,8 @@ usage is void (*_gtk_reserved1)(void);""" if isinstance(node, (ast.Class, ast.Interface, ast.Union, ast.Enum, ast.Bitfield, ast.Callback)): self._apply_annotations_annotated(node, self._get_block(node)) + if isinstance(node, (ast.Enum, ast.Bitfield)): + self._apply_annotations_enum_members(node, self._get_block(node)) if isinstance(node, (ast.Class, ast.Interface, ast.Record, ast.Union)): block = self._get_block(node) for field in node.fields: @@ -820,6 +822,15 @@ usage is void (*_gtk_reserved1)(void);""" if tag: node.value = tag.value + def _apply_annotations_enum_members(self, node, block): + if block is None: + return + + for m in node.members: + tag = block.params.get(m.symbol, None) + if tag is not None: + m.doc = tag.comment + def _pass_read_annotations2(self, node, chain): if isinstance(node, ast.Function): self._apply_annotations2_function(node, chain) diff --git a/tests/scanner/Annotation-1.0-expected.gir b/tests/scanner/Annotation-1.0-expected.gir index 2ea6c544..73d982dd 100644 --- a/tests/scanner/Annotation-1.0-expected.gir +++ b/tests/scanner/Annotation-1.0-expected.gir @@ -17,8 +17,10 @@ and/or use gtk-doc annotations. --> c:identifier-prefixes="Annotation" c:symbol-prefixes="annotation"> - - + + + + + c:identifier="FOO_SOME_SINGLE_ENUM"> + - - - + + + + + + - - - + + + + + + - - - - + + + + + + + + + glib:nick="alpha"> + + glib:nick="beta"> + + glib:nick="delta"> + @@ -217,15 +231,18 @@ and/or use gtk-doc annotations. --> + glib:nick="good"> + + glib:nick="bad"> + + glib:nick="ugly"> + @@ -257,9 +274,12 @@ and/or use gtk-doc annotations. --> - - - + + + + + + + glib:nick="first"> + + glib:nick="second"> + + glib:nick="third"> + @@ -693,23 +716,36 @@ it because it's not a boxed type. Some type that is only interesting from C and should not be exposed to language bindings. - - + + a skippable enum value + + + another skippable enum value + - - - - - - + + + + + + + + + + + + + c:identifier="FOO_LAYER_FOCUSED_WINDOW"> + - + c:identifier="FOO_LAYER_OVERRIDE_REDIRECT"> + + + diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 125a1ea3..53b3adc0 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -38,9 +38,12 @@ and/or use gtk-doc annotations. --> - - - + + + + + + + glib:nick="code1"> + + glib:nick="code2"> + + glib:nick="code3"> + @@ -353,34 +359,44 @@ use it should be. glib:error-domain="regress-test-def-error"> + c:identifier="REGRESS_TEST_DEF_ERROR_CODE0"> + + c:identifier="REGRESS_TEST_DEF_ERROR_CODE1"> + + c:identifier="REGRESS_TEST_DEF_ERROR_CODE2"> + + By purpose, not all members have documentation + glib:nick="value1"> + value 1 + + glib:nick="value2"> + value 2 + + glib:nick="value3"> + + glib:nick="value4"> + @@ -393,9 +409,12 @@ use it should be. - - - + + + + + + + glib:nick="value1"> + + glib:nick="value2"> + + glib:nick="code1"> + + glib:nick="code2"> + + glib:nick="code3"> + @@ -440,15 +464,18 @@ use it should be. + glib:nick="flag1"> + + glib:nick="flag2"> + + glib:nick="flag3"> + + glib:nick="code1"> + + glib:nick="code2"> + + glib:nick="code3"> + @@ -1376,10 +1406,12 @@ the introspection client langage. + c:identifier="REGRESS_TEST_PUBLIC_ENUM_BEFORE"> + + c:identifier="REGRESS_TEST_PUBLIC_ENUM_AFTER"> + diff --git a/tests/scanner/SLetter-1.0-expected.gir b/tests/scanner/SLetter-1.0-expected.gir index c6da0df4..0c438609 100644 --- a/tests/scanner/SLetter-1.0-expected.gir +++ b/tests/scanner/SLetter-1.0-expected.gir @@ -18,9 +18,12 @@ and/or use gtk-doc annotations. --> - - - + + + + + + @@ -33,9 +36,12 @@ and/or use gtk-doc annotations. --> - - - + + + + + + diff --git a/tests/scanner/Utility-1.0-expected.gir b/tests/scanner/Utility-1.0-expected.gir index 747f99c1..3d738803 100644 --- a/tests/scanner/Utility-1.0-expected.gir +++ b/tests/scanner/Utility-1.0-expected.gir @@ -40,9 +40,12 @@ and/or use gtk-doc annotations. --> - - - + + + + + + @@ -58,9 +61,12 @@ and/or use gtk-doc annotations. --> - - - + + + + + + Date: Tue, 28 Aug 2012 02:51:04 +0200 Subject: MallardWriter: support cross-references across namespaces Look in included namespaces when resolving a cross-reference. https://bugzilla.gnome.org/show_bug.cgi?id=683046 --- giscanner/mallardwriter.py | 46 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py index 9c833843..f928abbd 100644 --- a/giscanner/mallardwriter.py +++ b/giscanner/mallardwriter.py @@ -175,6 +175,28 @@ class MallardFormatter(object): def _process_other(self, namespace, match, props): return self.escape(match) + def _resolve_type(self, ident): + try: + matches = self._transformer.split_ctype_namespaces(ident) + except ValueError: + return None + for namespace, name in matches: + node = namespace.get(name) + if node: + return node + return None + + def _resolve_symbol(self, symbol): + try: + matches = self._transformer.split_csymbol_namespaces(symbol) + except ValueError: + return None + for namespace, name in matches: + node = namespace.get_by_symbol(symbol) + if node: + return node + return None + def _find_thing(self, list_, name): for item in list_: if item.name == name: @@ -182,7 +204,7 @@ class MallardFormatter(object): raise KeyError("Could not find %s" % (name, )) def _process_property(self, namespace, match, props): - type_node = namespace.get_by_ctype(props['type_name']) + type_node = self._resolve_type(props['type_name']) if type_node is None: return match @@ -195,7 +217,7 @@ class MallardFormatter(object): return '%s' % (make_page_id(namespace, node), xref_name) def _process_signal(self, namespace, match, props): - type_node = namespace.get_by_ctype(props['type_name']) + type_node = self._resolve_type(props['type_name']) if type_node is None: return match @@ -204,22 +226,22 @@ class MallardFormatter(object): except (AttributeError, KeyError), e: return match - xref_name = "%s.%s::%s" % (namespace.name, type_node.name, node.name) - return '%s' % (make_page_id(namespace, node), xref_name) + xref_name = "%s.%s::%s" % (node.namespace.name, type_node.name, node.name) + return '%s' % (make_page_id(node.namespace, node), xref_name) def _process_type_name(self, namespace, match, props): - node = namespace.get_by_ctype(props['type_name']) + node = self._resolve_type(props['type_name']) if node is None: return match - xref_name = "%s.%s" % (namespace.name, node.name) - return '%s' % (make_page_id(namespace, node), xref_name) + xref_name = "%s.%s" % (node.namespace.name, node.name) + return '%s' % (make_page_id(node.namespace, node), xref_name) def _process_function_call(self, namespace, match, props): - node = namespace.get_by_symbol(props['symbol_name']) + node = self._resolve_symbol(props['symbol_name']) if node is None: return match - return '%s' % (make_page_id(namespace, node), + return '%s' % (make_page_id(node.namespace, node), self.format_function_name(node)) def _process_fundamental(self, namespace, match, props): @@ -252,11 +274,11 @@ class MallardFormatter(object): def format_type(self, type_): raise NotImplementedError - def format_property_flags(self, property_): + def format_property_flags(self, property_, construct_only=False): flags = [] - if property_.readable: + if property_.readable and not construct_only: flags.append("Read") - if property_.writable: + if property_.writable and not construct_only: flags.append("Write") if property_.construct: flags.append("Construct") -- cgit v1.2.1 From ce4a25dc640bdb02ff30fc233abb1c468721cbbd Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Tue, 28 Aug 2012 03:38:46 +0200 Subject: Expand on the documentation tests Add tests for complex function signatures (including arrays and callbacks), for enumerations and for static methods. Add JS reference files. https://bugzilla.gnome.org/show_bug.cgi?id=683046 --- .../DocExamples.Callback.page | 11 ++++ .../DocExamples.Enum.page | 12 ++++ .../DocExamples.Obj.static_method.page | 39 +++++++++++++ .../DocExamples.array_function.page | 39 +++++++++++++ .../DocExamples.callback_function.page | 58 +++++++++++++++++++ .../DocExamples.Callback.page | 11 ++++ .../DocExamples.Enum.page | 23 ++++++++ .../DocExamples.Obj.static_method.page | 41 ++++++++++++++ .../DocExamples.array_function.page | 41 ++++++++++++++ .../DocExamples.callback_function.page | 54 ++++++++++++++++++ tests/doctool/doc-examples-obj.c | 65 ++++++++++++++++++++++ tests/doctool/doc-examples-obj.h | 29 ++++++++++ 12 files changed, 423 insertions(+) create mode 100644 tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page create mode 100644 tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page create mode 100644 tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page create mode 100644 tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page create mode 100644 tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page create mode 100644 tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page create mode 100644 tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page create mode 100644 tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page create mode 100644 tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page create mode 100644 tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page new file mode 100644 index 00000000..22d30c24 --- /dev/null +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page @@ -0,0 +1,11 @@ + + + + + DocExamples.Callback + + diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page new file mode 100644 index 00000000..56ebc4bb --- /dev/null +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page @@ -0,0 +1,12 @@ + + + + + + DocExamples.Enum +

This is an example to document an enumeration.

+ diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page new file mode 100644 index 00000000..ae7791e9 --- /dev/null +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page @@ -0,0 +1,39 @@ + + + + + + + + gboolean + + doc_examples_obj_static_method + + gint* + out_arg + + + + doc_examples_obj_static_method + +gboolean doc_examples_obj_static_method (gint* out_arg); + +

This is an example of a function with an out argument +and a return value.

+ + + + + + + + + + +

out_arg :

a pointer to int, or NULL to ignore

Returns :

TRUE if @out_arg is valid, FALSE otherwise

+ diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page new file mode 100644 index 00000000..a147b6bb --- /dev/null +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page @@ -0,0 +1,39 @@ + + + + + + + + gint* + + doc_examples_array_function + + gint* + out_len + + + + doc_examples_array_function + +gint* doc_examples_array_function (gint* out_len); + +

This function returns an array with an explicit length, +and the length should be invisible in most introspected bindings.

+ + + + + + + + + + +

out_len :

the length of the returned array

Returns :

an array of numbers.

+ diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page new file mode 100644 index 00000000..98958b22 --- /dev/null +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page @@ -0,0 +1,58 @@ + + + + + + + + void + + doc_examples_callback_function + + DocExamplesCallback + callback + + + gpointer + user_data + + + GDestroyNotify + destroy_notify + + + + doc_examples_callback_function + +void doc_examples_callback_function (DocExamplesCallback callback, + gpointer user_data, + GDestroyNotify destroy_notify); + +

This is a function that takes a callback. Different languages +will expose this in different ways (e.g. Python keeps the +@user_data parameter, while JS doesn't)

+ + + + + + + + + + + + + + + + + + +

callback :

Just Call Me Maybe

user_data :

your stuff

destroy_notify :

how to get rid of @user_data

Returns :

+ diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page new file mode 100644 index 00000000..22d30c24 --- /dev/null +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page @@ -0,0 +1,11 @@ + + + + + DocExamples.Callback + + diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page new file mode 100644 index 00000000..0f496063 --- /dev/null +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page @@ -0,0 +1,23 @@ + + + + + + DocExamples.Enum +

This is an example to document an enumeration.

+ + + + + + + + + +

Enum.FOO :

a foo

Enum.BAR :

a bar

+ + diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page new file mode 100644 index 00000000..d7990e03 --- /dev/null +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page @@ -0,0 +1,41 @@ + + + + + + + + gboolean + + doc_examples_obj_static_method + + gint + out_arg + + + + static_method + +@accepts(gint) +@returns(gboolean) +def static_method(out_arg) + +

This is an example of a function with an out argument +and a return value.

+ + + + + + + + + + +

out_arg :

a pointer to int, or None to ignore

Returns :

True if @out_arg is valid, False otherwise

+ diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page new file mode 100644 index 00000000..d552e178 --- /dev/null +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page @@ -0,0 +1,41 @@ + + + + + + + + [gint] + + doc_examples_array_function + + gint + out_len + + + + array_function + +@accepts(gint) +@returns([gint]) +def array_function(out_len) + +

This function returns an array with an explicit length, +and the length should be invisible in most introspected bindings.

+ + + + + + + + + + +

out_len :

the length of the returned array

Returns :

an array of numbers.

+ diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page new file mode 100644 index 00000000..ace76458 --- /dev/null +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page @@ -0,0 +1,54 @@ + + + + + + + + none + + doc_examples_callback_function + + DocExamples.Callback + callback + + + gpointer + user_data + + + GLib.DestroyNotify + destroy_notify + + + + callback_function + +@accepts(DocExamples.Callback, gpointer, GLib.DestroyNotify) +@returns(none) +def callback_function(callback, user_data, destroy_notify) + +

This is a function that takes a callback. Different languages +will expose this in different ways (e.g. Python keeps the +@user_data parameter, while JS doesn't)

+ + + + + + + + + + + + + + +

callback :

Just Call Me Maybe

user_data :

your stuff

destroy_notify :

how to get rid of @user_data

+ diff --git a/tests/doctool/doc-examples-obj.c b/tests/doctool/doc-examples-obj.c index 44360d9d..992e7151 100644 --- a/tests/doctool/doc-examples-obj.c +++ b/tests/doctool/doc-examples-obj.c @@ -125,3 +125,68 @@ doc_examples_obj_method (DocExamplesObj *self, gint first_arg, gfloat second_arg { return FALSE; } + +/** + * doc_examples_obj_static_method: + * @out_arg: (out) (allow-none): a pointer to int, or %NULL to ignore + * + * This is an example of a function with an out argument + * and a return value. + * + * Returns: %TRUE if @out_arg is valid, %FALSE otherwise + */ +gboolean +doc_examples_obj_static_method (gint *out_arg) +{ + if (out_arg) + *out_arg = 42; + + return TRUE; +} + +/** + * doc_examples_array_function: + * @out_len: (out): the length of the returned array + * + * This function returns an array with an explicit length, + * and the length should be invisible in most introspected bindings. + * + * Returns: (array length=out_len) (transfer full): an array of numbers. + */ +gint * +doc_examples_array_function (gint *out_len) +{ + gint *array; + int i, n = 3; + + array = g_new(int, n); + for (i = 0; i < n; i++) + array[i] = i; + + *out_len = n; + return array; +} + +/** + * doc_examples_callback_function: + * @callback: Just Call Me Maybe + * @user_data: your stuff + * @destroy_notify: how to get rid of @user_data + * + * This is a function that takes a callback. Different languages + * will expose this in different ways (e.g. Python keeps the + * @user_data parameter, while JS doesn't) + */ +void +doc_examples_callback_function (DocExamplesCallback callback, + gpointer user_data, + GDestroyNotify destroy_notify) +{ + gchar *result; + + result = callback (42, 17); + g_free (result); + + if (user_data && destroy_notify) + destroy_notify (user_data); +} diff --git a/tests/doctool/doc-examples-obj.h b/tests/doctool/doc-examples-obj.h index c8840d7a..e7aba555 100644 --- a/tests/doctool/doc-examples-obj.h +++ b/tests/doctool/doc-examples-obj.h @@ -59,6 +59,35 @@ DocExamplesObj *doc_examples_obj_new (void); gboolean doc_examples_obj_method (DocExamplesObj *self, gint first_arg, gfloat second_arg, gboolean boolean_arg, gpointer pointer_arg, gchar *string); +gboolean doc_examples_obj_static_method (gint *out_arg); + +gint *doc_examples_array_function (gint *out_len); + +/** + * DocExamplesEnum: + * @DOC_EXAMPLES_FOO: a foo + * @DOC_EXAMPLES_BAR: a bar + * + * This is an example to document an enumeration. + */ +typedef enum { + DOC_EXAMPLES_FOO, + DOC_EXAMPLES_BAR +} DocExamplesEnum; + +/** + * DocExamplesCallback: + * @one: first parameter + * @two: second parameter + * + * Returns: something + */ +typedef gchar * (*DocExamplesCallback) (int one, int two); + +void doc_examples_callback_function (DocExamplesCallback callback, + gpointer user_data, + GDestroyNotify destroy_notify); + G_END_DECLS #endif /* _DOC_EXAMPLES_OBJ_H */ -- cgit v1.2.1 From 383b0bdcc8e295d06035768062389797d3ba9262 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 26 Oct 2012 16:46:05 -0400 Subject: scanner: Correctly handle large 64 bit integer constants In C, positive integer constants are by default unsigned. This means an expression like 0x8000000000000000 will be "unsigned long long". In the actual scanner code, we were parsing them as "gint64", and storing them as gint64. This was incorrect; we need to parse them as guint64, and store the bits we get from that. This gives us an equivalent result to what the C compiler does. However, when we actually return the value as a Python "long" (arbitrary length integer), we need to treat the value as unsigned if the result indicated it was. https://bugzilla.gnome.org/show_bug.cgi?id=685022 --- giscanner/giscannermodule.c | 5 ++++- giscanner/scannerparser.y | 12 ++++++++---- giscanner/sourcescanner.h | 1 + tests/scanner/Regress-1.0-expected.gir | 15 +++++++++++++++ tests/scanner/regress.h | 5 +++++ 5 files changed, 33 insertions(+), 5 deletions(-) diff --git a/giscanner/giscannermodule.c b/giscanner/giscannermodule.c index 0f8d6cbb..0ece7f7a 100644 --- a/giscanner/giscannermodule.c +++ b/giscanner/giscannermodule.c @@ -162,7 +162,10 @@ symbol_get_const_int (PyGISourceSymbol *self, return Py_None; } - return PyLong_FromLongLong ((long long)self->symbol->const_int); + if (self->symbol->const_int_is_unsigned) + return PyLong_FromUnsignedLongLong ((unsigned long long)self->symbol->const_int); + else + return PyLong_FromLongLong ((long long)self->symbol->const_int); } static PyObject * diff --git a/giscanner/scannerparser.y b/giscanner/scannerparser.y index 81a9374f..82ee1d7c 100644 --- a/giscanner/scannerparser.y +++ b/giscanner/scannerparser.y @@ -1,4 +1,4 @@ -/* GObject introspection: C parser +/* GObject introspection: C parser -*- indent-tabs-mode: t; tab-width: 8 -*- * * Copyright (c) 1997 Sandro Sigala * Copyright (c) 2007-2008 Jürg Billeter @@ -232,15 +232,19 @@ primary_expression } | INTEGER { + char *rest; + guint64 value; $$ = gi_source_symbol_new (CSYMBOL_TYPE_CONST, scanner->current_filename, lineno); $$->const_int_set = TRUE; if (g_str_has_prefix (yytext, "0x") && strlen (yytext) > 2) { - $$->const_int = g_ascii_strtoll (yytext + 2, NULL, 16); + value = g_ascii_strtoull (yytext + 2, &rest, 16); } else if (g_str_has_prefix (yytext, "0") && strlen (yytext) > 1) { - $$->const_int = g_ascii_strtoll (yytext + 1, NULL, 8); + value = g_ascii_strtoull (yytext + 1, &rest, 8); } else { - $$->const_int = g_ascii_strtoll (yytext, NULL, 10); + value = g_ascii_strtoull (yytext, &rest, 10); } + $$->const_int = value; + $$->const_int_is_unsigned = (rest && (rest[0] == 'U')); } | CHARACTER { diff --git a/giscanner/sourcescanner.h b/giscanner/sourcescanner.h index df16cf6a..a2834caf 100644 --- a/giscanner/sourcescanner.h +++ b/giscanner/sourcescanner.h @@ -126,6 +126,7 @@ struct _GISourceSymbol gboolean const_int_set; gboolean private; gint64 const_int; /* 64-bit we can handle signed and unsigned 32-bit values */ + gboolean const_int_is_unsigned; char *const_string; gboolean const_double_set; double const_double; diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 53b3adc0..17d9d786 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -90,11 +90,26 @@ and/or use gtk-doc annotations. --> + + + + + + + + + diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h index aba29dfa..137c4e04 100644 --- a/tests/scanner/regress.h +++ b/tests/scanner/regress.h @@ -262,6 +262,7 @@ GQuark regress_atest_error_quark (void); /* constants */ +#define REGRESS_NEGATIVE_INT_CONSTANT -42 #define REGRESS_INT_CONSTANT 4422 #define REGRESS_DOUBLE_CONSTANT 44.22 #define REGRESS_STRING_CONSTANT "Some String" @@ -912,4 +913,8 @@ typedef struct { */ #define _DONTSCANTHIS 1 +/* https://bugzilla.gnome.org/show_bug.cgi?id=685022 */ +#define REGRESS_MININT64 ((gint64) G_GINT64_CONSTANT(0x8000000000000000)) +#define REGRESS_MAXUINT64 (G_GINT64_CONSTANT(0xffffffffffffffffU)) + #endif /* __GITESTTYPES_H__ */ -- cgit v1.2.1 From 4d671305adcd0e911cf282cc21010f44ef1d25b3 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 30 Oct 2012 18:23:09 -0400 Subject: cmph: Remove leftover statement-without-effect Compiler warning introduced from MSVC patches. --- girepository/cmph/brz.c | 1 - 1 file changed, 1 deletion(-) diff --git a/girepository/cmph/brz.c b/girepository/cmph/brz.c index d1079c22..cd35c8d8 100755 --- a/girepository/cmph/brz.c +++ b/girepository/cmph/brz.c @@ -672,7 +672,6 @@ static cmph_uint32 brz_bmz8_search(brz_data_t *brz, const char *key, cmph_uint32 n = (cmph_uint32)ceil(brz->c * m); h1 = hash(brz->h1[h0], key, keylen) % n; h2 = hash(brz->h2[h0], key, keylen) % n; - mphf_bucket; if (h1 == h2 && ++h2 >= n) h2 = 0; mphf_bucket = (cmph_uint8)(brz->g[h0][h1] + brz->g[h0][h2]); -- cgit v1.2.1 From 9d465d2bdcdb04a4b0873d7628f4a3a6becd8216 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 31 Oct 2012 10:35:33 -0400 Subject: tests/offsets: Remove leftover g_type_init() call --- tests/offsets/gen-gitestoffsets | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/offsets/gen-gitestoffsets b/tests/offsets/gen-gitestoffsets index 60efa439..77351060 100755 --- a/tests/offsets/gen-gitestoffsets +++ b/tests/offsets/gen-gitestoffsets @@ -209,8 +209,6 @@ output({}, r''' | if (argc != 3) | g_error ("Usage: gitestoffsets COMPILED_OFFSETS_FILE INTROSPECTED_OFFSETS_FILE"); | -| g_type_init (); -| | repository = g_irepository_get_default (); | if (!g_irepository_require (repository, namespace, version, 0, &error)) | g_error ("Failed to load %%s-%%s.typelib: %%s", namespace, version, error->message); -- cgit v1.2.1 From 046fbbac8730fe7ca578596fb71eb96fc77cfb93 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 31 Oct 2012 16:01:16 +0100 Subject: tests: work around make check warning The tests in tests/repository/ depend on libregress.so from tests/scanner which cannot be loaded during make check. Fixing this properly would require migrating to non-recursive automake for the tests, but for now we can just work around and set LD_LIBRARY_PATH (for linux) and PATH (for win32). http://bugzilla.gnome.org/show_bug.cgi?id=675049 --- tests/repository/Makefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tests/repository/Makefile.am b/tests/repository/Makefile.am index ca2efe36..96afb891 100644 --- a/tests/repository/Makefile.am +++ b/tests/repository/Makefile.am @@ -17,5 +17,8 @@ gitypelibtest_CPPFLAGS = $(GIREPO_CFLAGS) -I$(top_srcdir)/girepository gitypelibtest_LDADD = $(top_builddir)/libgirepository-1.0.la $(GIREPO_LIBS) TESTS = gitestrepo gitestthrows gitypelibtest -TESTS_ENVIRONMENT=env GI_TYPELIB_PATH=$(top_builddir):$(top_builddir)/gir:$(top_builddir)/tests:$(top_builddir)/tests/scanner: \ - XDG_DATA_DIRS="$(top_srcdir)/gir:$(XDG_DATA_DIRS)" $(DEBUG) +TESTS_ENVIRONMENT=env GI_TYPELIB_PATH="$(top_builddir):$(top_builddir)/gir:$(top_builddir)/tests:$(top_builddir)/tests/scanner" \ + XDG_DATA_DIRS="$(top_srcdir)/gir:$(XDG_DATA_DIRS)" \ + PATH="$(top_builddir)/tests/scanner/.libs:$(PATH)" \ + LD_LIBRARY_PATH="$(top_builddir)/tests/scanner/.libs:$(LD_LIBRARY_PATH)" \ + $(DEBUG) -- cgit v1.2.1 From f6a2c730c68661cf08c52fe2d0863cacfde98971 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Sat, 3 Nov 2012 14:08:36 +0100 Subject: Update annotations from glib git --- gir/gio-2.0.c | 7 ++++--- gir/glib-2.0.c | 32 ++++++++++++++++++-------------- 2 files changed, 22 insertions(+), 17 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index d037c548..cb1f6d21 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -5613,7 +5613,7 @@ * * #GNetworkMonitor provides an easy-to-use cross-platform API * for monitoring network connectivity. On Linux, the implementation - * is based on the kernels netlink interface. + * is based on the kernel's netlink interface. */ @@ -15944,7 +15944,8 @@ * g_dbus_object_manager_client_get_name: * @manager: A #GDBusObjectManagerClient * - * Gets the name that @manager is for. + * Gets the name that @manager is for, or %NULL if not a message bus + * connection. * * Returns: A unique or well-known name. Do not free, the string belongs to @manager. * Since: 2.30 @@ -16070,7 +16071,7 @@ * g_dbus_object_manager_client_new_sync: * @connection: A #GDBusConnection. * @flags: Zero or more flags from the #GDBusObjectManagerClientFlags enumeration. - * @name: The owner of the control object (unique or well-known name). + * @name: (allow-none): The owner of the control object (unique or well-known name), or %NULL when not using a message bus connection. * @object_path: The object path of the control object. * @get_proxy_type_func: (allow-none): A #GDBusProxyTypeFunc function or %NULL to always construct #GDBusProxy proxies. * @get_proxy_type_user_data: User data to pass to @get_proxy_type_func. diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index a9fc456e..5c1d942e 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -11150,9 +11150,9 @@ * g_spawn_close_pid() in the callback function for the source. * * Note further that using g_child_watch_source_new() is not - * compatible with calling waitpid(-1) in - * the application. Calling waitpid() for individual pids will - * still work fine. + * compatible with calling waitpid with a + * nonpositive first argument in the application. Calling waitpid() + * for individual pids will still work fine. * * Returns: the newly-created child watch source * Since: 2.4 @@ -14183,13 +14183,13 @@ /** * g_filename_from_uri: * @uri: a uri describing a filename (escaped, encoded in ASCII). - * @hostname: (allow-none): Location to store hostname for the URI, or %NULL. If there is no hostname in the URI, %NULL will be stored in this location. + * @hostname: (out) (allow-none): Location to store hostname for the URI, or %NULL. If there is no hostname in the URI, %NULL will be stored in this location. * @error: location to store the error occurring, or %NULL to ignore errors. Any of the errors in #GConvertError may occur. * * Converts an escaped ASCII-encoded URI to a local filename in the * encoding used for filenames. * - * Returns: a newly-allocated string holding the resulting filename, or %NULL on an error. + * Returns: (type filename): a newly-allocated string holding the resulting filename, or %NULL on an error. */ @@ -14197,8 +14197,8 @@ * g_filename_from_utf8: * @utf8string: a UTF-8 encoded string. * @len: the length of the string, or -1 if the string is nul-terminated. - * @bytes_read: location to store the number of bytes in the input string that were successfully converted, or %NULL. Even if the conversion was successful, this may be less than @len if there were partial characters at the end of the input. If the error #G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value stored will the byte offset after the last valid input sequence. - * @bytes_written: the number of bytes stored in the output buffer (not including the terminating nul). + * @bytes_read: (out) (allow-none): location to store the number of bytes in the input string that were successfully converted, or %NULL. Even if the conversion was successful, this may be less than @len if there were partial characters at the end of the input. If the error #G_CONVERT_ERROR_ILLEGAL_SEQUENCE occurs, the value stored will the byte offset after the last valid input sequence. + * @bytes_written: (out): the number of bytes stored in the output buffer (not including the terminating nul). * @error: location to store the error occurring, or %NULL to ignore errors. Any of the errors in #GConvertError may occur. * * Converts a string from UTF-8 to the encoding GLib uses for @@ -14206,7 +14206,7 @@ * on other platforms, this function indirectly depends on the * current locale. * - * Returns: The converted string, or %NULL on an error. + * Returns: (array length=bytes_written) (element-type guint8) (transfer full): The converted string, or %NULL on an error. */ @@ -27168,7 +27168,7 @@ * * context is already owned by another thread. * */ * g_test_expect_message (G_LOG_DOMAIN, - * G_LOG_LEVEL_CRITICIAL, + * G_LOG_LEVEL_CRITICAL, * "assertion.*acquired_context.*failed"); * g_main_context_push_thread_default (bad_context); * g_test_assert_expected_messages (); @@ -29710,11 +29710,15 @@ * @signum: A signal number * * Create a #GSource that will be dispatched upon delivery of the UNIX - * signal @signum. Currently only SIGHUP, - * SIGINT, and SIGTERM can - * be monitored. Note that unlike the UNIX default, all sources which - * have created a watch will be dispatched, regardless of which - * underlying thread invoked g_unix_signal_source_new(). + * signal @signum. In GLib versions before 2.36, only + * SIGHUP, SIGINT, + * SIGTERM can be monitored. In GLib 2.36, + * SIGUSR1 and SIGUSR2 were + * added. + * + * Note that unlike the UNIX default, all sources which have created a + * watch will be dispatched, regardless of which underlying thread + * invoked g_unix_signal_source_new(). * * For example, an effective use of this function is to handle SIGTERM * cleanly; flushing any outstanding files, and then calling -- cgit v1.2.1 From db71321a5b23715ac047058e56c1fcb6a5985376 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 6 Nov 2012 11:48:36 -0500 Subject: scanner: Emit correct type for unsigned integer constants Otherwise bindings will break. https://bugzilla.gnome.org/show_bug.cgi?id=685022 --- giscanner/scannerparser.y | 2 +- tests/scanner/Regress-1.0-expected.gir | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/giscanner/scannerparser.y b/giscanner/scannerparser.y index 82ee1d7c..773e9612 100644 --- a/giscanner/scannerparser.y +++ b/giscanner/scannerparser.y @@ -386,7 +386,7 @@ unary_expression { $$ = $3; if ($$->const_int_set) { - $$->base_type = gi_source_basic_type_new ("gint64"); + $$->base_type = gi_source_basic_type_new ($$->const_int_is_unsigned ? "guint64" : "gint64"); } } | INTUL_CONST '(' unary_expression ')' diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 17d9d786..a895a760 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -93,7 +93,7 @@ and/or use gtk-doc annotations. --> - + Date: Mon, 5 Nov 2012 18:13:24 -0500 Subject: gimarshallingtests: Add some GBytes tests Will be used by gjs for new byte array work. https://bugzilla.gnome.org/show_bug.cgi?id=687696 --- tests/gimarshallingtests.c | 30 ++++++++++++++++++++++++++++++ tests/gimarshallingtests.h | 5 +++++ 2 files changed, 35 insertions(+) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index e05f9169..5ce800d2 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -2232,6 +2232,36 @@ gi_marshalling_tests_bytearray_none_in (GByteArray *v) g_assert_cmpuint (g_array_index (v, unsigned char, 3), ==, 51); } +/** + * gi_marshalling_tests_gbytes_full_return: + * + * Returns: (transfer full): + */ +GBytes * +gi_marshalling_tests_gbytes_full_return (void) +{ + static guint8 data[] = {0, 49, 0xFF, 51}; + + return g_bytes_new_static (data, G_N_ELEMENTS(data)); +} + +/** + * gi_marshalling_tests_gbytes_none_in: + */ +void +gi_marshalling_tests_gbytes_none_in (GBytes *v) +{ + const guint8 *data; + gsize len; + data = g_bytes_get_data (v, &len); + + g_assert_cmpuint (len, ==, 4); + g_assert_cmpuint (data[0], ==, 0); + g_assert_cmpuint (data[1], ==, 49); + g_assert_cmpuint (data[2], ==, 0xFF); + g_assert_cmpuint (data[3], ==, 51); +} + /** * gi_marshalling_tests_gstrv_return: * diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index 73401eee..1b5d7ce2 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -459,6 +459,11 @@ void gi_marshalling_tests_gptrarray_utf8_full_inout (GPtrArray **parray_); GByteArray *gi_marshalling_tests_bytearray_full_return (void); void gi_marshalling_tests_bytearray_none_in (GByteArray* v); +/* GBytes */ + +GBytes *gi_marshalling_tests_gbytes_full_return (void); +void gi_marshalling_tests_gbytes_none_in (GBytes* v); + /* GStrv */ GStrv gi_marshalling_tests_gstrv_return (void); -- cgit v1.2.1 From dad7875eaa83957affa5abe3db5ad2fbdb1a4d72 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 9 Nov 2012 08:03:21 +0100 Subject: gimarshallingtests: Fix return data type gi_marshalling_tests_genum_returnv() should (and does) return a GIMarshallingTestsGEnum, not a GIMarshallingTestsEnum. The latter is already covered by gi_marshalling_tests_enum_returnv(). --- tests/gimarshallingtests.c | 2 +- tests/gimarshallingtests.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index 5ce800d2..04261324 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -3339,7 +3339,7 @@ gi_marshalling_tests_genum_get_type (void) return type; } -GIMarshallingTestsEnum +GIMarshallingTestsGEnum gi_marshalling_tests_genum_returnv (void) { return GI_MARSHALLING_TESTS_GENUM_VALUE3; diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index 1b5d7ce2..6cbefb08 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -303,7 +303,7 @@ typedef enum GType gi_marshalling_tests_genum_get_type (void) G_GNUC_CONST; #define GI_MARSHALLING_TESTS_TYPE_GENUM (gi_marshalling_tests_genum_get_type ()) -GIMarshallingTestsEnum gi_marshalling_tests_genum_returnv (void); +GIMarshallingTestsGEnum gi_marshalling_tests_genum_returnv (void); void gi_marshalling_tests_genum_in (GIMarshallingTestsGEnum v); -- cgit v1.2.1 From dc453895c2df0b6d26a08885d156b363ffa5b921 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 9 Nov 2012 09:40:45 +0100 Subject: Update annotations from glib git --- gir/glib-2.0.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 5c1d942e..1499a6de 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -10574,13 +10574,13 @@ * * Creates a new #GByteArray with a reference count of 1. * - * Returns: the new #GByteArray. + * Returns: (transfer full): the new #GByteArray. */ /** * g_byte_array_new_take: - * @data: (array length=len): byte data for the array + * @data: (transfer full) (array length=len): byte data for the array * @len: length of @data * * Create byte array containing the data. The data will be owned by the array @@ -10761,7 +10761,7 @@ * * This function will always return the same pointer for a given #GBytes. * - * Returns: (array length=size) (type guint8): a pointer to the byte data + * Returns: (transfer none) (array length=size) (type guint8): a pointer to the byte data * Since: 2.32 */ @@ -10795,7 +10795,7 @@ /** * g_bytes_new: - * @data: (array length=size): the data to be used for the bytes + * @data: (transfer none) (array length=size) (element-type guint8): the data to be used for the bytes * @size: the size of @data * * Creates a new #GBytes from @data. @@ -10825,8 +10825,8 @@ /** - * g_bytes_new_static: - * @data: (array length=size): the data to be used for the bytes + * g_bytes_new_static: (skip) + * @data: (transfer full) (array length=size) (element-type guint8): the data to be used for the bytes * @size: the size of @data * * Creates a new #GBytes from static data. @@ -10840,7 +10840,7 @@ /** * g_bytes_new_take: - * @data: (transfer full) (array length=size): the data to be used for the bytes + * @data: (transfer full) (array length=size) (element-type guint8): the data to be used for the bytes * @size: the size of @data * * Creates a new #GBytes from @data. -- cgit v1.2.1 From abc95859d05edc9d167ef967652327091422b682 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Mon, 12 Nov 2012 17:18:41 +0100 Subject: giscanner: unbreak g-ir-annotationtool... ... and by extension misc/update-glib-annotations.py. Commit 5c70ef2eb32949f8889e9ae654d50bfbf838951f broke these by assuming create_source_scanner() is always called with 'options' and 'args' built by the OptionParser() defined in scannermain.py's _get_option_parser(). This is not the case with g-ir-annotationtool, where annotationmain.py's annotation_main() creates it's own OptionParser() accepting a different set of 'options' and 'args' as compared to scannermain.py --- giscanner/scannermain.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py index 6efd291a..45dcbcbd 100755 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -348,7 +348,7 @@ def create_binary(transformer, options, args): return shlibs def create_source_scanner(options, args): - if options.filelist: + if hasattr(options, 'filelist') and options.filelist: filenames = extract_filelist(options) else: filenames = extract_filenames(args) @@ -408,7 +408,7 @@ def scanner_main(args): if options.test_codegen: return test_codegen(options.test_codegen) - if not options.filelist: + if hasattr(options, 'filelist') and not options.filelist: if len(args) <= 1: _error('Need at least one filename') -- cgit v1.2.1 From 91d5c783c9bf73e94c1ad050bd8ef1e260d2291c Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 14 Nov 2012 07:27:50 +0100 Subject: GIMarshallingTests: Add GVariant property --- tests/gimarshallingtests.c | 16 ++++++++++++++++ tests/gimarshallingtests.h | 1 + 2 files changed, 17 insertions(+) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index 04261324..c92dd10f 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -4624,6 +4624,7 @@ enum { SOME_DOUBLE_PROPERTY, SOME_STRV_PROPERTY, SOME_BOXED_STRUCT_PROPERTY, + SOME_VARIANT_PROPERTY, }; G_DEFINE_TYPE (GIMarshallingTestsPropertiesObject, gi_marshalling_tests_properties_object, G_TYPE_OBJECT); @@ -4684,6 +4685,9 @@ gi_marshalling_tests_properties_object_get_property (GObject * object, guint pro case SOME_BOXED_STRUCT_PROPERTY: g_value_set_boxed (value, self->some_boxed_struct); break; + case SOME_VARIANT_PROPERTY: + g_value_set_variant (value, self->some_variant); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -4737,6 +4741,13 @@ gi_marshalling_tests_properties_object_set_property (GObject * object, guint pro gi_marshalling_tests_boxed_struct_free (self->some_boxed_struct); self->some_boxed_struct = gi_marshalling_tests_boxed_struct_copy (g_value_get_boxed (value)); break; + case SOME_VARIANT_PROPERTY: + if (self->some_variant != NULL) + g_variant_unref (self->some_variant); + self->some_variant = g_value_get_variant (value); + if (self->some_variant != NULL) + g_variant_ref (self->some_variant); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -4804,6 +4815,11 @@ gi_marshalling_tests_properties_object_class_init (GIMarshallingTestsPropertiesO g_param_spec_boxed ("some-boxed-struct", "some-boxed-struct", "some-boxed-struct", gi_marshalling_tests_boxed_struct_get_type(), G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, SOME_VARIANT_PROPERTY, + g_param_spec_variant ("some-variant", "some-variant", "some-variant", + G_VARIANT_TYPE_ANY, NULL, + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); } GIMarshallingTestsPropertiesObject* diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index 6cbefb08..0e240773 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -1045,6 +1045,7 @@ struct _GIMarshallingTestsPropertiesObject { gdouble some_double; gchar **some_strv; GIMarshallingTestsBoxedStruct* some_boxed_struct; + GVariant *some_variant; }; struct _GIMarshallingTestsPropertiesObjectClass { -- cgit v1.2.1 From f2b17fded50efc4f9bbd510cdc4f599f6993f1ed Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Thu, 15 Nov 2012 20:56:21 +0100 Subject: docs: make gtkdoc-mkdb ignore cmph doxygen comment blocks. When building g-i reference documentation, girepository/cmph/* was being scanned for GTK-Doc comment blocks by gtkdoc-mkdb. Unfortunately, cmph uses doxygen comment blocks which also start with /**. This patch prevents gtkdoc-mkdb from complaining. https://bugzilla.gnome.org/show_bug.cgi?id=688418 --- docs/reference/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am index 19c9affa..c3157be3 100644 --- a/docs/reference/Makefile.am +++ b/docs/reference/Makefile.am @@ -13,7 +13,7 @@ DOC_SOURCE_DIR=$(top_srcdir)/girepository SCAN_OPTIONS= # Extra options to supply to gtkdoc-mkdb -MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=g +MKDB_OPTIONS=--sgml-mode --output-format=xml --name-space=g --ignore-files=cmph # Used for dependencies HFILE_GLOB=$(top_srcdir)/girepository/*.h -- cgit v1.2.1 From 338c78139ef31cc84feabfdf89566453184f3ae0 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Thu, 15 Nov 2012 20:56:41 +0100 Subject: docs: remove reference to object_grouped.sgml. This most likely sneaked in as a copy paste error from GTK+ reference docs as g-i never had a object_grouped.sgml... https://bugzilla.gnome.org/show_bug.cgi?id=688418 --- docs/reference/gi-docs.sgml | 1 - docs/reference/gi-overview.xml | 1 - docs/reference/gi-struct-hierarchy.xml | 1 - 3 files changed, 3 deletions(-) diff --git a/docs/reference/gi-docs.sgml b/docs/reference/gi-docs.sgml index 4d743c9a..2f8bf861 100644 --- a/docs/reference/gi-docs.sgml +++ b/docs/reference/gi-docs.sgml @@ -4,7 +4,6 @@ ]> - GObject Introspection Reference Manual diff --git a/docs/reference/gi-overview.xml b/docs/reference/gi-overview.xml index b624a884..0943b8e5 100644 --- a/docs/reference/gi-overview.xml +++ b/docs/reference/gi-overview.xml @@ -4,7 +4,6 @@ ]> - Introspection Overview diff --git a/docs/reference/gi-struct-hierarchy.xml b/docs/reference/gi-struct-hierarchy.xml index 7b63c548..eea51282 100644 --- a/docs/reference/gi-struct-hierarchy.xml +++ b/docs/reference/gi-struct-hierarchy.xml @@ -4,7 +4,6 @@ ]> - Struct hierarchy -- cgit v1.2.1 From 6b0687702695389e5aa4176062591a2d604d3e45 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Thu, 15 Nov 2012 20:56:54 +0100 Subject: docs: don't mark non GTK-Doc as being a GTK-Doc comment block This patch silences another gtkdoc-mkdb warning. https://bugzilla.gnome.org/show_bug.cgi?id=688418 --- girepository/gthash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/girepository/gthash.c b/girepository/gthash.c index b50ea6f0..ecc3b104 100644 --- a/girepository/gthash.c +++ b/girepository/gthash.c @@ -29,7 +29,7 @@ #define ALIGN_VALUE(this, boundary) \ (( ((unsigned long)(this)) + (((unsigned long)(boundary)) -1)) & (~(((unsigned long)(boundary))-1))) -/** +/* * String hashing in the typelib. We have a set of static (fixed) strings, * and given one, we need to find its index number. This problem is perfect * hashing: http://en.wikipedia.org/wiki/Perfect_hashing -- cgit v1.2.1 From fb1fc89e98b4fb7b065b8c8e4f36f4ef8f50c6e5 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Thu, 15 Nov 2012 20:57:07 +0100 Subject: docs: add GTK-Doc generated output to .gitignore https://bugzilla.gnome.org/show_bug.cgi?id=688418 --- .gitignore | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.gitignore b/.gitignore index f71ec463..70960591 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,18 @@ tests/offsets/offsets.introspected tests/doctool/DocExamples-1.0-C tests/doctool/DocExamples-1.0-Python .make-check-passed + +#GTK-Doc output +docs/reference/html +docs/reference/xml +docs/reference/gi.args +docs/reference/gi.hierarchy +docs/reference/gi.interfaces +docs/reference/gi.prerequisites +docs/reference/gi.signals +docs/reference/gi-decl.txt +docs/reference/gi-decl-list.txt +docs/reference/gi-undeclared.txt +docs/reference/gi-undocumented.txt +docs/reference/gi-unused.txt +docs/reference/version.xml -- cgit v1.2.1 From 3c8927ddff09745cd30654fe99c68ed9bcae6118 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 19 Nov 2012 13:57:49 +0100 Subject: Bump version to 1.35.2 Our configure.ac still said 1.34.0, which is even older than the stable gnome-3-6 branch. Bump it to 1.35.2 so that pygobject can depend on >= 1.34.2. --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index ca783155..f6fd5a06 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,8 @@ dnl the gi version number m4_define(gi_major_version, 1) -m4_define(gi_minor_version, 34) -m4_define(gi_micro_version, 0) +m4_define(gi_minor_version, 35) +m4_define(gi_micro_version, 2) m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version) AC_PREREQ([2.63]) -- cgit v1.2.1 From 5153efd29e9a813a97d58905340c0ec4af04c5bd Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Tue, 20 Nov 2012 00:20:46 +0100 Subject: Add more tests for boxed types gjs needs a boxed type that cannot be trivially allocated but has also a complex constructor. https://bugzilla.gnome.org/show_bug.cgi?id=612033 --- tests/scanner/regress.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ tests/scanner/regress.h | 10 ++++++++++ 2 files changed, 57 insertions(+) diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c index bdc1dc3c..b7526bfb 100644 --- a/tests/scanner/regress.c +++ b/tests/scanner/regress.c @@ -1953,6 +1953,53 @@ G_DEFINE_BOXED_TYPE(RegressTestBoxedC, regress_test_boxed_c_ref, regress_test_boxed_c_unref); +struct _RegressTestBoxedD { + char *a_string; + gint a_int; +}; + +RegressTestBoxedD * +regress_test_boxed_d_new (const char *a_string, int a_int) +{ + RegressTestBoxedD *boxed; + + boxed = g_slice_new (RegressTestBoxedD); + boxed->a_string = g_strdup (a_string); + boxed->a_int = a_int; + + return boxed; +} + +RegressTestBoxedD * +regress_test_boxed_d_copy (RegressTestBoxedD *boxed) +{ + RegressTestBoxedD *ret; + + ret = g_slice_new (RegressTestBoxedD); + ret->a_string = g_strdup (boxed->a_string); + ret->a_int = boxed->a_int; + + return ret; +} + +void +regress_test_boxed_d_free (RegressTestBoxedD *boxed) +{ + g_free (boxed->a_string); + g_slice_free (RegressTestBoxedD, boxed); +} + +int +regress_test_boxed_d_get_magic (RegressTestBoxedD *boxed) +{ + return strlen (boxed->a_string) + boxed->a_int; +} + +G_DEFINE_BOXED_TYPE(RegressTestBoxedD, + regress_test_boxed_d, + regress_test_boxed_d_copy, + regress_test_boxed_d_free); + G_DEFINE_TYPE(RegressTestObj, regress_test_obj, G_TYPE_OBJECT); enum diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h index 137c4e04..d8a3002e 100644 --- a/tests/scanner/regress.h +++ b/tests/scanner/regress.h @@ -432,6 +432,16 @@ struct _RegressTestBoxedC GType regress_test_boxed_c_get_type (void); RegressTestBoxedC *regress_test_boxed_c_new (void); +typedef struct _RegressTestBoxedD RegressTestBoxedD; + +GType regress_test_boxed_d_get_type (void); + +RegressTestBoxedD *regress_test_boxed_d_new (const char *a_string, int a_int); +RegressTestBoxedD *regress_test_boxed_d_copy (RegressTestBoxedD *boxed); +void regress_test_boxed_d_free (RegressTestBoxedD *boxed); + +int regress_test_boxed_d_get_magic (RegressTestBoxedD *boxed); + /* gobject */ #define REGRESS_TEST_TYPE_OBJ (regress_test_obj_get_type ()) #define REGRESS_TEST_OBJECT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), REGRESS_TEST_TYPE_OBJ, RegressTestObj)) -- cgit v1.2.1 From 21cec56f5aa24bf1288a6ef3ecd2d1d168bff827 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Wed, 21 Nov 2012 08:47:36 +0100 Subject: Regress: Update expected gir for previous changes Changes introduced by 5153efd29e9a813a97d58905340c0ec4af04c5bd --- tests/scanner/Regress-1.0-expected.gir | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index a895a760..7aee6419 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -271,6 +271,40 @@ use it should be. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v1.2.1 From 17fc978c081195dad1f6a66d69cc6e18423e6db5 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 21 Nov 2012 10:25:13 +0100 Subject: GIMarshallingTests: Add more virtual methods with out arguments Add virtuals method which takes both an (in) and and (out) argument, and variants with both caller and callee allocation. This came up in https://bugzilla.gnome.org/show_bug.cgi?id=688783 --- tests/gimarshallingtests.c | 32 ++++++++++++++++++++++++++++++++ tests/gimarshallingtests.h | 23 +++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index c92dd10f..9a533293 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -3940,6 +3940,38 @@ gi_marshalling_tests_object_method_int8_out (GIMarshallingTestsObject *self, gin GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->method_int8_out (self, out); } +/** + * gi_marshalling_tests_object_method_int8_arg_and_out_caller: + * @out: (out caller-allocates): + */ +void +gi_marshalling_tests_object_method_int8_arg_and_out_caller (GIMarshallingTestsObject *self, gint8 arg, gint8 *out) +{ + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->method_int8_arg_and_out_caller (self, arg, out); +} + +/** + * gi_marshalling_tests_object_method_int8_arg_and_out_callee: + * @out: (out): + */ +void +gi_marshalling_tests_object_method_int8_arg_and_out_callee (GIMarshallingTestsObject *self, gint8 arg, gint8 **out) +{ + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->method_int8_arg_and_out_callee (self, arg, out); +} + +/** + * gi_marshalling_tests_object_method_str_arg_out_ret: + * @out: (out caller-allocates): + * + * Returns: (transfer none) + */ +const gchar* +gi_marshalling_tests_object_method_str_arg_out_ret (GIMarshallingTestsObject *self, const gchar* arg, guint *out) +{ + return GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->method_str_arg_out_ret (self, arg, out); +} + /** * gi_marshalling_tests_object_method_with_default_implementation: * @in: (in): diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index 0e240773..23af6a52 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -711,6 +711,26 @@ struct _GIMarshallingTestsObjectClass */ void (* method_int8_out) (GIMarshallingTestsObject *self, gint8 *out); + /** + * GIMarshallingTestsObjectClass::method_int8_arg_and_out_caller: + * @out: (out caller-allocates): + */ + void (* method_int8_arg_and_out_caller) (GIMarshallingTestsObject *self, gint8 arg, gint8 *out); + + /** + * GIMarshallingTestsObjectClass::method_int8_arg_and_out_callee: + * @out: (out): + */ + void (* method_int8_arg_and_out_callee) (GIMarshallingTestsObject *self, gint8 arg, gint8 **out); + + /** + * GIMarshallingTestsObjectClass::method_str_arg_out_ret: + * @out: (out caller-allocates): + * + * Returns: (transfer none) + */ + const gchar* (* method_str_arg_out_ret) (GIMarshallingTestsObject *self, const gchar* arg, guint *out); + /** * GIMarshallingTestsObjectClass::method_with_default_implementation: * @in: (in): @@ -792,6 +812,9 @@ const gint *gi_marshalling_tests_object_method_array_return (GIMarshallingTestsO void gi_marshalling_tests_object_method_int8_in (GIMarshallingTestsObject *object, gint8 in); void gi_marshalling_tests_object_method_int8_out (GIMarshallingTestsObject *object, gint8 *out); +void gi_marshalling_tests_object_method_int8_arg_and_out_caller (GIMarshallingTestsObject *object, gint8 arg, gint8 *out); +void gi_marshalling_tests_object_method_int8_arg_and_out_callee (GIMarshallingTestsObject *object, gint8 arg, gint8 **out); +const gchar* gi_marshalling_tests_object_method_str_arg_out_ret (GIMarshallingTestsObject *object, const gchar* arg, guint *out); void gi_marshalling_tests_object_method_with_default_implementation (GIMarshallingTestsObject *object, gint8 in); void gi_marshalling_tests_object_method_variant_array_in (GIMarshallingTestsObject *object, GVariant **in, gsize n_in); -- cgit v1.2.1 From df8fc129e52e8fdb64d3b3dde42a2f98945532b5 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 21 Nov 2012 16:59:55 +0100 Subject: Update GLib annotations to master https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- gir/gio-2.0.c | 7 +++++-- gir/gobject-2.0.c | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index cb1f6d21..1c64ec13 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -4248,7 +4248,10 @@ * * With this setup, a D-Bus peer can transparently pass e.g. %FOO_BAR_ERROR_ANOTHER_ERROR and * other peers will see the D-Bus error name org.project.Foo.Bar.Error.AnotherError. - * If the other peer is using GDBus, the peer will see also %FOO_BAR_ERROR_ANOTHER_ERROR instead + * + * If the other peer is using GDBus, and has registered the association with + * g_dbus_error_register_error_domain() in advance (e.g. by invoking the %FOO_BAR_ERROR quark + * generation itself in the previous example) the peer will see also %FOO_BAR_ERROR_ANOTHER_ERROR instead * of %G_IO_ERROR_DBUS_ERROR. Note that GDBus clients can still recover * org.project.Foo.Bar.Error.AnotherError using g_dbus_error_get_remote_error(). * @@ -4616,7 +4619,7 @@ * #GDrive is a container class for #GVolume objects that stem from * the same piece of media. As such, #GDrive abstracts a drive with * (or without) removable media and provides operations for querying - * whether media is available, determing whether media change is + * whether media is available, determining whether media change is * automatically detected and ejecting the media. * * If the #GDrive reports that media isn't automatically detected, one diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c index 755f4c24..dc718cec 100644 --- a/gir/gobject-2.0.c +++ b/gir/gobject-2.0.c @@ -4259,7 +4259,7 @@ * structures. * * Note that the accumulated size of the private structures of - * a type and all its parent types cannot excced 64 KiB. + * a type and all its parent types cannot exceed 64 KiB. * * This function should be called in the type's class_init() function. * The private structure can be retrieved using the -- cgit v1.2.1 From 2b4126ab69ec4b7384cf50f5b0575a149acf5afd Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Tue, 30 Oct 2012 16:59:58 +0100 Subject: tests: add g-ir-doc-tool generated output to .gitignore https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 70960591..03d90a50 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,7 @@ docs/reference/gi-undeclared.txt docs/reference/gi-undocumented.txt docs/reference/gi-unused.txt docs/reference/version.xml + +#g-ir-doc-tool tests +tests/doctool/DocExamples-1.0-C +tests/doctool/DocExamples-1.0-Python -- cgit v1.2.1 From 4959599c423af9648d8d4e3f02b4117d11ab9a0b Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Tue, 17 Jul 2012 17:04:36 +0200 Subject: giscanner: improve wording of inline documentation https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- giscanner/annotationparser.py | 93 ++++++++++++++++++++++++++----------------- giscanner/maintransformer.py | 2 +- 2 files changed, 58 insertions(+), 37 deletions(-) diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index 2ac1b0eb..764d594c 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -20,7 +20,7 @@ # -# AnnotationParser - extract annotations from gtk-doc comments +# AnnotationParser - extract annotations from GTK-Doc comment blocks import re @@ -477,7 +477,8 @@ class AnnotationParser(object): :class:`DocTag`, :class:`DocOptions` and :class:`DocOption` objects. This parser tries to accept malformed input whenever possible and does not emit syntax errors. However, it does emit warnings at the slightest indication - of malformed input when possible. + of malformed input when possible. It is usually a good idea to heed these + warnings as malformed input is known to result in invalid GTK-Doc output. A GTK-Doc comment block can be constructed out of multiple parts that can be combined to write different types of documentation. @@ -489,38 +490,48 @@ class AnnotationParser(object): .. code-block:: c /** - * identifier_name: [annotations] - * @parameter_name: [annotations:] [description] + * identifier_name [:annotations] + * @parameter_name [:annotations] [:description] * - * description - * tag_name: [annotations:] [description] + * comment_block_description + * tag_name [:annotations] [:description] */ - - Parts and fields cannot span multiple lines, except for parameter descriptions, - tag descriptions and comment block descriptions. - - There has to be exactly 1 `identifier` part on the first line of the - comment block which consists of: - * an `identifier_name` field - * an optional `annotations` field - - There can be 0 or more `parameter` parts following the `identifier` part, - each consisting of: - * a `parameter_name` filed - * an optional `annotations` field - * an optional `description` field - - An empty lines signals the end of the `parameter` parts and the beginning - of the (free form) comment block `description` part. - - There can be 0 or 1 `description` parts following the `description` part. - - There can be 0 or more `tag` parts following the `description` part, - each consisting of: - * a `tag_name` field - * an optional `annotations` field - * an optional `description` field + The order in which the different parts have to be specified is important:: + + - There has to be exactly 1 `identifier` part on the first line of the + comment block which consists of: + * an `identifier_name` field + * an optional `annotations` field + - Followed by 0 or more `parameters` parts, each consisting of: + * a `parameter_name` field + * an optional `annotations` field + * an optional `description` field + - Followed by at least 1 empty line signaling the beginning of + the `comment_block_description` part + - Followed by an optional `comment block description` part. + - Followed by 0 or more `tag` parts, each consisting of: + * a `tag_name` field + * an optional `annotations` field + * an optional `description` field + + Additionally, the following restrictions are in effect:: + + - Parts can optionally be separated by an empty line, except between + the `parameter` parts and the `comment block description` part where + an empty line is required (see above). + - Parts and fields cannot span multiple lines, except for + `parameter descriptions`, `tag descriptions` and the + `comment_block_description` fields. + - `parameter descriptions` fields can not span multiple paragraphs. + - `tag descriptions` and `comment block description` fields can + span multiple paragraphs. .. NOTE:: :class:`AnnotationParser` functionality is heavily based on gtkdoc-mkdb's - `ScanSourceFile()`_ function and is currently in sync with gtk-doc + `ScanSourceFile()`_ function and is currently in sync with GTK-Doc commit `b41641b`_. - .. _types of documentation: + .. _GTK-Doc's documentation: http://developer.gnome.org/gtk-doc-manual/1.18/documenting.html.en .. _ScanSourceFile(): http://git.gnome.org/browse/gtk-doc/tree/gtkdoc-mkdb.in#n3722 @@ -532,7 +543,7 @@ class AnnotationParser(object): Parses multiple GTK-Doc comment blocks. :param comments: a list of (comment, filename, lineno) tuples - :returns: a list of :class:`DocBlock` or ``None`` objects + :returns: a dictionary mapping identifier names to :class:`DocBlock` objects """ comment_blocks = {} @@ -541,13 +552,17 @@ class AnnotationParser(object): comment_block = self.parse_comment_block(comment) if comment_block is not None: + # Note: previous versions of this parser did not check + # if an identifier was already stored in comment_blocks, + # so when multiple comment blocks where encountered documenting + # the same identifier the last one seen "wins". + # Keep this behavior for backwards compatibility, but + # emit a warning. if comment_block.name in comment_blocks: message.warn("multiple comment blocks documenting '%s:' identifier." % (comment_block.name), comment_block.position) - # Always store the block even if it's a duplicate for - # backward compatibility... comment_blocks[comment_block.name] = comment_block return comment_blocks @@ -561,6 +576,10 @@ class AnnotationParser(object): """ comment, filename, lineno = comment + + # Assign line numbers to each line of the comment block, + # which will later be used as the offset to calculate the + # real line number in the source file comment_lines = list(enumerate(comment.split('\n'))) # Check for the start the comment block. @@ -579,11 +598,12 @@ class AnnotationParser(object): def _parse_comment_block(self, comment_lines, filename, lineno): """ - Parses a single GTK-Doc comment block stripped from it's + Parses a single GTK-Doc comment block already stripped from its comment start (/**) and comment end (*/) marker lines. - :param comment_lines: GTK-Doc comment block stripped from it's comment - start (/**) and comment end (*/) marker lines + :param comment_lines: list of (line_offset, line) tuples representing a + GTK-Doc comment block already stripped from it's + start (/**) and end (*/) marker lines :param filename: source file name where the comment block originated from :param lineno: line in the source file where the comment block starts :returns: a :class:`DocBlock` object or ``None`` @@ -756,7 +776,7 @@ class AnnotationParser(object): # # When we are parsing comment block parameters or the comment block # identifier (when there are no parameters) and encounter an empty - # line, we must be parsing the comment block description + # line, we must be parsing the comment block description. #################################################################### if (EMPTY_LINE_RE.search(line) and (in_part == PART_IDENTIFIER or in_part == PART_PARAMETERS)): @@ -904,8 +924,9 @@ class AnnotationParser(object): @classmethod def parse_options(cls, tag, value): - # (foo) - # (bar opt1 opt2 ...) + # (annotation) + # (annotation opt1 opt2 ...) + # (annotation opt1=value1 opt2=value2 ...) opened = -1 options = DocOptions() options.position = tag.position diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py index bf276c06..037cb265 100644 --- a/giscanner/maintransformer.py +++ b/giscanner/maintransformer.py @@ -791,7 +791,7 @@ usage is void (*_gtk_reserved1)(void);""" block = self._blocks.get('%s::%s' % (prefix, signal.name)) self._apply_annotations_annotated(signal, block) # We're only attempting to name the signal parameters if - # the number of parameter tags (@foo) is the same or greater + # the number of parameters (@foo) is the same or greater # than the number of signal parameters if block and len(block.params) > len(signal.parameters): names = block.params.items() -- cgit v1.2.1 From d6c2ad348892c32a42d112d94168ac071a14c0a2 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Tue, 20 Nov 2012 07:54:43 +0100 Subject: giscanner: use "if in [a, b]" instead of "if == a or if == b" It simply looks better... https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- giscanner/annotationparser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index 764d594c..d4989135 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -779,7 +779,7 @@ class AnnotationParser(object): # line, we must be parsing the comment block description. #################################################################### if (EMPTY_LINE_RE.search(line) - and (in_part == PART_IDENTIFIER or in_part == PART_PARAMETERS)): + and in_part in [PART_IDENTIFIER, PART_PARAMETERS]): in_part = PART_DESCRIPTION continue @@ -844,7 +844,7 @@ class AnnotationParser(object): # If we get here, we must be in the middle of a multiline # comment block, parameter or tag description. #################################################################### - if in_part == PART_DESCRIPTION or in_part == PART_IDENTIFIER: + if in_part in [PART_IDENTIFIER, PART_DESCRIPTION]: if not comment_block.comment: # Backwards compatibility with old style GTK-Doc # comment blocks where Description used to be a comment -- cgit v1.2.1 From a867ab49295f5f6f1f72042c237625905e43953f Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 28 Nov 2012 19:05:07 +0100 Subject: giscanner: use dict.items()... ... in favor of "for key in dict: value=dict[key]" and "dict.iteritems()". This makes it possible to run the upcoming annotationparser.py tests with both Python 2 and Python 3. https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- giscanner/annotationparser.py | 11 +++++------ giscanner/maintransformer.py | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index d4989135..97704801 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -250,7 +250,7 @@ class DocTag(object): if value is None: return - for name, v in value.all().iteritems(): + for name, v in value.all().items(): if name in [OPT_ARRAY_ZERO_TERMINATED, OPT_ARRAY_FIXED_SIZE]: try: int(v) @@ -318,12 +318,12 @@ class DocTag(object): if value: if type(value) != str: value = ' '.join((serialize_one(k, v, '%s=%s', '%s') - for k, v in value.all().iteritems())) + for k, v in value.all().items())) return fmt % (option, value) else: return fmt2 % (option, ) annotations = [] - for option, value in self.options.iteritems(): + for option, value in self.options.items(): annotations.append( serialize_one(option, value, '(%s %s)', '(%s)')) if annotations: @@ -345,8 +345,7 @@ class DocTag(object): # validation below is most certainly going to fail. return - for option in self.options: - value = self.options[option] + for option, value in self.options.items(): if option == OPT_ALLOW_NONE: self._validate_option(option, value, n_params=0) elif option == OPT_ARRAY: @@ -429,7 +428,7 @@ class DocOptions(object): if key == item: yield value - def iteritems(self): + def items(self): return iter(self.values) diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py index 037cb265..4ad800d4 100644 --- a/giscanner/maintransformer.py +++ b/giscanner/maintransformer.py @@ -631,7 +631,7 @@ usage is void (*_gtk_reserved1)(void);""" annos_tag = block.get_tag(TAG_ATTRIBUTES) if annos_tag is not None: - for key, value in annos_tag.options.iteritems(): + for key, value in annos_tag.options.items(): if value: node.attributes.append((key, value.one())) -- cgit v1.2.1 From 93abf1c2f65a2378971a056d6f5e7df68e9e72c4 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 28 Nov 2012 19:05:58 +0100 Subject: giscanner: use dict.values() in favor of dict.itervalues() This makes it possible to run the upcoming annotationparser.py tests with both Python 2 and Python 3. https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- giscanner/annotationparser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index 97704801..89c44136 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -879,10 +879,10 @@ class AnnotationParser(object): else: comment_block.comment = '' - for tag in comment_block.tags.itervalues(): + for tag in comment_block.tags.values(): self._clean_comment_block_part(tag) - for param in comment_block.params.itervalues(): + for param in comment_block.params.values(): self._clean_comment_block_part(param) # Validate and store block. -- cgit v1.2.1 From b0a78b8734aee54b0f976fc4f1194bb73f7e52f4 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Thu, 5 Jul 2012 21:30:01 +0200 Subject: giscanner: use collections.OrderedDict when available Starting with Python 2.7 we can use the batteries included collections.OrderedDict class. However, configure.ac claims we still support Python 2.5 and 2.6, so don't remove our custom odict implementation just yet... https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- giscanner/odict.py | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) diff --git a/giscanner/odict.py b/giscanner/odict.py index df703cbb..fa164c31 100644 --- a/giscanner/odict.py +++ b/giscanner/odict.py @@ -20,26 +20,31 @@ """odict - an ordered dictionary""" -from UserDict import DictMixin +try: + # Starting with Python 2.7 we can use collections.OrderedDict + from collections import OrderedDict as odict +except ImportError: + # But we still support Python 2.5 and 2.6 + from UserDict import DictMixin -class odict(DictMixin): + class odict(DictMixin): - def __init__(self): - self._items = {} - self._keys = [] + def __init__(self): + self._items = {} + self._keys = [] - def __setitem__(self, key, value): - if key not in self._items: - self._keys.append(key) - self._items[key] = value + def __setitem__(self, key, value): + if key not in self._items: + self._keys.append(key) + self._items[key] = value - def __getitem__(self, key): - return self._items[key] + def __getitem__(self, key): + return self._items[key] - def __delitem__(self, key): - del self._items[key] - self._keys.remove(key) + def __delitem__(self, key): + del self._items[key] + self._keys.remove(key) - def keys(self): - return self._keys[:] + def keys(self): + return self._keys[:] -- cgit v1.2.1 From 0cd1ad297e0b7bb78242ea6b22955e133dfc7958 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Fri, 29 Jun 2012 14:40:31 +0200 Subject: giscanner: remove duplicate "os" import... https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- giscanner/shlibs.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py index 2ea34c91..6c583a4b 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py @@ -20,10 +20,9 @@ # import os -import re import platform +import re import subprocess -import os from .utils import get_libtool_command, extract_libtool_shlib -- cgit v1.2.1 From bdb479f3663d284e1a785f603f17670a754d0bbf Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Fri, 29 Jun 2012 14:43:33 +0200 Subject: giscanner: remove unused variables https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- giscanner/annotationparser.py | 14 +------------- giscanner/maintransformer.py | 9 ++++----- giscanner/scannermain.py | 1 - giscanner/transformer.py | 3 +-- giscanner/utils.py | 2 +- 5 files changed, 7 insertions(+), 22 deletions(-) diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index 89c44136..364fdbfc 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -644,24 +644,17 @@ class AnnotationParser(object): # Check for GTK-Doc comment block identifier. #################################################################### if not comment_block: - # The correct identifier name would have the colon at the end - # but maintransformer.py does not expect us to do that. So - # make sure to compute an identifier_name without the colon and - # a real_identifier_name with the colon. - if not identifier: result = SECTION_RE.search(line) if result: identifier = IDENTIFIER_SECTION - real_identifier_name = 'SECTION:%s' % (result.group('section_name')) - identifier_name = real_identifier_name + identifier_name = 'SECTION:%s' % (result.group('section_name')) column = result.start('section_name') + column_offset if not identifier: result = SYMBOL_RE.search(line) if result: identifier = IDENTIFIER_SYMBOL - real_identifier_name = '%s:' % (result.group('symbol_name')) identifier_name = '%s' % (result.group('symbol_name')) column = result.start('symbol_name') + column_offset @@ -669,8 +662,6 @@ class AnnotationParser(object): result = PROPERTY_RE.search(line) if result: identifier = IDENTIFIER_PROPERTY - real_identifier_name = '%s:%s:' % (result.group('class_name'), - result.group('property_name')) identifier_name = '%s:%s' % (result.group('class_name'), result.group('property_name')) column = result.start('property_name') + column_offset @@ -679,8 +670,6 @@ class AnnotationParser(object): result = SIGNAL_RE.search(line) if result: identifier = IDENTIFIER_SIGNAL - real_identifier_name = '%s::%s:' % (result.group('class_name'), - result.group('signal_name')) identifier_name = '%s::%s' % (result.group('class_name'), result.group('signal_name')) column = result.start('signal_name') + column_offset @@ -914,7 +903,6 @@ class AnnotationParser(object): result = MULTILINE_ANNOTATION_CONTINUATION_RE.search(line) if result: - line = result.group('description') column = result.start('annotations') + column_offset marker = ' '*column + '^' message.warn('ignoring invalid multiline annotation continuation:\n' diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py index 4ad800d4..34d153be 100644 --- a/giscanner/maintransformer.py +++ b/giscanner/maintransformer.py @@ -125,7 +125,7 @@ usage is void (*_gtk_reserved1)(void);""" def _get_validate_parameter_name(self, parent, param_name, origin): try: param = parent.get_parameter(param_name) - except ValueError, e: + except ValueError: param = None if param is None: if isinstance(origin, ast.Parameter): @@ -888,11 +888,10 @@ the ones that failed to resolve removed.""" else: self._transformer.resolve_type(field.type) if isinstance(node, (ast.Class, ast.Interface)): - resolved_parent = None for parent in node.parent_chain: try: self._transformer.resolve_type(parent) - except ValueError, e: + except ValueError: continue target = self._transformer.lookup_typenode(parent) if target: @@ -1293,7 +1292,7 @@ method or constructor of some type.""" params = node.parameters # First, do defaults for well-known callback types - for i, param in enumerate(params): + for param in params: argnode = self._transformer.lookup_typenode(param.type) if isinstance(argnode, ast.Callback): if param.type.target_giname in ('Gio.AsyncReadyCallback', @@ -1302,7 +1301,7 @@ method or constructor of some type.""" param.transfer = ast.PARAM_TRANSFER_NONE callback_param = None - for i, param in enumerate(params): + for param in params: argnode = self._transformer.lookup_typenode(param.type) is_destroynotify = False if isinstance(argnode, ast.Callback): diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py index 45dcbcbd..56d73f8c 100755 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -310,7 +310,6 @@ def create_transformer(namespace, options): transformer.disable_cache() transformer.set_passthrough_mode() - shown_include_warning = False for include in options.includes: if os.sep in include: _error("Invalid include path %r" % (include, )) diff --git a/giscanner/transformer.py b/giscanner/transformer.py index e4938b93..67367999 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -903,9 +903,8 @@ Note that type resolution may not succeed.""" pointer_stripped = typeval.ctype.replace('*', '') try: matches = self.split_ctype_namespaces(pointer_stripped) - except ValueError, e: + except ValueError: return self._resolve_type_from_ctype_all_namespaces(typeval, pointer_stripped) - target_giname = None for namespace, name in matches: target = namespace.get(name) if not target: diff --git a/giscanner/utils.py b/giscanner/utils.py index 642da362..9adf6d93 100644 --- a/giscanner/utils.py +++ b/giscanner/utils.py @@ -121,7 +121,7 @@ def get_libtool_command(options): try: subprocess.check_call(['libtool', '--version'], stdout=open(os.devnull)) - except (subprocess.CalledProcessError, OSError), e: + except (subprocess.CalledProcessError, OSError): # If libtool's not installed, assume we don't need it return None -- cgit v1.2.1 From c78302ce7b33e7353bf0bc9272c86956841cb49a Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 21 Nov 2012 17:42:41 +0100 Subject: giscanner: implement DocOption() in terms of odict instead of dict The order of the "options" key/value pairs returned by DocOption().all() should be identical to the order in which they where stored. Hence replace the dict usage with odict. https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- gir/glib-2.0.c | 10 +++++----- giscanner/annotationparser.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 1499a6de..51805c44 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -16894,7 +16894,7 @@ * returned array is %NULL-terminated, so @length may optionally * be %NULL. * - * Returns: (array length=length zero-terminated=1) (element-type utf8) (transfer full): a newly allocated %NULL-terminated string array or %NULL if the key isn't found. The string array should be freed with g_strfreev(). + * Returns: (array zero-terminated=1 length=length) (element-type utf8) (transfer full): a newly allocated %NULL-terminated string array or %NULL if the key isn't found. The string array should be freed with g_strfreev(). * Since: 2.6 */ @@ -16946,7 +16946,7 @@ * event that the @group_name cannot be found, %NULL is returned * and @error is set to #G_KEY_FILE_ERROR_GROUP_NOT_FOUND. * - * Returns: (array length=length zero-terminated=1) (element-type utf8) (transfer full): a %NULL-terminated string array or %NULL if the specified key cannot be found. The array should be freed with g_strfreev(). + * Returns: (array zero-terminated=1 length=length) (element-type utf8) (transfer full): a %NULL-terminated string array or %NULL if the specified key cannot be found. The array should be freed with g_strfreev(). * Since: 2.6 */ @@ -17316,7 +17316,7 @@ * @group_name: a group name * @key: a key * @locale: a locale identifier - * @list: (array length=length zero-terminated=1): a %NULL-terminated array of locale string values + * @list: (array zero-terminated=1 length=length): a %NULL-terminated array of locale string values * @length: the length of @list * * Associates a list of string values for @key and @locale under @@ -17349,7 +17349,7 @@ * @key_file: a #GKeyFile * @group_name: a group name * @key: a key - * @list: (array length=length zero-terminated=1) (element-type utf8): an array of string values + * @list: (array zero-terminated=1 length=length) (element-type utf8): an array of string values * @length: number of string values in @list * * Associates a list of string values for @key under @group_name. @@ -30725,7 +30725,7 @@ * * The return value must be freed using g_free(). * - * Returns: (transfer full) (array length=length zero-terminated=1) (element-type guint8): a newly allocated string + * Returns: (transfer full) (array zero-terminated=1 length=length) (element-type guint8): a newly allocated string * Since: 2.26 */ diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index 364fdbfc..c405ef43 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -437,7 +437,7 @@ class DocOption(object): def __init__(self, tag, option): self.tag = tag self._array = [] - self._dict = {} + self._dict = odict() # (annotation option1=value1 option2=value2) etc for p in option.split(' '): if '=' in p: -- cgit v1.2.1 From bfc8b8d40ddb4093ff7f6e516eb4088c52136db2 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Fri, 29 Jun 2012 16:57:54 +0200 Subject: giscanner: make it clear DocOptions() also has a position attribute Lost a couple of hours hunting down a failed test case (from the annotationparser work about to land) due to this not being clear... https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- giscanner/annotationparser.py | 1 + 1 file changed, 1 insertion(+) diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index c405ef43..28db1a36 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -398,6 +398,7 @@ class DocTag(object): class DocOptions(object): def __init__(self): self.values = [] + self.position = None def __repr__(self): return '' % (self.values, ) -- cgit v1.2.1 From 964d9229d188dc9661149bd153c7bf29e3669bb7 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 21 Nov 2012 17:50:55 +0100 Subject: giscanner: drop dead code DocOptions already has a position attribute, no need to overwrite it when the position of DocBlock or DocTag is set, hence the set_position methods are no longer needed. https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- giscanner/annotationparser.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index 28db1a36..0e7e91b3 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -154,10 +154,6 @@ class DocBlock(object): def __repr__(self): return '' % (self.name, self.options) - def set_position(self, position): - self.position = position - self.options.position = position - def get_tag(self, name): return self.tags.get(name) @@ -309,10 +305,6 @@ class DocTag(object): value_str), self.position) return - def set_position(self, position): - self.position = position - self.options.position = position - def _get_gtk_doc_value(self): def serialize_one(option, value, fmt, fmt2): if value: @@ -679,7 +671,7 @@ class AnnotationParser(object): in_part = PART_IDENTIFIER comment_block = DocBlock(identifier_name) - comment_block.set_position(position) + comment_block.position = position if 'colon' in result.groupdict() and result.group('colon') != ':': colon_start = result.start('colon') @@ -749,7 +741,7 @@ class AnnotationParser(object): position) tag = DocTag(comment_block, param_name) - tag.set_position(position) + tag.position = position tag.comment = param_description if param_annotations: tag.options = self.parse_options(tag, param_annotations) -- cgit v1.2.1 From c9516551d29432270f5f840ef315ce34f654a62f Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Fri, 29 Jun 2012 17:03:23 +0200 Subject: giscanner: use re.match() instead of re.search() From Python's documentation: Python offers two different primitive operations based on regular expressions: match checks for a match only at the beginning of the string, while search checks for a match anywhere in the string (this is what Perl does by default). The different behavior between match() and search() doesn't matter in our case and conceptually we are checking if a piece of text matches a certain pattern, so match() is a better fit. https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- giscanner/annotationparser.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index 0e7e91b3..f3bf71ec 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -575,14 +575,14 @@ class AnnotationParser(object): comment_lines = list(enumerate(comment.split('\n'))) # Check for the start the comment block. - if COMMENT_START_RE.search(comment_lines[0][1]): + if COMMENT_START_RE.match(comment_lines[0][1]): del comment_lines[0] else: # Not a GTK-Doc comment block. return None # Check for the end the comment block. - if COMMENT_END_RE.search(comment_lines[-1][1]): + if COMMENT_END_RE.match(comment_lines[-1][1]): del comment_lines[-1] # If we get this far, we are inside a GTK-Doc comment block. @@ -638,21 +638,21 @@ class AnnotationParser(object): #################################################################### if not comment_block: if not identifier: - result = SECTION_RE.search(line) + result = SECTION_RE.match(line) if result: identifier = IDENTIFIER_SECTION identifier_name = 'SECTION:%s' % (result.group('section_name')) column = result.start('section_name') + column_offset if not identifier: - result = SYMBOL_RE.search(line) + result = SYMBOL_RE.match(line) if result: identifier = IDENTIFIER_SYMBOL identifier_name = '%s' % (result.group('symbol_name')) column = result.start('symbol_name') + column_offset if not identifier: - result = PROPERTY_RE.search(line) + result = PROPERTY_RE.match(line) if result: identifier = IDENTIFIER_PROPERTY identifier_name = '%s:%s' % (result.group('class_name'), @@ -660,7 +660,7 @@ class AnnotationParser(object): column = result.start('property_name') + column_offset if not identifier: - result = SIGNAL_RE.search(line) + result = SIGNAL_RE.match(line) if result: identifier = IDENTIFIER_SIGNAL identifier_name = '%s::%s' % (result.group('class_name'), @@ -706,7 +706,7 @@ class AnnotationParser(object): #################################################################### # Check for comment block parameters. #################################################################### - result = PARAMETER_RE.search(line) + result = PARAMETER_RE.match(line) if result: param_name = result.group('parameter_name') param_annotations = result.group('annotations') @@ -759,7 +759,7 @@ class AnnotationParser(object): # identifier (when there are no parameters) and encounter an empty # line, we must be parsing the comment block description. #################################################################### - if (EMPTY_LINE_RE.search(line) + if (EMPTY_LINE_RE.match(line) and in_part in [PART_IDENTIFIER, PART_PARAMETERS]): in_part = PART_DESCRIPTION continue @@ -767,7 +767,7 @@ class AnnotationParser(object): #################################################################### # Check for GTK-Doc comment block tags. #################################################################### - result = TAG_RE.search(line) + result = TAG_RE.match(line) if result: tag_name = result.group('tag_name') tag_annotations = result.group('annotations') @@ -894,7 +894,7 @@ class AnnotationParser(object): :param position: position of `line` in the source file ''' - result = MULTILINE_ANNOTATION_CONTINUATION_RE.search(line) + result = MULTILINE_ANNOTATION_CONTINUATION_RE.match(line) if result: column = result.start('annotations') + column_offset marker = ' '*column + '^' -- cgit v1.2.1 From af2e146f5f24b93322ad0112d37a8e41222c3085 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 4 Jul 2012 11:58:13 +0200 Subject: giscanner: add AnnotationParser tests The tests in giscanner/annotationpatters.py only test the regular expression programs used when parsing GTK-Doc comment blocks but do not test the structure of the resulting "parse tree". This patch adds 193 GTK-Doc comment blocks and the expected results AnnotationParser should return (with it's current level of understanding of GTK-Doc comment block syntax). These are compared by tests/scanner/annotationparser/test_parser.py which complains with a diff on failure. https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- Makefile.am | 2 + tests/scanner/annotationparser/README | 40 ++ .../annotationparser/gi/annotation_allow_none.xml | 47 ++ .../annotationparser/gi/annotation_array.xml | 277 ++++++++ .../annotationparser/gi/annotation_closure.xml | 74 ++ .../annotationparser/gi/annotation_constructor.xml | 21 + .../annotationparser/gi/annotation_destroy.xml | 46 ++ .../gi/annotation_element_type.xml | 126 ++++ .../annotationparser/gi/annotation_foreign.xml | 22 + .../gi/annotation_get_value_func.xml | 30 + .../scanner/annotationparser/gi/annotation_in.xml | 52 ++ .../annotationparser/gi/annotation_in_out.xml | 54 ++ .../annotationparser/gi/annotation_method.xml | 28 + .../scanner/annotationparser/gi/annotation_out.xml | 110 +++ .../annotationparser/gi/annotation_ref_func.xml | 30 + .../annotationparser/gi/annotation_rename_to.xml | 52 ++ .../annotationparser/gi/annotation_scope.xml | 106 +++ .../gi/annotation_set_value_func.xml | 30 + .../annotationparser/gi/annotation_skip.xml | 43 ++ .../annotationparser/gi/annotation_transfer.xml | 162 +++++ .../annotationparser/gi/annotation_type.xml | 84 +++ .../annotationparser/gi/annotation_unref_func.xml | 30 + .../annotationparser/gi/annotation_value.xml | 30 + .../annotationparser/gi/annotation_virtual.xml | 47 ++ tests/scanner/annotationparser/gi/syntax.xml | 98 +++ .../annotationparser/gi/syntax_identifier.xml | 286 ++++++++ .../gi/syntax_paragraph_breaks.xml | 122 ++++ .../scanner/annotationparser/gi/tag_deprecated.xml | 43 ++ .../annotationparser/gi/tag_description.xml | 21 + tests/scanner/annotationparser/gi/tag_returns.xml | 76 ++ tests/scanner/annotationparser/gi/tag_since.xml | 43 ++ .../scanner/annotationparser/gi/tag_stability.xml | 81 +++ .../gtkdoc/annotations/tester.c.xml | 344 +++++++++ .../gtkdoc/annotations/tester.h.xml | 31 + .../annotationparser/gtkdoc/bugs/tester.c.xml | 765 +++++++++++++++++++++ .../annotationparser/gtkdoc/bugs/tester.h.xml | 677 ++++++++++++++++++ .../annotationparser/gtkdoc/empty/tester.c.xml | 53 ++ .../annotationparser/gtkdoc/fail/tester.c.xml | 162 +++++ .../annotationparser/gtkdoc/fail/tester.h.xml | 205 ++++++ .../annotationparser/gtkdoc/gobject/giface.c.xml | 147 ++++ .../annotationparser/gtkdoc/gobject/giface.h.xml | 119 ++++ .../annotationparser/gtkdoc/gobject/gobject.c.xml | 416 +++++++++++ .../annotationparser/gtkdoc/gobject/gobject.h.xml | 158 +++++ .../annotationparser/gtkdoc/gobject/gtypes.c.xml | 36 + .../annotationparser/gtkdoc/gobject/gtypes.h.xml | 57 ++ tests/scanner/annotationparser/test_parser.py | 297 ++++++++ 46 files changed, 5780 insertions(+) create mode 100644 tests/scanner/annotationparser/README create mode 100644 tests/scanner/annotationparser/gi/annotation_allow_none.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_array.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_closure.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_constructor.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_destroy.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_element_type.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_foreign.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_get_value_func.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_in.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_in_out.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_method.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_out.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_ref_func.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_rename_to.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_scope.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_set_value_func.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_skip.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_transfer.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_type.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_unref_func.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_value.xml create mode 100644 tests/scanner/annotationparser/gi/annotation_virtual.xml create mode 100644 tests/scanner/annotationparser/gi/syntax.xml create mode 100644 tests/scanner/annotationparser/gi/syntax_identifier.xml create mode 100644 tests/scanner/annotationparser/gi/syntax_paragraph_breaks.xml create mode 100644 tests/scanner/annotationparser/gi/tag_deprecated.xml create mode 100644 tests/scanner/annotationparser/gi/tag_description.xml create mode 100644 tests/scanner/annotationparser/gi/tag_returns.xml create mode 100644 tests/scanner/annotationparser/gi/tag_since.xml create mode 100644 tests/scanner/annotationparser/gi/tag_stability.xml create mode 100644 tests/scanner/annotationparser/gtkdoc/annotations/tester.c.xml create mode 100644 tests/scanner/annotationparser/gtkdoc/annotations/tester.h.xml create mode 100644 tests/scanner/annotationparser/gtkdoc/bugs/tester.c.xml create mode 100644 tests/scanner/annotationparser/gtkdoc/bugs/tester.h.xml create mode 100644 tests/scanner/annotationparser/gtkdoc/empty/tester.c.xml create mode 100644 tests/scanner/annotationparser/gtkdoc/fail/tester.c.xml create mode 100644 tests/scanner/annotationparser/gtkdoc/fail/tester.h.xml create mode 100644 tests/scanner/annotationparser/gtkdoc/gobject/giface.c.xml create mode 100644 tests/scanner/annotationparser/gtkdoc/gobject/giface.h.xml create mode 100644 tests/scanner/annotationparser/gtkdoc/gobject/gobject.c.xml create mode 100644 tests/scanner/annotationparser/gtkdoc/gobject/gobject.h.xml create mode 100644 tests/scanner/annotationparser/gtkdoc/gobject/gtypes.c.xml create mode 100644 tests/scanner/annotationparser/gtkdoc/gobject/gtypes.h.xml create mode 100644 tests/scanner/annotationparser/test_parser.py diff --git a/Makefile.am b/Makefile.am index 2059b989..76837554 100644 --- a/Makefile.am +++ b/Makefile.am @@ -66,6 +66,8 @@ check-local: @find $(top_srcdir)/giscanner -name \*.py | sort | uniq | xargs $(PYTHON) $(top_srcdir)/misc/pep8.py --repeat --exclude=config.py @echo "TEST: Annotation pattern programs" $(PYTHON) $(top_srcdir)/giscanner/annotationpatterns.py + @echo "TEST: GTK-Doc Annotation Parser" + PYTHONPATH="$(top_builddir):$(top_srcdir)" $(PYTHON) $(top_srcdir)/tests/scanner/annotationparser/test_parser.py @touch $(top_builddir)/.make-check-passed check-pyflakes: diff --git a/tests/scanner/annotationparser/README b/tests/scanner/annotationparser/README new file mode 100644 index 00000000..1f621a57 --- /dev/null +++ b/tests/scanner/annotationparser/README @@ -0,0 +1,40 @@ +test_parser.py +============== + +Notes +----- + +- the names of directories containing test .xml and the .xml files themselves should + not contain the hyphen ('-') character. This because we use the directory and file + names to generate valid Python method names (where the hyphen character is illegal). + +- GTK-Doc comment blocks can contain XML fragments on their own. You can wrap such + comment blocks into a CDATA section to prevent the tests XML parser from doing the + wrong thing. + Occasionally, GTK-Doc comment blocks containing XML fragments can also contain CDATA + sections on their own. This can be handled by wrapping the GTK-Doc comment block into + a CDATA section as described above, and escape the embedded GTK-Doc CDATA section's + opening bracket "" with "!}}". + +- *Note well* that the trailing whitespace in gi/syntax_paragraph_breaks.xml *is* expected. + Whatever your text editor of choice or scm du jour might claim, trailing whitespace + are required for these tests! + + +Tests +----- + +gtk-doc/*.xml: + The GTK-Doc comment block tests in this directory are copied verbatim from the GTK-Doc + test suite. Not all of these tests make sense from GTK-Doc's point of view without the + actual C sources they document, but are great for testing the level of understanding + AnnotationParser has about the GTK-Doc comment block syntax. + + GTK-Doc tests originally taken at revision: + http://git.gnome.org/browse/gtk-doc/tree/tests?id=2a6b01253fe41412172a60f26705114b953d0a95 + + +gobject-introspection/*.xml: + GTK-Doc comment blocks specifically designed to ensure AnnotationParser does the + right thing and continues to function correctly. The goal is to exercise all possible + combinations of tags, parameters and annotations (both current and deprecated syntax). diff --git a/tests/scanner/annotationparser/gi/annotation_allow_none.xml b/tests/scanner/annotationparser/gi/annotation_allow_none.xml new file mode 100644 index 00000000..02db79a9 --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_allow_none.xml @@ -0,0 +1,47 @@ + + + + + + /** + * annotation_object_inout: + * @object: a #GObject + * @inoutarg: (inout) (allow-none): This is an argument test + * + * This is a test for out arguments + * + * Return value: an int + */ + + + annotation_object_inout + + + + object + a #GObject + + + inoutarg + + + inout + + + allow-none + + + This is an argument test + + + This is a test for out arguments + + + returns + an int + + + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_array.xml b/tests/scanner/annotationparser/gi/annotation_array.xml new file mode 100644 index 00000000..26bb1104 --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_array.xml @@ -0,0 +1,277 @@ + + + + + + /** + * annotation_object_compute_sum: + * @nums: (array): Sequence of numbers + * + * Test taking a zero-terminated array + **/ + + + annotation_object_compute_sum + + + + nums + + + array + + + Sequence of numbers + + + Test taking a zero-terminated array + + + + + /** + * annotation_object_compute_sum_n: + * @object: a #AnnotationObject + * @nums: (array length=n_nums zero-terminated=0): Sequence of + * numbers that are zero-terminated + * @n_nums: Length of number array + * + * Test taking an array with length parameter + **/ + + + annotation_object_compute_sum_n + + + + object + a #AnnotationObject + + + nums + + + array + + + + + + + Sequence of numbers that are zero-terminated + + + n_nums + Length of number array + + + Test taking an array with length parameter + + + + + /** + * annotation_object_compute_sum_nz: + * @object: a #AnnotationObject + * @nums: (array length=n_nums zero-terminated=1): Sequence of numbers that + * are zero-terminated + * @n_nums: Length of number array + * + * Test taking a zero-terminated array with length parameter + **/ + + + annotation_object_compute_sum_nz + + + + object + a #AnnotationObject + + + nums + + + array + + + + + + + Sequence of numbers that are zero-terminated + + + n_nums + Length of number array + + + Test taking a zero-terminated array with length parameter + + + + + /** + * annotation_object_parse_args: + * @object: a #AnnotationObject + * @argc: (inout): Length of the argument vector + * @argv: (inout) (array length=argc zero-terminated=1): Argument vector + * + * Test taking a zero-terminated array with length parameter + **/ + + + annotation_object_parse_args + + + + object + a #AnnotationObject + + + argc + + + inout + + + Length of the argument vector + + + argv + + + inout + + + array + + + + + + + Argument vector + + + Test taking a zero-terminated array with length parameter + + + + + /** + * annotation_object_set_data: + * @object: a #AnnotationObject + * @data: (array length=length): The data + * @length: Length of the data + * + * Test taking a guchar * with a length. + **/ + + + annotation_object_set_data + + + + object + a #AnnotationObject + + + data + + + array + + + + + + The data + + + length + Length of the data + + + Test taking a guchar * with a length. + + + + + /** + * annotation_string_zero_terminated: + * @data: (array fixed-size=2): a third value + * + * Return value: (transfer full) (array zero-terminated=1): The return value + */ + + + annotation_string_zero_terminated + + + + data + + + array + + + + + + a third value + + + + + returns + + + transfer + + + + + + array + + + + + + The return value + + + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_closure.xml b/tests/scanner/annotationparser/gi/annotation_closure.xml new file mode 100644 index 00000000..8211dc7b --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_closure.xml @@ -0,0 +1,74 @@ + + + + + + /** + * AnnotationNotifyFunc: + * @data: (closure): The user data + * + * This is a callback with a 'closure' argument that is not named + * 'user_data' and hence has to be annotated. + */ + + + AnnotationNotifyFunc + + + + data + + + closure + + + The user data + + + This is a callback with a 'closure' argument that is not named +'user_data' and hence has to be annotated. + + + + + /** + * annotation_custom_destroy: + * @callback: (destroy destroy) (closure data): Destroy notification + * + * Test messing up the heuristic of closure/destroy-notification + * detection, and fixing it via annotations. + */ + + + annotation_custom_destroy + + + + callback + + + destroy + + + + + + closure + + + + + + Destroy notification + + + Test messing up the heuristic of closure/destroy-notification +detection, and fixing it via annotations. + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_constructor.xml b/tests/scanner/annotationparser/gi/annotation_constructor.xml new file mode 100644 index 00000000..4bf3b038 --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_constructor.xml @@ -0,0 +1,21 @@ + + + + + + /** + * regress_constructor: (constructor) + */ + + + regress_constructor + + + constructor + + + + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_destroy.xml b/tests/scanner/annotationparser/gi/annotation_destroy.xml new file mode 100644 index 00000000..449dd8e1 --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_destroy.xml @@ -0,0 +1,46 @@ + + + + + + /** + * annotation_custom_destroy: + * @callback: (destroy destroy) (closure data): Destroy notification + * + * Test messing up the heuristic of closure/destroy-notification + * detection, and fixing it via annotations. + */ + + + annotation_custom_destroy + + + + callback + + + destroy + + + + + + closure + + + + + + Destroy notification + + + Test messing up the heuristic of closure/destroy-notification +detection, and fixing it via annotations. + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_element_type.xml b/tests/scanner/annotationparser/gi/annotation_element_type.xml new file mode 100644 index 00000000..d03c4268 --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_element_type.xml @@ -0,0 +1,126 @@ + + + + + + /** + * foo_test_array: + * + * Returns: (element-type utf8) (transfer container): returns %NULL. + */ + + + foo_test_array + + + + returns + + + element-type + + + + + + transfer + + + + + + returns %NULL. + + + + + + + /** + * RegressTestObj::sig-with-hash-prop: + * @self: an object + * @hash: (element-type utf8 GObject.Value): + * + * This test signal is like TelepathyGlib's + * TpAccount::status-changed + */ + + + RegressTestObj::sig-with-hash-prop + + + + self + an object + + + hash + + + element-type + + + + + + + + + This test signal is like TelepathyGlib's + TpAccount::status-changed + + + + + ) (transfer full): + */]]> + + + regress_test_ghash_nested_everything_return2 + + Another way of specifying nested parameterized types: using the +element-type annotation. + + + returns + + + element-type + + + + + + + transfer + + + + + + + + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_foreign.xml b/tests/scanner/annotationparser/gi/annotation_foreign.xml new file mode 100644 index 00000000..11e589c5 --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_foreign.xml @@ -0,0 +1,22 @@ + + + + + + /** + * FooForeignStruct: (foreign) + * + */ + + + FooForeignStruct + + + foreign + + + + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_get_value_func.xml b/tests/scanner/annotationparser/gi/annotation_get_value_func.xml new file mode 100644 index 00000000..bc779943 --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_get_value_func.xml @@ -0,0 +1,30 @@ + + + + + + + /** + * RegressTestFundamentalObject: + * + * This object tests regressions... + * + * Get value func: regress_test_value_get_fundamental_object + */ + + + RegressTestFundamentalObject + + This object tests regressions... + + + get value func + regress_test_value_get_fundamental_object + + + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_in.xml b/tests/scanner/annotationparser/gi/annotation_in.xml new file mode 100644 index 00000000..517f1a3f --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_in.xml @@ -0,0 +1,52 @@ + + + + + + /** + * annotation_object_in: + * @object: a #GObject + * @inarg: (in) (transfer none): This is an argument test + * + * This is a test for in arguments + * + * Return value: an int + */ + + + annotation_object_in + + + + object + a #GObject + + + inarg + + + in + + + transfer + + + + + + This is an argument test + + + This is a test for in arguments + + + returns + an int + + + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_in_out.xml b/tests/scanner/annotationparser/gi/annotation_in_out.xml new file mode 100644 index 00000000..c8d36f45 --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_in_out.xml @@ -0,0 +1,54 @@ + + + + + + /** + * annotation_object_inout: + * @object: a #GObject + * @inoutarg: (inout): This is an argument test + * @inoutarg2: (in-out): This is an argument test + * + * This is a test for inout arguments + * + * Return value: an int + */ + + + annotation_object_inout + + + + object + a #GObject + + + inoutarg + + + inout + + + This is an argument test + + + inoutarg2 + + + in-out + + + This is an argument test + + + This is a test for inout arguments + + + returns + an int + + + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_method.xml b/tests/scanner/annotationparser/gi/annotation_method.xml new file mode 100644 index 00000000..e4d44389 --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_method.xml @@ -0,0 +1,28 @@ + + + + + + /** + * regress_forced_method: (method) + * @obj: A #RegressTestObj + */ + + + regress_forced_method + + + method + + + + + + obj + A #RegressTestObj + + + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_out.xml b/tests/scanner/annotationparser/gi/annotation_out.xml new file mode 100644 index 00000000..cca5e12e --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_out.xml @@ -0,0 +1,110 @@ + + + + + + /** + * annotation_object_out: + * @object: a #GObject + * @outarg: (out): This is an argument test + * + * This is a test for out arguments + * + * Return value: an int + */ + + + annotation_object_out + + + + object + a #GObject + + + outarg + + + out + + + This is an argument test + + + This is a test for out arguments + + + returns + an int + + + + + + + /** + * regress_test_struct_a_clone: + * @a: the structure + * @a_out: (out caller-allocates): the cloned structure + */ + + + regress_test_struct_a_clone + + + + a + the structure + + + a_out + + + out + + + + + + the cloned structure + + + + + + + /** + * regress_test_struct_a_clone: + * @a: the structure + * @a_out: (out callee-allocates): the cloned structure + */ + + + regress_test_struct_a_clone + + + + a + the structure + + + a_out + + + out + + + + + + the cloned structure + + + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_ref_func.xml b/tests/scanner/annotationparser/gi/annotation_ref_func.xml new file mode 100644 index 00000000..7850fc3f --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_ref_func.xml @@ -0,0 +1,30 @@ + + + + + + + /** + * RegressTestFundamentalObject: + * + * This object tests regressions... + * + * Ref func: regress_test_fundamental_object_ref + */ + + + RegressTestFundamentalObject + + This object tests regressions... + + + ref func + regress_test_fundamental_object_ref + + + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_rename_to.xml b/tests/scanner/annotationparser/gi/annotation_rename_to.xml new file mode 100644 index 00000000..390f4878 --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_rename_to.xml @@ -0,0 +1,52 @@ + + + + + + + /** + * annotation_object_watch_full: + * @object: A #AnnotationObject + * @func: The callback + * @user_data: The callback data + * @destroy: Destroy notification + * + * Test overriding via the "Rename To" annotation. + * + * Rename to: annotation_object_watch + */ + + + annotation_object_watch_full + + + + object + A #AnnotationObject + + + func + The callback + + + user_data + The callback data + + + destroy + Destroy notification + + + Test overriding via the "Rename To" annotation. + + + rename to + annotation_object_watch + + + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_scope.xml b/tests/scanner/annotationparser/gi/annotation_scope.xml new file mode 100644 index 00000000..7f05a4c6 --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_scope.xml @@ -0,0 +1,106 @@ + + + + + + /** + * annotation_object_foreach: + * @object: a #AnnotationObject + * @func: (scope call): Callback to invoke + * @user_data: Callback user data + * + * Test taking a call-scoped callback + **/ + + + annotation_object_foreach + + + + object + a #AnnotationObject + + + func + + + scope + + + + + + Callback to invoke + + + user_data + Callback user data + + + Test taking a call-scoped callback + + + + + /** + * regress_test_callback_destroy_notify: + * @callback: (scope notified): + * + * Notified - callback persists until a DestroyNotify delegate + * is invoked. + **/ + + + regress_test_callback_destroy_notify + + + + callback + + + scope + + + + + + + + Notified - callback persists until a DestroyNotify delegate +is invoked. + + + + + /** + * regress_test_callback_async: + * @callback: (scope async): + * + **/ + + + regress_test_callback_async + + + + callback + + + scope + + + + + + + + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_set_value_func.xml b/tests/scanner/annotationparser/gi/annotation_set_value_func.xml new file mode 100644 index 00000000..1f3a44d3 --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_set_value_func.xml @@ -0,0 +1,30 @@ + + + + + + + /** + * RegressTestFundamentalObject: + * + * This object tests regressions... + * + * Set value func: regress_test_value_set_fundamental_object + */ + + + RegressTestFundamentalObject + + This object tests regressions... + + + set value func + regress_test_value_set_fundamental_object + + + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_skip.xml b/tests/scanner/annotationparser/gi/annotation_skip.xml new file mode 100644 index 00000000..030b0c42 --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_skip.xml @@ -0,0 +1,43 @@ + + + + + + /** + * annotation_object_watch: (skip) + * @object: A #AnnotationObject + * @func: The callback + * @user_data: The callback data + * + * This is here just for the sake of being overriden by its + * annotation_object_watch_full(). + */ + + + annotation_object_watch + + + skip + + + + + + object + A #AnnotationObject + + + func + The callback + + + user_data + The callback data + + + This is here just for the sake of being overriden by its +annotation_object_watch_full(). + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_transfer.xml b/tests/scanner/annotationparser/gi/annotation_transfer.xml new file mode 100644 index 00000000..49df32fd --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_transfer.xml @@ -0,0 +1,162 @@ + + + + + + /** + * AnnotationObject::list-signal: + * @annotation: the annotation object + * @list: (type GLib.List) (element-type utf8) (transfer container): a list of strings + * + * This is a signal which takes a list of strings, but it's not + * known by GObject as it's only marked as G_TYPE_POINTER + */ + + + AnnotationObject::list-signal + + + + annotation + the annotation object + + + list + + + type + + + + + + element-type + + + + + + transfer + + + + + + a list of strings + + + This is a signal which takes a list of strings, but it's not +known by GObject as it's only marked as G_TYPE_POINTER + + + + + /** + * annotation_object_in: + * @object: a #GObject + * @inarg: (in) (transfer none): This is an argument test + * + * This is a test for in arguments + * + * Return value: an int + */ + + + annotation_object_in + + + + object + a #GObject + + + inarg + + + in + + + transfer + + + + + + This is an argument test + + + This is a test for in arguments + + + returns + an int + + + + + + + /** + * annotation_transfer_floating: + * + * Returns: (transfer floating): A floating object + */ + + + annotation_transfer_floating + + + + returns + + + transfer + + + + + + A floating object + + + + + + + + /** + * FsSession:codecs-without-config: + * + * This is the same list of codecs as #FsSession:codecs + * without.... + * + * Transfer: full + */ + + + FsSession:codecs-without-config + + This is the same list of codecs as #FsSession:codecs +without.... + + + transfer + full + + + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_type.xml b/tests/scanner/annotationparser/gi/annotation_type.xml new file mode 100644 index 00000000..d357423a --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_type.xml @@ -0,0 +1,84 @@ + + + + + + /** + * AnnotationObject::list-signal: + * @annotation: the annotation object + * @list: (type GLib.List) (element-type utf8) (transfer container): a list of strings + * + * This is a signal which takes a list of strings, but it's not + * known by GObject as it's only marked as G_TYPE_POINTER + */ + + + AnnotationObject::list-signal + + + + annotation + the annotation object + + + list + + + type + + + + + + element-type + + + + + + transfer + + + + + + a list of strings + + + This is a signal which takes a list of strings, but it's not +known by GObject as it's only marked as G_TYPE_POINTER + + + + + + /** + * RegressTestObj:hash-table: + * + * Test. + * + * Type: GLib.HashTable(utf8,gint8) + */ + + + RegressTestObj:hash-table + + Test. + + + type + GLib.HashTable(utf8,gint8) + + + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_unref_func.xml b/tests/scanner/annotationparser/gi/annotation_unref_func.xml new file mode 100644 index 00000000..98ac0a3e --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_unref_func.xml @@ -0,0 +1,30 @@ + + + + + + + /** + * RegressTestFundamentalObject: + * + * This object tests regressions... + * + * Unref func: regress_test_fundamental_object_unref + */ + + + RegressTestFundamentalObject + + This object tests regressions... + + + unref func + regress_test_fundamental_object_unref + + + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_value.xml b/tests/scanner/annotationparser/gi/annotation_value.xml new file mode 100644 index 00000000..4a1a0785 --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_value.xml @@ -0,0 +1,30 @@ + + + + + + + /** + * ANNOTATION_CALCULATED_LARGE: + * + * Constant to define a calculated large value + * + * Value: 10000000000UL + */ + + + ANNOTATION_CALCULATED_LARGE + + Constant to define a calculated large value + + + value + 10000000000UL + + + + + + diff --git a/tests/scanner/annotationparser/gi/annotation_virtual.xml b/tests/scanner/annotationparser/gi/annotation_virtual.xml new file mode 100644 index 00000000..f2b6b23a --- /dev/null +++ b/tests/scanner/annotationparser/gi/annotation_virtual.xml @@ -0,0 +1,47 @@ + + + + + + + /** + * foo_object_read: + * @object: obj + * @offset: offset + * @length: length + * + * Read some stuff. + * + * Virtual: read_fn + */ + + + foo_object_read + + + + object + obj + + + offset + offset + + + length + length + + + Read some stuff. + + + virtual + read_fn + + + + + + diff --git a/tests/scanner/annotationparser/gi/syntax.xml b/tests/scanner/annotationparser/gi/syntax.xml new file mode 100644 index 00000000..67224de5 --- /dev/null +++ b/tests/scanner/annotationparser/gi/syntax.xml @@ -0,0 +1,98 @@ + + + + + + + //Test + + + + + // Test + + + + + /*Test*/ + + + + + /* Test */ + + + + + /* Test +something */ + + + + + /* +Test +something */ + + + + + /**Test*/ + + + + + /** Test */ + + + + + /** Test +something */ + + + + + /** + * SECTION:meepapp + * + * @short_description: the application class + * + * The application class handles ... + */ + + + SECTION:meepapp + + + + short_description + the application class + + + The application class handles ... + + + + diff --git a/tests/scanner/annotationparser/gi/syntax_identifier.xml b/tests/scanner/annotationparser/gi/syntax_identifier.xml new file mode 100644 index 00000000..4c1e0b1c --- /dev/null +++ b/tests/scanner/annotationparser/gi/syntax_identifier.xml @@ -0,0 +1,286 @@ + + + + + + + /** +* +* SECTION:meepapp +*/ + + + + + /** + * SECTION:meepapp + * SECTION:meepapp2 + * @short_description: the application class + * + * The application class handles ... + */ + + + SECTION:meepapp + + + + short_description + the application class + + + SECTION:meepapp2 +The application class handles ... + + + + + + /** + * SECTION:meepapp + * @short_description: the application class + * @title: Meep application + * @section_id: + * @see_also: #MeepSettings + * @stability: Stable + * @include: meep/app.h + * @image: application.png + * + * The application class handles ... + */ + + + SECTION:meepapp + + + + short_description + the application class + + + title + Meep application + + + section_id + + + see_also + #MeepSettings + + + stability + Stable + + + include + meep/app.h + + + image + application.png + + + The application class handles ... + + + + + + /** + * SECTION:meepapp + * + * @short_description: the application class + * @title: Meep application + * @section_id: + * @see_also: #MeepSettings + * @stability: Stable + * @include: meep/app.h + * @image: application.png + * + * The application class handles ... + */ + + + SECTION:meepapp + + + + short_description + the application class + + + title + Meep application + + + section_id + + + see_also + #MeepSettings + + + stability + Stable + + + include + meep/app.h + + + image + application.png + + + The application class handles ... + + + + + + /** + * SECTION:meepapp + * + * The application class handles ... + * @short_description: the application class + * @title: Meep application + * @section_id: + * @see_also: #MeepSettings + * @stability: Stable + * @include: meep/app.h + * @image: application.png + */ + + + SECTION:meepapp + + + + short_description + the application class + + + title + Meep application + + + section_id + + + see_also + #MeepSettings + + + stability + Stable + + + include + meep/app.h + + + image + application.png + + + The application class handles ... + + + + + + /** + * SECTION:meepapp + * + * The application class handles ... + * + * @short_description: the application class + * @title: Meep application + * @section_id: + * @see_also: #MeepSettings + * @stability: Stable + * @include: meep/app.h + * @image: application.png + */ + + + SECTION:meepapp + + + + short_description + the application class + + + title + Meep application + + + section_id + + + see_also + #MeepSettings + + + stability + Stable + + + include + meep/app.h + + + image + application.png + + + The application class handles ... + + + + + + /** + * SECTION:tester + * @short_description: module for gtk-doc unit test + * + * This file contains non-sense code for the sole purpose of testing the docs. + * + * As described in http://bugzilla.gnome.org/show_bug.cgi?id=457077 it + * returns nothing. + */ + + + SECTION:tester + + + + short_description + module for gtk-doc unit test + + + This file contains non-sense code for the sole purpose of testing the docs. + +As described in http://bugzilla.gnome.org/show_bug.cgi?id=457077 it +returns nothing. + + + + diff --git a/tests/scanner/annotationparser/gi/syntax_paragraph_breaks.xml b/tests/scanner/annotationparser/gi/syntax_paragraph_breaks.xml new file mode 100644 index 00000000..62914932 --- /dev/null +++ b/tests/scanner/annotationparser/gi/syntax_paragraph_breaks.xml @@ -0,0 +1,122 @@ + + + + + + + /** + * SECTION:test + * + * The following line is ' *' (blank-asterisk). + * + * So this is considered a new paragraph. + */ + + + SECTION:test + + The following line is ' *' (blank-asterisk). + +So this is considered a new paragraph. + + + + + + /** + * SECTION:test + * + * The following line is ' * ' (blank-asterisk-blank). + * + * So this is considered a new paragraph. + */ + + + SECTION:test + + The following line is ' * ' (blank-asterisk-blank). + +So this is considered a new paragraph. + + + + + + /** + * SECTION:test + * + * The following line is (blank-asterisk-blank-blank). + * + * So this is preceded by an empty line and is not considered a new paragraph. + */ + + + SECTION:test + + The following line is (blank-asterisk-blank-blank). + +So this is preceded by an empty line and is not considered a new paragraph. + + + + + + + * Iterating over attributes + * + * void + * print_attributes (GIBaseInfo *info) + * { + * GIAttributeIter iter = { 0, }; + * char *name; + * char *value; + * + * while (g_base_info_iterate_attributes (info, &iter, &name, &value)) + * { + * g_print ("attribute name: %s value: %s", name, value); + * } + * } + * + * + */]]> + + + SECTION:test + + +Iterating over attributes + +void +print_attributes (GIBaseInfo *info) +{ + GIAttributeIter iter = { 0, }; + char *name; + char *value; + + while (g_base_info_iterate_attributes (info, &iter, &name, &value)) + { + g_print ("attribute name: %s value: %s", name, value); + } +} + +]]> + + + + diff --git a/tests/scanner/annotationparser/gi/tag_deprecated.xml b/tests/scanner/annotationparser/gi/tag_deprecated.xml new file mode 100644 index 00000000..6374bf81 --- /dev/null +++ b/tests/scanner/annotationparser/gi/tag_deprecated.xml @@ -0,0 +1,43 @@ + + + + + + /** + * annotation_versioned: + * + * Deprecated: 0.6: Use something else instead + **/ + + + annotation_versioned + + + + deprecated + 0.6: Use something else instead + + + + + + + /** + * annotation_versioned: + * + * Deprecated: 0.6 + **/ + + + annotation_versioned + + + + deprecated + 0.6 + + + + + + diff --git a/tests/scanner/annotationparser/gi/tag_description.xml b/tests/scanner/annotationparser/gi/tag_description.xml new file mode 100644 index 00000000..75860f60 --- /dev/null +++ b/tests/scanner/annotationparser/gi/tag_description.xml @@ -0,0 +1,21 @@ + + + + + + /** + * shiny_function: + * + * Description: This is a callback with a 'closure' argument that is not named + * 'user_data' and hence has to be annotated. + **/ + + + shiny_function + + This is a callback with a 'closure' argument that is not named +'user_data' and hence has to be annotated. + + + + diff --git a/tests/scanner/annotationparser/gi/tag_returns.xml b/tests/scanner/annotationparser/gi/tag_returns.xml new file mode 100644 index 00000000..302d8cf6 --- /dev/null +++ b/tests/scanner/annotationparser/gi/tag_returns.xml @@ -0,0 +1,76 @@ + + + + + + /** + * annotation_object_string_out: + * + * Test returning a string as an out parameter + * + * Returns: some boolean + **/ + + + annotation_object_string_out + + + + returns + some boolean + + + Test returning a string as an out parameter + + + + + + /** + * annotation_object_string_out: + * + * Test returning a string as an out parameter + * + * Return value: some boolean + **/ + + + annotation_object_string_out + + + + returns + some boolean + + + Test returning a string as an out parameter + + + + + + /** + * annotation_object_string_out: + * @returns: some boolean + * + * Test returning a string as an out parameter + **/ + + + annotation_object_string_out + + + + returns + some boolean + + + Test returning a string as an out parameter + + + + diff --git a/tests/scanner/annotationparser/gi/tag_since.xml b/tests/scanner/annotationparser/gi/tag_since.xml new file mode 100644 index 00000000..2bd8c5c2 --- /dev/null +++ b/tests/scanner/annotationparser/gi/tag_since.xml @@ -0,0 +1,43 @@ + + + + + + /** + * annotation_versioned: + * + * Since: 0.6 + **/ + + + annotation_versioned + + + + since + 0.6 + + + + + + + /** + * annotation_versioned: + * + * Since: this function is available since version 0.6 + **/ + + + annotation_versioned + + + + since + this function is available since version 0.6 + + + + + + diff --git a/tests/scanner/annotationparser/gi/tag_stability.xml b/tests/scanner/annotationparser/gi/tag_stability.xml new file mode 100644 index 00000000..154b8385 --- /dev/null +++ b/tests/scanner/annotationparser/gi/tag_stability.xml @@ -0,0 +1,81 @@ + + + + + + /** + * annotation_versioned: + * + * Stability: Stable + **/ + + + annotation_versioned + + + + stability + Stable + + + + + + + /** + * annotation_versioned: + * + * Stability: Unstable + **/ + + + annotation_versioned + + + + stability + Unstable + + + + + + + /** + * annotation_versioned: + * + * Stability: Private + **/ + + + annotation_versioned + + + + stability + Private + + + + + + + /** + * annotation_versioned: + * + * Stability: behavior tends to vary depending on the phase of the moon. + **/ + + + annotation_versioned + + + + stability + behavior tends to vary depending on the phase of the moon. + + + + + + diff --git a/tests/scanner/annotationparser/gtkdoc/annotations/tester.c.xml b/tests/scanner/annotationparser/gtkdoc/annotations/tester.c.xml new file mode 100644 index 00000000..9be3db76 --- /dev/null +++ b/tests/scanner/annotationparser/gtkdoc/annotations/tester.c.xml @@ -0,0 +1,344 @@ + + + + + + /** + * SECTION:tester + * @short_description: module for gtk-doc unit test + * + * This file contains non-sense code for the sole purpose of testing the docs. + */ + + + SECTION:tester + + + + short_description + module for gtk-doc unit test + + + This file contains non-sense code for the sole purpose of testing the docs. + + + + + /** + * annotation_array_length: + * @list: a #GtkListStore + * @n_columns: number of columns + * @types: (array length=n_columns): list of types + * + * Document parameter relation for array length. + */ + + + annotation_array_length + + + + list + a #GtkListStore + + + n_columns + number of columns + + + types + + + array + + + + + + list of types + + + Document parameter relation for array length. + + + + + /** + * annotation_nullable: + * @uri: a uri + * @label: (allow-none): an optional string, which is used in ways too + * complicated to describe in a single line, making it necessary to wrap it + * + * Document optional parameters. + * + * Returns: (transfer full) (allow-none): Returns stuff which you have to + * free after use, whose description is also rather long + */ + + + annotation_nullable + + + + uri + a uri + + + label + + + allow-none + + + an optional string, which is used in ways too complicated to describe in a single line, making it necessary to wrap it + + + Document optional parameters. + + + returns + + + transfer + + + + + + allow-none + + + Returns stuff which you have to free after use, whose description is also rather long + + + + + + + /** + * annotation_elementtype: + * @list: (element-type GObject): list of #GObject instances to search + * + * Document optional parameters. + * + * Returns: %TRUE for success + */ + + + annotation_elementtype + + + + list + + + element-type + + + + + + list of #GObject instances to search + + + Document optional parameters. + + + returns + %TRUE for success + + + + + + + /** + * annotation_elementtype_transfer: + * @list: (element-type utf8) (transfer full): list of #GObject instances to search + * + * Document optional parameters. + * + * Returns: %TRUE for success + */ + + + annotation_elementtype_transfer + + + + list + + + element-type + + + + + + transfer + + + + + + list of #GObject instances to search + + + Document optional parameters. + + + returns + %TRUE for success + + + + + + + /** + * annotation_elementtype_returns: + * + * Document optional parameters. + * + * Returns: (element-type GObject): A list of #GObject instances. + */ + + + annotation_elementtype_returns + + Document optional parameters. + + + returns + + + element-type + + + + + + A list of #GObject instances. + + + + + + + /** + * annotation_outparams: + * @list: (out) (transfer none): a pointer to take a list + * + * Document optional parameters. + * + * Returns: %TRUE for success + */ + + + annotation_outparams + + + + list + + + out + + + transfer + + + + + + a pointer to take a list + + + Document optional parameters. + + + returns + %TRUE for success + + + + + + + /** + * annotation_skip: (skip) + * @list: a pointer to take a list + * + * Documentation for this function. + */ + + + annotation_skip + + + skip + + + + + + list + a pointer to take a list + + + Documentation for this function. + + + + + /** + * annotation_scope: + * @callback: (scope async): a callback + * @user_data: data to pass to callback + * + * Documentation for this function. + */ + + + annotation_scope + + + + callback + + + scope + + + + + + a callback + + + user_data + data to pass to callback + + + Documentation for this function. + + + + diff --git a/tests/scanner/annotationparser/gtkdoc/annotations/tester.h.xml b/tests/scanner/annotationparser/gtkdoc/annotations/tester.h.xml new file mode 100644 index 00000000..b79e1bcd --- /dev/null +++ b/tests/scanner/annotationparser/gtkdoc/annotations/tester.h.xml @@ -0,0 +1,31 @@ + + + + + + /** + * GtkdocAnnotation: + * @that: (allow-none): eventualy points to something + * + * small struct + */ + + + GtkdocAnnotation + + + + that + + + allow-none + + + eventualy points to something + + + small struct + + + + diff --git a/tests/scanner/annotationparser/gtkdoc/bugs/tester.c.xml b/tests/scanner/annotationparser/gtkdoc/bugs/tester.c.xml new file mode 100644 index 00000000..f0a2b225 --- /dev/null +++ b/tests/scanner/annotationparser/gtkdoc/bugs/tester.c.xml @@ -0,0 +1,765 @@ + + + + + + link containing a # char. + * + * + * more details + * + * Second paragraph inside subsection. + * + * + */]]> + + + SECTION:tester + + + + short_description + module for gtk-doc unit test + + + link containing a # char. + + +more details + +Second paragraph inside subsection. + +]]> + + + + + /** + * bug_141869_a: + * @pid: arg + * + * http://bugzilla.gnome.org/show_bug.cgi?id=141869 + */ + + + bug_141869_a + + + + pid + arg + + + http://bugzilla.gnome.org/show_bug.cgi?id=141869 + + + + + /** + * bug_141869_b: + * @pid: arg + * + * http://bugzilla.gnome.org/show_bug.cgi?id=141869 + */ + + + bug_141869_b + + + + pid + arg + + + http://bugzilla.gnome.org/show_bug.cgi?id=141869 + + + + + /** + * bug_379466: + * @pid: arg + * + * http://bugzilla.gnome.org/show_bug.cgi?id=379466 + */ + + + bug_379466 + + + + pid + arg + + + http://bugzilla.gnome.org/show_bug.cgi?id=379466 + + + + + /** + * bug_380824: + * @arg: arg + * + * Returns a value. + * http://bugzilla.gnome.org/show_bug.cgi?id=380824 + * + * Since: 0.1 + * + * Returns: result + */ + + + bug_380824 + + + + arg + arg + + + Returns a value. +http://bugzilla.gnome.org/show_bug.cgi?id=380824 + + + since + 0.1 + + + returns + result + + + + + + + /** + * bug_411739: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=411739 + * + * Returns: result + */ + + + bug_411739 + + http://bugzilla.gnome.org/show_bug.cgi?id=411739 + + + returns + result + + + + + + + /** + * bug_419997: + * @const_values: arg + * + * http://bugzilla.gnome.org/show_bug.cgi?id=419997 + */ + + + bug_419997 + + + + const_values + arg + + + http://bugzilla.gnome.org/show_bug.cgi?id=419997 + + + + + /** + * bug_445693: + * @pid: arg + * + * http://bugzilla.gnome.org/show_bug.cgi?id=445693 + */ + + + bug_445693 + + + + pid + arg + + + http://bugzilla.gnome.org/show_bug.cgi?id=445693 + + + + + /** + * bug_471014: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=471014 + * + * Returns: result + */ + + + bug_471014 + + http://bugzilla.gnome.org/show_bug.cgi?id=471014 + + + returns + result + + + + + + + /** + * Bug446648: + * @BUG_446648_FOO: foo + * + * http://bugzilla.gnome.org/show_bug.cgi?id=446648 + **/ + + + Bug446648 + + + + BUG_446648_FOO + foo + + + http://bugzilla.gnome.org/show_bug.cgi?id=446648 + + + + + /** + * bug_552602: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=552602 + * + * Returns: result + */ + + + bug_552602 + + http://bugzilla.gnome.org/show_bug.cgi?id=552602 + + + returns + result + + + + + + + /** + * bug_574654a: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=574654 + * + * Returns: result + */ + + + bug_574654a + + http://bugzilla.gnome.org/show_bug.cgi?id=574654 + + + returns + result + + + + + + + /** + * bug_574654b: + * @offset: skip this many items + * + * http://bugzilla.gnome.org/show_bug.cgi?id=574654 + */ + + + bug_574654b + + + + offset + skip this many items + + + http://bugzilla.gnome.org/show_bug.cgi?id=574654 + + + + + /** + * bug_580300a_get_type: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=580300 + */ + + + bug_580300a_get_type + + http://bugzilla.gnome.org/show_bug.cgi?id=580300 + + + + + /** + * bug_580300b_get_type: + * @a: value + * + * http://bugzilla.gnome.org/show_bug.cgi?id=580300 + */ + + + bug_580300b_get_type + + + + a + value + + + http://bugzilla.gnome.org/show_bug.cgi?id=580300 + + + + + /** + * bug_580300c_get_type: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=580300 + */ + + + bug_580300c_get_type + + http://bugzilla.gnome.org/show_bug.cgi?id=580300 + + + + + /** + * bug_580300d_get_type: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=580300 + * + * Returns: result + */ + + + bug_580300d_get_type + + http://bugzilla.gnome.org/show_bug.cgi?id=580300 + + + returns + result + + + + + + + /** + * bug_597937: + * @function_arg: value + * + * http://bugzilla.gnome.org/show_bug.cgi?id=597937 + */ + + + bug_597937 + + + + function_arg + value + + + http://bugzilla.gnome.org/show_bug.cgi?id=597937 + + + + + /** + * bug_602518a: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=602518 + * + * Returns: result + */ + + + bug_602518a + + http://bugzilla.gnome.org/show_bug.cgi?id=602518 + + + returns + result + + + + + + + /** + * bug_602518b: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=602518 + * + * Returns: result + */ + + + bug_602518b + + http://bugzilla.gnome.org/show_bug.cgi?id=602518 + + + returns + result + + + + + + + /** + * bug_602518c: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=602518 + * + * Returns: result + */ + + + bug_602518c + + http://bugzilla.gnome.org/show_bug.cgi?id=602518 + + + returns + result + + + + + + + /** + * bug_607445: + * @a: parameter + * @n: parameter + * + * http://bugzilla.gnome.org/show_bug.cgi?id=607445 + */ + + + bug_607445 + + + + a + parameter + + + n + parameter + + + http://bugzilla.gnome.org/show_bug.cgi?id=607445 + + + + + /** + * bug_610257: + * @der: parameter + * @len: parameter + * + * http://bugzilla.gnome.org/show_bug.cgi?id=610257 + */ + + + bug_610257 + + + + der + parameter + + + len + parameter + + + http://bugzilla.gnome.org/show_bug.cgi?id=610257 + + + + + test + * + * subsect + * test + * + **/]]> + + + bug_623968a + + test + + subsect + test +]]> + + + + + + * subsect + * test + * + **/]]> + + + bug_623968b + + + subsect + test +]]> + + + + + test + **/]]> + + + bug_623968c + + test]]> + + + + + /** + * bug_624200a: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=624200 + * + * Returns: result + */ + + + bug_624200a + + http://bugzilla.gnome.org/show_bug.cgi?id=624200 + + + returns + result + + + + + + + /** + * bug_624200b: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=624200 + * + * Returns: result + */ + + + bug_624200b + + http://bugzilla.gnome.org/show_bug.cgi?id=624200 + + + returns + result + + + + + + + /** + * bug_638330: + * @arg1: arg1 + * @data: data + * @length: length + * + * http://bugzilla.gnome.org/show_bug.cgi?id=638330 + */ + + + bug_638330 + + + + arg1 + arg1 + + + data + data + + + length + length + + + http://bugzilla.gnome.org/show_bug.cgi?id=638330 + + + + + /** + * bug_000000_va1: + * @name: a name + * @...: A printf-style message to output + * + * Outputs a message. + */ + + + bug_000000_va1 + + + + name + a name + + + ... + A printf-style message to output + + + Outputs a message. + + + + + /** + * bug_624001a: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=624001 + */ + + + bug_624001a + + http://bugzilla.gnome.org/show_bug.cgi?id=624001 + + + + + /** + * bug_624001b: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=624001 + */ + + + bug_624001b + + http://bugzilla.gnome.org/show_bug.cgi?id=624001 + + + + + /** + * bug_624001c: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=624001 + */ + + + bug_624001c + + http://bugzilla.gnome.org/show_bug.cgi?id=624001 + + + + + /** + * bug_624001d: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=624001 + */ + + + bug_624001d + + http://bugzilla.gnome.org/show_bug.cgi?id=624001 + + + + + /** + * bug_624001e: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=624001 + */ + + + bug_624001e + + http://bugzilla.gnome.org/show_bug.cgi?id=624001 + + + + diff --git a/tests/scanner/annotationparser/gtkdoc/bugs/tester.h.xml b/tests/scanner/annotationparser/gtkdoc/bugs/tester.h.xml new file mode 100644 index 00000000..da7c7919 --- /dev/null +++ b/tests/scanner/annotationparser/gtkdoc/bugs/tester.h.xml @@ -0,0 +1,677 @@ + + + + + + /** + * Bug324535: + * @BUG_324535_A: enum 1 + * @BUG_324535_B: enum 2 + * @BUG_324535_C: enum 3 + * + * http://bugzilla.gnome.org/show_bug.cgi?id=324535 + */ + + + Bug324535 + + + + BUG_324535_A + enum 1 + + + BUG_324535_B + enum 2 + + + BUG_324535_C + enum 3 + + + http://bugzilla.gnome.org/show_bug.cgi?id=324535 + + + + + /** + * bug_481811: + * @x: argument + * + * http://bugzilla.gnome.org/show_bug.cgi?id=481811 + **/ + + + bug_481811 + + + + x + argument + + + http://bugzilla.gnome.org/show_bug.cgi?id=481811 + + + + + /** + * bug_501038: + * @a: value + * @b: deprecated value + * @_b: scrambled deprecated value + * + * http://bugzilla.gnome.org/show_bug.cgi?id=501038 + */ + + + bug_501038 + + + + a + value + + + b + deprecated value + + + _b + scrambled deprecated value + + + http://bugzilla.gnome.org/show_bug.cgi?id=501038 + + + + + /** + * bug_460127: + * @a: field + * + * http://bugzilla.gnome.org/show_bug.cgi?id=460127 + */ + + + bug_460127 + + + + a + field + + + http://bugzilla.gnome.org/show_bug.cgi?id=460127 + + + + + /** + * bug_477532: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=477532 + */ + + + bug_477532 + + http://bugzilla.gnome.org/show_bug.cgi?id=477532 + + + + + /** + * Bug446648: + * @BUG_446648_FOO: field + * + * http://bugzilla.gnome.org/show_bug.cgi?id=446648 + */ + + + Bug446648 + + + + BUG_446648_FOO + field + + + http://bugzilla.gnome.org/show_bug.cgi?id=446648 + + + + + /** + * Bug512154: + * @index: field + * + * http://bugzilla.gnome.org/show_bug.cgi?id=512154 + */ + + + Bug512154 + + + + index + field + + + http://bugzilla.gnome.org/show_bug.cgi?id=512154 + + + + + /** + * bug_512155a_function_pointer_t: + * @arg1: param 1 + * @arg2: param 1 + * @arg3: param 1 + * + * http://bugzilla.gnome.org/show_bug.cgi?id=512155 + */ + + + bug_512155a_function_pointer_t + + + + arg1 + param 1 + + + arg2 + param 1 + + + arg3 + param 1 + + + http://bugzilla.gnome.org/show_bug.cgi?id=512155 + + + + + /** + * bug_512155b_function_pointer_t: + * @arg1: param 1 + * @arg2: param 1 + * @arg3: param 1 + * + * http://bugzilla.gnome.org/show_bug.cgi?id=512155 + */ + + + bug_512155b_function_pointer_t + + + + arg1 + param 1 + + + arg2 + param 1 + + + arg3 + param 1 + + + http://bugzilla.gnome.org/show_bug.cgi?id=512155 + + + + + /** + * bug_512155c_function_pointer_t: + * @arg1: param 1 + * @arg2: param 1 + * @arg3: param 1 + * + * http://bugzilla.gnome.org/show_bug.cgi?id=512155 + */ + + + bug_512155c_function_pointer_t + + + + arg1 + param 1 + + + arg2 + param 1 + + + arg3 + param 1 + + + http://bugzilla.gnome.org/show_bug.cgi?id=512155 + + + + + Test + */]]> + + + BUG_530758 + + Test]]> + + + + + /** + * bug_532395a: + * @number: a number + * + * http://bugzilla.gnome.org/show_bug.cgi?id=532395 + * + * Returns: number + */ + + + bug_532395a + + + + number + a number + + + http://bugzilla.gnome.org/show_bug.cgi?id=532395 + + + returns + number + + + + + + + /** + * bug_532395b: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=532395 + */ + + + bug_532395b + + http://bugzilla.gnome.org/show_bug.cgi?id=532395 + + + + + /** + * bug_544172: + * @self: object pointer. + * + * http://bugzilla.gnome.org/show_bug.cgi?id=544172 + * + * Returns: result or %NULL. + */ + + + bug_544172 + + + + self + object pointer. + + + http://bugzilla.gnome.org/show_bug.cgi?id=544172 + + + returns + result or %NULL. + + + + + + + /** + * bug_554833: + * @i: value; + * + * http://bugzilla.gnome.org/show_bug.cgi?id=554833 + */ + + + bug_554833 + + + + i + value; + + + http://bugzilla.gnome.org/show_bug.cgi?id=554833 + + + + + /** + * bug_554833_new: + * + * http://bugzilla.gnome.org/show_bug.cgi?id=554833 + * + * Returns: result + */ + + + bug_554833_new + + http://bugzilla.gnome.org/show_bug.cgi?id=554833 + + + returns + result + + + + + + + /** + * Bug165425a: + * @i: data as int + * @f: data as float + * + * http://bugzilla.gnome.org/show_bug.cgi?id=165425 + */ + + + Bug165425a + + + + i + data as int + + + f + data as float + + + http://bugzilla.gnome.org/show_bug.cgi?id=165425 + + + + + /** + * Bug165425b: + * @i: data as int + * @f: data as float + * + * http://bugzilla.gnome.org/show_bug.cgi?id=165425 + */ + + + Bug165425b + + + + i + data as int + + + f + data as float + + + http://bugzilla.gnome.org/show_bug.cgi?id=165425 + + + + + /** + * Bug642998: + * @red: red color intensity, from 0–255 + * @green: green color intensity, from 0–255 + * @blue: blue color intensity, from 0–255 + * + * https://bugzilla.gnome.org/show_bug.cgi?id=642998 + */ + + + Bug642998 + + + + red + red color intensity, from 0–255 + + + green + green color intensity, from 0–255 + + + blue + blue color intensity, from 0–255 + + + https://bugzilla.gnome.org/show_bug.cgi?id=642998 + + + + + /** + * Bug644291: + * @BUG_644291_START: foo + * @BUG_644291_TEXT: bar + * @BUG_644291_END: milk + * @BUG_644291_ATTRIBUTE: comes + * @BUG_644291_XMLNS: from + * @BUG_644291_ASSIGN_TO: cows + * + * https://bugzilla.gnome.org/show_bug.cgi?id=644291 + */ + + + Bug644291 + + + + BUG_644291_START + foo + + + BUG_644291_TEXT + bar + + + BUG_644291_END + milk + + + BUG_644291_ATTRIBUTE + comes + + + BUG_644291_XMLNS + from + + + BUG_644291_ASSIGN_TO + cows + + + https://bugzilla.gnome.org/show_bug.cgi?id=644291 + + + + + /** + * BUG_000000_VA2: + * @name: a name + * @...: A printf-style message to output + * + * Outputs a message. + */ + + + BUG_000000_VA2 + + + + name + a name + + + ... + A printf-style message to output + + + Outputs a message. + + + + + /** + * BUG_000000_VA3: + * @name: a name + * @...: A printf-style message to output + * + * Outputs a message. + */ + + + BUG_000000_VA3 + + + + name + a name + + + ... + A printf-style message to output + + + Outputs a message. + + + + + /** + * Bug000000Scope: + * + * Opaque structure. + * "warning: Field descriptions for Bug000000Scope are missing in source code comment block." + * but not if we remove the blank line before "int b"; + */ + + + Bug000000Scope + + Opaque structure. +"warning: Field descriptions for Bug000000Scope are missing in source code comment block." +but not if we remove the blank line before "int b"; + + + + + /** + * gst_play_marshal_BUFFER__BOXED: + * @closure: test + * @return_value: test + * @marshal_data: test + * + * test. + */ + + + gst_play_marshal_BUFFER__BOXED + + + + closure + test + + + return_value + test + + + marshal_data + test + + + test. + + + + + /** + * BUG_656773a: + * + * https://bugzilla.gnome.org/show_bug.cgi?id=656773 + */ + + + BUG_656773a + + https://bugzilla.gnome.org/show_bug.cgi?id=656773 + + + + + /** + * BUG_656773b: + * + * https://bugzilla.gnome.org/show_bug.cgi?id=656773 + */ + + + BUG_656773b + + https://bugzilla.gnome.org/show_bug.cgi?id=656773 + + + + + /** + * BUG_656773c: + * + * https://bugzilla.gnome.org/show_bug.cgi?id=656773 + */ + + + BUG_656773c + + https://bugzilla.gnome.org/show_bug.cgi?id=656773 + + + + + /** + * BUG_656946: + * + * https://bugzilla.gnome.org/show_bug.cgi?id=656946 + */ + + + BUG_656946 + + https://bugzilla.gnome.org/show_bug.cgi?id=656946 + + + + diff --git a/tests/scanner/annotationparser/gtkdoc/empty/tester.c.xml b/tests/scanner/annotationparser/gtkdoc/empty/tester.c.xml new file mode 100644 index 00000000..c18e29fd --- /dev/null +++ b/tests/scanner/annotationparser/gtkdoc/empty/tester.c.xml @@ -0,0 +1,53 @@ + + + + + + + + + SECTION:tester + + + + short_description + module for gtk-doc unit test + + + + + + + + /** + * test: + * @a: arg + * + * lonely function + */ + + + test + + + + a + arg + + + lonely function + + + + diff --git a/tests/scanner/annotationparser/gtkdoc/fail/tester.c.xml b/tests/scanner/annotationparser/gtkdoc/fail/tester.c.xml new file mode 100644 index 00000000..7ebf440b --- /dev/null +++ b/tests/scanner/annotationparser/gtkdoc/fail/tester.c.xml @@ -0,0 +1,162 @@ + + + + + + /* + * SECTION:tester_nodocs + * @short_description: module for gtk-doc unit test + * @title: GtkdocTesterNoDocs + * + * This file contains non-sense code for the sole purpose of testing the docs. + */ + + + + /** + * SECTION:tester_nolongdesc + * @short_description: module for gtk-doc unit test + * @title: GtkdocTesterNoLongDesc + */ + + + SECTION:tester_nolongdesc + + + + short_description + module for gtk-doc unit test + + + title + GtkdocTesterNoLongDesc + + + + + + + /** + * SECTION:tester_noshortdesc + * @title: GtkdocTesterNoShortDesc + * + * This file contains non-sense code for the sole purpose of testing the docs. + */ + + + SECTION:tester_noshortdesc + + + + title + GtkdocTesterNoShortDesc + + + This file contains non-sense code for the sole purpose of testing the docs. + + + + + /** + * SECTION:tester_brokendocs + * @short_description: module for gtk-doc unit test + * @title: GtkdocTesterBrokenDocs + * + * This file contains non-sense code for the sole purpose of testing the docs. + */ + + + SECTION:tester_brokendocs + + + + short_description + module for gtk-doc unit test + + + title + GtkdocTesterBrokenDocs + + + This file contains non-sense code for the sole purpose of testing the docs. + + + + + /** + * func_no_docs: + */ + + + func_no_docs + + + + + + /** + * func_no_item_docs: + * + * Here we document the function but not the parameters. + */ + + + func_no_item_docs + + Here we document the function but not the parameters. + + + + + /** + * func_incomplete_docs: + * @a: a value + * + * Here we document the function but not all the parameters. + */ + + + func_incomplete_docs + + + + a + a value + + + Here we document the function but not all the parameters. + + + + + /** + * func_unused_docs: + * @a: a value + * @b: a value + * @c: an unexisting value + * + * Here we document the function and more than the actual parameters. + */ + + + func_unused_docs + + + + a + a value + + + b + a value + + + c + an unexisting value + + + Here we document the function and more than the actual parameters. + + + + diff --git a/tests/scanner/annotationparser/gtkdoc/fail/tester.h.xml b/tests/scanner/annotationparser/gtkdoc/fail/tester.h.xml new file mode 100644 index 00000000..3e51b761 --- /dev/null +++ b/tests/scanner/annotationparser/gtkdoc/fail/tester.h.xml @@ -0,0 +1,205 @@ + + + + + +/** + * MACRO_NO_ITEM_DOCS: + * + * Here we document the macro but not the parameters. + */ + + + MACRO_NO_ITEM_DOCS + + Here we document the macro but not the parameters. + + + + +/** + * MACRO_INCOMPLETE_DOCS: + * @a: a value + * + * Here we document the macro but not all the parameters. + */ + + + MACRO_INCOMPLETE_DOCS + + + + a + a value + + + Here we document the macro but not all the parameters. + + + + +/** + * MACRO_UNUSED_DOCS: + * @a: a value + * @b: a value + * @c: an unexisting value + * + * Here we document the macro and more than the actual parameters. + */ + + + MACRO_UNUSED_DOCS + + + + a + a value + + + b + a value + + + c + an unexisting value + + + Here we document the macro and more than the actual parameters. + + + + +/** + * EnumNoItemDocs: + * + * Here we document the enum but not the values. + * http://bugzilla.gnome.org/show_bug.cgi?id=568711 + */ + + + EnumNoItemDocs + + Here we document the enum but not the values. +http://bugzilla.gnome.org/show_bug.cgi?id=568711 + + + + +/** + * EnumIncompleteDocs: + * @ENUM_INCOMPLETE_DOCS_1: a value + * + * Here we document the enum but not all the values. + */ + + + EnumIncompleteDocs + + + + ENUM_INCOMPLETE_DOCS_1 + a value + + + Here we document the enum but not all the values. + + + + +/** + * EnumUnusedDocs: + * @ENUM_UNUSED_DOCS_1: a value + * @ENUM_UNUSED_DOCS_2: a value + * @ENUM_UNUSED_DOCS_3: an unexisting value + * + * Here we document the enum and more than the actual values. + */ + + + EnumUnusedDocs + + + + ENUM_UNUSED_DOCS_1 + a value + + + ENUM_UNUSED_DOCS_2 + a value + + + ENUM_UNUSED_DOCS_3 + an unexisting value + + + Here we document the enum and more than the actual values. + + + + +/** + * StructNoItemDocs: + * + * Here we document the struct but not the values. + */ + + + StructNoItemDocs + + Here we document the struct but not the values. + + + + +/** + * StructIncompleteDocs: + * @a: a value + * + * Here we document the struct but not all the values. + */ + + + StructIncompleteDocs + + + + a + a value + + + Here we document the struct but not all the values. + + + + +/** + * StructUnusedDocs: + * @a: a value + * @b: a value + * @c: an unexisting value + * + * Here we document the struct and more than the actual values. + */ + + + StructUnusedDocs + + + + a + a value + + + b + a value + + + c + an unexisting value + + + Here we document the struct and more than the actual values. + + + + diff --git a/tests/scanner/annotationparser/gtkdoc/gobject/giface.c.xml b/tests/scanner/annotationparser/gtkdoc/gobject/giface.c.xml new file mode 100644 index 00000000..ea09d126 --- /dev/null +++ b/tests/scanner/annotationparser/gtkdoc/gobject/giface.c.xml @@ -0,0 +1,147 @@ + + + + + + + * + * Home sweet home. + * + * + * Just incase you wonder, special caracters can be escaped with a \ like in \% + * or \# or even \@. + */]]> + + + SECTION:iface + + + + title + GtkdocIface + + + short_description + interface for gtk-doc unit test + + + see_also + #GtkdocObject + + + + + Home sweet home. + + +Just incase you wonder, special caracters can be escaped with a \ like in \% +or \# or even \@.]]> + + + + + /** + * SECTION:iface2 + * @title: GtkdocIface2 + * @short_description: interface with a prerequisite for gtk-doc unit test + * @see_also: #GtkdocObject, #GtkdocIface + * + * This file contains non-sense code for the sole purpose of testing the docs. + */ + + + SECTION:iface2 + + + + title + GtkdocIface2 + + + short_description + interface with a prerequisite for gtk-doc unit test + + + see_also + #GtkdocObject, #GtkdocIface + + + This file contains non-sense code for the sole purpose of testing the docs. + + + + + /** + * gtkdoc_iface_configure: + * @config: settings + * + * Configure a new instance + * + * Returns: %TRUE for sucess or %FALSE in case of an error + * + * Since: 0.1 + */ + + + gtkdoc_iface_configure + + + + config + settings + + + Configure a new instance + + + returns + %TRUE for sucess or %FALSE in case of an error + + + since + 0.1 + + + + + + + /** + * GtkdocIface::itest: + * @self: myself + * + * The event has been triggered. + */ + + + GtkdocIface::itest + + + + self + myself + + + The event has been triggered. + + + + diff --git a/tests/scanner/annotationparser/gtkdoc/gobject/giface.h.xml b/tests/scanner/annotationparser/gtkdoc/gobject/giface.h.xml new file mode 100644 index 00000000..7185ad0b --- /dev/null +++ b/tests/scanner/annotationparser/gtkdoc/gobject/giface.h.xml @@ -0,0 +1,119 @@ + + + + + + /** + * GtkdocIface: + * + * opaque instance of gtk-doc unit test interface + */ + + + GtkdocIface + + opaque instance of gtk-doc unit test interface + + + + + /** + * GtkdocIface2: + * + * opaque instance of gtk-doc unit test interface + */ + + + GtkdocIface2 + + opaque instance of gtk-doc unit test interface + + + + + /** + * GtkdocIfaceInterface: + * @parent: this is a bug :/ + * @test: overideable method + * + * class data of gtk-doc unit test interface + */ + + + GtkdocIfaceInterface + + + + parent + this is a bug :/ + + + test + overideable method + + + class data of gtk-doc unit test interface + + + + + /** + * GTKDOC_IFACE_MACRO_DUMMY: + * @parameter_1: first arg + * @parameter_2: second arg + * + * This macro does nothing. + */ + + + GTKDOC_IFACE_MACRO_DUMMY + + + + parameter_1 + first arg + + + parameter_2 + second arg + + + This macro does nothing. + + + + + /** + * GTKDOC_IFACE_MACRO_SUM: + * @parameter_1: first arg + * @parameter_2: second arg + * + * This macro adds its args. + * + * Returns: the sum of @parameter_1 and @parameter_2 + */ + + + GTKDOC_IFACE_MACRO_SUM + + + + parameter_1 + first arg + + + parameter_2 + second arg + + + This macro adds its args. + + + returns + the sum of @parameter_1 and @parameter_2 + + + + + + diff --git a/tests/scanner/annotationparser/gtkdoc/gobject/gobject.c.xml b/tests/scanner/annotationparser/gtkdoc/gobject/gobject.c.xml new file mode 100644 index 00000000..e6ac5f97 --- /dev/null +++ b/tests/scanner/annotationparser/gtkdoc/gobject/gobject.c.xml @@ -0,0 +1,416 @@ + + + + + + + * + * + * + * This example serves two main purposes: + * - testing conversion (long description + * follows here) + * - catching bugs + * - having an example + * + * Nothing more to say. + */]]> + + + SECTION:object + + + + title + GtkdocObject + + + short_description + class for gtk-doc unit test + + + see_also + #GtkdocIface + + + Image + object.png + + + + + + +This example serves two main purposes: +- testing conversion (long description + follows here) +- catching bugs +- having an example + +Nothing more to say.]]> + + + + + /** + * SECTION:object2 + * @title: GtkdocObject2 + * @short_description: class with interface for gtk-doc unit test + * @see_also: #GtkdocIface + * + * This file contains non-sense code for the sole purpose of testing the docs. + * + * Internals + * ========= + * + * All the internal details go here or not: + * - single item list + */ + + + SECTION:object2 + + + + title + GtkdocObject2 + + + short_description + class with interface for gtk-doc unit test + + + see_also + #GtkdocIface + + + This file contains non-sense code for the sole purpose of testing the docs. + +Internals +========= + +All the internal details go here or not: +- single item list + + + + + + * This will only work if you have called g_type_init() before. + * + * Returns: the instance or %NULL in case of an error + * + * Since: 0.1 + */]]> + + + gtkdoc_object_new + + + This will only work if you have called g_type_init() before. +]]> + + + returns + the instance or %NULL in case of an error + + + since + 0.1 + + + + + + + + + + gtkdoc_object_set_otest + + + + self + the object + + + value + the new otest value, whose description extends further than one line will allow + + + Set the #GtkdocObject:otest property. + + + deprecated + + + + since + 0.5 + + + + + + + + * + * Negative frobnication can lead to unexpected behaviour. + * + * + * + * Since: 0.5 + */]]> + + + gtkdoc_object_frobnicate + + + + self + the object + + + n + number of iterations + + + + + Negative frobnication can lead to unexpected behaviour. + +]]> + + + since + 0.5 + + + + + + + /** + * gtkdoc_object_fooify: + * @self: the object + * @...: a NULL terminated list of arguments + * + * Fooify the content of @self. + * + * Returns: %TRUE for success + */ + + + gtkdoc_object_fooify + + + + self + the object + + + ... + a NULL terminated list of arguments + + + Fooify the content of @self. + + + returns + %TRUE for success + + + + + + + /** + * GtkdocObject::otest: + * @self: myself + * + * The event has been triggered. + */ + + + GtkdocObject::otest + + + + self + myself + + + The event has been triggered. + + + + + /** + * GtkdocObject::dep-otest: + * @self: myself + * + * The event has been triggered. + * + * Deprecated: Use the #GtkdocObject::otest signal instead. + */ + + + GtkdocObject::dep-otest + + + + self + myself + + + The event has been triggered. + + + deprecated + Use the #GtkdocObject::otest signal instead. + + + + + + + /** + * GtkdocObject::strings-changed: + * + * Something has happened. + */ + + + GtkdocObject::strings-changed + + Something has happened. + + + + + /** + * GtkdocObject::variant-changed: + * + * Something has happened. + */ + + + GtkdocObject::variant-changed + + Something has happened. + + + + + /** + * GtkdocObject:otest: + * + * Since: 0.1 + */ + + + GtkdocObject:otest + + + + since + 0.1 + + + + + + + /** + * GtkdocObject:dep-otest: + * + * Deprecated: use #GtkdocObject:otest property + */ + + + GtkdocObject:dep-otest + + + + deprecated + use #GtkdocObject:otest property + + + + + + diff --git a/tests/scanner/annotationparser/gtkdoc/gobject/gobject.h.xml b/tests/scanner/annotationparser/gtkdoc/gobject/gobject.h.xml new file mode 100644 index 00000000..42fcc664 --- /dev/null +++ b/tests/scanner/annotationparser/gtkdoc/gobject/gobject.h.xml @@ -0,0 +1,158 @@ + + + + + + /** + * GtkdocObject: + * + * instance data of gtk-doc unit test class + */ + + + GtkdocObject + + instance data of gtk-doc unit test class + + + + + /** + * GtkdocObjectClass: + * @parent: this is a bug :/ + * @test: overideable method + * @ping: can be used before calling the @test() function + * @foo_bar: lets you refine your frobnicator + * + * class data of gtk-doc unit test class + */ + + + GtkdocObjectClass + + + + parent + this is a bug :/ + + + test + overideable method + + + ping + can be used before calling the @test() function + + + foo_bar + lets you refine your frobnicator + + + class data of gtk-doc unit test class + + + + + /** + * GtkdocObject2: + * + * instance data of gtk-doc unit test class + */ + + + GtkdocObject2 + + instance data of gtk-doc unit test class + + + + + /** + * GtkdocObject2Class: + * @parent: this is a bug :/ + * + * class data of gtk-doc unit test class + */ + + + GtkdocObject2Class + + + + parent + this is a bug :/ + + + class data of gtk-doc unit test class + + + + + /** + * GTKDOC_OBJECT_MACRO_DUMMY: + * @parameter_1: first arg + * @parameter_2: second arg + * + * This macro does nothing. + * + * Since: 0.1 + */ + + + GTKDOC_OBJECT_MACRO_DUMMY + + + + parameter_1 + first arg + + + parameter_2 + second arg + + + This macro does nothing. + + + since + 0.1 + + + + + + + /** + * GTKDOC_OBJECT_MACRO_SUM: + * @parameter_1: first arg + * @parameter_2: second arg + * + * This macro adds its args. + * + * Returns: the sum of @parameter_1 and @parameter_2 + */ + + + GTKDOC_OBJECT_MACRO_SUM + + + + parameter_1 + first arg + + + parameter_2 + second arg + + + This macro adds its args. + + + returns + the sum of @parameter_1 and @parameter_2 + + + + + + diff --git a/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.c.xml b/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.c.xml new file mode 100644 index 00000000..72dcdf90 --- /dev/null +++ b/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.c.xml @@ -0,0 +1,36 @@ + + + + + + /** + * SECTION:types + * @title: GtkdocTypes + * @short_description: other gobject types for gtk-doc unit test + * @see_also: #GtkdocObject, #GtkdocIface + * + * This file contains non-sense code for the sole purpose of testing the docs. + */ + + + SECTION:types + + + + title + GtkdocTypes + + + short_description + other gobject types for gtk-doc unit test + + + see_also + #GtkdocObject, #GtkdocIface + + + This file contains non-sense code for the sole purpose of testing the docs. + + + + diff --git a/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.h.xml b/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.h.xml new file mode 100644 index 00000000..f4e76e58 --- /dev/null +++ b/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.h.xml @@ -0,0 +1,57 @@ + + + + + + /** + * GtkdocPlainOldData: + * @n: Some integer member. + * @x: Some floating point member. + * + * Unboxed plain old data that should default to public members. + **/ + + + GtkdocPlainOldData + + + + n + Some integer member. + + + x + Some floating point member. + + + Unboxed plain old data that should default to public members. + + + + + /** + * GtkdocBoxedPlainOldData: + * @n: Some integer member. + * @x: Some floating point member. + * + * Boxed plain old data that should default to public members. + **/ + + + GtkdocBoxedPlainOldData + + + + n + Some integer member. + + + x + Some floating point member. + + + Boxed plain old data that should default to public members. + + + + diff --git a/tests/scanner/annotationparser/test_parser.py b/tests/scanner/annotationparser/test_parser.py new file mode 100644 index 00000000..86cd41a7 --- /dev/null +++ b/tests/scanner/annotationparser/test_parser.py @@ -0,0 +1,297 @@ +# -*- Mode: Python -*- +# GObject-Introspection - a framework for introspecting GObject libraries +# Copyright (C) 2012 Dieter Verfaillie +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. +# + + +''' +test_parser.py + +Tests ensuring the "parse tree" built by annotationparser.py +continues to function correctly. +''' + + +import difflib +import os +import xml.etree.ElementTree as etree +import unittest + +from giscanner.annotationparser import AnnotationParser +from giscanner.ast import Namespace +from giscanner.message import MessageLogger + + +def parsed2tree(docblock): + parsed = '' + + if docblock is not None: + parsed += '\n' + + parsed += ' \n' + # An identifier name is always required, but we can't trust our + # own parser to ensure this when testing so fall back to an empty + # string when no name has been parsed... + parsed += ' %s\n' % (docblock.name or '', ) + if docblock.options.values: + parsed += ' \n' + for key, value in docblock.options.values: + parsed += ' \n' + parsed += ' %s\n' % (key, ) + if value is not None: + options = value.all() + parsed += ' \n' + for option in options: + parsed += ' \n' + parsed += ' \n' + parsed += ' \n' + parsed += ' \n' + parsed += ' \n' + + if docblock.params: + parsed += ' \n' + for param_name in docblock.params: + param = docblock.params.get(param_name) + parsed += ' \n' + parsed += ' %s\n' % (param_name, ) + if param.options.values: + parsed += ' \n' + for key, value in param.options.values: + parsed += ' \n' + parsed += ' %s\n' % (key, ) + if value is not None: + options = value.all() + parsed += ' \n' + for option in options: + parsed += ' \n' + parsed += ' \n' + parsed += ' \n' + parsed += ' \n' + if param.comment or param.value: + parsed += ' %s\n' % (param.comment or param.value, ) + parsed += ' \n' + parsed += ' \n' + + if docblock.comment or docblock.value: + parsed += ' %s\n' % (docblock.comment or docblock.value, ) + + if docblock.tags: + parsed += ' \n' + for tag_name in docblock.tags: + tag = docblock.tags.get(tag_name) + parsed += ' \n' + parsed += ' %s\n' % (tag_name, ) + if tag.options.values: + parsed += ' \n' + for key, value in tag.options.values: + parsed += ' \n' + parsed += ' %s\n' %(key, ) + if value is not None: + options = value.all() + parsed += ' \n' + for option in options: + parsed += ' \n' + parsed += ' \n' + parsed += ' \n' + parsed += ' \n' + if tag.comment or tag.value: + parsed += ' %s\n' % (tag.comment or tag.value, ) + parsed += ' \n' + parsed += ' \n' + + parsed += '' + + return parsed + +def expected2tree(docblock): + # Note: this sucks, but we can't rely on etree.tostring() to generate useable output :( + + expected = '' + + if docblock is not None: + expected += '\n' + + if docblock.find('identifier') is not None: + expected += ' \n' + # Expecting an identifier name is required, don't bother checking if it's there or not + expected += ' %s\n' % (docblock.find('identifier/name').text, ) + annotations = docblock.find('identifier/annotations') + if annotations is not None: + expected += ' \n' + for annotation in annotations.iterfind('annotation'): + expected += ' \n' + expected += ' %s\n' % (annotation.find('name').text, ) + if annotation.find('options') is not None: + expected += ' \n' + for option in annotation.iterfind('options/option'): + expected += ' \n' + expected += ' \n' + expected += ' \n' + expected += ' \n' + expected += ' \n' + + parameters = docblock.find('parameters') + if parameters is not None: + expected += ' \n' + for parameter in parameters.iterfind('parameter'): + expected += ' \n' + expected += ' %s\n' % (parameter.find('name').text, ) + annotations = parameter.find('annotations') + if annotations is not None: + expected += ' \n' + for annotation in parameter.iterfind('annotations/annotation'): + expected += ' \n' + expected += ' %s\n' % (annotation.find('name').text, ) + if annotation.find('options') is not None: + expected += ' \n' + for option in annotation.iterfind('options/option'): + expected += ' \n' + expected += ' \n' + expected += ' \n' + expected += ' \n' + if parameter.find('description') is not None: + expected += ' %s\n' % (parameter.find('description').text, ) + expected += ' \n' + expected += ' \n' + + description = docblock.find('description') + if description is not None: + expected += ' %s\n' % (description.text, ) + + tags = docblock.find('tags') + if tags is not None: + expected += ' \n' + for tag in tags.iterfind('tag'): + expected += ' \n' + expected += ' %s\n' % (tag.find('name').text, ) + annotations = tag.find('annotations') + if annotations is not None: + expected += ' \n' + for annotation in tag.iterfind('annotations/annotation'): + expected += ' \n' + expected += ' %s\n' % (annotation.find('name').text, ) + if annotation.find('options') is not None: + expected += ' \n' + for option in annotation.iterfind('options/option'): + expected += ' \n' + expected += ' \n' + expected += ' \n' + expected += ' \n' + if tag.find('description') is not None: + expected += ' %s\n' % (tag.find('description').text, ) + expected += ' \n' + expected += ' \n' + + expected += '' + + return expected + + +def create_tests(tests_dir, tests_file): + tests_name = os.path.relpath(tests_file[:-4], tests_dir) + tests_name = tests_name.replace('/', '.').replace('\\', '.') + + tests_tree = etree.parse(tests_file).getroot() + + fix_cdata_elements = tests_tree.findall('test/commentblock') + fix_cdata_elements += tests_tree.findall('.//description') + + for element in fix_cdata_elements: + if element.text: + element.text = element.text.replace('{{?', '') + + for counter, test in enumerate(tests_tree.findall('test')): + test_name = 'test_%s.%03d' % (tests_name, counter + 1) + test_method = TestCommentBlock.__create_test__(test) + setattr(TestCommentBlock, test_name, test_method) + + +class TestCommentBlock(unittest.TestCase): + @classmethod + def __create_test__(cls, testcase): + def do_test(self): + # Parse GTK-Doc comment block + commentblock = testcase.find('commentblock').text + parsed_docblock = AnnotationParser().parse_comment_block((commentblock, 'test.c', 1)) + parsed_tree = parsed2tree(parsed_docblock).split('\n') + + # Get expected output + expected_docblock = testcase.find('docblock') + expected_tree = expected2tree(expected_docblock).split('\n') + + # Construct a meaningful message + msg = 'Parsed DocBlock object tree does not match expected output:\n\n' + msg += '%s\n\n' % (commentblock, ) + + diff = difflib.unified_diff(expected_tree, parsed_tree, + 'Expected DocBlock', 'Parsed DocBlock', + n=max(len(expected_tree), len(parsed_tree)), + lineterm='') + for line in diff: + msg += '%s\n' % (line, ) + + # Compare parsed with expected DocBlock tree + self.assertEqual(parsed_tree, expected_tree, msg) + + return do_test + + +if __name__ == '__main__': + # Initialize message logger + # TODO: at some point it might be a good idea to test warnings emitted + # by annotationparser here, instead of having them in tests/warn/annotationparser.h? + namespace = Namespace('Test', '1.0') + logger = MessageLogger.get(namespace=namespace) + logger.enable_warnings(False) + + # Load test cases from disc + tests_dir = os.path.dirname(os.path.abspath(__file__)) + + for dirpath, dirnames, filenames in os.walk(tests_dir): + for filename in filenames: + tests_file = os.path.join(dirpath, filename) + if os.path.basename(tests_file).endswith('.xml'): + create_tests(tests_dir, tests_file) + + # Run test suite + unittest.main() -- cgit v1.2.1 From 1de10b1b740ae84a51c6f4e52374afdbbc10d74c Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 28 Nov 2012 19:48:47 +0100 Subject: giscanner: move unit tests from giscanner/annotationpatters.py... ... to tests/scanner/annotationparser/test_patterns.py because the following patch will remove giscanner/annotationpatters.py https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- Makefile.am | 2 +- giscanner/annotationpatterns.py | 556 ---------------------- tests/scanner/annotationparser/README | 11 + tests/scanner/annotationparser/test_patterns.py | 590 ++++++++++++++++++++++++ 4 files changed, 602 insertions(+), 557 deletions(-) create mode 100644 tests/scanner/annotationparser/test_patterns.py diff --git a/Makefile.am b/Makefile.am index 76837554..c4f67031 100644 --- a/Makefile.am +++ b/Makefile.am @@ -65,7 +65,7 @@ check-local: @echo "TEST: PEP-8 INQUISITION" @find $(top_srcdir)/giscanner -name \*.py | sort | uniq | xargs $(PYTHON) $(top_srcdir)/misc/pep8.py --repeat --exclude=config.py @echo "TEST: Annotation pattern programs" - $(PYTHON) $(top_srcdir)/giscanner/annotationpatterns.py + PYTHONPATH="$(top_builddir):$(top_srcdir)" $(PYTHON) $(top_srcdir)/tests/scanner/annotationparser/test_patterns.py @echo "TEST: GTK-Doc Annotation Parser" PYTHONPATH="$(top_builddir):$(top_srcdir)" $(PYTHON) $(top_srcdir)/tests/scanner/annotationparser/test_parser.py @touch $(top_builddir)/.make-check-passed diff --git a/giscanner/annotationpatterns.py b/giscanner/annotationpatterns.py index a4030051..95c11c9e 100644 --- a/giscanner/annotationpatterns.py +++ b/giscanner/annotationpatterns.py @@ -250,559 +250,3 @@ MULTILINE_ANNOTATION_CONTINUATION_RE = re.compile(r''' $ # end ''', re.VERBOSE | re.MULTILINE) - - -if __name__ == '__main__': - import unittest - - identifier_section_tests = [ - (SECTION_RE, 'TSIEOCN', - None), - (SECTION_RE, 'section', - None), - (SECTION_RE, 'section:', - None), - (SECTION_RE, 'section:test', - None), - (SECTION_RE, 'SECTION', - {'colon': '', - 'section_name': None}), - (SECTION_RE, 'SECTION \t ', - {'colon': '', - 'section_name': None}), - (SECTION_RE, ' \t SECTION \t ', - {'colon': '', - 'section_name': None}), - (SECTION_RE, 'SECTION: \t ', - {'colon': ':', - 'section_name': None}), - (SECTION_RE, 'SECTION : ', - {'colon': ':', - 'section_name': None}), - (SECTION_RE, ' SECTION : ', - {'colon': ':', - 'section_name': None}), - (SECTION_RE, 'SECTION:gtkwidget', - {'colon': ':', - 'section_name': 'gtkwidget'}), - (SECTION_RE, 'SECTION:gtkwidget ', - {'colon': ':', - 'section_name': 'gtkwidget'}), - (SECTION_RE, ' SECTION:gtkwidget', - {'colon': ':', - 'section_name': 'gtkwidget'}), - (SECTION_RE, ' SECTION:gtkwidget\t ', - {'colon': ':', - 'section_name': 'gtkwidget'}), - (SECTION_RE, 'SECTION: gtkwidget ', - {'colon': ':', - 'section_name': 'gtkwidget'}), - (SECTION_RE, 'SECTION : gtkwidget', - {'colon': ':', - 'section_name': 'gtkwidget'}), - (SECTION_RE, 'SECTION gtkwidget \f ', - {'colon': '', - 'section_name': 'gtkwidget'})] - - identifier_symbol_tests = [ - (SYMBOL_RE, 'GBaseFinalizeFunc:', - {'colon': ':', - 'symbol_name': 'GBaseFinalizeFunc', - 'annotations': ''}), - (SYMBOL_RE, 'gtk_widget_show ', - {'colon': '', - 'symbol_name': 'gtk_widget_show', - 'annotations': ''}), - (SYMBOL_RE, ' gtk_widget_show', - {'colon': '', - 'symbol_name': 'gtk_widget_show', - 'annotations': ''}), - (SYMBOL_RE, ' gtk_widget_show ', - {'colon': '', - 'symbol_name': 'gtk_widget_show', - 'annotations': ''}), - (SYMBOL_RE, 'gtk_widget_show:', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': ''}), - (SYMBOL_RE, 'gtk_widget_show :', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': ''}), - (SYMBOL_RE, 'gtk_widget_show: ', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': ''}), - (SYMBOL_RE, 'gtk_widget_show : ', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': ''}), - (SYMBOL_RE, ' gtk_widget_show:', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': ''}), - (SYMBOL_RE, ' gtk_widget_show :', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': ''}), - (SYMBOL_RE, ' gtk_widget_show: ', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': ''}), - (SYMBOL_RE, ' gtk_widget_show : ', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': ''}), - (SYMBOL_RE, 'gtk_widget_show (skip)', - {'colon': '', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip)'}), - (SYMBOL_RE, 'gtk_widget_show: (skip)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip)'}), - (SYMBOL_RE, 'gtk_widget_show : (skip)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip)'}), - (SYMBOL_RE, 'gtk_widget_show: (skip)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip)'}), - (SYMBOL_RE, 'gtk_widget_show : (skip)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip)'}), - (SYMBOL_RE, ' gtk_widget_show:(skip)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip)'}), - (SYMBOL_RE, ' gtk_widget_show :(skip)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip)'}), - (SYMBOL_RE, ' gtk_widget_show: (skip)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip)'}), - (SYMBOL_RE, ' gtk_widget_show : (skip) \t ', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip) \t '}), - (SYMBOL_RE, ' gtk_widget_show : (skip) \t ', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip) \t '}), - (SYMBOL_RE, 'gtk_widget_show:(skip)(test1)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip)(test1)'}), - (SYMBOL_RE, 'gtk_widget_show (skip)(test1)', - {'colon': '', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip)(test1)'}), - (SYMBOL_RE, 'gtk_widget_show: (skip) (test1)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip) (test1)'}), - (SYMBOL_RE, 'gtk_widget_show : (skip) (test1)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip) (test1)'}), - (SYMBOL_RE, 'gtk_widget_show: (skip) (test1)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip) (test1)'}), - (SYMBOL_RE, 'gtk_widget_show : (skip) (test1)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip) (test1)'}), - (SYMBOL_RE, ' gtk_widget_show:(skip) (test1)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip) (test1)'}), - (SYMBOL_RE, ' gtk_widget_show :(skip) (test1)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip) (test1)'}), - (SYMBOL_RE, ' gtk_widget_show: (skip) (test1)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip) (test1)'}), - (SYMBOL_RE, ' gtk_widget_show : (skip) (test1) ', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip) (test1) '}), - (SYMBOL_RE, 'gtk_widget_show: (skip) (test1) (test-2)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip) (test1) (test-2)'}), - (SYMBOL_RE, 'gtk_widget_show : (skip) (test1) (test-2)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip) (test1) (test-2)'}), - (SYMBOL_RE, 'gtk_widget_show: (skip) (test1) (test-2)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip) (test1) (test-2)'}), - (SYMBOL_RE, 'gtk_widget_show : (skip) (test1) (test-2)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip) (test1) (test-2)'}), - (SYMBOL_RE, ' gtk_widget_show:(skip) (test1) (test-2)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip) (test1) (test-2)'}), - (SYMBOL_RE, ' gtk_widget_show :(skip) (test1) (test-2)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip) (test1) (test-2)'}), - (SYMBOL_RE, ' gtk_widget_show: (skip) (test1) (test-2)', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip) (test1) (test-2)'}), - (SYMBOL_RE, ' gtk_widget_show : (skip) (test1) (test-2) ', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip) (test1) (test-2) '}), - (SYMBOL_RE, ' gtk_widget_show : (skip) (test1) (test-2) ', - {'colon': ':', - 'symbol_name': 'gtk_widget_show', - 'annotations': '(skip) (test1) (test-2) '}), - # constants - (SYMBOL_RE, 'MY_CONSTANT:', - {'colon': ':', - 'symbol_name': 'MY_CONSTANT', - 'annotations': ''}), - # structs - (SYMBOL_RE, 'FooWidget:', - {'colon': ':', - 'symbol_name': 'FooWidget', - 'annotations': ''}), - # enums - (SYMBOL_RE, 'Something:', - {'colon': ':', - 'symbol_name': 'Something', - 'annotations': ''})] - - identifier_property_tests = [ - # simple property name - (PROPERTY_RE, 'GtkWidget:name (skip)', - {'class_name': 'GtkWidget', - 'property_name': 'name', - 'colon': '', - 'annotations': '(skip)'}), - (PROPERTY_RE, 'GtkWidget:name', - {'class_name': 'GtkWidget', - 'property_name': 'name', - 'colon': '', - 'annotations': ''}), - (PROPERTY_RE, ' GtkWidget :name', - {'class_name': 'GtkWidget', - 'property_name': 'name', - 'colon': '', - 'annotations': ''}), - (PROPERTY_RE, 'GtkWidget: name ', - {'class_name': 'GtkWidget', - 'property_name': 'name', - 'colon': '', - 'annotations': ''}), - (PROPERTY_RE, ' GtkWidget : name ', - {'class_name': 'GtkWidget', - 'property_name': 'name', - 'colon': '', - 'annotations': ''}), - (PROPERTY_RE, 'GtkWidget:name:', - {'class_name': 'GtkWidget', - 'property_name': 'name', - 'colon': ':', - 'annotations': ''}), - (PROPERTY_RE, 'GtkWidget:name: ', - {'class_name': 'GtkWidget', - 'property_name': 'name', - 'colon': ':', - 'annotations': ''}), - (PROPERTY_RE, ' GtkWidget:name:', - {'class_name': 'GtkWidget', - 'property_name': 'name', - 'colon': ':', - 'annotations': ''}), - (PROPERTY_RE, 'Something:name:', - {'class_name': 'Something', - 'property_name': 'name', - 'colon': ':', - 'annotations': ''}), - (PROPERTY_RE, 'Something:name: ', - {'class_name': 'Something', - 'property_name': 'name', - 'colon': ':', - 'annotations': ''}), - (PROPERTY_RE, ' Something:name:', - {'class_name': 'Something', - 'property_name': 'name', - 'colon': ':', - 'annotations': ''}), - (PROPERTY_RE, 'Weird-thing:name:', - None), - (PROPERTY_RE, 'really-weird_thing:name:', - None), - (PROPERTY_RE, 'GWin32InputStream:handle:', - {'class_name': 'GWin32InputStream', - 'property_name': 'handle', - 'colon': ':', - 'annotations': ''}), - # property name that contains a dash - (PROPERTY_RE, 'GtkWidget:double-buffered (skip)', - {'class_name': 'GtkWidget', - 'property_name': 'double-buffered', - 'colon': '', - 'annotations': '(skip)'}), - (PROPERTY_RE, 'GtkWidget:double-buffered', - {'class_name': 'GtkWidget', - 'property_name': 'double-buffered', - 'colon': '', - 'annotations': ''}), - (PROPERTY_RE, ' GtkWidget :double-buffered', - {'class_name': 'GtkWidget', - 'property_name': 'double-buffered', - 'colon': '', - 'annotations': ''}), - (PROPERTY_RE, 'GtkWidget: double-buffered ', - {'class_name': 'GtkWidget', - 'property_name': 'double-buffered', - 'colon': '', - 'annotations': ''}), - (PROPERTY_RE, ' GtkWidget : double-buffered ', - {'class_name': 'GtkWidget', - 'property_name': 'double-buffered', - 'colon': '', - 'annotations': ''}), - (PROPERTY_RE, 'GtkWidget:double-buffered:', - {'class_name': 'GtkWidget', - 'property_name': 'double-buffered', - 'colon': ':', - 'annotations': ''}), - (PROPERTY_RE, 'GtkWidget:double-buffered: ', - {'class_name': 'GtkWidget', - 'property_name': 'double-buffered', - 'colon': ':', - 'annotations': ''}), - (PROPERTY_RE, ' GtkWidget:double-buffered:', - {'class_name': 'GtkWidget', - 'property_name': 'double-buffered', - 'colon': ':', - 'annotations': ''}), - (PROPERTY_RE, 'Something:double-buffered:', - {'class_name': 'Something', - 'property_name': 'double-buffered', - 'colon': ':', - 'annotations': ''}), - (PROPERTY_RE, 'Something:double-buffered: ', - {'class_name': 'Something', - 'property_name': 'double-buffered', - 'colon': ':', - 'annotations': ''}), - (PROPERTY_RE, ' Something:double-buffered:', - {'class_name': 'Something', - 'property_name': 'double-buffered', - 'colon': ':', - 'annotations': ''}), - (PROPERTY_RE, 'Weird-thing:double-buffered:', - None), - (PROPERTY_RE, 'really-weird_thing:double-buffered:', - None), - (PROPERTY_RE, ' GMemoryOutputStream:realloc-function: (skip)', - {'class_name': 'GMemoryOutputStream', - 'property_name': 'realloc-function', - 'colon': ':', - 'annotations': '(skip)'})] - - identifier_signal_tests = [ - # simple property name - (SIGNAL_RE, 'GtkWidget::changed: (skip)', - {'class_name': 'GtkWidget', - 'signal_name': 'changed', - 'colon': ':', - 'annotations': '(skip)'}), - (SIGNAL_RE, 'GtkWidget::changed:', - {'class_name': 'GtkWidget', - 'signal_name': 'changed', - 'colon': ':', - 'annotations': ''}), - (SIGNAL_RE, 'Something::changed:', - {'class_name': 'Something', - 'signal_name': 'changed', - 'colon': ':', - 'annotations': ''}), - (SIGNAL_RE, 'Weird-thing::changed:', - None), - (SIGNAL_RE, 'really-weird_thing::changed:', - None), - # property name that contains a dash - (SIGNAL_RE, 'GtkWidget::hierarchy-changed: (skip)', - {'class_name': 'GtkWidget', - 'signal_name': 'hierarchy-changed', - 'colon': ':', - 'annotations': '(skip)'}), - (SIGNAL_RE, 'GtkWidget::hierarchy-changed:', - {'class_name': 'GtkWidget', - 'signal_name': 'hierarchy-changed', - 'colon': ':', - 'annotations': ''}), - (SIGNAL_RE, 'Something::hierarchy-changed:', - {'class_name': 'Something', - 'signal_name': 'hierarchy-changed', - 'colon': ':', - 'annotations': ''}), - (SIGNAL_RE, 'Weird-thing::hierarchy-changed:', - None), - (SIGNAL_RE, 'really-weird_thing::hierarchy-changed:', - None)] - - parameter_tests = [ - (PARAMETER_RE, '@Short_description: Base class for all widgets ', - {'parameter_name': 'Short_description', - 'annotations': '', - 'colon': '', - 'description': 'Base class for all widgets'}), - (PARAMETER_RE, '@...: the value of the first property, followed optionally by more', - {'parameter_name': '...', - 'annotations': '', - 'colon': '', - 'description': 'the value of the first property, followed optionally by more'}), - (PARAMETER_RE, '@widget: a #GtkWidget', - {'parameter_name': 'widget', - 'annotations': '', - 'colon': '', - 'description': 'a #GtkWidget'}), - (PARAMETER_RE, '@widget_pointer: (inout) (transfer none): ' - 'address of a variable that contains @widget', - {'parameter_name': 'widget_pointer', - 'annotations': '(inout) (transfer none)', - 'colon': ':', - 'description': 'address of a variable that contains @widget'}), - (PARAMETER_RE, '@weird_thing: (inout) (transfer none) (allow-none) (attribute) (destroy) ' - '(foreign) (inout) (out) (transfer) (skip) (method): some weird @thing', - {'parameter_name': 'weird_thing', - 'annotations': '(inout) (transfer none) (allow-none) (attribute) (destroy) ' - '(foreign) (inout) (out) (transfer) (skip) (method)', - 'colon': ':', - 'description': 'some weird @thing'}), - (PARAMETER_RE, '@data: a pointer to the element data. The data may be moved as elements ' - 'are added to the #GByteArray.', - {'parameter_name': 'data', - 'annotations': '', - 'colon': '', - 'description': 'a pointer to the element data. The data may be moved as elements ' - 'are added to the #GByteArray.'}), - (PARAMETER_RE, '@a: a #GSequenceIter', - {'parameter_name': 'a', - 'annotations': '', - 'colon': '', - 'description': 'a #GSequenceIter'}), - (PARAMETER_RE, '@keys: (array length=n_keys) (element-type GQuark) (allow-none):', - {'parameter_name': 'keys', - 'annotations': '(array length=n_keys) (element-type GQuark) (allow-none)', - 'colon': ':', - 'description': ''})] - - tag_tests = [ - (TAG_RE, 'Since 3.0', - None), - (TAG_RE, 'Since: 3.0', - {'tag_name': 'Since', - 'annotations': '', - 'colon': '', - 'description': '3.0'}), - (TAG_RE, 'Attributes: (inout) (transfer none): some note about attributes', - {'tag_name': 'Attributes', - 'annotations': '(inout) (transfer none)', - 'colon': ':', - 'description': 'some note about attributes'}), - (TAG_RE, 'Rename to: something_else', - {'tag_name': 'Rename to', - 'annotations': '', - 'colon': '', - 'description': 'something_else'}), - (TAG_RE, '@Deprecated: Since 2.8, reference counting is done atomically', - None), - (TAG_RE, 'Returns %TRUE and does weird things', - None), - (TAG_RE, 'Returns: a #GtkWidget', - {'tag_name': 'Returns', - 'annotations': '', - 'colon': '', - 'description': 'a #GtkWidget'}), - (TAG_RE, 'Return value: (transfer none): The binary data that @text responds. ' - 'This pointer', - {'tag_name': 'Return value', - 'annotations': '(transfer none)', - 'colon': ':', - 'description': 'The binary data that @text responds. This pointer'}), - (TAG_RE, 'Return value: (transfer full) (array length=out_len) (element-type guint8):', - {'tag_name': 'Return value', - 'annotations': '(transfer full) (array length=out_len) (element-type guint8)', - 'colon': ':', - 'description': ''}), - (TAG_RE, 'Returns: A boolean value, but let me tell you a bit about this boolean. It', - {'tag_name': 'Returns', - 'annotations': '', - 'colon': '', - 'description': 'A boolean value, but let me tell you a bit about this boolean. ' - 'It'}), - (TAG_RE, 'Returns: (transfer container) (element-type GObject.ParamSpec): a', - {'tag_name': 'Returns', - 'annotations': '(transfer container) (element-type GObject.ParamSpec)', - 'colon': ':', - 'description': 'a'}), - (TAG_RE, 'Return value: (type GLib.HashTable>) ' - '(transfer full):', - {'tag_name': 'Return value', - 'annotations': '(type GLib.HashTable>) ' - '(transfer full)', - 'colon': ':', - 'description': ''})] - - - def create_tests(cls, test_name, testcases): - for (index, testcase) in enumerate(testcases): - real_test_name = '%s_%03d' % (test_name, index) - - test_method = cls.__create_test__(testcase) - test_method.__name__ = real_test_name - setattr(cls, real_test_name, test_method) - - - class TestProgram(unittest.TestCase): - @classmethod - def __create_test__(cls, testcase): - def do_test(self): - (program, text, expected) = testcase - - match = program.search(text) - - if expected is None: - msg = 'Program matched text but shouldn\'t:\n"%s"' - self.assertTrue(match is None, msg % (text)) - else: - msg = 'Program should match text but didn\'t:\n"%s"' - self.assertTrue(match is not None, msg % (text)) - - for key, value in expected.items(): - msg = 'expected "%s" for "%s" but match returned "%s"' - msg = msg % (value, key, match.group(key)) - self.assertEqual(match.group(key), value, msg) - - return do_test - - - # Create tests from data - create_tests(TestProgram, 'test_identifier_section', identifier_section_tests) - create_tests(TestProgram, 'test_identifier_symbol', identifier_symbol_tests) - create_tests(TestProgram, 'test_identifier_property', identifier_property_tests) - create_tests(TestProgram, 'test_identifier_signal', identifier_signal_tests) - create_tests(TestProgram, 'test_parameter', parameter_tests) - create_tests(TestProgram, 'test_tag', tag_tests) - - # Run test suite - unittest.main() diff --git a/tests/scanner/annotationparser/README b/tests/scanner/annotationparser/README index 1f621a57..03cdf59d 100644 --- a/tests/scanner/annotationparser/README +++ b/tests/scanner/annotationparser/README @@ -1,3 +1,14 @@ +test_patterns.py +================ + +Notes +----- + +The tests included within test_patterns.py are designed to torture the regular +expression programs used to match different parts of GTK-Doc comment blocks +by giscanner/annotationparser.py + + test_parser.py ============== diff --git a/tests/scanner/annotationparser/test_patterns.py b/tests/scanner/annotationparser/test_patterns.py new file mode 100644 index 00000000..0b5592a4 --- /dev/null +++ b/tests/scanner/annotationparser/test_patterns.py @@ -0,0 +1,590 @@ +# -*- Mode: Python -*- +# GObject-Introspection - a framework for introspecting GObject libraries +# Copyright (C) 2012 Dieter Verfaillie +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. +# + + +''' +test_patterns.py + +Tests ensuring the regular expression programs used +in annotationparser.py continue to function correctly. +Each regular expression program is tested on input that +should not match and input that should match. When input +should match, resulting symbolic groups are verified +against the expected output. +''' + + +from giscanner.annotationpatterns import (SECTION_RE, SYMBOL_RE, PROPERTY_RE, + SIGNAL_RE, PARAMETER_RE, TAG_RE) +from unittest import (TestCase, main) + + +identifier_section_tests = [ + (SECTION_RE, 'TSIEOCN', + None), + (SECTION_RE, 'section', + None), + (SECTION_RE, 'section:', + None), + (SECTION_RE, 'section:test', + None), + (SECTION_RE, 'SECTION', + {'colon': '', + 'section_name': None}), + (SECTION_RE, 'SECTION \t ', + {'colon': '', + 'section_name': None}), + (SECTION_RE, ' \t SECTION \t ', + {'colon': '', + 'section_name': None}), + (SECTION_RE, 'SECTION: \t ', + {'colon': ':', + 'section_name': None}), + (SECTION_RE, 'SECTION : ', + {'colon': ':', + 'section_name': None}), + (SECTION_RE, ' SECTION : ', + {'colon': ':', + 'section_name': None}), + (SECTION_RE, 'SECTION:gtkwidget', + {'colon': ':', + 'section_name': 'gtkwidget'}), + (SECTION_RE, 'SECTION:gtkwidget ', + {'colon': ':', + 'section_name': 'gtkwidget'}), + (SECTION_RE, ' SECTION:gtkwidget', + {'colon': ':', + 'section_name': 'gtkwidget'}), + (SECTION_RE, ' SECTION:gtkwidget\t ', + {'colon': ':', + 'section_name': 'gtkwidget'}), + (SECTION_RE, 'SECTION: gtkwidget ', + {'colon': ':', + 'section_name': 'gtkwidget'}), + (SECTION_RE, 'SECTION : gtkwidget', + {'colon': ':', + 'section_name': 'gtkwidget'}), + (SECTION_RE, 'SECTION gtkwidget \f ', + {'colon': '', + 'section_name': 'gtkwidget'})] + +identifier_symbol_tests = [ + (SYMBOL_RE, 'GBaseFinalizeFunc:', + {'colon': ':', + 'symbol_name': 'GBaseFinalizeFunc', + 'annotations': ''}), + (SYMBOL_RE, 'gtk_widget_show ', + {'colon': '', + 'symbol_name': 'gtk_widget_show', + 'annotations': ''}), + (SYMBOL_RE, ' gtk_widget_show', + {'colon': '', + 'symbol_name': 'gtk_widget_show', + 'annotations': ''}), + (SYMBOL_RE, ' gtk_widget_show ', + {'colon': '', + 'symbol_name': 'gtk_widget_show', + 'annotations': ''}), + (SYMBOL_RE, 'gtk_widget_show:', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': ''}), + (SYMBOL_RE, 'gtk_widget_show :', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': ''}), + (SYMBOL_RE, 'gtk_widget_show: ', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': ''}), + (SYMBOL_RE, 'gtk_widget_show : ', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': ''}), + (SYMBOL_RE, ' gtk_widget_show:', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': ''}), + (SYMBOL_RE, ' gtk_widget_show :', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': ''}), + (SYMBOL_RE, ' gtk_widget_show: ', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': ''}), + (SYMBOL_RE, ' gtk_widget_show : ', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': ''}), + (SYMBOL_RE, 'gtk_widget_show (skip)', + {'colon': '', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip)'}), + (SYMBOL_RE, 'gtk_widget_show: (skip)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip)'}), + (SYMBOL_RE, 'gtk_widget_show : (skip)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip)'}), + (SYMBOL_RE, 'gtk_widget_show: (skip)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip)'}), + (SYMBOL_RE, 'gtk_widget_show : (skip)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip)'}), + (SYMBOL_RE, ' gtk_widget_show:(skip)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip)'}), + (SYMBOL_RE, ' gtk_widget_show :(skip)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip)'}), + (SYMBOL_RE, ' gtk_widget_show: (skip)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip)'}), + (SYMBOL_RE, ' gtk_widget_show : (skip) \t ', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip) \t '}), + (SYMBOL_RE, ' gtk_widget_show : (skip) \t ', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip) \t '}), + (SYMBOL_RE, 'gtk_widget_show:(skip)(test1)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip)(test1)'}), + (SYMBOL_RE, 'gtk_widget_show (skip)(test1)', + {'colon': '', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip)(test1)'}), + (SYMBOL_RE, 'gtk_widget_show: (skip) (test1)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip) (test1)'}), + (SYMBOL_RE, 'gtk_widget_show : (skip) (test1)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip) (test1)'}), + (SYMBOL_RE, 'gtk_widget_show: (skip) (test1)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip) (test1)'}), + (SYMBOL_RE, 'gtk_widget_show : (skip) (test1)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip) (test1)'}), + (SYMBOL_RE, ' gtk_widget_show:(skip) (test1)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip) (test1)'}), + (SYMBOL_RE, ' gtk_widget_show :(skip) (test1)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip) (test1)'}), + (SYMBOL_RE, ' gtk_widget_show: (skip) (test1)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip) (test1)'}), + (SYMBOL_RE, ' gtk_widget_show : (skip) (test1) ', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip) (test1) '}), + (SYMBOL_RE, 'gtk_widget_show: (skip) (test1) (test-2)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip) (test1) (test-2)'}), + (SYMBOL_RE, 'gtk_widget_show : (skip) (test1) (test-2)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip) (test1) (test-2)'}), + (SYMBOL_RE, 'gtk_widget_show: (skip) (test1) (test-2)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip) (test1) (test-2)'}), + (SYMBOL_RE, 'gtk_widget_show : (skip) (test1) (test-2)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip) (test1) (test-2)'}), + (SYMBOL_RE, ' gtk_widget_show:(skip) (test1) (test-2)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip) (test1) (test-2)'}), + (SYMBOL_RE, ' gtk_widget_show :(skip) (test1) (test-2)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip) (test1) (test-2)'}), + (SYMBOL_RE, ' gtk_widget_show: (skip) (test1) (test-2)', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip) (test1) (test-2)'}), + (SYMBOL_RE, ' gtk_widget_show : (skip) (test1) (test-2) ', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip) (test1) (test-2) '}), + (SYMBOL_RE, ' gtk_widget_show : (skip) (test1) (test-2) ', + {'colon': ':', + 'symbol_name': 'gtk_widget_show', + 'annotations': '(skip) (test1) (test-2) '}), + # constants + (SYMBOL_RE, 'MY_CONSTANT:', + {'colon': ':', + 'symbol_name': 'MY_CONSTANT', + 'annotations': ''}), + # structs + (SYMBOL_RE, 'FooWidget:', + {'colon': ':', + 'symbol_name': 'FooWidget', + 'annotations': ''}), + # enums + (SYMBOL_RE, 'Something:', + {'colon': ':', + 'symbol_name': 'Something', + 'annotations': ''})] + +identifier_property_tests = [ + # simple property name + (PROPERTY_RE, 'GtkWidget:name (skip)', + {'class_name': 'GtkWidget', + 'property_name': 'name', + 'colon': '', + 'annotations': '(skip)'}), + (PROPERTY_RE, 'GtkWidget:name', + {'class_name': 'GtkWidget', + 'property_name': 'name', + 'colon': '', + 'annotations': ''}), + (PROPERTY_RE, ' GtkWidget :name', + {'class_name': 'GtkWidget', + 'property_name': 'name', + 'colon': '', + 'annotations': ''}), + (PROPERTY_RE, 'GtkWidget: name ', + {'class_name': 'GtkWidget', + 'property_name': 'name', + 'colon': '', + 'annotations': ''}), + (PROPERTY_RE, ' GtkWidget : name ', + {'class_name': 'GtkWidget', + 'property_name': 'name', + 'colon': '', + 'annotations': ''}), + (PROPERTY_RE, 'GtkWidget:name:', + {'class_name': 'GtkWidget', + 'property_name': 'name', + 'colon': ':', + 'annotations': ''}), + (PROPERTY_RE, 'GtkWidget:name: ', + {'class_name': 'GtkWidget', + 'property_name': 'name', + 'colon': ':', + 'annotations': ''}), + (PROPERTY_RE, ' GtkWidget:name:', + {'class_name': 'GtkWidget', + 'property_name': 'name', + 'colon': ':', + 'annotations': ''}), + (PROPERTY_RE, 'Something:name:', + {'class_name': 'Something', + 'property_name': 'name', + 'colon': ':', + 'annotations': ''}), + (PROPERTY_RE, 'Something:name: ', + {'class_name': 'Something', + 'property_name': 'name', + 'colon': ':', + 'annotations': ''}), + (PROPERTY_RE, ' Something:name:', + {'class_name': 'Something', + 'property_name': 'name', + 'colon': ':', + 'annotations': ''}), + (PROPERTY_RE, 'Weird-thing:name:', + None), + (PROPERTY_RE, 'really-weird_thing:name:', + None), + (PROPERTY_RE, 'GWin32InputStream:handle:', + {'class_name': 'GWin32InputStream', + 'property_name': 'handle', + 'colon': ':', + 'annotations': ''}), + # property name that contains a dash + (PROPERTY_RE, 'GtkWidget:double-buffered (skip)', + {'class_name': 'GtkWidget', + 'property_name': 'double-buffered', + 'colon': '', + 'annotations': '(skip)'}), + (PROPERTY_RE, 'GtkWidget:double-buffered', + {'class_name': 'GtkWidget', + 'property_name': 'double-buffered', + 'colon': '', + 'annotations': ''}), + (PROPERTY_RE, ' GtkWidget :double-buffered', + {'class_name': 'GtkWidget', + 'property_name': 'double-buffered', + 'colon': '', + 'annotations': ''}), + (PROPERTY_RE, 'GtkWidget: double-buffered ', + {'class_name': 'GtkWidget', + 'property_name': 'double-buffered', + 'colon': '', + 'annotations': ''}), + (PROPERTY_RE, ' GtkWidget : double-buffered ', + {'class_name': 'GtkWidget', + 'property_name': 'double-buffered', + 'colon': '', + 'annotations': ''}), + (PROPERTY_RE, 'GtkWidget:double-buffered:', + {'class_name': 'GtkWidget', + 'property_name': 'double-buffered', + 'colon': ':', + 'annotations': ''}), + (PROPERTY_RE, 'GtkWidget:double-buffered: ', + {'class_name': 'GtkWidget', + 'property_name': 'double-buffered', + 'colon': ':', + 'annotations': ''}), + (PROPERTY_RE, ' GtkWidget:double-buffered:', + {'class_name': 'GtkWidget', + 'property_name': 'double-buffered', + 'colon': ':', + 'annotations': ''}), + (PROPERTY_RE, 'Something:double-buffered:', + {'class_name': 'Something', + 'property_name': 'double-buffered', + 'colon': ':', + 'annotations': ''}), + (PROPERTY_RE, 'Something:double-buffered: ', + {'class_name': 'Something', + 'property_name': 'double-buffered', + 'colon': ':', + 'annotations': ''}), + (PROPERTY_RE, ' Something:double-buffered:', + {'class_name': 'Something', + 'property_name': 'double-buffered', + 'colon': ':', + 'annotations': ''}), + (PROPERTY_RE, 'Weird-thing:double-buffered:', + None), + (PROPERTY_RE, 'really-weird_thing:double-buffered:', + None), + (PROPERTY_RE, ' GMemoryOutputStream:realloc-function: (skip)', + {'class_name': 'GMemoryOutputStream', + 'property_name': 'realloc-function', + 'colon': ':', + 'annotations': '(skip)'})] + +identifier_signal_tests = [ + # simple property name + (SIGNAL_RE, 'GtkWidget::changed: (skip)', + {'class_name': 'GtkWidget', + 'signal_name': 'changed', + 'colon': ':', + 'annotations': '(skip)'}), + (SIGNAL_RE, 'GtkWidget::changed:', + {'class_name': 'GtkWidget', + 'signal_name': 'changed', + 'colon': ':', + 'annotations': ''}), + (SIGNAL_RE, 'Something::changed:', + {'class_name': 'Something', + 'signal_name': 'changed', + 'colon': ':', + 'annotations': ''}), + (SIGNAL_RE, 'Weird-thing::changed:', + None), + (SIGNAL_RE, 'really-weird_thing::changed:', + None), + # signal name that contains a dash + (SIGNAL_RE, 'GtkWidget::hierarchy-changed: (skip)', + {'class_name': 'GtkWidget', + 'signal_name': 'hierarchy-changed', + 'colon': ':', + 'annotations': '(skip)'}), + (SIGNAL_RE, 'GtkWidget::hierarchy-changed:', + {'class_name': 'GtkWidget', + 'signal_name': 'hierarchy-changed', + 'colon': ':', + 'annotations': ''}), + (SIGNAL_RE, 'Something::hierarchy-changed:', + {'class_name': 'Something', + 'signal_name': 'hierarchy-changed', + 'colon': ':', + 'annotations': ''}), + (SIGNAL_RE, 'Weird-thing::hierarchy-changed:', + None), + (SIGNAL_RE, 'really-weird_thing::hierarchy-changed:', + None)] + +parameter_tests = [ + (PARAMETER_RE, '@Short_description: Base class for all widgets ', + {'parameter_name': 'Short_description', + 'annotations': '', + 'colon': '', + 'description': 'Base class for all widgets'}), + (PARAMETER_RE, '@...: the value of the first property, followed optionally by more', + {'parameter_name': '...', + 'annotations': '', + 'colon': '', + 'description': 'the value of the first property, followed optionally by more'}), + (PARAMETER_RE, '@widget: a #GtkWidget', + {'parameter_name': 'widget', + 'annotations': '', + 'colon': '', + 'description': 'a #GtkWidget'}), + (PARAMETER_RE, '@widget_pointer: (inout) (transfer none): ' + 'address of a variable that contains @widget', + {'parameter_name': 'widget_pointer', + 'annotations': '(inout) (transfer none)', + 'colon': ':', + 'description': 'address of a variable that contains @widget'}), + (PARAMETER_RE, '@weird_thing: (inout) (transfer none) (allow-none) (attribute) (destroy) ' + '(foreign) (inout) (out) (transfer) (skip) (method): some weird @thing', + {'parameter_name': 'weird_thing', + 'annotations': '(inout) (transfer none) (allow-none) (attribute) (destroy) ' + '(foreign) (inout) (out) (transfer) (skip) (method)', + 'colon': ':', + 'description': 'some weird @thing'}), + (PARAMETER_RE, '@data: a pointer to the element data. The data may be moved as elements ' + 'are added to the #GByteArray.', + {'parameter_name': 'data', + 'annotations': '', + 'colon': '', + 'description': 'a pointer to the element data. The data may be moved as elements ' + 'are added to the #GByteArray.'}), + (PARAMETER_RE, '@a: a #GSequenceIter', + {'parameter_name': 'a', + 'annotations': '', + 'colon': '', + 'description': 'a #GSequenceIter'}), + (PARAMETER_RE, '@keys: (array length=n_keys) (element-type GQuark) (allow-none):', + {'parameter_name': 'keys', + 'annotations': '(array length=n_keys) (element-type GQuark) (allow-none)', + 'colon': ':', + 'description': ''})] + +tag_tests = [ + (TAG_RE, 'Since 3.0', + None), + (TAG_RE, 'Since: 3.0', + {'tag_name': 'Since', + 'annotations': '', + 'colon': '', + 'description': '3.0'}), + (TAG_RE, 'Attributes: (inout) (transfer none): some note about attributes', + {'tag_name': 'Attributes', + 'annotations': '(inout) (transfer none)', + 'colon': ':', + 'description': 'some note about attributes'}), + (TAG_RE, 'Rename to: something_else', + {'tag_name': 'Rename to', + 'annotations': '', + 'colon': '', + 'description': 'something_else'}), + (TAG_RE, '@Deprecated: Since 2.8, reference counting is done atomically', + None), + (TAG_RE, 'Returns %TRUE and does weird things', + None), + (TAG_RE, 'Returns: a #GtkWidget', + {'tag_name': 'Returns', + 'annotations': '', + 'colon': '', + 'description': 'a #GtkWidget'}), + (TAG_RE, 'Return value: (transfer none): The binary data that @text responds. ' + 'This pointer', + {'tag_name': 'Return value', + 'annotations': '(transfer none)', + 'colon': ':', + 'description': 'The binary data that @text responds. This pointer'}), + (TAG_RE, 'Return value: (transfer full) (array length=out_len) (element-type guint8):', + {'tag_name': 'Return value', + 'annotations': '(transfer full) (array length=out_len) (element-type guint8)', + 'colon': ':', + 'description': ''}), + (TAG_RE, 'Returns: A boolean value, but let me tell you a bit about this boolean. It', + {'tag_name': 'Returns', + 'annotations': '', + 'colon': '', + 'description': 'A boolean value, but let me tell you a bit about this boolean. ' + 'It'}), + (TAG_RE, 'Returns: (transfer container) (element-type GObject.ParamSpec): a', + {'tag_name': 'Returns', + 'annotations': '(transfer container) (element-type GObject.ParamSpec)', + 'colon': ':', + 'description': 'a'}), + (TAG_RE, 'Return value: (type GLib.HashTable>) ' + '(transfer full):', + {'tag_name': 'Return value', + 'annotations': '(type GLib.HashTable>) ' + '(transfer full)', + 'colon': ':', + 'description': ''})] + + +def create_tests(tests_name, testcases): + for (index, testcase) in enumerate(testcases): + real_test_name = '%s_%03d' % (tests_name, index) + + test_method = TestProgram.__create_test__(testcase) + test_method.__name__ = real_test_name + setattr(TestProgram, real_test_name, test_method) + + +class TestProgram(TestCase): + @classmethod + def __create_test__(cls, testcase): + def do_test(self): + (program, text, expected) = testcase + + match = program.match(text) + + if expected is None: + msg = 'Program matched text but shouldn\'t:\n"%s"' + self.assertTrue(match is None, msg % (text, )) + else: + msg = 'Program should match text but didn\'t:\n"%s"' + self.assertTrue(match is not None, msg % (text, )) + + for key, value in expected.items(): + msg = 'expected "%s" for "%s" but match returned "%s"' + msg = msg % (value, key, match.group(key)) + self.assertEqual(match.group(key), value, msg) + + return do_test + + +if __name__ == '__main__': + # Create tests from data + create_tests('test_identifier_section', identifier_section_tests) + create_tests('test_identifier_symbol', identifier_symbol_tests) + create_tests('test_identifier_property', identifier_property_tests) + create_tests('test_identifier_signal', identifier_signal_tests) + create_tests('test_parameter', parameter_tests) + create_tests('test_tag', tag_tests) + + # Run test suite + main() -- cgit v1.2.1 From 2d9245c4ed1367dd243d0bdcda5509c74803a834 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 4 Jul 2012 07:50:14 +0200 Subject: giscanner: construct list of possible tag names for TAG_RE from _ALL_TAGS... ... instead of having a secondary hard-coded list. This results in the removal of giscanner/annotationpatterns.py to prevent a circular import. https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- Makefile-giscanner.am | 1 - giscanner/annotationparser.py | 224 ++++++++++++++++++++- giscanner/annotationpatterns.py | 252 ------------------------ tests/scanner/annotationparser/test_patterns.py | 4 +- 4 files changed, 221 insertions(+), 260 deletions(-) delete mode 100644 giscanner/annotationpatterns.py diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am index d4d2a620..2bb9b6d8 100644 --- a/Makefile-giscanner.am +++ b/Makefile-giscanner.am @@ -30,7 +30,6 @@ pkgpyexec_PYTHON = \ giscanner/__init__.py \ giscanner/annotationmain.py \ giscanner/annotationparser.py \ - giscanner/annotationpatterns.py \ giscanner/ast.py \ giscanner/cachestore.py \ giscanner/codegen.py \ diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index f3bf71ec..509579f3 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -26,11 +26,6 @@ import re from . import message -from .annotationpatterns import (COMMENT_START_RE, COMMENT_END_RE, - COMMENT_ASTERISK_RE, EMPTY_LINE_RE, - SECTION_RE, SYMBOL_RE, PROPERTY_RE, SIGNAL_RE, - PARAMETER_RE, DESCRIPTION_TAG_RE, TAG_RE, - MULTILINE_ANNOTATION_CONTINUATION_RE) from .odict import odict @@ -137,6 +132,225 @@ OPT_TRANSFER_FULL = 'full' OPT_TRANSFER_FLOATING = 'floating' +#The following regular expression programs are built to: +# - match (or substitute) a single comment block line at a time; +# - support MULTILINE mode and should support (but remains untested) +# LOCALE and UNICODE modes. + +# Program matching the start of a comment block. +# +# Results in 0 symbolic groups. +COMMENT_START_RE = re.compile(r''' + ^ # start + [^\S\n\r]* # 0 or more whitespace characters + / # 1 forward slash character + \*{2} # exactly 2 asterisk characters + [^\S\n\r]* # 0 or more whitespace characters + $ # end + ''', + re.VERBOSE | re.MULTILINE) + +# Program matching the end of a comment block. +# +# Results in 0 symbolic groups. +COMMENT_END_RE = re.compile(r''' + ^ # start + [^\S\n\r]* # 0 or more whitespace characters + \*+ # 1 or more asterisk characters + / # 1 forward slash character + $ # end + ''', + re.VERBOSE | re.MULTILINE) + +# Program matching the ' * ' at the beginning of every +# line inside a comment block. +# +# Results in 0 symbolic groups. +COMMENT_ASTERISK_RE = re.compile(r''' + ^ # start + [^\S\n\r]* # 0 or more whitespace characters + \* # 1 asterisk character + [^\S\n\r]? # 0 or 1 whitespace characters. Careful, + # removing more than 1 whitespace + # character would break embedded + # example program indentation + ''', + re.VERBOSE) + +# Program matching an empty line. +# +# Results in 0 symbolic groups. +EMPTY_LINE_RE = re.compile(r''' + ^ # start + [^\S\n\r]* # 0 or more whitespace characters + $ # end + ''', + re.VERBOSE | re.MULTILINE) + +# Program matching SECTION identifiers. +# +# Results in 2 symbolic groups: +# - group 1 = colon +# - group 2 = section_name +SECTION_RE = re.compile(r''' + ^ # start + [^\S\n\r]* # 0 or more whitespace characters + SECTION # SECTION + [^\S\n\r]* # 0 or more whitespace characters + (?P:?) # colon + [^\S\n\r]* # 0 or more whitespace characters + (?P\w\S+)? # section name + [^\S\n\r]* # 0 or more whitespace characters + $ + ''', + re.VERBOSE | re.MULTILINE) + +# Program matching symbol (function, constant, struct and enum) identifiers. +# +# Results in 3 symbolic groups: +# - group 1 = symbol_name +# - group 2 = colon +# - group 3 = annotations +SYMBOL_RE = re.compile(r''' + ^ # start + [^\S\n\r]* # 0 or more whitespace characters + (?P[\w-]*\w) # symbol name + [^\S\n\r]* # 0 or more whitespace characters + (?P:?) # colon + [^\S\n\r]* # 0 or more whitespace characters + (?P(?:\(.*?\)[^\S\n\r]*)*) # annotations + [^\S\n\r]* # 0 or more whitespace characters + $ # end + ''', + re.VERBOSE | re.MULTILINE) + +# Program matching property identifiers. +# +# Results in 4 symbolic groups: +# - group 1 = class_name +# - group 2 = property_name +# - group 3 = colon +# - group 4 = annotations +PROPERTY_RE = re.compile(r''' + ^ # start + [^\S\n\r]* # 0 or more whitespace characters + (?P[\w]+) # class name + [^\S\n\r]* # 0 or more whitespace characters + :{1} # required colon + [^\S\n\r]* # 0 or more whitespace characters + (?P[\w-]*\w) # property name + [^\S\n\r]* # 0 or more whitespace characters + (?P:?) # colon + [^\S\n\r]* # 0 or more whitespace characters + (?P(?:\(.*?\)[^\S\n\r]*)*) # annotations + [^\S\n\r]* # 0 or more whitespace characters + $ # end + ''', + re.VERBOSE | re.MULTILINE) + +# Program matching signal identifiers. +# +# Results in 4 symbolic groups: +# - group 1 = class_name +# - group 2 = signal_name +# - group 3 = colon +# - group 4 = annotations +SIGNAL_RE = re.compile(r''' + ^ # start + [^\S\n\r]* # 0 or more whitespace characters + (?P[\w]+) # class name + [^\S\n\r]* # 0 or more whitespace characters + :{2} # 2 required colons + [^\S\n\r]* # 0 or more whitespace characters + (?P[\w-]*\w) # signal name + [^\S\n\r]* # 0 or more whitespace characters + (?P:?) # colon + [^\S\n\r]* # 0 or more whitespace characters + (?P(?:\(.*?\)[^\S\n\r]*)*) # annotations + [^\S\n\r]* # 0 or more whitespace characters + $ # end + ''', + re.VERBOSE | re.MULTILINE) + +# Program matching parameters. +# +# Results in 4 symbolic groups: +# - group 1 = parameter_name +# - group 2 = annotations +# - group 3 = colon +# - group 4 = description +PARAMETER_RE = re.compile(r''' + ^ # start + [^\S\n\r]* # 0 or more whitespace characters + @ # @ character + (?P[\w-]*\w|\.\.\.) # parameter name + [^\S\n\r]* # 0 or more whitespace characters + :{1} # required colon + [^\S\n\r]* # 0 or more whitespace characters + (?P(?:\(.*?\)[^\S\n\r]*)*) # annotations + (?P:?) # colon + [^\S\n\r]* # 0 or more whitespace characters + (?P.*?) # description + [^\S\n\r]* # 0 or more whitespace characters + $ # end + ''', + re.VERBOSE | re.MULTILINE) + +# Program matching old style "Description:" tag. +# +# Results in 0 symbolic groups. +DESCRIPTION_TAG_RE = re.compile(r''' + ^ # start + [^\S\n\r]* # 0 or more whitespace characters + Description: # 'Description:' literal + ''', + re.VERBOSE | re.MULTILINE) + +# Program matching tags. +# +# Results in 4 symbolic groups: +# - group 1 = tag_name +# - group 2 = annotations +# - group 3 = colon +# - group 4 = description +_all_tags = '|'.join(_ALL_TAGS).replace(' ', '\\ ') +TAG_RE = re.compile(r''' + ^ # start + [^\S\n\r]* # 0 or more whitespace characters + (?P''' + _all_tags + r''') # tag name + [^\S\n\r]* # 0 or more whitespace characters + :{1} # required colon + [^\S\n\r]* # 0 or more whitespace characters + (?P(?:\(.*?\)[^\S\n\r]*)*) # annotations + (?P:?) # colon + [^\S\n\r]* # 0 or more whitespace characters + (?P.*?) # description + [^\S\n\r]* # 0 or more whitespace characters + $ # end + ''', + re.VERBOSE | re.MULTILINE | re.IGNORECASE) + +# Program matching multiline annotation continuations. +# This is used on multiline parameters and tags (but not on the first line) to +# generate warnings about invalid annotations spanning multiple lines. +# +# Results in 3 symbolic groups: +# - group 2 = annotations +# - group 3 = colon +# - group 4 = description +MULTILINE_ANNOTATION_CONTINUATION_RE = re.compile(r''' + ^ # start + [^\S\n\r]* # 0 or more whitespace characters + (?P(?:\(.*?\)[^\S\n\r]*)*) # annotations + (?P:) # colon + [^\S\n\r]* # 0 or more whitespace characters + (?P.*?) # description + [^\S\n\r]* # 0 or more whitespace characters + $ # end + ''', + re.VERBOSE | re.MULTILINE) + + class DocBlock(object): def __init__(self, name): diff --git a/giscanner/annotationpatterns.py b/giscanner/annotationpatterns.py deleted file mode 100644 index 95c11c9e..00000000 --- a/giscanner/annotationpatterns.py +++ /dev/null @@ -1,252 +0,0 @@ -# -*- Mode: Python -*- -# GObject-Introspection - a framework for introspecting GObject libraries -# Copyright (C) 2012 Dieter Verfaillie -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. -# - - -''' -This module provides regular expression programs that can be used to identify -and extract useful information from different parts of GTK-Doc comment blocks. -These programs are built to: - - match (or substitute) a single comment block line at a time; - - support MULTILINE mode and should support (but remains untested) - LOCALE and UNICODE modes. -''' - - -import re - - -# Program matching the start of a comment block. -# -# Results in 0 symbolic groups. -COMMENT_START_RE = re.compile(r''' - ^ # start - [^\S\n\r]* # 0 or more whitespace characters - / # 1 forward slash character - \*{2} # exactly 2 asterisk characters - [^\S\n\r]* # 0 or more whitespace characters - $ # end - ''', - re.VERBOSE | re.MULTILINE) - -# Program matching the end of a comment block. -# -# Results in 0 symbolic groups. -COMMENT_END_RE = re.compile(r''' - ^ # start - [^\S\n\r]* # 0 or more whitespace characters - \*+ # 1 or more asterisk characters - / # 1 forward slash character - $ # end - ''', - re.VERBOSE | re.MULTILINE) - -# Program matching the "*" at the beginning of every -# line inside a comment block. -# -# Results in 0 symbolic groups. -COMMENT_ASTERISK_RE = re.compile(r''' - ^ # start - [^\S\n\r]* # 0 or more whitespace characters - \* # 1 asterisk character - [^\S\n\r]? # 0 or 1 whitespace characters - # Carefull: removing more would - # break embedded example program - # indentation - ''', - re.VERBOSE) - -# Program matching an empty line. -# -# Results in 0 symbolic groups. -EMPTY_LINE_RE = re.compile(r''' - ^ # start - [^\S\n\r]* # 0 or 1 whitespace characters - $ # end - ''', - re.VERBOSE | re.MULTILINE) - -# Program matching SECTION identifiers. -# -# Results in 2 symbolic groups: -# - group 1 = colon -# - group 2 = section_name -SECTION_RE = re.compile(r''' - ^ # start - [^\S\n\r]* # 0 or more whitespace characters - SECTION # SECTION - [^\S\n\r]* # 0 or more whitespace characters - (?P:?) # colon - [^\S\n\r]* # 0 or more whitespace characters - (?P\w\S+)? # section name - [^\S\n\r]* # 0 or more whitespace characters - $ - ''', - re.VERBOSE | re.MULTILINE) - -# Program matching symbol (function, constant, struct and enum) identifiers. -# -# Results in 3 symbolic groups: -# - group 1 = symbol_name -# - group 2 = colon -# - group 3 = annotations -SYMBOL_RE = re.compile(r''' - ^ # start - [^\S\n\r]* # 0 or more whitespace characters - (?P[\w-]*\w) # symbol name - [^\S\n\r]* # 0 or more whitespace characters - (?P:?) # colon - [^\S\n\r]* # 0 or more whitespace characters - (?P(?:\(.*?\)[^\S\n\r]*)*) # annotations - [^\S\n\r]* # 0 or more whitespace characters - $ # end - ''', - re.VERBOSE | re.MULTILINE) - -# Program matching property identifiers. -# -# Results in 4 symbolic groups: -# - group 1 = class_name -# - group 2 = property_name -# - group 3 = colon -# - group 4 = annotations -PROPERTY_RE = re.compile(r''' - ^ # start - [^\S\n\r]* # 0 or more whitespace characters - (?P[\w]+) # class name - [^\S\n\r]* # 0 or more whitespace characters - :{1} # required colon - [^\S\n\r]* # 0 or more whitespace characters - (?P[\w-]*\w) # property name - [^\S\n\r]* # 0 or more whitespace characters - (?P:?) # colon - [^\S\n\r]* # 0 or more whitespace characters - (?P(?:\(.*?\)[^\S\n\r]*)*) # annotations - [^\S\n\r]* # 0 or more whitespace characters - $ # end - ''', - re.VERBOSE | re.MULTILINE) - -# Program matching signal identifiers. -# -# Results in 4 symbolic groups: -# - group 1 = class_name -# - group 2 = signal_name -# - group 3 = colon -# - group 4 = annotations -SIGNAL_RE = re.compile(r''' - ^ # start - [^\S\n\r]* # 0 or more whitespace characters - (?P[\w]+) # class name - [^\S\n\r]* # 0 or more whitespace characters - :{2} # 2 required colons - [^\S\n\r]* # 0 or more whitespace characters - (?P[\w-]*\w) # signal name - [^\S\n\r]* # 0 or more whitespace characters - (?P:?) # colon - [^\S\n\r]* # 0 or more whitespace characters - (?P(?:\(.*?\)[^\S\n\r]*)*) # annotations - [^\S\n\r]* # 0 or more whitespace characters - $ # end - ''', - re.VERBOSE | re.MULTILINE) - -# Program matching parameters. -# -# Results in 4 symbolic groups: -# - group 1 = parameter_name -# - group 2 = annotations -# - group 3 = colon -# - group 4 = description -PARAMETER_RE = re.compile(r''' - ^ # start - [^\S\n\r]* # 0 or more whitespace characters - @ # @ character - (?P[\w-]*\w|\.\.\.) # parameter name - [^\S\n\r]* # 0 or more whitespace characters - :{1} # required colon - [^\S\n\r]* # 0 or more whitespace characters - (?P(?:\(.*?\)[^\S\n\r]*)*) # annotations - (?P:?) # colon - [^\S\n\r]* # 0 or more whitespace characters - (?P.*?) # description - [^\S\n\r]* # 0 or more whitespace characters - $ # end - ''', - re.VERBOSE | re.MULTILINE) - -# Program matching old style "Description:" tag. -# -# Results in 0 symbolic groups. -DESCRIPTION_TAG_RE = re.compile(r''' - ^ # start - [^\S\n\r]* # 0 or more whitespace characters - Description: # 'Description:' literal - ''', - re.VERBOSE | re.MULTILINE) - -# Program matching tags. -# -# Results in 4 symbolic groups: -# - group 1 = tag_name -# - group 2 = annotations -# - group 3 = colon -# - group 4 = description -TAG_RE = re.compile(r''' - ^ # start - [^\S\n\r]* # 0 or more whitespace characters - (?Pvirtual|since|stability| - deprecated|returns| - return\ value|attributes| - rename\ to|type| - unref\ func|ref\ func| - set\ value\ func| - get\ value\ func| - transfer|value) # tag name - [^\S\n\r]* # 0 or more whitespace characters - :{1} # required colon - [^\S\n\r]* # 0 or more whitespace characters - (?P(?:\(.*?\)[^\S\n\r]*)*) # annotations - (?P:?) # colon - [^\S\n\r]* # 0 or more whitespace characters - (?P.*?) # description - [^\S\n\r]* # 0 or more whitespace characters - $ # end - ''', - re.VERBOSE | re.MULTILINE | re.IGNORECASE) - -# Program matching multiline annotation continuations. -# This is used on multiline parameters and tags (but not on the first line) to -# generate warnings about invalid annotations spanning multiple lines. -# -# Results in 3 symbolic groups: -# - group 2 = annotations -# - group 3 = colon -# - group 4 = description -MULTILINE_ANNOTATION_CONTINUATION_RE = re.compile(r''' - ^ # start - [^\S\n\r]* # 0 or more whitespace characters - (?P(?:\(.*?\)[^\S\n\r]*)*) # annotations - (?P:) # colon - [^\S\n\r]* # 0 or more whitespace characters - (?P.*?) # description - [^\S\n\r]* # 0 or more whitespace characters - $ # end - ''', - re.VERBOSE | re.MULTILINE) diff --git a/tests/scanner/annotationparser/test_patterns.py b/tests/scanner/annotationparser/test_patterns.py index 0b5592a4..2755cc9a 100644 --- a/tests/scanner/annotationparser/test_patterns.py +++ b/tests/scanner/annotationparser/test_patterns.py @@ -31,8 +31,8 @@ against the expected output. ''' -from giscanner.annotationpatterns import (SECTION_RE, SYMBOL_RE, PROPERTY_RE, - SIGNAL_RE, PARAMETER_RE, TAG_RE) +from giscanner.annotationparser import (SECTION_RE, SYMBOL_RE, PROPERTY_RE, + SIGNAL_RE, PARAMETER_RE, TAG_RE) from unittest import (TestCase, main) -- cgit v1.2.1 From 079b2c5bf9d73ac47a7bb1c62f176cbd85fb1e2a Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Tue, 17 Jul 2012 17:30:47 +0200 Subject: giscanner: treat the GTK-Doc Description: tag like any other tag and add paragraph break tests. https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- giscanner/annotationparser.py | 33 +++--- .../gi/syntax_paragraph_breaks.xml | 117 +++++++++++++++++++++ 2 files changed, 136 insertions(+), 14 deletions(-) diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index 509579f3..179af86a 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -48,6 +48,7 @@ TAG_STABILITY = 'stability' TAG_DEPRECATED = 'deprecated' TAG_RETURNS = 'returns' TAG_RETURNVALUE = 'return value' +TAG_DESCRIPTION = 'description' TAG_ATTRIBUTES = 'attributes' TAG_RENAME_TO = 'rename to' TAG_TYPE = 'type' @@ -63,6 +64,7 @@ _ALL_TAGS = [TAG_VFUNC, TAG_DEPRECATED, TAG_RETURNS, TAG_RETURNVALUE, + TAG_DESCRIPTION, TAG_ATTRIBUTES, TAG_RENAME_TO, TAG_TYPE, @@ -296,16 +298,6 @@ PARAMETER_RE = re.compile(r''' ''', re.VERBOSE | re.MULTILINE) -# Program matching old style "Description:" tag. -# -# Results in 0 symbolic groups. -DESCRIPTION_TAG_RE = re.compile(r''' - ^ # start - [^\S\n\r]* # 0 or more whitespace characters - Description: # 'Description:' literal - ''', - re.VERBOSE | re.MULTILINE) - # Program matching tags. # # Results in 4 symbolic groups: @@ -987,6 +979,23 @@ class AnnotationParser(object): tag_annotations = result.group('annotations') tag_description = result.group('description') + marker = ' '*(result.start('tag_name') + column_offset) + '^' + + # Deprecated GTK-Doc Description: tag + if tag_name.lower() == TAG_DESCRIPTION: + message.warn("GTK-Doc tag \"Description:\" has been deprecated:\n%s\n%s" % + (original_line, marker), + position) + + in_part = PART_DESCRIPTION + + if not comment_block.comment: + comment_block.comment = tag_description + else: + comment_block.comment += '\n' + tag_description + continue + + # Now that the deprecated stuff is out of the way, continue parsing real tags if in_part == PART_DESCRIPTION: in_part = PART_TAGS @@ -1041,10 +1050,6 @@ class AnnotationParser(object): #################################################################### if in_part in [PART_IDENTIFIER, PART_DESCRIPTION]: if not comment_block.comment: - # Backwards compatibility with old style GTK-Doc - # comment blocks where Description used to be a comment - # block tag. Simply get rid of 'Description:'. - line = re.sub(DESCRIPTION_TAG_RE, '', line) comment_block.comment = line else: comment_block.comment += '\n' + line diff --git a/tests/scanner/annotationparser/gi/syntax_paragraph_breaks.xml b/tests/scanner/annotationparser/gi/syntax_paragraph_breaks.xml index 62914932..4ae1e036 100644 --- a/tests/scanner/annotationparser/gi/syntax_paragraph_breaks.xml +++ b/tests/scanner/annotationparser/gi/syntax_paragraph_breaks.xml @@ -24,6 +24,28 @@ So this is considered a new paragraph. + + + /** + * SECTION:test + * + * Description: The following line is ' *' (blank-asterisk). + * + * So this is considered a new paragraph. + */ + + + SECTION:test + + The following line is ' *' (blank-asterisk). + +So this is considered a new paragraph. + + + + /** + * SECTION:test + * + * Description: The following line is ' * ' (blank-asterisk-blank). + * + * So this is considered a new paragraph. + */ + + + SECTION:test + + The following line is ' * ' (blank-asterisk-blank). + +So this is considered a new paragraph. + + + + /** + * SECTION:test + * + * Description: The following line is (blank-asterisk-blank-blank). + * + * So this is preceded by an empty line and is not considered a new paragraph. + */ + + + SECTION:test + + The following line is (blank-asterisk-blank-blank). + +So this is preceded by an empty line and is not considered a new paragraph. + + + + + * Iterating over attributes + * + * void + * print_attributes (GIBaseInfo *info) + * { + * GIAttributeIter iter = { 0, }; + * char *name; + * char *value; + * + * while (g_base_info_iterate_attributes (info, &iter, &name, &value)) + * { + * g_print ("attribute name: %s value: %s", name, value); + * } + * } + * + * + */]]> + + + SECTION:test + + +Iterating over attributes + +void +print_attributes (GIBaseInfo *info) +{ + GIAttributeIter iter = { 0, }; + char *name; + char *value; + + while (g_base_info_iterate_attributes (info, &iter, &name, &value)) + { + g_print ("attribute name: %s value: %s", name, value); + } +} + +]]> + + + -- cgit v1.2.1 From 8f638062fb49866e3a2f632a64eb71d7dbcc75bc Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 4 Jul 2012 09:10:51 +0200 Subject: giscanner: Correctly detect invalid GTK-Doc comment block end markers https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- giscanner/annotationparser.py | 3 +++ tests/scanner/annotationparser/gi/syntax.xml | 19 +++++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index 179af86a..57a5433e 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -790,6 +790,9 @@ class AnnotationParser(object): # Check for the end the comment block. if COMMENT_END_RE.match(comment_lines[-1][1]): del comment_lines[-1] + else: + # Not a GTK-Doc comment block. + return None # If we get this far, we are inside a GTK-Doc comment block. return self._parse_comment_block(comment_lines, filename, lineno) diff --git a/tests/scanner/annotationparser/gi/syntax.xml b/tests/scanner/annotationparser/gi/syntax.xml index 67224de5..c97bd5bc 100644 --- a/tests/scanner/annotationparser/gi/syntax.xml +++ b/tests/scanner/annotationparser/gi/syntax.xml @@ -69,6 +69,25 @@ something */ something */ + + + /** +Test +something */ + + + + + /** +Test +something **/ + + + + /** + * GApplicationFlags: + * @G_APPLICATION_NON_UNIQUE: Make no attempts to do any of the typical + * single-instance application negotiation, even if the application + * ID is given. The application neither attempts to become the + * owner of the application ID nor does it check if an existing + * owner already exists. Everything occurs in the local process. + * Since: 2.30. + * + * Flags used to define the behaviour of a #GApplication. + * + * Since: 2.28 + **/ + + + GApplicationFlags + + + + G_APPLICATION_NON_UNIQUE + Make no attempts to do any of the typical single-instance application negotiation, even if the application ID is given. The application neither attempts to become the owner of the application ID nor does it check if an existing owner already exists. Everything occurs in the local process. Since: 2.30. + + + Flags used to define the behaviour of a #GApplication. + + + since + 2.28 + + + + + + diff --git a/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.h.xml b/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.h.xml index f4e76e58..1d188271 100644 --- a/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.h.xml +++ b/tests/scanner/annotationparser/gtkdoc/gobject/gtypes.h.xml @@ -2,6 +2,33 @@ + + /** + * GtkdocEnum: + * @GTKDOC_ENUM_V1: first + * @GTKDOC_ENUM_V2: second + * Since: 0.10 + * + * Enum values for the #GtkdocEnum type. + */ + + + GtkdocEnum + + + + GTKDOC_ENUM_V1 + first + + + GTKDOC_ENUM_V2 + second Since: 0.10 + + + Enum values for the #GtkdocEnum type. + + + /** * GtkdocPlainOldData: -- cgit v1.2.1 From c291bce772a09af1e884a064ceaa736712fe36a4 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Mon, 29 Oct 2012 08:32:08 +0100 Subject: giscanner: fix DocBlock().comment If there is no comment block description, DocBlock().comment should be None. This results in the removal of unneeded blank lines in the output of DocBlock().to_gtk_doc and hence the .c files generated by misc/update-glib-annotations.py https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- gir/gio-2.0.c | 2 -- gir/glib-2.0.c | 6 ------ gir/gobject-2.0.c | 4 ---- giscanner/annotationparser.py | 9 ++++----- giscanner/maintransformer.py | 4 ++-- 5 files changed, 6 insertions(+), 19 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 1c64ec13..0ebadc78 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -7377,8 +7377,6 @@ * @title: GTlsBackend * @short_description: TLS backend implementation * @include: gio/gio.h - * - * */ diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 51805c44..24ed46ec 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -7319,8 +7319,6 @@ * SECTION:shell * @title: Shell-related Utilities * @short_description: shell-like commandline handling - * - * */ @@ -7328,8 +7326,6 @@ * SECTION:spawn * @Short_description: process launching * @Title: Spawning Processes - * - * */ @@ -16083,8 +16079,6 @@ /** * g_io_channel_error_quark: * - * - * * Returns: the quark used as %G_IO_CHANNEL_ERROR */ diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c index dc718cec..5d6f3e55 100644 --- a/gir/gobject-2.0.c +++ b/gir/gobject-2.0.c @@ -5473,8 +5473,6 @@ * g_value_peek_pointer: * @value: An initialized #GValue structure. * - * - * * Returns: (transfer none): the value contents as pointer. This function asserts that g_value_fits_pointer() returned %TRUE for the passed in value. This is an internal function introduced mainly for C marshallers. */ @@ -5917,8 +5915,6 @@ /** * g_variant_get_gtype: * - * - * * Since: 2.24 * Deprecated: 2.26 */ diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index 8c48d0aa..393ef38a 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -389,9 +389,10 @@ class DocBlock(object): lines[0] += options for param in self.params.values(): lines.append(param.to_gtk_doc_param()) - lines.append('') - for l in self.comment.split('\n'): - lines.append(l) + if self.comment: + lines.append('') + for l in self.comment.split('\n'): + lines.append(l) if self.tags: lines.append('') for tag in self.tags.values(): @@ -1105,8 +1106,6 @@ class AnnotationParser(object): # intended. Strip those. if comment_block.comment: comment_block.comment = comment_block.comment.strip() - else: - comment_block.comment = '' for tag in comment_block.tags.values(): self._clean_comment_block_part(tag) diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py index 34d153be..67168d6b 100644 --- a/giscanner/maintransformer.py +++ b/giscanner/maintransformer.py @@ -225,7 +225,7 @@ usage is void (*_gtk_reserved1)(void);""" section_name = 'SECTION:' + name.lower() block = self._blocks.get(section_name) if block: - node.doc = block.comment + node.doc = block.comment if block.comment else '' if isinstance(node, (ast.Class, ast.Interface)): for prop in node.properties: self._apply_annotations_property(node, prop) @@ -600,7 +600,7 @@ usage is void (*_gtk_reserved1)(void);""" if block is None: return - node.doc = block.comment + node.doc = block.comment if block.comment else '' since_tag = block.get_tag(TAG_SINCE) if since_tag is not None: -- cgit v1.2.1 From 3c8c01c28a5d7ee94ec74be6c205942ddae2eb59 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Thu, 22 Nov 2012 17:58:46 +0100 Subject: giscanner: don't continue parsing after multiline descriptions This doesn't change anything, really, except that you don't have to read a whole page of code just to realize that nothing else happens with that line and we go on processing the next. Putting the continue statements there makes it a bit more readable. https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- giscanner/annotationparser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index 393ef38a..e91df3ae 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -1086,18 +1086,18 @@ class AnnotationParser(object): elif in_part == PART_PARAMETERS: self._validate_multiline_annotation_continuation(line, original_line, column_offset, position) - # Append to parameter description. current_param.comment += ' ' + line.strip() + continue elif in_part == PART_TAGS: self._validate_multiline_annotation_continuation(line, original_line, column_offset, position) - # Append to tag description. if current_tag.name.lower() in [TAG_RETURNS, TAG_RETURNVALUE]: current_tag.comment += ' ' + line.strip() else: current_tag.value += ' ' + line.strip() + continue ######################################################################## # Finished parsing this comment block. -- cgit v1.2.1 From f4bb1c1b18085ddbd22596de7f72993a2fd76c2d Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 29 Nov 2012 14:54:01 -0500 Subject: gimarshallingtests: Add a utf8-in-bytearray test Will be used by gjs --- tests/gimarshallingtests.c | 18 ++++++++++++++++++ tests/gimarshallingtests.h | 4 ++++ 2 files changed, 22 insertions(+) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index 9a533293..7f7abf81 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -1064,6 +1064,24 @@ gi_marshalling_tests_utf8_none_in (const gchar *utf8) g_assert_cmpstr(GI_MARSHALLING_TESTS_CONSTANT_UTF8, ==, utf8); } +/** + * gi_marshalling_tests_utf8_as_uint8array_in: + * @array: (array length=len) (element-type guint8): Byte data that happens to be UTF-8 + * @len: Length + * + * Takes data that happens to be UTF-8 as a byte array, to test + * binding conversion from their string type (e.g. JavaScript's + * UTF-16) to UTF-8. + */ +void +gi_marshalling_tests_utf8_as_uint8array_in (const guint8 *array, + gsize len) +{ + gsize orig_len = strlen (GI_MARSHALLING_TESTS_CONSTANT_UTF8); + g_assert_cmpint (orig_len, ==, len); + g_assert (memcmp (GI_MARSHALLING_TESTS_CONSTANT_UTF8, array, len) == 0); +} + /** * gi_marshalling_tests_utf8_none_out: * @utf8: (out) (transfer none): diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index 23af6a52..840f763b 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -267,6 +267,10 @@ void gi_marshalling_tests_utf8_full_inout (gchar **utf8); GSList *gi_marshalling_tests_filename_list_return (void); +void gi_marshalling_tests_utf8_as_uint8array_in (const guint8 *array, + gsize len); + + /* Enum */ typedef enum -- cgit v1.2.1 From ceb84d1e084b8048b2abb81d1e1ebe600f00d00e Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Sat, 1 Dec 2012 16:02:01 +0100 Subject: scanner: Parse comments with */ not on a new line, but emit a warning We don't know how many apps do this, but at least ibus had one. https://bugzilla.gnome.org/show_bug.cgi?id=689354 --- giscanner/annotationparser.py | 25 +++++++++++++++++---- tests/scanner/annotationparser/gi/syntax.xml | 17 +++++++++++--- tests/scanner/annotationparser/test_patterns.py | 30 ++++++++++++++++++++++++- tests/warn/annotationparser.h | 11 +++++++++ 4 files changed, 75 insertions(+), 8 deletions(-) diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index e91df3ae..f5455903 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -151,14 +151,20 @@ COMMENT_START_RE = re.compile(r''' ''', re.VERBOSE) -# Program matching the end of a comment block. +# Program matching the end of a comment block. We need to take care +# of comment ends that aren't on their own line for legacy support +# reasons. See https://bugzilla.gnome.org/show_bug.cgi?id=689354 # -# Results in 0 symbolic groups. +# Results in 1 symbolic group: +# - group 1 = description COMMENT_END_RE = re.compile(r''' ^ # start [^\S\n\r]* # 0 or more whitespace characters + (?P.*?) # description text + [^\S\n\r]* # 0 or more whitespace characters \*+ # 1 or more asterisk characters / # 1 forward slash character + [^\S\n\r]* # 0 or more whitespace characters $ # end ''', re.VERBOSE) @@ -801,8 +807,19 @@ class AnnotationParser(object): return None # Check for the end the comment block. - if COMMENT_END_RE.match(comment_lines[-1][1]): - del comment_lines[-1] + line_offset, line = comment_lines[-1] + result = COMMENT_END_RE.match(line) + if result: + description = result.group('description') + if description: + comment_lines[-1] = (line_offset, description) + position = message.Position(filename, lineno + line_offset) + marker = ' '*result.end('description') + '^' + message.warn("Comments should end with */ on a new line:\n%s\n%s" % + (line, marker), + position) + else: + del comment_lines[-1] else: # Not a GTK-Doc comment block. return None diff --git a/tests/scanner/annotationparser/gi/syntax.xml b/tests/scanner/annotationparser/gi/syntax.xml index c97bd5bc..83c56b9b 100644 --- a/tests/scanner/annotationparser/gi/syntax.xml +++ b/tests/scanner/annotationparser/gi/syntax.xml @@ -71,23 +71,34 @@ something */ /** Test something */ + + + Test + + something + /** Test something **/ + + + Test + + something + - + + + + + + + + + + + + + + + + + + diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c index 27791d7e..b7526bfb 100644 --- a/tests/scanner/regress.c +++ b/tests/scanner/regress.c @@ -1656,20 +1656,6 @@ regress_atest_error_quark (void) return g_quark_from_static_string ("regress-atest-error"); } -GQuark -regress_unpaired_error_quark (void) -{ - return g_quark_from_static_string ("regress-unpaired-error"); -} - -gboolean -regress_throw_unpaired (GError **error) -{ - g_set_error_literal (error, regress_unpaired_error_quark (), 0, - "Unpaired error"); - return FALSE; -} - /* structures */ /** -- cgit v1.2.1 From cb464ef54d1af1eab631c08433e16bd48b895657 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Wed, 5 Dec 2012 21:56:05 +0100 Subject: build: Include tests/scanner/annotationparser/* to EXTRA_DIST --- tests/scanner/Makefile.am | 49 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index ba2a58bf..e6001462 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -160,3 +160,52 @@ Headeronly-1.0.gir: headeronly.h @diff -u -U 10 $(srcdir)/$*-expected.gir $*.gir && echo " TEST $*.gir" check-local: Headeronly-1.0.gir $(CHECKGIRS) $(TYPELIBS) + +EXTRA_DIST += \ + annotationparser/README \ + annotationparser/test_parser.py \ + annotationparser/test_patterns.py \ + annotationparser/gi/annotation_allow_none.xml \ + annotationparser/gi/annotation_array.xml \ + annotationparser/gi/annotation_closure.xml \ + annotationparser/gi/annotation_constructor.xml \ + annotationparser/gi/annotation_destroy.xml \ + annotationparser/gi/annotation_element_type.xml \ + annotationparser/gi/annotation_foreign.xml \ + annotationparser/gi/annotation_get_value_func.xml \ + annotationparser/gi/annotation_in.xml \ + annotationparser/gi/annotation_in_out.xml \ + annotationparser/gi/annotation_method.xml \ + annotationparser/gi/annotation_out.xml \ + annotationparser/gi/annotation_ref_func.xml \ + annotationparser/gi/annotation_rename_to.xml \ + annotationparser/gi/annotation_scope.xml \ + annotationparser/gi/annotation_set_value_func.xml \ + annotationparser/gi/annotation_skip.xml \ + annotationparser/gi/annotation_transfer.xml \ + annotationparser/gi/annotation_type.xml \ + annotationparser/gi/annotation_unref_func.xml \ + annotationparser/gi/annotation_value.xml \ + annotationparser/gi/annotation_virtual.xml \ + annotationparser/gi/syntax.xml \ + annotationparser/gi/syntax_identifier.xml \ + annotationparser/gi/syntax_nested_tags.xml \ + annotationparser/gi/syntax_paragraph_breaks.xml \ + annotationparser/gi/tag_deprecated.xml \ + annotationparser/gi/tag_description.xml \ + annotationparser/gi/tag_returns.xml \ + annotationparser/gi/tag_since.xml \ + annotationparser/gi/tag_stability.xml \ + annotationparser/gtkdoc/gobject/gtypes.h.xml \ + annotationparser/gtkdoc/gobject/gtypes.c.xml \ + annotationparser/gtkdoc/gobject/giface.h.xml \ + annotationparser/gtkdoc/gobject/giface.c.xml \ + annotationparser/gtkdoc/fail/tester.h.xml \ + annotationparser/gtkdoc/fail/tester.c.xml \ + annotationparser/gtkdoc/empty/tester.c.xml \ + annotationparser/gtkdoc/bugs/tester.h.xml \ + annotationparser/gtkdoc/bugs/tester.c.xml \ + annotationparser/gtkdoc/annotations/tester.h.xml \ + annotationparser/gtkdoc/annotations/tester.c.xml \ + annotationparser/gtkdoc/gobject/gobject.h.xml \ + annotationparser/gtkdoc/gobject/gobject.c.xml -- cgit v1.2.1 From 702a24d97be5f046cabbe8ae84638683de114e8a Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Wed, 5 Dec 2012 22:56:02 +0100 Subject: Update annotations from glib git --- gir/gio-2.0.c | 117 ++++++++++++++++++++++++++++++++++++++++++++++++++---- gir/glib-2.0.c | 28 ++++++++++--- gir/gobject-2.0.c | 3 +- 3 files changed, 134 insertions(+), 14 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 0ebadc78..db413910 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -2402,7 +2402,7 @@ /** * GTaskThreadFunc: * @task: the #GTask - * @source_object: @task's source object + * @source_object: (type GObject): @task's source object * @task_data: @task's task data * @cancellable: @task's #GCancellable, or %NULL * @@ -10315,6 +10315,23 @@ */ +/** + * g_application_command_line_create_file_for_arg: + * @cmdline: a #GApplicationCommandLine + * @arg: an argument from @cmdline + * + * Creates a #GFile corresponding to a filename that was given as part + * of the invocation of @cmdline. + * + * This differs from g_file_new_for_commandline_arg() in that it + * resolves relative pathnames using the current working directory of + * the invoking process rather than the local process. + * + * Returns: (transfer full): a new #GFile + * Since: 2.36 + */ + + /** * g_application_command_line_get_arguments: * @cmdline: a #GApplicationCommandLine @@ -16998,6 +17015,20 @@ */ +/** + * g_desktop_app_info_get_boolean: + * @info: a #GDesktopAppInfo + * @key: the key to look up + * + * Looks up a boolean value in the keyfile backing @info. + * + * The @key is looked up in the "Desktop Entry" group. + * + * Returns: the boolean value, or %FALSE if the key is not found + * Since: 2.36 + */ + + /** * g_desktop_app_info_get_categories: * @info: a #GDesktopAppInfo @@ -17099,6 +17130,33 @@ */ +/** + * g_desktop_app_info_get_string: + * @info: a #GDesktopAppInfo + * @key: the key to look up + * + * Looks up a string value in the keyfile backing @info. + * + * The @key is looked up in the "Desktop Entry" group. + * + * Returns: a newly allocated string, or %NULL if the key is not found + * Since: 2.36 + */ + + +/** + * g_desktop_app_info_has_key: + * @info: a #GDesktopAppInfo + * @key: the key to look up + * + * Returns whether @key exists in the "Desktop Entry" group + * of the keyfile backing @info. + * + * Returns: %TRUE if the @key exists + * Since: 2.26 + */ + + /** * g_desktop_app_info_launch_uris_as_manager: * @appinfo: a #GDesktopAppInfo @@ -18330,7 +18388,7 @@ * returned. * * If the file does not exist, the %G_IO_ERROR_NOT_FOUND error will - * be returned. If the file is not a directory, the %G_FILE_ERROR_NOTDIR + * be returned. If the file is not a directory, the %G_IO_ERROR_NOT_DIRECTORY * error will be returned. Other errors are possible too. * * Returns: (transfer full): A #GFileEnumerator if successful, %NULL on error. Free the returned object with g_object_unref(). @@ -19029,6 +19087,19 @@ */ +/** + * g_file_info_get_deletion_date: + * @info: a #GFileInfo. + * + * Returns the #GDateTime representing the deletion date of the file, as + * available in G_FILE_ATTRIBUTE_TRASH_DELETION_DATE. If the + * G_FILE_ATTRIBUTE_TRASH_DELETION_DATE attribute is unset, %NULL is returned. + * + * Returns: a #GDateTime, or %NULL. + * Since: 2.36 + */ + + /** * g_file_info_get_display_name: * @info: a #GFileInfo. @@ -20070,6 +20141,28 @@ */ +/** + * g_file_new_for_commandline_arg_and_cwd: + * @arg: a command line string + * @cwd: the current working directory of the commandline + * + * Creates a #GFile with the given argument from the command line. + * + * This function is similar to g_file_new_for_commandline_arg() except + * that it allows for passing the current working directory as an + * argument instead of using the current working directory of the + * process. + * + * This is useful if the commandline argument was given in a context + * other than the invocation of the current process. + * + * See also g_application_command_line_create_file_for_arg(). + * + * Returns: (transfer full): a new #GFile + * Since: 2.36 + */ + + /** * g_file_new_for_path: * @path: a string containing a relative or absolute path. The string must be encoded in the glib filename encoding. @@ -23078,6 +23171,16 @@ */ +/** + * g_memory_output_stream_new_resizable: + * + * Creates a new #GMemoryOutputStream, using g_realloc() and g_free() + * for memory allocation. + * + * Since: 2.36 + */ + + /** * g_memory_output_stream_steal_as_bytes: * @ostream: a #GMemoryOutputStream @@ -30913,7 +31016,7 @@ * Gets the source object from @task. Like * g_async_result_get_source_object(), but does not ref the object. * - * Returns: (transfer none): @task's source object, or %NULL + * Returns: (transfer none) (type GObject): @task's source object, or %NULL * Since: 2.36 */ @@ -30954,7 +31057,7 @@ /** * g_task_is_valid: * @result: (type Gio.AsyncResult): A #GAsyncResult - * @source_object: (allow-none): the source object expected to be associated with the task + * @source_object: (allow-none) (type GObject): the source object expected to be associated with the task * * Checks that @result is a #GTask, and that @source_object is its * source object (or that @source_object is %NULL and @result has no @@ -30967,7 +31070,7 @@ /** * g_task_new: - * @source_object: (allow-none): the #GObject that owns this task, or %NULL. + * @source_object: (allow-none) (type GObject): the #GObject that owns this task, or %NULL. * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. * @callback: (scope async): a #GAsyncReadyCallback. * @callback_data: (closure): user data passed to @callback. @@ -31052,7 +31155,7 @@ /** * g_task_report_error: - * @source_object: (allow-none): the #GObject that owns this task, or %NULL. + * @source_object: (allow-none) (type GObject): the #GObject that owns this task, or %NULL. * @callback: (scope async): a #GAsyncReadyCallback. * @callback_data: (closure): user data passed to @callback. * @source_tag: an opaque pointer indicating the source of this task @@ -31073,7 +31176,7 @@ /** * g_task_report_new_error: - * @source_object: (allow-none): the #GObject that owns this task, or %NULL. + * @source_object: (allow-none) (type GObject): the #GObject that owns this task, or %NULL. * @callback: (scope async): a #GAsyncReadyCallback. * @callback_data: (closure): user data passed to @callback. * @source_tag: an opaque pointer indicating the source of this task diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 24ed46ec..ec3aa02b 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -6486,16 +6486,21 @@ * easy-to-use form. * * In order to use these macros in an application, you must include - * glib/gi18n.h. For use in a library, must include + * glib/gi18n.h. For use in a library, you must include * glib/gi18n-lib.h after defining * the GETTEXT_PACKAGE macro suitably for your library: * |[ * #define GETTEXT_PACKAGE "gtk20" * #include <glib/gi18n-lib.h> * ]| - * Note that you also have to call setlocale() and textdomain() (as well as - * bindtextdomain() and bind_textdomain_codeset()) early on in your main() - * to make gettext() work. + * For an application, note that you also have to call bindtextdomain(), + * bind_textdomain_codeset(), textdomain() and setlocale() early on in your + * main() to make gettext() work. + * + * For a library, you only have to call bindtextdomain() and + * bind_textdomain_codeset() in your initialization function. If your library + * doesn't have an initialization function, you can call the functions before + * the first translated message. * * The gettext manual covers details of how to set up message extraction * with xgettext. @@ -12565,7 +12570,7 @@ * * Calculates the difference in time between @end and @begin. The * #GTimeSpan that is returned is effectively @end - @begin (ie: - * positive if the first simparameter is larger). + * positive if the first parameter is larger). * * Returns: the difference between the two #GDateTime, as a time span expressed in microseconds. * Since: 2.26 @@ -27163,7 +27168,7 @@ * */ * g_test_expect_message (G_LOG_DOMAIN, * G_LOG_LEVEL_CRITICAL, - * "assertion.*acquired_context.*failed"); + * "assertion*acquired_context*failed"); * g_main_context_push_thread_default (bad_context); * g_test_assert_expected_messages (); * ]| @@ -27295,6 +27300,16 @@ */ +/** + * g_test_initialized: + * + * Returns %TRUE if g_test_init() has been called. + * + * Returns: %TRUE if g_test_init() has been called. + * Since: 2.36 + */ + + /** * g_test_log_buffer_free: * @@ -29695,6 +29710,7 @@ * using g_source_remove(). * * Returns: An ID (greater than 0) for the event source + * Rename to: g_unix_signal_add * Since: 2.30 */ diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c index 5d6f3e55..fff5b1b0 100644 --- a/gir/gobject-2.0.c +++ b/gir/gobject-2.0.c @@ -586,7 +586,8 @@ * /* restore floating state */ * if (was_floating) * g_object_force_floating (object); - * g_object_unref (object); /* release previously acquired reference */ + * else + * g_object_unref (object); /* release previously acquired reference */ * ]| */ -- cgit v1.2.1 From f8e95c68dc0e4a0fb35979db7415de8ec09e1e7e Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 10 Dec 2012 13:12:13 -0500 Subject: scanner: Warn if we're missing (element-type) for GPtrArray For background, See https://bugzilla.gnome.org/show_bug.cgi?id=629682 See https://bugzilla.gnome.org/show_bug.cgi?id=689871 Basically we should emit a warning here. https://bugzilla.gnome.org/show_bug.cgi?id=689998 --- giscanner/introspectablepass.py | 2 +- tests/warn/invalid-element-type.h | 1 + tests/warn/missing-element-type.h | 8 ++++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/giscanner/introspectablepass.py b/giscanner/introspectablepass.py index 97ccfe71..b87156a8 100644 --- a/giscanner/introspectablepass.py +++ b/giscanner/introspectablepass.py @@ -87,7 +87,7 @@ class IntrospectablePass(object): parent.introspectable = False return - if (isinstance(node.type, ast.List) + if (isinstance(node.type, (ast.List, ast.Array)) and node.type.element_type == ast.TYPE_ANY): self._parameter_warning(parent, node, "Missing (element-type) annotation") parent.introspectable = False diff --git a/tests/warn/invalid-element-type.h b/tests/warn/invalid-element-type.h index 52e31164..c9ff3040 100644 --- a/tests/warn/invalid-element-type.h +++ b/tests/warn/invalid-element-type.h @@ -80,3 +80,4 @@ GList* test_unresolved_element_type(void); // EXPECT:63: Warning: Test: test_unresolved_element_type: Unknown type: 'Unresolved' // EXPECT:4: Warning: Test: test_invalid_list_element_type: argument l1: Missing (element-type) annotation // EXPECT:4: Warning: Test: test_invalid_list_element_type: argument l2: Missing (element-type) annotation +// EXPECT:50: Warning: Test: test_invalid_ptrarray_element_type: argument p1: Missing (element-type) annotation diff --git a/tests/warn/missing-element-type.h b/tests/warn/missing-element-type.h index 1f958a74..87206403 100644 --- a/tests/warn/missing-element-type.h +++ b/tests/warn/missing-element-type.h @@ -8,3 +8,11 @@ GSList *test_gslist_element_type(void); // EXPECT:6: Warning: Test: test_gslist_element_type: return value: Missing (element-type) annotation + +/** + * test_ptrarray_element_type: + * @somearray: An array. + */ +void test_ptrarray_arg_element_type(GPtrArray *somearray); + +// EXPECT:16: Warning: Test: test_ptrarray_arg_element_type: argument somearray: Missing (element-type) annotation -- cgit v1.2.1 From 54aaf14da2e02f1c8e60c1c5229c9b7d5932482d Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Wed, 12 Dec 2012 09:15:22 +1000 Subject: common.mk: escape $CC in quotes If CC is defined at "ccache gcc", the expanded command ends up as: env PATH=... CC=ccache gcc PYTHONPATH=... ./g-ir-scanner causing compilation errors. https://bugzilla.gnome.org/show_bug.cgi?id=690074 --- common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.mk b/common.mk index f67b2e83..87ceaee2 100644 --- a/common.mk +++ b/common.mk @@ -9,7 +9,7 @@ INTROSPECTION_SCANNER = \ env PATH=.libs:$(PATH) \ LPATH=.libs \ - CC=$(CC) \ + CC="$(CC)" \ PYTHONPATH=$(top_builddir):$(top_srcdir) \ UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \ -- cgit v1.2.1 From 29e9a62c1da12f45113779235796ccbb4226d7d8 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Sun, 16 Dec 2012 11:47:54 +0100 Subject: Update annotations from glib git --- gir/gio-2.0.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++- gir/glib-2.0.c | 54 ++++++++++++------------- gir/gobject-2.0.c | 14 +++++++ 3 files changed, 155 insertions(+), 29 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index db413910..fa453370 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -5608,6 +5608,33 @@ */ +/** + * SECTION:gnetworking + * @title: gnetworking.h + * @short_description: System networking includes + * @include: gio/gnetworking.h + * + * The gnetworking.h header can be included to get + * various low-level networking-related system headers, automatically + * taking care of certain portability issues for you. + * + * This can be used, for example, if you want to call setsockopt() + * on a #GSocket. + * + * Note that while WinSock has many of the same APIs as the + * traditional UNIX socket API, most of them behave at least slightly + * differently (particularly with respect to error handling). If you + * want your code to work under both UNIX and Windows, you will need + * to take these differences into account. + * + * Also, under glibc, certain non-portable functions are only visible + * in the headers if you define _GNU_SOURCE before + * including them. Note that this symbol must be defined before + * including any headers, or it may not take + * effect. + */ + + /** * SECTION:gnetworkmonitor * @title: GNetworkMonitor @@ -6446,7 +6473,7 @@ * SECTION:gsocket * @short_description: Low-level socket object * @include: gio/gio.h - * @see_also: #GInitable + * @see_also: #GInitable, gnetworking.h * * A #GSocket is a low-level networking primitive. It is a more or less * direct mapping of the BSD socket API in a portable GObject based API. @@ -18486,6 +18513,27 @@ */ +/** + * g_file_enumerator_get_child: + * @enumerator: a #GFileEnumerator + * @info: a #GFileInfo gotten from g_file_enumerator_next_file() or the async equivalents. + * + * Return a new #GFile which refers to the file named by @info in the source + * directory of @enumerator. This function is primarily intended to be used + * inside loops with g_file_enumerator_next_file(). + * + * This is a convenience method that's equivalent to: + * |[ + * gchar *name = g_file_info_get_name (info); + * GFile *child = g_file_get_child (g_file_enumerator_get_container (enumr), + * name); + * ]| + * + * Returns: (transfer full): a #GFile for the #GFileInfo passed it. + * Since: 2.36 + */ + + /** * g_file_enumerator_get_container: * @enumerator: a #GFileEnumerator @@ -21149,7 +21197,7 @@ * triggering the cancellable object from another thread. If the operation * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. * - * Returns: %TRUE if there was any error, %FALSE otherwise. + * Returns: %FALSE if there was any error, %TRUE otherwise. */ @@ -24978,6 +25026,18 @@ */ +/** + * g_networking_init: + * + * Initializes the platform networking libraries (eg, on Windows, this + * calls WSAStartup()). GLib will call this itself if it is needed, so + * you only need to call it if you directly call system networking + * functions (without calling any GLib networking functions first). + * + * Since: 2.36 + */ + + /** * g_null_settings_backend_new: * @@ -29835,6 +29895,34 @@ */ +/** + * g_socket_get_option: + * @socket: a #GSocket + * @level: the "API level" of the option (eg, SOL_SOCKET) + * @optname: the "name" of the option (eg, SO_BROADCAST) + * @value: (out): return location for the option value + * @error: #GError for error reporting, or %NULL to ignore. + * + * Gets the value of an integer-valued option on @socket, as with + * getsockopt (). (If you need to fetch a + * non-integer-valued option, you will need to call + * getsockopt () directly.) + * + * The <gio/gnetworking.h> + * header pulls in system headers that will define most of the + * standard/portable socket options. For unusual socket protocols or + * platform-dependent options, you may need to include additional + * headers. + * + * Note that even for socket options that are a single byte in size, + * @value is still a pointer to a #gint variable, not a #guchar; + * g_socket_get_option() will handle the conversion internally. + * + * Returns: success or failure. On failure, @error will be set, and the system error value (errno or WSAGetLastError ()) will still be set to the result of the getsockopt () call. + * Since: 2.36 + */ + + /** * g_socket_get_protocol: * @socket: a #GSocket. @@ -30698,6 +30786,30 @@ */ +/** + * g_socket_set_option: + * @socket: a #GSocket + * @level: the "API level" of the option (eg, SOL_SOCKET) + * @optname: the "name" of the option (eg, SO_BROADCAST) + * @value: the value to set the option to + * @error: #GError for error reporting, or %NULL to ignore. + * + * Sets the value of an integer-valued option on @socket, as with + * setsockopt (). (If you need to set a + * non-integer-valued option, you will need to call + * setsockopt () directly.) + * + * The <gio/gnetworking.h> + * header pulls in system headers that will define most of the + * standard/portable socket options. For unusual socket protocols or + * platform-dependent options, you may need to include additional + * headers. + * + * Returns: success or failure. On failure, @error will be set, and the system error value (errno or WSAGetLastError ()) will still be set to the result of the setsockopt () call. + * Since: 2.36 + */ + + /** * g_socket_set_timeout: * @socket: a #GSocket. diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index ec3aa02b..4c858e20 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -10975,7 +10975,7 @@ /** - * g_checksum_get_digest: + * g_checksum_get_digest: (skip) * @checksum: a #GChecksum * @buffer: output buffer * @digest_len: an inout parameter. The caller initializes it to the size of @buffer. After the call it contains the length of the digest. @@ -11024,7 +11024,7 @@ * will be closed and it won't be possible to call g_checksum_update() * on it anymore. * - * Returns: the newly created #GChecksum, or %NULL. Use g_checksum_free() to free the memory allocated by it. + * Returns: (transfer full): the newly created #GChecksum, or %NULL. Use g_checksum_free() to free the memory allocated by it. * Since: 2.16 */ @@ -11053,7 +11053,7 @@ /** * g_checksum_update: * @checksum: a #GChecksum - * @data: buffer used to compute the checksum + * @data: (array length=length) (element-type guint8): buffer used to compute the checksum * @length: size of the buffer, or -1 if it is a null-terminated string. * * Feeds @data into an existing #GChecksum. The checksum must still be @@ -11232,7 +11232,7 @@ /** * g_compute_checksum_for_data: * @checksum_type: a #GChecksumType - * @data: binary blob to compute the digest of + * @data: (array length=length) (element-type guint8): binary blob to compute the digest of * @length: length of @data * * Computes the checksum for a binary @data of @length. This is a @@ -14516,31 +14516,31 @@ /** * g_get_home_dir: * - * Gets the current user's home directory as defined in the - * password database. + * Gets the current user's home directory. * - * Note that in contrast to traditional UNIX tools, this function - * prefers passwd entries over the HOME - * environment variable. + * As with most UNIX tools, this function will return the value of the + * HOME environment variable if it is set to an existing + * absolute path name, falling back to the passwd + * file in the case that it is unset. * - * One of the reasons for this decision is that applications in many - * cases need special handling to deal with the case where - * HOME is - * - * Not owned by the user - * Not writeable - * Not even readable - * - * Since applications are in general not written - * to deal with these situations it was considered better to make - * g_get_home_dir() not pay attention to HOME and to - * return the real home directory for the user. If applications - * want to pay attention to HOME, they can do: - * |[ - * const char *homedir = g_getenv ("HOME"); - * if (!homedir) - * homedir = g_get_home_dir (); - * ]| + * If the path given in HOME is non-absolute, does not + * exist, or is not a directory, the result is undefined. + * + * + * Before version 2.36 this function would ignore the + * HOME environment variable, taking the value from the + * passwd database instead. This was changed to + * increase the compatibility of GLib with other programs (and the XDG + * basedir specification) and to increase testability of programs + * based on GLib (by making it easier to run them from test + * frameworks). + * + * If your program has a strong requirement for either the new or the + * old behaviour (and if you don't wish to increase your GLib + * dependency to ensure that the new behaviour is in effect) then you + * should either directly check the HOME environment + * variable yourself or unset it before calling any functions in GLib. + * * * Returns: the current user's home directory */ diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c index fff5b1b0..fe54ac1c 100644 --- a/gir/gobject-2.0.c +++ b/gir/gobject-2.0.c @@ -4574,6 +4574,20 @@ */ +/** + * g_type_get_type_registration_serial: + * + * Returns an opaque serial number that represents the state of the set of registered + * types. Any time a type is registred this serial changes, which means you can + * cache information based on type lookups (such as g_type_from_name) and know if + * the cache is still valid at a later time by comparing the current serial with + * the one at the type lookup. + * + * Since: 2.36 + * Returns: An unsigned int, representing the state of type registrations. + */ + + /** * g_type_init: * -- cgit v1.2.1 From 46ccb9dfe51372b0fc51c93890088853d0f1617e Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 17 Dec 2012 15:03:48 +0100 Subject: Use python-config instead of assuming include and library paths Call $PYTHON-config to determine include and library paths and linker flags instead of making assumptions about them. Also drop the unused PYTHON_LIB_LOC macro. https://bugzilla.gnome.org/show_bug.cgi?id=690347 --- m4/python.m4 | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/m4/python.m4 b/m4/python.m4 index 69557b66..cdd586c4 100644 --- a/m4/python.m4 +++ b/m4/python.m4 @@ -43,14 +43,7 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS], [AC_REQUIRE([AM_PATH_PYTHON]) AC_MSG_CHECKING(for headers required to compile python extensions) dnl deduce PYTHON_INCLUDES -py_prefix=`$PYTHON -c "import sys; print(sys.prefix)"` -py_exec_prefix=`$PYTHON -c "import sys; print(sys.exec_prefix)"` -if test "x$PYTHON_INCLUDES" == x; then - PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" - if test "$py_prefix" != "$py_exec_prefix"; then - PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" - fi -fi +PYTHON_INCLUDES=`$PYTHON-config --includes` AC_SUBST(PYTHON_INCLUDES) dnl check if the headers exist: save_CPPFLAGS="$CPPFLAGS" @@ -71,13 +64,9 @@ AC_DEFUN([AM_CHECK_PYTHON_LIBS], AC_MSG_CHECKING(for libraries required to link against libpython) dnl deduce PYTHON_LIBS if test "x$PYTHON_LIBS" == x; then - PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}" -fi -if test "x$PYTHON_LIB_LOC" == x; then - PYTHON_LIB_LOC="${py_prefix}/lib" + PYTHON_LIBS=`$PYTHON-config --ldflags --libs` fi AC_SUBST(PYTHON_LIBS) -AC_SUBST(PYTHON_LIB_LOC) dnl check if libpython exist: save_LIBS="$LIBS" LIBS="$LIBS $PYTHON_LIBS" -- cgit v1.2.1 From a021f0b29cf3208fa6a09bf715f23f298bca9cb2 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 17 Dec 2012 09:50:28 -0500 Subject: repo: Drop deprecated GStaticMutex usage In favor of GOnce, since we just want initialize-once semantics. --- girepository/girepository.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/girepository/girepository.c b/girepository/girepository.c index b5c30297..ccdd3611 100644 --- a/girepository/girepository.c +++ b/girepository/girepository.c @@ -35,7 +35,6 @@ #include "config.h" -static GStaticMutex globals_lock = G_STATIC_MUTEX_INIT; static GIRepository *default_repository = NULL; static GSList *search_path = NULL; static GSList *override_search_path = NULL; @@ -134,12 +133,13 @@ g_irepository_class_init (GIRepositoryClass *class) static void init_globals (void) { - g_static_mutex_lock (&globals_lock); + static gsize initialized = 0; + + if (!g_once_init_enter (&initialized)) + return; if (default_repository == NULL) - { - default_repository = g_object_new (G_TYPE_IREPOSITORY, NULL); - } + default_repository = g_object_new (G_TYPE_IREPOSITORY, NULL); if (search_path == NULL) { @@ -184,7 +184,7 @@ init_globals (void) search_path = g_slist_reverse (search_path); } - g_static_mutex_unlock (&globals_lock); + g_once_init_leave (&initialized, 1); } void -- cgit v1.2.1 From f885e3ecce5e4f1df19659b76a89598d5df4fab5 Mon Sep 17 00:00:00 2001 From: Gonzalo Odiard Date: Tue, 11 Dec 2012 10:54:00 -0300 Subject: gimarshallingtests:: Add test for returning a caller-allocated GArray https://bugzilla.gnome.org/show_bug.cgi?id=690041 --- tests/gimarshallingtests.c | 17 +++++++++++++++++ tests/gimarshallingtests.h | 1 + 2 files changed, 18 insertions(+) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index 7f7abf81..281f34f3 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -1924,6 +1924,23 @@ gi_marshalling_tests_garray_utf8_full_out (GArray **array_) } } +/** + * gi_marshalling_tests_garray_utf8_full_out_caller_allocated: + * @array_: (out caller-allocates) (array) (element-type utf8) (transfer full): + */ +void +gi_marshalling_tests_garray_utf8_full_out_caller_allocated (GArray *array_) +{ + static gchar *values[] = {"0", "1", "2", NULL}; + gint i; + + g_array_set_size (array_, 0); + for (i = 0; values[i]; i++) { + gchar *str = g_strdup (values[i]); + g_array_append_val (array_, str); + } +} + /** * gi_marshalling_tests_garray_utf8_none_inout: * @array_: (inout) (element-type utf8) (transfer none): diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index 840f763b..84366346 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -438,6 +438,7 @@ void gi_marshalling_tests_garray_utf8_none_in (GArray *array_); void gi_marshalling_tests_garray_utf8_none_out (GArray **array_); void gi_marshalling_tests_garray_utf8_container_out (GArray **array_); void gi_marshalling_tests_garray_utf8_full_out (GArray **array_); +void gi_marshalling_tests_garray_utf8_full_out_caller_allocated (GArray *array_); void gi_marshalling_tests_garray_utf8_none_inout (GArray **array_); void gi_marshalling_tests_garray_utf8_container_inout (GArray **array_); -- cgit v1.2.1 From 1114a687d8e1596aa67f986cfdb4891d19a8da1a Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 18 Dec 2012 11:36:57 -0500 Subject: Release 1.35.3 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index b1e8ea9f..37380be6 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl the gi version number m4_define(gi_major_version, 1) m4_define(gi_minor_version, 35) -m4_define(gi_micro_version, 2) +m4_define(gi_micro_version, 3) m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version) AC_PREREQ([2.63]) -- cgit v1.2.1 From aae598e1e60aad3d30b21c398f55e9b6944be971 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 18 Dec 2012 09:35:02 +0100 Subject: Automatically install pre-commit hook Instead of telling the user to do so and failing, we can just install the hook ourselves. This saves the user some trouble and more importantly avoids breaking tests in jhbuild continuous integration setups. https://bugzilla.gnome.org/show_bug.cgi?id=686388 --- Makefile.am | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index c4f67031..70164581 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,10 +58,7 @@ EXTRA_DIST += \ check-local: gtester --verbose $(GTESTER_PROGS) - @test ! -d $(top_srcdir)/.git || (test -f $(top_srcdir)/.git/hooks/pre-commit || (echo -e "ERROR: missing \ - pre-commit hook.\n\ncopy misc/pre-commit to .git/hooks"; false)) - @test ! -d $(top_srcdir)/.git || (test -x $(top_srcdir)/.git/hooks/pre-commit || (echo -e "ERROR: pre-commit \ - is not executable\n\nrun chmod +x .git/hooks/pre-commit"; false)) + @test ! -d $(top_srcdir)/.git || (test -f $(top_srcdir)/.git/hooks/pre-commit || install misc/pre-commit .git/hooks/pre-commit) @echo "TEST: PEP-8 INQUISITION" @find $(top_srcdir)/giscanner -name \*.py | sort | uniq | xargs $(PYTHON) $(top_srcdir)/misc/pep8.py --repeat --exclude=config.py @echo "TEST: Annotation pattern programs" -- cgit v1.2.1 From 2611eb1a69bfe4a098c60ab8efda32ec443c250c Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 18 Dec 2012 22:43:25 +0100 Subject: gimarshallingtests: Add test for value array of boxed structs We already have tests for "array of simple structs" (gi_marshalling_tests_array_simple_struct_in) and "array of pointers to boxed structs" (gi_marshalling_tests_array_struct_in), but were missing "array of boxed structs", which reproduces https://bugzilla.gnome.org/show_bug.cgi?id=656312 --- tests/gimarshallingtests.c | 13 +++++++++++++ tests/gimarshallingtests.h | 1 + 2 files changed, 14 insertions(+) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index 281f34f3..95bb196e 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -1381,6 +1381,19 @@ gi_marshalling_tests_array_struct_in (GIMarshallingTestsBoxedStruct **structs, g g_assert_cmpint(structs[2]->long_, ==, 3); } +/** + * gi_marshalling_tests_array_struct_value_in: + * @structs: (array length=length): + */ +void +gi_marshalling_tests_array_struct_value_in (GIMarshallingTestsBoxedStruct *structs, gint length) +{ + g_assert_cmpint(length, ==, 3); + g_assert_cmpint(structs[0].long_, ==, 1); + g_assert_cmpint(structs[1].long_, ==, 2); + g_assert_cmpint(structs[2].long_, ==, 3); +} + /** * gi_marshalling_tests_array_simple_struct_in: * @structs: (array length=length): diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index 84366346..e4875d6e 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -389,6 +389,7 @@ void gi_marshalling_tests_array_in_len_zero_terminated (const gint *ints, gint l void gi_marshalling_tests_array_string_in (const gchar **strings, gint length); void gi_marshalling_tests_array_uint8_in (const guint8 *chars, gint length); void gi_marshalling_tests_array_struct_in (GIMarshallingTestsBoxedStruct **structs, gint length); +void gi_marshalling_tests_array_struct_value_in (GIMarshallingTestsBoxedStruct *structs, gint length); void gi_marshalling_tests_array_struct_take_in (GIMarshallingTestsBoxedStruct **structs, gint length); void gi_marshalling_tests_array_simple_struct_in (GIMarshallingTestsSimpleStruct *structs, gint length); void gi_marshalling_tests_multi_array_key_value_in (gint length, const gchar **keys, const GValue *values); -- cgit v1.2.1 From 651ba3d400e9efd75e1618066cd1b485cccac1a2 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 17 Dec 2012 11:08:05 -0500 Subject: tests/annotationparser: Drop Python API usage down to 2.6, not 2.7 .iterfind() is new in 2.7, but we claim 2.6 support, as I use on RHEL6. --- tests/scanner/annotationparser/test_parser.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/scanner/annotationparser/test_parser.py b/tests/scanner/annotationparser/test_parser.py index 86cd41a7..a1c5866c 100644 --- a/tests/scanner/annotationparser/test_parser.py +++ b/tests/scanner/annotationparser/test_parser.py @@ -145,12 +145,12 @@ def expected2tree(docblock): annotations = docblock.find('identifier/annotations') if annotations is not None: expected += ' \n' - for annotation in annotations.iterfind('annotation'): + for annotation in annotations.findall('annotation'): expected += ' \n' expected += ' %s\n' % (annotation.find('name').text, ) if annotation.find('options') is not None: expected += ' \n' - for option in annotation.iterfind('options/option'): + for option in annotation.findall('options/option'): expected += ' + + + /** +*/ + + + /** + * gnm_cell_set_expr_and_value: Stores (WITHOUT COPYING) the supplied value, and + * references the supplied expression and links it into the expression + * list. It marks the sheet as dirty. It is intended for use by import + * routines or operations that do bulk assignment. + * + * WARNING : This is an internal routine that does not queue redraws, + * does not auto-resize, does not calculate spans, and does + * not render the value. + * + * NOTE : This DOES check for array partitioning. + */ + + -- cgit v1.2.1 From fbe0966625757266040d1a9831d27f78bd00d753 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 9 Jan 2013 22:45:40 +0100 Subject: giscanner: emit a warning when we fail to parse a GTK-Doc comment block Instead of going down with a for the user inexplicable backtrace, emit a warning asking said user to file a bug including the comment block in question. Thanks to Alexandre Rostovtsev for proposing something similar in bug #690850 https://bugzilla.gnome.org/show_bug.cgi?id=690850 --- giscanner/annotationparser.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index d4b24992..9c0ce5a4 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -766,7 +766,13 @@ class AnnotationParser(object): comment_blocks = {} for comment in comments: - comment_block = self.parse_comment_block(comment) + try: + comment_block = self.parse_comment_block(comment) + except Exception: + message.warn('unrecoverable parse error, please file a GObject-Introspection ' + 'bug report including the complete comment block at the ' + 'indicated location.', message.Position(comment[1], comment[2])) + continue if comment_block is not None: # Note: previous versions of this parser did not check -- cgit v1.2.1 From 6ad132c69c74f46f54d770835ea45e8a58fbd612 Mon Sep 17 00:00:00 2001 From: Paolo Borelli Date: Thu, 10 Jan 2013 22:23:36 +0100 Subject: gimarshallingtests: Add vfunc with an array output Add vfunc_array_out_param to GIMarshallingTestsObjectClass. https://bugzilla.gnome.org/show_bug.cgi?id=690851 --- tests/gimarshallingtests.c | 13 +++++++++++++ tests/gimarshallingtests.h | 7 +++++++ 2 files changed, 20 insertions(+) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index 95bb196e..d4b6cb30 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -4238,6 +4238,19 @@ gi_marshalling_tests_object_vfunc_caller_allocated_out_parameter (GIMarshallingT g_assert_cmpint(local, ==, 0x12345678); } +/** + * gi_marshalling_tests_object_vfunc_array_out_parameter: + * @a: (out) (array zero-terminated=1): + */ +void +gi_marshalling_tests_object_vfunc_array_out_parameter (GIMarshallingTestsObject *self, gfloat **a) +{ + /* make sure that local variables don't get smashed */ + gulong local = 0x12345678; + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_array_out_parameter (self, a); + g_assert_cmpint(local, ==, 0x12345678); +} + /** * gi_marshalling_tests_object_vfunc_return_value_and_one_out_parameter: * @a: (out): diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index e4875d6e..03d165b9 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -777,6 +777,12 @@ struct _GIMarshallingTestsObjectClass */ void (* vfunc_caller_allocated_out_parameter) (GIMarshallingTestsObject *self, GValue *a); + /** + * GIMarshallingTestsObjectClass::vfunc_array_out_parameter: + * @a: (out) (array zero-terminated=1): + */ + void (* vfunc_array_out_parameter) (GIMarshallingTestsObject *self, gfloat **a); + /** * GIMarshallingTestsObjectClass::vfunc_return_value_and_one_out_parameter: * @a: (out): @@ -828,6 +834,7 @@ glong gi_marshalling_tests_object_vfunc_return_value_only (GIMarshallingTestsObj void gi_marshalling_tests_object_vfunc_one_out_parameter (GIMarshallingTestsObject *self, gfloat *a); void gi_marshalling_tests_object_vfunc_multiple_out_parameters (GIMarshallingTestsObject *self, gfloat *a, gfloat *b); void gi_marshalling_tests_object_vfunc_caller_allocated_out_parameter (GIMarshallingTestsObject *self, GValue *a); +void gi_marshalling_tests_object_vfunc_array_out_parameter (GIMarshallingTestsObject *self, gfloat **a); glong gi_marshalling_tests_object_vfunc_return_value_and_one_out_parameter (GIMarshallingTestsObject *self, glong *a); glong gi_marshalling_tests_object_vfunc_return_value_and_multiple_out_parameters (GIMarshallingTestsObject *self, glong *a, glong *b); gboolean gi_marshalling_tests_object_vfunc_meth_with_error (GIMarshallingTestsObject *object, gint x, GError **error); -- cgit v1.2.1 From ee36c78b0c11763a69203e8ef14d74543698473a Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Fri, 11 Jan 2013 08:42:27 +0100 Subject: girepository: gchar is a signed type gchar is signed, not unsigned. Add "guchar" alias as unsigned for completeness (but usually it appears as guint8). https://bugzilla.gnome.org/show_bug.cgi?id=691524 --- girepository/girparser.c | 3 ++- tests/repository/gitypelibtest.c | 55 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/girepository/girparser.c b/girepository/girparser.c index ce88a691..1a83c239 100644 --- a/girepository/girparser.c +++ b/girepository/girparser.c @@ -379,7 +379,8 @@ typedef struct { } IntegerAliasInfo; static IntegerAliasInfo integer_aliases[] = { - { "gchar", SIZEOF_CHAR, 0 }, + { "gchar", SIZEOF_CHAR, 1 }, + { "guchar", SIZEOF_CHAR, 0 }, { "gshort", SIZEOF_SHORT, 1 }, { "gushort", SIZEOF_SHORT, 0 }, { "gint", SIZEOF_INT, 1 }, diff --git a/tests/repository/gitypelibtest.c b/tests/repository/gitypelibtest.c index 36770738..54fe5234 100644 --- a/tests/repository/gitypelibtest.c +++ b/tests/repository/gitypelibtest.c @@ -178,6 +178,60 @@ test_hash_with_cairo_typelib (GIRepository *repo) g_assert (info == NULL); } +static GIPropertyInfo * +lookup_property (GIObjectInfo *info, const gchar *name) +{ + gssize n_props; + gssize i; + GIPropertyInfo *property_info; + + n_props = g_object_info_get_n_properties (info); + for (i = 0; i < n_props; i++) { + property_info = g_object_info_get_property (info, i); + if (strcmp (name, g_base_info_get_name (property_info)) == 0) + return property_info; + g_base_info_unref (property_info); + } + + return NULL; +} + +static void +test_char_types (GIRepository *repo) +{ + GITypelib *ret; + GError *error = NULL; + GIBaseInfo *prop_obj; + GIPropertyInfo *prop_info; + GITypeInfo *type_info; + + ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error); + if (!ret) + g_error ("%s", error->message); + + prop_obj = g_irepository_find_by_name (repo, "GIMarshallingTests", "PropertiesObject"); + g_assert (prop_obj != NULL); + g_assert (GI_IS_OBJECT_INFO (prop_obj)); + + /* unsigned char */ + prop_info = lookup_property ((GIObjectInfo *) prop_obj, "some-uchar"); + g_assert (prop_info != NULL); + type_info = g_property_info_get_type (prop_info); + g_assert_cmpuint (g_type_info_get_tag (type_info), ==, GI_TYPE_TAG_UINT8); + g_base_info_unref (type_info); + g_base_info_unref (prop_info); + + /* signed char */ + prop_info = lookup_property ((GIObjectInfo *) prop_obj, "some-char"); + g_assert (prop_info != NULL); + type_info = g_property_info_get_type (prop_info); + g_assert_cmpuint (g_type_info_get_tag (type_info), ==, GI_TYPE_TAG_INT8); + g_base_info_unref (type_info); + g_base_info_unref (prop_info); + + g_base_info_unref (prop_obj); +} + int main(int argc, char **argv) { @@ -192,6 +246,7 @@ main(int argc, char **argv) test_is_pointer_for_struct_arg (repo); test_fundamental_get_ref_function_pointer (repo); test_hash_with_cairo_typelib (repo); + test_char_types (repo); exit(0); } -- cgit v1.2.1 From 63c9759e17ef5ac71c50d5ac91289714db19b587 Mon Sep 17 00:00:00 2001 From: Vadim Rutkovsky Date: Fri, 11 Jan 2013 12:17:53 +0100 Subject: gimarshallingtests: Add string_ to boxed structure Co-Authored-By: Martin Pitt https://bugzilla.gnome.org/show_bug.cgi?id=678401 --- tests/gimarshallingtests.c | 6 +++++- tests/gimarshallingtests.h | 5 +++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index d4b6cb30..f12ea05e 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -3645,6 +3645,7 @@ gi_marshalling_tests_boxed_struct_copy (GIMarshallingTestsBoxedStruct *struct_) new_struct = g_slice_new (GIMarshallingTestsBoxedStruct); *new_struct = *struct_; + new_struct->string_ = g_strdup (struct_->string_); return new_struct; } @@ -3652,8 +3653,10 @@ gi_marshalling_tests_boxed_struct_copy (GIMarshallingTestsBoxedStruct *struct_) static void gi_marshalling_tests_boxed_struct_free (GIMarshallingTestsBoxedStruct *struct_) { - if (struct_ != NULL) + if (struct_ != NULL) { + g_free (struct_->string_); g_slice_free (GIMarshallingTestsBoxedStruct, struct_); + } } GType @@ -3690,6 +3693,7 @@ gi_marshalling_tests_boxed_struct_returnv (void) struct_ = g_new(GIMarshallingTestsBoxedStruct, 1); struct_->long_ = 42; + struct_->string_ = g_strdup("hello"); struct_->g_strv = g_new0(gchar*, 4); struct_->g_strv[0] = g_strdup("0"); struct_->g_strv[1] = g_strdup("1"); diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index 03d165b9..6ac212e7 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -656,6 +656,7 @@ void gi_marshalling_tests_pointer_struct_inv (GIMarshallingTestsPointerStruct *s struct _GIMarshallingTestsBoxedStruct { glong long_; + gchar *string_; GStrv g_strv; }; @@ -968,7 +969,7 @@ typedef struct _GIMarshallingTestsInterface3Iface GIMarshallingTestsInterface3If struct _GIMarshallingTestsInterface3Iface { GTypeInterface base_iface; - + /** * GIMarshallingTestsInterface3::test_variant_array_in: * @in: (in) (array length=n_in): @@ -1080,7 +1081,7 @@ struct _GIMarshallingTestsPropertiesObject { gfloat some_float; gdouble some_double; gchar **some_strv; - GIMarshallingTestsBoxedStruct* some_boxed_struct; + GIMarshallingTestsBoxedStruct* some_boxed_struct; GVariant *some_variant; }; -- cgit v1.2.1 From d94aa67674261cf921f5a29565c21ebe1ad42a31 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 14 Jan 2013 08:48:03 +0100 Subject: gimarshallingtests: Add boxed GList property https://bugzilla.gnome.org/show_bug.cgi?id=684059 --- tests/gimarshallingtests.c | 33 +++++++++++++++++++++++++++++++++ tests/gimarshallingtests.h | 1 + 2 files changed, 34 insertions(+) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index f12ea05e..e8559812 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -3673,6 +3673,20 @@ gi_marshalling_tests_boxed_struct_get_type (void) return type; } +static GType +gi_marshalling_tests_boxed_glist_get_type (void) +{ + static GType type = 0; + + if (type == 0) { + type = g_boxed_type_register_static ("GIMarshallingTestsBoxedGList", + (GBoxedCopyFunc) g_list_copy, + (GBoxedFreeFunc) g_list_free); + } + + return type; +} + GIMarshallingTestsBoxedStruct * gi_marshalling_tests_boxed_struct_new (void) { @@ -4722,6 +4736,7 @@ enum { SOME_STRV_PROPERTY, SOME_BOXED_STRUCT_PROPERTY, SOME_VARIANT_PROPERTY, + SOME_BOXED_GLIST_PROPERTY, }; G_DEFINE_TYPE (GIMarshallingTestsPropertiesObject, gi_marshalling_tests_properties_object, G_TYPE_OBJECT); @@ -4782,6 +4797,9 @@ gi_marshalling_tests_properties_object_get_property (GObject * object, guint pro case SOME_BOXED_STRUCT_PROPERTY: g_value_set_boxed (value, self->some_boxed_struct); break; + case SOME_BOXED_GLIST_PROPERTY: + g_value_set_boxed (value, self->some_boxed_glist); + break; case SOME_VARIANT_PROPERTY: g_value_set_variant (value, self->some_variant); break; @@ -4838,6 +4856,10 @@ gi_marshalling_tests_properties_object_set_property (GObject * object, guint pro gi_marshalling_tests_boxed_struct_free (self->some_boxed_struct); self->some_boxed_struct = gi_marshalling_tests_boxed_struct_copy (g_value_get_boxed (value)); break; + case SOME_BOXED_GLIST_PROPERTY: + g_list_free (self->some_boxed_glist); + self->some_boxed_glist = g_list_copy (g_value_get_boxed (value)); + break; case SOME_VARIANT_PROPERTY: if (self->some_variant != NULL) g_variant_unref (self->some_variant); @@ -4913,6 +4935,17 @@ gi_marshalling_tests_properties_object_class_init (GIMarshallingTestsPropertiesO gi_marshalling_tests_boxed_struct_get_type(), G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + /** + * GIMarshallingTestsPropertiesObject:some-boxed-glist: + * + * Type: GLib.List(gint) + * Transfer: none + */ + g_object_class_install_property (object_class, SOME_BOXED_GLIST_PROPERTY, + g_param_spec_boxed ("some-boxed-glist", "some-boxed-glist", "some-boxed-glist", + gi_marshalling_tests_boxed_glist_get_type(), + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + g_object_class_install_property (object_class, SOME_VARIANT_PROPERTY, g_param_spec_variant ("some-variant", "some-variant", "some-variant", G_VARIANT_TYPE_ANY, NULL, diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index 6ac212e7..74090f05 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -1082,6 +1082,7 @@ struct _GIMarshallingTestsPropertiesObject { gdouble some_double; gchar **some_strv; GIMarshallingTestsBoxedStruct* some_boxed_struct; + GList* some_boxed_glist; GVariant *some_variant; }; -- cgit v1.2.1 From 2a1c4df3c078e5ab43f8e752fb61367cd4234662 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 14 Jan 2013 11:37:27 +0100 Subject: Update annotations from glib git --- gir/gio-2.0.c | 14 ++++----- gir/gobject-2.0.c | 86 +++++++++++++++++++++++++++---------------------------- 2 files changed, 50 insertions(+), 50 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 0ca00c0f..4a8148fd 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -9717,7 +9717,7 @@ /** * g_action_map_add_action_entries: * @action_map: a #GActionMap - * @entries: a pointer to the first item in an array of #GActionEntry structs + * @entries: (array length=n_entries) (element-type GActionEntry): a pointer to the first item in an array of #GActionEntry structs * @n_entries: the length of @entries, or -1 if @entries is %NULL-terminated * @user_data: the user data for signal connections * @@ -22235,7 +22235,7 @@ /** * g_input_stream_read: * @stream: a #GInputStream. - * @buffer: a buffer to read data into (which should be at least count bytes long). + * @buffer: (array length=count) (element-type guint8): a buffer to read data into (which should be at least count bytes long). * @count: the number of bytes that will be read from the stream * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. * @error: location to store the error occurring, or %NULL to ignore @@ -22266,7 +22266,7 @@ /** * g_input_stream_read_all: * @stream: a #GInputStream. - * @buffer: a buffer to read data into (which should be at least count bytes long). + * @buffer: (array length=count) (element-type guint8): a buffer to read data into (which should be at least count bytes long). * @count: the number of bytes that will be read from the stream * @bytes_read: (out): location to store the number of bytes that was read from the stream * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. @@ -22293,7 +22293,7 @@ /** * g_input_stream_read_async: * @stream: A #GInputStream. - * @buffer: a buffer to read data into (which should be at least count bytes long). + * @buffer: (array length=count) (element-type guint8): a buffer to read data into (which should be at least count bytes long). * @count: the number of bytes that will be read from the stream * @io_priority: the I/O priority of the request. * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore. @@ -30415,7 +30415,7 @@ /** * g_socket_receive: * @socket: a #GSocket - * @buffer: a buffer to read data into (which should be at least @size bytes long). + * @buffer: (array length=size) (element-type guint8): a buffer to read data into (which should be at least @size bytes long). * @size: the number of bytes you want to read from the socket * @cancellable: (allow-none): a %GCancellable or %NULL * @error: #GError for error reporting, or %NULL to ignore. @@ -30549,7 +30549,7 @@ /** * g_socket_receive_with_blocking: * @socket: a #GSocket - * @buffer: a buffer to read data into (which should be at least @size bytes long). + * @buffer: (array length=size) (element-type guint8): a buffer to read data into (which should be at least @size bytes long). * @size: the number of bytes you want to read from the socket * @blocking: whether to do blocking or non-blocking I/O * @cancellable: (allow-none): a %GCancellable or %NULL @@ -32674,7 +32674,7 @@ * Finish an asynchronous lookup of certificates. See * g_tls_database_lookup_certificates_issued_by() for more information. * - * Returns: (transfer full): a newly allocated list of #GTlsCertificate objects. Use g_object_unref() on each certificate, and g_list_free() on the release the list. + * Returns: (transfer full) (element-type GTlsCertificate): a newly allocated list of #GTlsCertificate objects. Use g_object_unref() on each certificate, and g_list_free() on the release the list. * Since: 2.30 */ diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c index fe54ac1c..23faa5f6 100644 --- a/gir/gobject-2.0.c +++ b/gir/gobject-2.0.c @@ -2698,7 +2698,7 @@ /** - * g_param_spec_boolean: (skip) + * g_param_spec_boolean: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified @@ -2710,12 +2710,12 @@ * * See g_param_spec_internal() for details on property names. * - * Returns: a newly created parameter specification + * Returns: (transfer full): a newly created parameter specification */ /** - * g_param_spec_boxed: (skip) + * g_param_spec_boxed: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified @@ -2727,12 +2727,12 @@ * * See g_param_spec_internal() for details on property names. * - * Returns: a newly created parameter specification + * Returns: (transfer full): a newly created parameter specification */ /** - * g_param_spec_char: (skip) + * g_param_spec_char: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified @@ -2743,12 +2743,12 @@ * * Creates a new #GParamSpecChar instance specifying a %G_TYPE_CHAR property. * - * Returns: a newly created parameter specification + * Returns: (transfer full): a newly created parameter specification */ /** - * g_param_spec_double: (skip) + * g_param_spec_double: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified @@ -2762,12 +2762,12 @@ * * See g_param_spec_internal() for details on property names. * - * Returns: a newly created parameter specification + * Returns: (transfer full): a newly created parameter specification */ /** - * g_param_spec_enum: (skip) + * g_param_spec_enum: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified @@ -2780,12 +2780,12 @@ * * See g_param_spec_internal() for details on property names. * - * Returns: a newly created parameter specification + * Returns: (transfer full): a newly created parameter specification */ /** - * g_param_spec_flags: (skip) + * g_param_spec_flags: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified @@ -2798,12 +2798,12 @@ * * See g_param_spec_internal() for details on property names. * - * Returns: a newly created parameter specification + * Returns: (transfer full): a newly created parameter specification */ /** - * g_param_spec_float: (skip) + * g_param_spec_float: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified @@ -2816,7 +2816,7 @@ * * See g_param_spec_internal() for details on property names. * - * Returns: a newly created parameter specification + * Returns: (transfer full): a newly created parameter specification */ @@ -2882,7 +2882,7 @@ /** - * g_param_spec_gtype: (skip) + * g_param_spec_gtype: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified @@ -2895,12 +2895,12 @@ * See g_param_spec_internal() for details on property names. * * Since: 2.10 - * Returns: a newly created parameter specification + * Returns: (transfer full): a newly created parameter specification */ /** - * g_param_spec_int: (skip) + * g_param_spec_int: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified @@ -2913,12 +2913,12 @@ * * See g_param_spec_internal() for details on property names. * - * Returns: a newly created parameter specification + * Returns: (transfer full): a newly created parameter specification */ /** - * g_param_spec_int64: (skip) + * g_param_spec_int64: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified @@ -2931,7 +2931,7 @@ * * See g_param_spec_internal() for details on property names. * - * Returns: a newly created parameter specification + * Returns: (transfer full): a newly created parameter specification */ @@ -2966,7 +2966,7 @@ /** - * g_param_spec_long: (skip) + * g_param_spec_long: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified @@ -2979,12 +2979,12 @@ * * See g_param_spec_internal() for details on property names. * - * Returns: a newly created parameter specification + * Returns: (transfer full): a newly created parameter specification */ /** - * g_param_spec_object: (skip) + * g_param_spec_object: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified @@ -2996,7 +2996,7 @@ * * See g_param_spec_internal() for details on property names. * - * Returns: a newly created parameter specification + * Returns: (transfer full): a newly created parameter specification */ @@ -3015,7 +3015,7 @@ /** - * g_param_spec_param: (skip) + * g_param_spec_param: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified @@ -3027,12 +3027,12 @@ * * See g_param_spec_internal() for details on property names. * - * Returns: a newly created parameter specification + * Returns: (transfer full): a newly created parameter specification */ /** - * g_param_spec_pointer: (skip) + * g_param_spec_pointer: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified @@ -3042,7 +3042,7 @@ * * See g_param_spec_internal() for details on property names. * - * Returns: a newly created parameter specification + * Returns: (transfer full): a newly created parameter specification */ @@ -3198,7 +3198,7 @@ /** - * g_param_spec_string: (skip) + * g_param_spec_string: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified @@ -3209,12 +3209,12 @@ * * See g_param_spec_internal() for details on property names. * - * Returns: a newly created parameter specification + * Returns: (transfer full): a newly created parameter specification */ /** - * g_param_spec_uchar: (skip) + * g_param_spec_uchar: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified @@ -3225,12 +3225,12 @@ * * Creates a new #GParamSpecUChar instance specifying a %G_TYPE_UCHAR property. * - * Returns: a newly created parameter specification + * Returns: (transfer full): a newly created parameter specification */ /** - * g_param_spec_uint: (skip) + * g_param_spec_uint: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified @@ -3243,12 +3243,12 @@ * * See g_param_spec_internal() for details on property names. * - * Returns: a newly created parameter specification + * Returns: (transfer full): a newly created parameter specification */ /** - * g_param_spec_uint64: (skip) + * g_param_spec_uint64: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified @@ -3262,12 +3262,12 @@ * * See g_param_spec_internal() for details on property names. * - * Returns: a newly created parameter specification + * Returns: (transfer full): a newly created parameter specification */ /** - * g_param_spec_ulong: (skip) + * g_param_spec_ulong: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified @@ -3281,12 +3281,12 @@ * * See g_param_spec_internal() for details on property names. * - * Returns: a newly created parameter specification + * Returns: (transfer full): a newly created parameter specification */ /** - * g_param_spec_unichar: (skip) + * g_param_spec_unichar: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified @@ -3299,7 +3299,7 @@ * * See g_param_spec_internal() for details on property names. * - * Returns: a newly created parameter specification + * Returns: (transfer full): a newly created parameter specification */ @@ -3331,12 +3331,12 @@ /** - * g_param_spec_variant: (skip) + * g_param_spec_variant: * @name: canonical name of the property specified * @nick: nick name for the property specified * @blurb: description of the property specified * @type: a #GVariantType - * @default_value: (allow-none): a #GVariant of type @type to use as the default value, or %NULL + * @default_value: (allow-none) (transfer full): a #GVariant of type @type to use as the default value, or %NULL * @flags: flags for the property specified * * Creates a new #GParamSpecVariant instance specifying a #GVariant @@ -3346,7 +3346,7 @@ * * See g_param_spec_internal() for details on property names. * - * Returns: the newly created #GParamSpec + * Returns: (transfer full): the newly created #GParamSpec * Since: 2.26 */ -- cgit v1.2.1 From 5e4ddbcb8eacede04d5ade9e630d2efe29c022a0 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 14 Jan 2013 12:34:06 +0100 Subject: gimarshallingtests: Add method taking a GParamSpec argument Add gi_marshalling_tests_param_spec_in_bool(), supplementing the already existing tests for a GParamSpec out argument and return value. https://bugzilla.gnome.org/show_bug.cgi?id=682355 --- tests/gimarshallingtests.c | 15 +++++++++++++-- tests/gimarshallingtests.h | 1 + 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index e8559812..a81e4d86 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -4698,6 +4698,17 @@ gi_marshalling_tests_filename_list_return (void) return NULL; } +/** + * gi_marshalling_tests_param_spec_in_bool: + */ +void +gi_marshalling_tests_param_spec_in_bool (const GParamSpec *param) +{ + g_assert (G_IS_PARAM_SPEC (param)); + g_assert_cmpint (G_PARAM_SPEC_TYPE (param), ==, G_TYPE_BOOLEAN); + g_assert_cmpstr (g_param_spec_get_name(param), ==, "mybool"); +} + /** * gi_marshalling_tests_param_spec_return: * @@ -4706,7 +4717,7 @@ gi_marshalling_tests_filename_list_return (void) GParamSpec * gi_marshalling_tests_param_spec_return (void) { - return g_param_spec_string ("test-param", "test", "This is a test", "42", G_PARAM_READABLE); + return g_param_spec_string ("test-param", "test", "This is a test", "42", G_PARAM_READABLE); } /** @@ -4716,7 +4727,7 @@ gi_marshalling_tests_param_spec_return (void) void gi_marshalling_tests_param_spec_out(GParamSpec **param) { - *param = g_param_spec_string("test-param", "test", "This is a test", "42", G_PARAM_READABLE); + *param = g_param_spec_string("test-param", "test", "This is a test", "42", G_PARAM_READABLE); } diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index 74090f05..10179c68 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -1003,6 +1003,7 @@ void gi_marshalling_tests_gerror_out_transfer_none(GError **err, const gchar **d GError *gi_marshalling_tests_gerror_return(void); /* GParamSpec */ +void gi_marshalling_tests_param_spec_in_bool(const GParamSpec *param); GParamSpec *gi_marshalling_tests_param_spec_return (void); void gi_marshalling_tests_param_spec_out(GParamSpec **param); -- cgit v1.2.1 From f65395f5f9f1ef980315ae11c454c324bb61e24d Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Tue, 15 Jan 2013 10:05:20 +0100 Subject: tests: Fix compiler warnings Fix (void) function declarations that occur with -Wstrict-prototypes, and the g_param_spec_get_name() which drops the const from its argument. --- tests/gimarshallingtests.c | 2 +- tests/gimarshallingtests.h | 2 +- tests/scanner/regress.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index a81e4d86..21d31e00 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -4706,7 +4706,7 @@ gi_marshalling_tests_param_spec_in_bool (const GParamSpec *param) { g_assert (G_IS_PARAM_SPEC (param)); g_assert_cmpint (G_PARAM_SPEC_TYPE (param), ==, G_TYPE_BOOLEAN); - g_assert_cmpstr (g_param_spec_get_name(param), ==, "mybool"); + g_assert_cmpstr (g_param_spec_get_name((GParamSpec*) param), ==, "mybool"); } /** diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index 10179c68..803b02c7 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -573,7 +573,7 @@ GClosure *gi_marshalling_tests_gclosure_return (void); /** * GIMarshallingTestsCallbackReturnValueOnly: */ -typedef glong (* GIMarshallingTestsCallbackReturnValueOnly) (); +typedef glong (* GIMarshallingTestsCallbackReturnValueOnly) (void); glong gi_marshalling_tests_callback_return_value_only (GIMarshallingTestsCallbackReturnValueOnly callback); diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c index 89dc8738..b5fc8585 100644 --- a/tests/scanner/regress.c +++ b/tests/scanner/regress.c @@ -908,7 +908,7 @@ regress_test_array_int_null_out (int **arr, int *len) /* GList */ static /*const*/ GList * -regress_test_sequence_list() +regress_test_sequence_list (void) { static GList *list = NULL; if (!list) { @@ -1029,7 +1029,7 @@ regress_test_glist_null_out (GSList **out_list) /* GSList */ static /*const*/ GSList * -regress_test_sequence_slist() +regress_test_sequence_slist (void) { static GSList *list = NULL; if (!list) { @@ -1153,7 +1153,7 @@ static char *table_data[3][2] = { }; static GHashTable * -regress_test_table_ghash_new_container() +regress_test_table_ghash_new_container (void) { GHashTable *hash; int i; @@ -1164,7 +1164,7 @@ regress_test_table_ghash_new_container() } static GHashTable * -regress_test_table_ghash_new_full() +regress_test_table_ghash_new_full (void) { GHashTable *hash; int i; @@ -1177,7 +1177,7 @@ regress_test_table_ghash_new_full() } static /*const*/ GHashTable * -regress_test_table_ghash_const() +regress_test_table_ghash_const (void) { static GHashTable *hash = NULL; if (!hash) { -- cgit v1.2.1 From 99c1a8790d36a3307b699dfbf977e7f36fbf6e7a Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 15 Jan 2013 10:22:43 -0500 Subject: Release 1.35.4 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 71223e05..f83b3b4b 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl the gi version number m4_define(gi_major_version, 1) m4_define(gi_minor_version, 35) -m4_define(gi_micro_version, 3) +m4_define(gi_micro_version, 4) m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version) AC_PREREQ([2.63]) -- cgit v1.2.1 From 4fe47538d317b7824538fa5e42a6981e475c3607 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 15 Jan 2013 16:00:12 -0500 Subject: Post-release version bump --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index f83b3b4b..fc39916b 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl the gi version number m4_define(gi_major_version, 1) m4_define(gi_minor_version, 35) -m4_define(gi_micro_version, 4) +m4_define(gi_micro_version, 5) m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version) AC_PREREQ([2.63]) -- cgit v1.2.1 From e602311ca686ee879b370213c69bb06f50c195b4 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 16 Jan 2013 18:06:35 +0100 Subject: Fix install location of Mallard templates http://git.gnome.org/browse/gobject-introspection/commit/?id=8b23c6c changed the lookup path of the g-ir-doc-tool templates at runtime, but did not change the install location of the templates. Install them into the expected place. https://bugzilla.gnome.org/show_bug.cgi?id=691873 --- Makefile-giscanner.am | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am index ef99904f..c43b5bdf 100644 --- a/Makefile-giscanner.am +++ b/Makefile-giscanner.am @@ -26,7 +26,7 @@ libgiscanner_la_CFLAGS = $(GOBJECT_CFLAGS) $(GIO_CFLAGS) # Python module pkgpyexecdir = $(pkglibdir)/giscanner pkgpyexec_LTLIBRARIES = _giscanner.la -pkgpyexec_PYTHON = \ +pkgpyexec_PYTHON = \ giscanner/__init__.py \ giscanner/annotationmain.py \ giscanner/annotationparser.py \ @@ -42,6 +42,18 @@ pkgpyexec_PYTHON = \ giscanner/libtoolimporter.py \ giscanner/odict.py \ giscanner/mallardwriter.py \ + giscanner/maintransformer.py \ + giscanner/message.py \ + giscanner/shlibs.py \ + giscanner/scannermain.py \ + giscanner/sourcescanner.py \ + giscanner/testcodegen.py \ + giscanner/transformer.py \ + giscanner/utils.py \ + giscanner/xmlwriter.py + +templatedir = $(pkglibdir) +nobase_template_DATA = \ giscanner/doctemplates/C/mallard-C-class.tmpl \ giscanner/doctemplates/C/mallard-C-default.tmpl \ giscanner/doctemplates/C/mallard-C-enum.tmpl \ @@ -59,16 +71,7 @@ pkgpyexec_PYTHON = \ giscanner/doctemplates/Python/mallard-Python-property.tmpl \ giscanner/doctemplates/Python/mallard-Python-record.tmpl \ giscanner/doctemplates/Python/mallard-Python-signal.tmpl \ - giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl \ - giscanner/maintransformer.py \ - giscanner/message.py \ - giscanner/shlibs.py \ - giscanner/scannermain.py \ - giscanner/sourcescanner.py \ - giscanner/testcodegen.py \ - giscanner/transformer.py \ - giscanner/utils.py \ - giscanner/xmlwriter.py + giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl _giscanner_la_CFLAGS = \ $(PYTHON_INCLUDES) \ -- cgit v1.2.1 From c66bd85d20de927fa220f770c15b3c312298f019 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20Sch=C3=B6nfeld?= Date: Sat, 19 Jan 2013 16:03:08 +0100 Subject: tests: Avoid handing out uninitialized memory gi_marshalling_tests_boxed_struct_out and gi_marshalling_tests_boxed_struct_inout allocated memory without completely initializing it. https://bugzilla.gnome.org/show_bug.cgi?id=692084 --- tests/gimarshallingtests.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index 21d31e00..7855dd71 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -3738,7 +3738,7 @@ gi_marshalling_tests_boxed_struct_out (GIMarshallingTestsBoxedStruct **struct_) static GIMarshallingTestsBoxedStruct *new_struct = NULL; if (new_struct == NULL) { - new_struct = g_new(GIMarshallingTestsBoxedStruct, 1); + new_struct = g_new0(GIMarshallingTestsBoxedStruct, 1); new_struct->long_ = 42; } @@ -3755,7 +3755,7 @@ gi_marshalling_tests_boxed_struct_inout (GIMarshallingTestsBoxedStruct **struct_ { g_assert_cmpint((*struct_)->long_, ==, 42); - (*struct_) = g_slice_new (GIMarshallingTestsBoxedStruct); + (*struct_) = g_slice_new0 (GIMarshallingTestsBoxedStruct); (*struct_)->long_ = 0; } -- cgit v1.2.1 From 8e8cc1a3966ae3afc395a2e9783657509d1903e8 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 21 Jan 2013 10:40:02 +0800 Subject: Visual C++ projects: Update .sln/README.txt line endings ...So that they will have Windows line endings. Specifically, this is something that affects how Windows detect the Visual Studio version from the .sln files, and the README.txt's should have Windows line endings. --- build/win32/vs10/README.txt | 172 +++++------ build/win32/vs10/gobject-introspection.sln | 412 ++++++++++++------------- build/win32/vs9/README.txt | 172 +++++------ build/win32/vs9/gobject-introspection.sln | 478 ++++++++++++++--------------- 4 files changed, 617 insertions(+), 617 deletions(-) diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt index a3d97061..5fe6192d 100644 --- a/build/win32/vs10/README.txt +++ b/build/win32/vs10/README.txt @@ -1,86 +1,86 @@ -Please do not compile this package (gobject-introspection) in paths that contain -spaces in them-as strange problems may occur during compilation or during -the use of the library. - -Please refer to the following GNOME Live! page for more detailed -instructions on building gobject-introsecption and its dependencies -with Visual C++: - -https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack - -This VS10 solution and the projects it includes are intented to be used -in a gobject-introspection source tree unpacked from a tarball. In a git checkout you -first need to use some Unix-like environment, which will do the work for you. - -The required dependencies are Python 2.6 or later, GLib and LibFFI. It is recommended -that GLib is built with Visual C++ 2010 to avoid problems cause by usage of different CRTs - -Please refer to the README.txt file in $(GLib_src_root)\build\win32\vs10 on how to build -GLib using Visual C++ 2010 - -For LibFFI, please get version 3.0.10 or later, as Visual C++ build support -was added in the 3.0.10 release series. Please see the README file that -comes with the LibFFI source package for more details on how to build LibFFI -on Visual C++-please note that the mozilla-build package from Mozilla is needed -in order to build LibFFI on Windows. - -For Python, retrieving the official Windows binaries for 2.6 or later from -http://www.python.org will do the job-be sure that the Python version that -you downloaded matches the configuration of your build (win32 or x64/amd64). - -For building the Regress test project, cairo (and possibly cairo-gobject support) -is needed. - -Set up the source tree as follows under some arbitrary top -folder : - -\ -\vs10\ - -*this* file you are now reading is thus located at -\\build\win32\vs10\README. - - is either Win32 or x64, as in VS10 project files. - -For LibFFI, one should also put the generated ffi.h and ffitarget.h -into \vs10\\include\ and the compiled static libffi.lib -(or copy libffi-convenience.lib into libffi.lib) into -\vs10\\lib\. - -The libintl.h that is used for building GLib needs to be in -\vs10\\include, if not already done so - -You will also need a working GCC/MinGW compiler installation -in order to generate the .gir and .typelib files. One may be -obtained from the mingw or the mingw64 project. - -A working pkg-config tool is also required-it may be obtained from -http://www.gtk.org/download/win32.php [32-bit] -http://www.gtk.org/download/win64.php [64-bit] - -*** Note! *** -Please note that due to numerous possible configurations on Python, some environmental -variables need to be set before launching the gobject-introsection.sln solution file. - -These variables are namely: -PYTHONDIR: Root installation folder of your Python interpretor. - It must match your build configuration (Win32 or x64/amd64) -PKG_CONFIG_PATH: Location of the .pc (pkg-config) files, especially for the GLib .pc files. -MINGWDIR: Root installation folder for your Windows GCC (such as MinGW). -*** End of Note! *** - -The "install" project will copy build results and headers into their -appropriate location under \vs10\. For instance, -built DLLs go into \vs10\\bin, built LIBs into -\vs10\\lib and gobject-introspection headers into -\vs10\\include\gobject-introsection-1.0. - -The generated .gir files will end up in \vs10\\share\gir-1.0 -and .typelib files will end up in \vs10\\lib\girepository-1.0 - -This is then from where -project files higher in the stack are supposed to look for them, not -from a specific gobject-introspection source tree. - ---Tor Lillqvist ---Updated by Chun-wei Fan +Please do not compile this package (gobject-introspection) in paths that contain +spaces in them-as strange problems may occur during compilation or during +the use of the library. + +Please refer to the following GNOME Live! page for more detailed +instructions on building gobject-introsecption and its dependencies +with Visual C++: + +https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack + +This VS10 solution and the projects it includes are intented to be used +in a gobject-introspection source tree unpacked from a tarball. In a git checkout you +first need to use some Unix-like environment, which will do the work for you. + +The required dependencies are Python 2.6 or later, GLib and LibFFI. It is recommended +that GLib is built with Visual C++ 2010 to avoid problems cause by usage of different CRTs + +Please refer to the README.txt file in $(GLib_src_root)\build\win32\vs10 on how to build +GLib using Visual C++ 2010 + +For LibFFI, please get version 3.0.10 or later, as Visual C++ build support +was added in the 3.0.10 release series. Please see the README file that +comes with the LibFFI source package for more details on how to build LibFFI +on Visual C++-please note that the mozilla-build package from Mozilla is needed +in order to build LibFFI on Windows. + +For Python, retrieving the official Windows binaries for 2.6 or later from +http://www.python.org will do the job-be sure that the Python version that +you downloaded matches the configuration of your build (win32 or x64/amd64). + +For building the Regress test project, cairo (and possibly cairo-gobject support) +is needed. + +Set up the source tree as follows under some arbitrary top +folder : + +\ +\vs10\ + +*this* file you are now reading is thus located at +\\build\win32\vs10\README. + + is either Win32 or x64, as in VS10 project files. + +For LibFFI, one should also put the generated ffi.h and ffitarget.h +into \vs10\\include\ and the compiled static libffi.lib +(or copy libffi-convenience.lib into libffi.lib) into +\vs10\\lib\. + +The libintl.h that is used for building GLib needs to be in +\vs10\\include, if not already done so + +You will also need a working GCC/MinGW compiler installation +in order to generate the .gir and .typelib files. One may be +obtained from the mingw or the mingw64 project. + +A working pkg-config tool is also required-it may be obtained from +http://www.gtk.org/download/win32.php [32-bit] +http://www.gtk.org/download/win64.php [64-bit] + +*** Note! *** +Please note that due to numerous possible configurations on Python, some environmental +variables need to be set before launching the gobject-introsection.sln solution file. + +These variables are namely: +PYTHONDIR: Root installation folder of your Python interpretor. + It must match your build configuration (Win32 or x64/amd64) +PKG_CONFIG_PATH: Location of the .pc (pkg-config) files, especially for the GLib .pc files. +MINGWDIR: Root installation folder for your Windows GCC (such as MinGW). +*** End of Note! *** + +The "install" project will copy build results and headers into their +appropriate location under \vs10\. For instance, +built DLLs go into \vs10\\bin, built LIBs into +\vs10\\lib and gobject-introspection headers into +\vs10\\include\gobject-introsection-1.0. + +The generated .gir files will end up in \vs10\\share\gir-1.0 +and .typelib files will end up in \vs10\\lib\girepository-1.0 + +This is then from where +project files higher in the stack are supposed to look for them, not +from a specific gobject-introspection source tree. + +--Tor Lillqvist +--Updated by Chun-wei Fan diff --git a/build/win32/vs10/gobject-introspection.sln b/build/win32/vs10/gobject-introspection.sln index 9088324e..916cbb8c 100644 --- a/build/win32/vs10/gobject-introspection.sln +++ b/build/win32/vs10/gobject-introspection.sln @@ -1,206 +1,206 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph", "cmph.vcxproj", "{442C007E-D901-41DA-9706-5DB4AFB4C06B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph-bdz-test", "cmph-bdz-test.vcxproj", "{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "girepository", "girepository.vcxproj", "{23E28245-8FC7-4B41-B1C5-8785BD4366A7}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_giscanner", "_giscanner.vcxproj", "{8311394F-9114-4C97-80F2-51BCABA054C9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-print", "glib-print.vcxproj", "{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-generate", "g-ir-generate.vcxproj", "{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-compiler", "g-ir-compiler.vcxproj", "{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gimarshallingtests", "gimarshallingtests.vcxproj", "{E2F8D205-0A53-4D40-9169-CE1EF2AAF203}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regress", "regress.vcxproj", "{0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utility", "utility.vcxproj", "{A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "annotation", "annotation.vcxproj", "{A70C7D31-0019-45D9-9537-BB1DB5F31886}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "foo", "foo.vcxproj", "{CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testinherit", "testinherit.vcxproj", "{3F2C9F08-7FB7-4465-BF24-84E083EC4913}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gettype", "gettype.vcxproj", "{F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkfrob", "gtkfrob.vcxproj", "{95C833D3-6EC2-493D-969A-6082E5495F66}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sletter", "sletter.vcxproj", "{86A35E44-E4C8-4628-87E9-942D136D72BC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "everything", "everything.vcxproj", "{2986281A-BD41-4BD1-8B43-25B7D7E7F234}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate_typelibs", "generate_typelibs.vcxproj", "{BE771349-F11E-42AE-A23F-DA083FDC6FB8}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.ActiveCfg = Debug|Win32 - {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.Build.0 = Debug|Win32 - {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.ActiveCfg = Debug|x64 - {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.Build.0 = Debug|x64 - {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.ActiveCfg = Release|Win32 - {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.Build.0 = Release|Win32 - {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.ActiveCfg = Release|x64 - {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.Build.0 = Release|x64 - {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.ActiveCfg = Debug|Win32 - {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.Build.0 = Debug|Win32 - {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.ActiveCfg = Debug|x64 - {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.Build.0 = Debug|x64 - {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.ActiveCfg = Release|Win32 - {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.Build.0 = Release|Win32 - {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.ActiveCfg = Release|x64 - {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.Build.0 = Release|x64 - {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.ActiveCfg = Debug|Win32 - {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.Build.0 = Debug|Win32 - {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.ActiveCfg = Debug|x64 - {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.Build.0 = Debug|x64 - {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.ActiveCfg = Release|Win32 - {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.Build.0 = Release|Win32 - {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.ActiveCfg = Release|x64 - {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.Build.0 = Release|x64 - {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.ActiveCfg = Debug|Win32 - {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.Build.0 = Debug|Win32 - {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.ActiveCfg = Debug|x64 - {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.Build.0 = Debug|x64 - {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.ActiveCfg = Release|Win32 - {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.Build.0 = Release|Win32 - {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.ActiveCfg = Release|x64 - {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.Build.0 = Release|x64 - {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.ActiveCfg = Debug|Win32 - {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.Build.0 = Debug|Win32 - {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.ActiveCfg = Debug|x64 - {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.Build.0 = Debug|x64 - {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.ActiveCfg = Release|Win32 - {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.Build.0 = Release|Win32 - {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.ActiveCfg = Release|x64 - {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.Build.0 = Release|x64 - {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.ActiveCfg = Debug|Win32 - {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.Build.0 = Debug|Win32 - {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.ActiveCfg = Debug|x64 - {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.Build.0 = Debug|x64 - {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.ActiveCfg = Release|Win32 - {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.Build.0 = Release|Win32 - {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.ActiveCfg = Release|x64 - {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.Build.0 = Release|x64 - {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.ActiveCfg = Debug|Win32 - {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.Build.0 = Debug|Win32 - {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.ActiveCfg = Debug|x64 - {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.Build.0 = Debug|x64 - {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.ActiveCfg = Release|Win32 - {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.Build.0 = Release|Win32 - {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.ActiveCfg = Release|x64 - {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.Build.0 = Release|x64 - {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|Win32.ActiveCfg = Debug|Win32 - {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|Win32.Build.0 = Debug|Win32 - {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|x64.ActiveCfg = Debug|x64 - {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|x64.Build.0 = Debug|x64 - {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|Win32.ActiveCfg = Release|Win32 - {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|Win32.Build.0 = Release|Win32 - {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|x64.ActiveCfg = Release|x64 - {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|x64.Build.0 = Release|x64 - {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|Win32.ActiveCfg = Debug|Win32 - {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|Win32.Build.0 = Debug|Win32 - {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|x64.ActiveCfg = Debug|x64 - {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|x64.Build.0 = Debug|x64 - {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|Win32.ActiveCfg = Release|Win32 - {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|Win32.Build.0 = Release|Win32 - {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|x64.ActiveCfg = Release|x64 - {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|x64.Build.0 = Release|x64 - {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|Win32.ActiveCfg = Debug|Win32 - {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|Win32.Build.0 = Debug|Win32 - {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|x64.ActiveCfg = Debug|x64 - {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|x64.Build.0 = Debug|x64 - {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|Win32.ActiveCfg = Release|Win32 - {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|Win32.Build.0 = Release|Win32 - {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|x64.ActiveCfg = Release|x64 - {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|x64.Build.0 = Release|x64 - {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|Win32.ActiveCfg = Debug|Win32 - {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|Win32.Build.0 = Debug|Win32 - {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|x64.ActiveCfg = Debug|x64 - {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|x64.Build.0 = Debug|x64 - {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|Win32.ActiveCfg = Release|Win32 - {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|Win32.Build.0 = Release|Win32 - {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|x64.ActiveCfg = Release|x64 - {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|x64.Build.0 = Release|x64 - {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|Win32.ActiveCfg = Debug|Win32 - {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|Win32.Build.0 = Debug|Win32 - {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|x64.ActiveCfg = Debug|x64 - {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|x64.Build.0 = Debug|x64 - {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|Win32.ActiveCfg = Release|Win32 - {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|Win32.Build.0 = Release|Win32 - {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|x64.ActiveCfg = Release|x64 - {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|x64.Build.0 = Release|x64 - {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|Win32.ActiveCfg = Debug|Win32 - {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|Win32.Build.0 = Debug|Win32 - {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|x64.ActiveCfg = Debug|x64 - {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|x64.Build.0 = Debug|x64 - {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|Win32.ActiveCfg = Release|Win32 - {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|Win32.Build.0 = Release|Win32 - {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|x64.ActiveCfg = Release|x64 - {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|x64.Build.0 = Release|x64 - {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|Win32.ActiveCfg = Debug|Win32 - {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|Win32.Build.0 = Debug|Win32 - {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|x64.ActiveCfg = Debug|x64 - {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|x64.Build.0 = Debug|x64 - {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|Win32.ActiveCfg = Release|Win32 - {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|Win32.Build.0 = Release|Win32 - {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|x64.ActiveCfg = Release|x64 - {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|x64.Build.0 = Release|x64 - {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|Win32.ActiveCfg = Debug|Win32 - {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|Win32.Build.0 = Debug|Win32 - {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|x64.ActiveCfg = Debug|x64 - {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|x64.Build.0 = Debug|x64 - {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|Win32.ActiveCfg = Release|Win32 - {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|Win32.Build.0 = Release|Win32 - {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|x64.ActiveCfg = Release|x64 - {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|x64.Build.0 = Release|x64 - {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|Win32.ActiveCfg = Debug|Win32 - {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|Win32.Build.0 = Debug|Win32 - {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|x64.ActiveCfg = Debug|x64 - {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|x64.Build.0 = Debug|x64 - {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|Win32.ActiveCfg = Release|Win32 - {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|Win32.Build.0 = Release|Win32 - {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|x64.ActiveCfg = Release|x64 - {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|x64.Build.0 = Release|x64 - {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|Win32.ActiveCfg = Debug|Win32 - {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|Win32.Build.0 = Debug|Win32 - {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|x64.ActiveCfg = Debug|x64 - {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|x64.Build.0 = Debug|x64 - {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|Win32.ActiveCfg = Release|Win32 - {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|Win32.Build.0 = Release|Win32 - {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|x64.ActiveCfg = Release|x64 - {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|x64.Build.0 = Release|x64 - {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|Win32.ActiveCfg = Debug|Win32 - {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|Win32.Build.0 = Debug|Win32 - {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|x64.ActiveCfg = Debug|x64 - {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|x64.Build.0 = Debug|x64 - {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|Win32.ActiveCfg = Release|Win32 - {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|Win32.Build.0 = Release|Win32 - {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|x64.ActiveCfg = Release|x64 - {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|x64.Build.0 = Release|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph", "cmph.vcxproj", "{442C007E-D901-41DA-9706-5DB4AFB4C06B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph-bdz-test", "cmph-bdz-test.vcxproj", "{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "girepository", "girepository.vcxproj", "{23E28245-8FC7-4B41-B1C5-8785BD4366A7}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_giscanner", "_giscanner.vcxproj", "{8311394F-9114-4C97-80F2-51BCABA054C9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-print", "glib-print.vcxproj", "{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-generate", "g-ir-generate.vcxproj", "{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-compiler", "g-ir-compiler.vcxproj", "{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gimarshallingtests", "gimarshallingtests.vcxproj", "{E2F8D205-0A53-4D40-9169-CE1EF2AAF203}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regress", "regress.vcxproj", "{0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utility", "utility.vcxproj", "{A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "annotation", "annotation.vcxproj", "{A70C7D31-0019-45D9-9537-BB1DB5F31886}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "foo", "foo.vcxproj", "{CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testinherit", "testinherit.vcxproj", "{3F2C9F08-7FB7-4465-BF24-84E083EC4913}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gettype", "gettype.vcxproj", "{F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkfrob", "gtkfrob.vcxproj", "{95C833D3-6EC2-493D-969A-6082E5495F66}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sletter", "sletter.vcxproj", "{86A35E44-E4C8-4628-87E9-942D136D72BC}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "everything", "everything.vcxproj", "{2986281A-BD41-4BD1-8B43-25B7D7E7F234}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate_typelibs", "generate_typelibs.vcxproj", "{BE771349-F11E-42AE-A23F-DA083FDC6FB8}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcxproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.ActiveCfg = Debug|Win32 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.Build.0 = Debug|Win32 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.ActiveCfg = Debug|x64 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.Build.0 = Debug|x64 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.ActiveCfg = Release|Win32 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.Build.0 = Release|Win32 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.ActiveCfg = Release|x64 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.Build.0 = Release|x64 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.ActiveCfg = Debug|Win32 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.Build.0 = Debug|Win32 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.ActiveCfg = Debug|x64 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.Build.0 = Debug|x64 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.ActiveCfg = Release|Win32 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.Build.0 = Release|Win32 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.ActiveCfg = Release|x64 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.Build.0 = Release|x64 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.ActiveCfg = Debug|Win32 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.Build.0 = Debug|Win32 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.ActiveCfg = Debug|x64 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.Build.0 = Debug|x64 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.ActiveCfg = Release|Win32 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.Build.0 = Release|Win32 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.ActiveCfg = Release|x64 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.Build.0 = Release|x64 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.ActiveCfg = Debug|Win32 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.Build.0 = Debug|Win32 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.ActiveCfg = Debug|x64 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.Build.0 = Debug|x64 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.ActiveCfg = Release|Win32 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.Build.0 = Release|Win32 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.ActiveCfg = Release|x64 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.Build.0 = Release|x64 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.ActiveCfg = Debug|Win32 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.Build.0 = Debug|Win32 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.ActiveCfg = Debug|x64 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.Build.0 = Debug|x64 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.ActiveCfg = Release|Win32 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.Build.0 = Release|Win32 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.ActiveCfg = Release|x64 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.Build.0 = Release|x64 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.ActiveCfg = Debug|Win32 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.Build.0 = Debug|Win32 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.ActiveCfg = Debug|x64 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.Build.0 = Debug|x64 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.ActiveCfg = Release|Win32 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.Build.0 = Release|Win32 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.ActiveCfg = Release|x64 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.Build.0 = Release|x64 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.ActiveCfg = Debug|Win32 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.Build.0 = Debug|Win32 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.ActiveCfg = Debug|x64 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.Build.0 = Debug|x64 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.ActiveCfg = Release|Win32 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.Build.0 = Release|Win32 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.ActiveCfg = Release|x64 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.Build.0 = Release|x64 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|Win32.ActiveCfg = Debug|Win32 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|Win32.Build.0 = Debug|Win32 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|x64.ActiveCfg = Debug|x64 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|x64.Build.0 = Debug|x64 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|Win32.ActiveCfg = Release|Win32 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|Win32.Build.0 = Release|Win32 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|x64.ActiveCfg = Release|x64 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|x64.Build.0 = Release|x64 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|Win32.ActiveCfg = Debug|Win32 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|Win32.Build.0 = Debug|Win32 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|x64.ActiveCfg = Debug|x64 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|x64.Build.0 = Debug|x64 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|Win32.ActiveCfg = Release|Win32 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|Win32.Build.0 = Release|Win32 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|x64.ActiveCfg = Release|x64 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|x64.Build.0 = Release|x64 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|Win32.Build.0 = Debug|Win32 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|x64.ActiveCfg = Debug|x64 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|x64.Build.0 = Debug|x64 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|Win32.ActiveCfg = Release|Win32 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|Win32.Build.0 = Release|Win32 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|x64.ActiveCfg = Release|x64 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|x64.Build.0 = Release|x64 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|Win32.ActiveCfg = Debug|Win32 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|Win32.Build.0 = Debug|Win32 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|x64.ActiveCfg = Debug|x64 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|x64.Build.0 = Debug|x64 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|Win32.ActiveCfg = Release|Win32 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|Win32.Build.0 = Release|Win32 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|x64.ActiveCfg = Release|x64 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|x64.Build.0 = Release|x64 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|Win32.ActiveCfg = Debug|Win32 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|Win32.Build.0 = Debug|Win32 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|x64.ActiveCfg = Debug|x64 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|x64.Build.0 = Debug|x64 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|Win32.ActiveCfg = Release|Win32 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|Win32.Build.0 = Release|Win32 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|x64.ActiveCfg = Release|x64 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|x64.Build.0 = Release|x64 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|Win32.ActiveCfg = Debug|Win32 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|Win32.Build.0 = Debug|Win32 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|x64.ActiveCfg = Debug|x64 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|x64.Build.0 = Debug|x64 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|Win32.ActiveCfg = Release|Win32 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|Win32.Build.0 = Release|Win32 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|x64.ActiveCfg = Release|x64 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|x64.Build.0 = Release|x64 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|Win32.ActiveCfg = Debug|Win32 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|Win32.Build.0 = Debug|Win32 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|x64.ActiveCfg = Debug|x64 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|x64.Build.0 = Debug|x64 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|Win32.ActiveCfg = Release|Win32 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|Win32.Build.0 = Release|Win32 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|x64.ActiveCfg = Release|x64 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|x64.Build.0 = Release|x64 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|Win32.ActiveCfg = Debug|Win32 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|Win32.Build.0 = Debug|Win32 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|x64.ActiveCfg = Debug|x64 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|x64.Build.0 = Debug|x64 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|Win32.ActiveCfg = Release|Win32 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|Win32.Build.0 = Release|Win32 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|x64.ActiveCfg = Release|x64 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|x64.Build.0 = Release|x64 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|Win32.ActiveCfg = Debug|Win32 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|Win32.Build.0 = Debug|Win32 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|x64.ActiveCfg = Debug|x64 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|x64.Build.0 = Debug|x64 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|Win32.ActiveCfg = Release|Win32 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|Win32.Build.0 = Release|Win32 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|x64.ActiveCfg = Release|x64 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|x64.Build.0 = Release|x64 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|Win32.ActiveCfg = Debug|Win32 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|Win32.Build.0 = Debug|Win32 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|x64.ActiveCfg = Debug|x64 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|x64.Build.0 = Debug|x64 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|Win32.ActiveCfg = Release|Win32 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|Win32.Build.0 = Release|Win32 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|x64.ActiveCfg = Release|x64 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|x64.Build.0 = Release|x64 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|Win32.ActiveCfg = Debug|Win32 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|Win32.Build.0 = Debug|Win32 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|x64.ActiveCfg = Debug|x64 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|x64.Build.0 = Debug|x64 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|Win32.ActiveCfg = Release|Win32 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|Win32.Build.0 = Release|Win32 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|x64.ActiveCfg = Release|x64 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|x64.Build.0 = Release|x64 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt index 6872a236..bb9fca65 100644 --- a/build/win32/vs9/README.txt +++ b/build/win32/vs9/README.txt @@ -1,86 +1,86 @@ -Please do not compile this package (gobject-introspection) in paths that contain -spaces in them-as strange problems may occur during compilation or during -the use of the library. - -Please refer to the following GNOME Live! page for more detailed -instructions on building gobject-introsecption and its dependencies -with Visual C++: - -https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack - -This VS9 solution and the projects it includes are intented to be used -in a gobject-introspection source tree unpacked from a tarball. In a git checkout you -first need to use some Unix-like environment, which will do the work for you. - -The required dependencies are Python 2.6 or later, GLib and LibFFI. It is recommended -that GLib is built with Visual C++ 2008 to avoid problems cause by usage of different CRTs - -Please refer to the README.txt file in $(GLib_src_root)\build\win32\vs9 on how to build -GLib using Visual C++ 2008 - -For LibFFI, please get version 3.0.10 or later, as Visual C++ build support -was added in the 3.0.10 release series. Please see the README file that -comes with the LibFFI source package for more details on how to build LibFFI -on Visual C++-please note that the mozilla-build package from Mozilla is needed -in order to build LibFFI on Windows. - -For Python, retrieving the official Windows binaries for 2.6 or later from -http://www.python.org will do the job-be sure that the Python version that -you downloaded matches the configuration of your build (win32 or x64/amd64). - -For building the Regress test project, cairo (and possibly cairo-gobject support) -is needed. - -Set up the source tree as follows under some arbitrary top -folder : - -\ -\vs9\ - -*this* file you are now reading is thus located at -\\build\win32\vs9\README. - - is either Win32 or x64, as in VS9 project files. - -For LibFFI, one should also put the generated ffi.h and ffitarget.h -into \vs9\\include\ and the compiled static libffi.lib -(or copy libffi-convenience.lib into libffi.lib) into -\vs9\\lib\. - -The libintl.h that is used for building GLib needs to be in -\vs9\\include, if not already done so - -You will also need a working GCC/MinGW compiler installation -in order to generate the .gir and .typelib files. One may be -obtained from the mingw or the mingw64 project. - -A working pkg-config tool is also required-it may be obtained from -http://www.gtk.org/download/win32.php [32-bit] -http://www.gtk.org/download/win64.php [64-bit] - -*** Note! *** -Please note that due to numerous possible configurations on Python, some environmental -variables need to be set before launching the gobject-introsection.sln solution file. - -These variables are namely: -PYTHONDIR: Root installation folder of your Python interpretor. - It must match your build configuration (Win32 or x64/amd64) -PKG_CONFIG_PATH: Location of the .pc (pkg-config) files, especially for the GLib .pc files. -MINGWDIR: Root installation folder for your Windows GCC (such as MinGW). -*** End of Note! *** - -The "install" project will copy build results and headers into their -appropriate location under \vs9\. For instance, -built DLLs go into \vs9\\bin, built LIBs into -\vs9\\lib and gobject-introspection headers into -\vs9\\include\gobject-introsection-1.0. - -The generated .gir files will end up in \vs9\\share\gir-1.0 -and .typelib files will end up in \vs9\\lib\girepository-1.0 - -This is then from where -project files higher in the stack are supposed to look for them, not -from a specific gobject-introspection source tree. - ---Tor Lillqvist ---Updated by Chun-wei Fan +Please do not compile this package (gobject-introspection) in paths that contain +spaces in them-as strange problems may occur during compilation or during +the use of the library. + +Please refer to the following GNOME Live! page for more detailed +instructions on building gobject-introsecption and its dependencies +with Visual C++: + +https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack + +This VS9 solution and the projects it includes are intented to be used +in a gobject-introspection source tree unpacked from a tarball. In a git checkout you +first need to use some Unix-like environment, which will do the work for you. + +The required dependencies are Python 2.6 or later, GLib and LibFFI. It is recommended +that GLib is built with Visual C++ 2008 to avoid problems cause by usage of different CRTs + +Please refer to the README.txt file in $(GLib_src_root)\build\win32\vs9 on how to build +GLib using Visual C++ 2008 + +For LibFFI, please get version 3.0.10 or later, as Visual C++ build support +was added in the 3.0.10 release series. Please see the README file that +comes with the LibFFI source package for more details on how to build LibFFI +on Visual C++-please note that the mozilla-build package from Mozilla is needed +in order to build LibFFI on Windows. + +For Python, retrieving the official Windows binaries for 2.6 or later from +http://www.python.org will do the job-be sure that the Python version that +you downloaded matches the configuration of your build (win32 or x64/amd64). + +For building the Regress test project, cairo (and possibly cairo-gobject support) +is needed. + +Set up the source tree as follows under some arbitrary top +folder : + +\ +\vs9\ + +*this* file you are now reading is thus located at +\\build\win32\vs9\README. + + is either Win32 or x64, as in VS9 project files. + +For LibFFI, one should also put the generated ffi.h and ffitarget.h +into \vs9\\include\ and the compiled static libffi.lib +(or copy libffi-convenience.lib into libffi.lib) into +\vs9\\lib\. + +The libintl.h that is used for building GLib needs to be in +\vs9\\include, if not already done so + +You will also need a working GCC/MinGW compiler installation +in order to generate the .gir and .typelib files. One may be +obtained from the mingw or the mingw64 project. + +A working pkg-config tool is also required-it may be obtained from +http://www.gtk.org/download/win32.php [32-bit] +http://www.gtk.org/download/win64.php [64-bit] + +*** Note! *** +Please note that due to numerous possible configurations on Python, some environmental +variables need to be set before launching the gobject-introsection.sln solution file. + +These variables are namely: +PYTHONDIR: Root installation folder of your Python interpretor. + It must match your build configuration (Win32 or x64/amd64) +PKG_CONFIG_PATH: Location of the .pc (pkg-config) files, especially for the GLib .pc files. +MINGWDIR: Root installation folder for your Windows GCC (such as MinGW). +*** End of Note! *** + +The "install" project will copy build results and headers into their +appropriate location under \vs9\. For instance, +built DLLs go into \vs9\\bin, built LIBs into +\vs9\\lib and gobject-introspection headers into +\vs9\\include\gobject-introsection-1.0. + +The generated .gir files will end up in \vs9\\share\gir-1.0 +and .typelib files will end up in \vs9\\lib\girepository-1.0 + +This is then from where +project files higher in the stack are supposed to look for them, not +from a specific gobject-introspection source tree. + +--Tor Lillqvist +--Updated by Chun-wei Fan diff --git a/build/win32/vs9/gobject-introspection.sln b/build/win32/vs9/gobject-introspection.sln index 7f129c47..68eaf25c 100644 --- a/build/win32/vs9/gobject-introspection.sln +++ b/build/win32/vs9/gobject-introspection.sln @@ -1,239 +1,239 @@ - -Microsoft Visual Studio Solution File, Format Version 10.00 -# Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph", "cmph.vcproj", "{442C007E-D901-41DA-9706-5DB4AFB4C06B}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph-bdz-test", "cmph-bdz-test.vcproj", "{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}" - ProjectSection(ProjectDependencies) = postProject - {442C007E-D901-41DA-9706-5DB4AFB4C06B} = {442C007E-D901-41DA-9706-5DB4AFB4C06B} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "girepository", "girepository.vcproj", "{23E28245-8FC7-4B41-B1C5-8785BD4366A7}" - ProjectSection(ProjectDependencies) = postProject - {442C007E-D901-41DA-9706-5DB4AFB4C06B} = {442C007E-D901-41DA-9706-5DB4AFB4C06B} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_giscanner", "_giscanner.vcproj", "{8311394F-9114-4C97-80F2-51BCABA054C9}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-print", "glib-print.vcproj", "{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}" - ProjectSection(ProjectDependencies) = postProject - {23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-generate", "g-ir-generate.vcproj", "{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}" - ProjectSection(ProjectDependencies) = postProject - {23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-compiler", "g-ir-compiler.vcproj", "{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}" - ProjectSection(ProjectDependencies) = postProject - {23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7} - {442C007E-D901-41DA-9706-5DB4AFB4C06B} = {442C007E-D901-41DA-9706-5DB4AFB4C06B} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gimarshallingtests", "gimarshallingtests.vcproj", "{E2F8D205-0A53-4D40-9169-CE1EF2AAF203}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regress", "regress.vcproj", "{0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utility", "utility.vcproj", "{A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "annotation", "annotation.vcproj", "{A70C7D31-0019-45D9-9537-BB1DB5F31886}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "foo", "foo.vcproj", "{CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}" - ProjectSection(ProjectDependencies) = postProject - {23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testinherit", "testinherit.vcproj", "{3F2C9F08-7FB7-4465-BF24-84E083EC4913}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gettype", "gettype.vcproj", "{F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkfrob", "gtkfrob.vcproj", "{95C833D3-6EC2-493D-969A-6082E5495F66}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sletter", "sletter.vcproj", "{86A35E44-E4C8-4628-87E9-942D136D72BC}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "everything", "everything.vcproj", "{2986281A-BD41-4BD1-8B43-25B7D7E7F234}" - ProjectSection(ProjectDependencies) = postProject - {8311394F-9114-4C97-80F2-51BCABA054C9} = {8311394F-9114-4C97-80F2-51BCABA054C9} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate_typelibs", "generate_typelibs.vcproj", "{BE771349-F11E-42AE-A23F-DA083FDC6FB8}" - ProjectSection(ProjectDependencies) = postProject - {8311394F-9114-4C97-80F2-51BCABA054C9} = {8311394F-9114-4C97-80F2-51BCABA054C9} - {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774} = {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}" - ProjectSection(ProjectDependencies) = postProject - {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3} = {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3} - {23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7} - {BE771349-F11E-42AE-A23F-DA083FDC6FB8} = {BE771349-F11E-42AE-A23F-DA083FDC6FB8} - {8311394F-9114-4C97-80F2-51BCABA054C9} = {8311394F-9114-4C97-80F2-51BCABA054C9} - {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774} = {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774} - EndProjectSection -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.ActiveCfg = Debug|Win32 - {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.Build.0 = Debug|Win32 - {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.ActiveCfg = Debug|x64 - {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.Build.0 = Debug|x64 - {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.ActiveCfg = Release|Win32 - {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.Build.0 = Release|Win32 - {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.ActiveCfg = Release|x64 - {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.Build.0 = Release|x64 - {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.ActiveCfg = Debug|Win32 - {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.Build.0 = Debug|Win32 - {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.ActiveCfg = Debug|x64 - {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.Build.0 = Debug|x64 - {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.ActiveCfg = Release|Win32 - {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.Build.0 = Release|Win32 - {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.ActiveCfg = Release|x64 - {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.Build.0 = Release|x64 - {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.ActiveCfg = Debug|Win32 - {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.Build.0 = Debug|Win32 - {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.ActiveCfg = Debug|x64 - {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.Build.0 = Debug|x64 - {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.ActiveCfg = Release|Win32 - {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.Build.0 = Release|Win32 - {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.ActiveCfg = Release|x64 - {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.Build.0 = Release|x64 - {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.ActiveCfg = Debug|Win32 - {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.Build.0 = Debug|Win32 - {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.ActiveCfg = Debug|x64 - {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.Build.0 = Debug|x64 - {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.ActiveCfg = Release|Win32 - {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.Build.0 = Release|Win32 - {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.ActiveCfg = Release|x64 - {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.Build.0 = Release|x64 - {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.ActiveCfg = Debug|Win32 - {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.Build.0 = Debug|Win32 - {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.ActiveCfg = Debug|x64 - {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.Build.0 = Debug|x64 - {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.ActiveCfg = Release|Win32 - {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.Build.0 = Release|Win32 - {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.ActiveCfg = Release|x64 - {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.Build.0 = Release|x64 - {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.ActiveCfg = Debug|Win32 - {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.Build.0 = Debug|Win32 - {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.ActiveCfg = Debug|x64 - {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.Build.0 = Debug|x64 - {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.ActiveCfg = Release|Win32 - {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.Build.0 = Release|Win32 - {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.ActiveCfg = Release|x64 - {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.Build.0 = Release|x64 - {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.ActiveCfg = Debug|Win32 - {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.Build.0 = Debug|Win32 - {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.ActiveCfg = Debug|x64 - {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.Build.0 = Debug|x64 - {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.ActiveCfg = Release|Win32 - {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.Build.0 = Release|Win32 - {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.ActiveCfg = Release|x64 - {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.Build.0 = Release|x64 - {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|Win32.ActiveCfg = Debug|Win32 - {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|Win32.Build.0 = Debug|Win32 - {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|x64.ActiveCfg = Debug|x64 - {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|x64.Build.0 = Debug|x64 - {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|Win32.ActiveCfg = Release|Win32 - {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|Win32.Build.0 = Release|Win32 - {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|x64.ActiveCfg = Release|x64 - {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|x64.Build.0 = Release|x64 - {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|Win32.ActiveCfg = Debug|Win32 - {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|Win32.Build.0 = Debug|Win32 - {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|x64.ActiveCfg = Debug|x64 - {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|x64.Build.0 = Debug|x64 - {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|Win32.ActiveCfg = Release|Win32 - {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|Win32.Build.0 = Release|Win32 - {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|x64.ActiveCfg = Release|x64 - {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|x64.Build.0 = Release|x64 - {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|Win32.ActiveCfg = Debug|Win32 - {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|Win32.Build.0 = Debug|Win32 - {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|x64.ActiveCfg = Debug|x64 - {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|x64.Build.0 = Debug|x64 - {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|Win32.ActiveCfg = Release|Win32 - {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|Win32.Build.0 = Release|Win32 - {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|x64.ActiveCfg = Release|x64 - {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|x64.Build.0 = Release|x64 - {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|Win32.ActiveCfg = Debug|Win32 - {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|Win32.Build.0 = Debug|Win32 - {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|x64.ActiveCfg = Debug|x64 - {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|x64.Build.0 = Debug|x64 - {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|Win32.ActiveCfg = Release|Win32 - {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|Win32.Build.0 = Release|Win32 - {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|x64.ActiveCfg = Release|x64 - {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|x64.Build.0 = Release|x64 - {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|Win32.ActiveCfg = Debug|Win32 - {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|Win32.Build.0 = Debug|Win32 - {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|x64.ActiveCfg = Debug|x64 - {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|x64.Build.0 = Debug|x64 - {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|Win32.ActiveCfg = Release|Win32 - {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|Win32.Build.0 = Release|Win32 - {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|x64.ActiveCfg = Release|x64 - {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|x64.Build.0 = Release|x64 - {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|Win32.ActiveCfg = Debug|Win32 - {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|Win32.Build.0 = Debug|Win32 - {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|x64.ActiveCfg = Debug|x64 - {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|x64.Build.0 = Debug|x64 - {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|Win32.ActiveCfg = Release|Win32 - {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|Win32.Build.0 = Release|Win32 - {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|x64.ActiveCfg = Release|x64 - {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|x64.Build.0 = Release|x64 - {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|Win32.ActiveCfg = Debug|Win32 - {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|Win32.Build.0 = Debug|Win32 - {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|x64.ActiveCfg = Debug|x64 - {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|x64.Build.0 = Debug|x64 - {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|Win32.ActiveCfg = Release|Win32 - {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|Win32.Build.0 = Release|Win32 - {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|x64.ActiveCfg = Release|x64 - {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|x64.Build.0 = Release|x64 - {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|Win32.ActiveCfg = Debug|Win32 - {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|Win32.Build.0 = Debug|Win32 - {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|x64.ActiveCfg = Debug|x64 - {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|x64.Build.0 = Debug|x64 - {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|Win32.ActiveCfg = Release|Win32 - {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|Win32.Build.0 = Release|Win32 - {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|x64.ActiveCfg = Release|x64 - {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|x64.Build.0 = Release|x64 - {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|Win32.ActiveCfg = Debug|Win32 - {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|Win32.Build.0 = Debug|Win32 - {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|x64.ActiveCfg = Debug|x64 - {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|x64.Build.0 = Debug|x64 - {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|Win32.ActiveCfg = Release|Win32 - {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|Win32.Build.0 = Release|Win32 - {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|x64.ActiveCfg = Release|x64 - {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|x64.Build.0 = Release|x64 - {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|Win32.ActiveCfg = Debug|Win32 - {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|Win32.Build.0 = Debug|Win32 - {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|x64.ActiveCfg = Debug|x64 - {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|x64.Build.0 = Debug|x64 - {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|Win32.ActiveCfg = Release|Win32 - {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|Win32.Build.0 = Release|Win32 - {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|x64.ActiveCfg = Release|x64 - {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|x64.Build.0 = Release|x64 - {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|Win32.ActiveCfg = Debug|Win32 - {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|Win32.Build.0 = Debug|Win32 - {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|x64.ActiveCfg = Debug|x64 - {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|x64.Build.0 = Debug|x64 - {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|Win32.ActiveCfg = Release|Win32 - {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|Win32.Build.0 = Release|Win32 - {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|x64.ActiveCfg = Release|x64 - {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|x64.Build.0 = Release|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64 - {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 10.00 +# Visual Studio 2008 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph", "cmph.vcproj", "{442C007E-D901-41DA-9706-5DB4AFB4C06B}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cmph-bdz-test", "cmph-bdz-test.vcproj", "{E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}" + ProjectSection(ProjectDependencies) = postProject + {442C007E-D901-41DA-9706-5DB4AFB4C06B} = {442C007E-D901-41DA-9706-5DB4AFB4C06B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "girepository", "girepository.vcproj", "{23E28245-8FC7-4B41-B1C5-8785BD4366A7}" + ProjectSection(ProjectDependencies) = postProject + {442C007E-D901-41DA-9706-5DB4AFB4C06B} = {442C007E-D901-41DA-9706-5DB4AFB4C06B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "_giscanner", "_giscanner.vcproj", "{8311394F-9114-4C97-80F2-51BCABA054C9}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib-print", "glib-print.vcproj", "{2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}" + ProjectSection(ProjectDependencies) = postProject + {23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-generate", "g-ir-generate.vcproj", "{F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}" + ProjectSection(ProjectDependencies) = postProject + {23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "g-ir-compiler", "g-ir-compiler.vcproj", "{5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}" + ProjectSection(ProjectDependencies) = postProject + {23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7} + {442C007E-D901-41DA-9706-5DB4AFB4C06B} = {442C007E-D901-41DA-9706-5DB4AFB4C06B} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gimarshallingtests", "gimarshallingtests.vcproj", "{E2F8D205-0A53-4D40-9169-CE1EF2AAF203}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "regress", "regress.vcproj", "{0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utility", "utility.vcproj", "{A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "annotation", "annotation.vcproj", "{A70C7D31-0019-45D9-9537-BB1DB5F31886}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "foo", "foo.vcproj", "{CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}" + ProjectSection(ProjectDependencies) = postProject + {23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testinherit", "testinherit.vcproj", "{3F2C9F08-7FB7-4465-BF24-84E083EC4913}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gettype", "gettype.vcproj", "{F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtkfrob", "gtkfrob.vcproj", "{95C833D3-6EC2-493D-969A-6082E5495F66}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sletter", "sletter.vcproj", "{86A35E44-E4C8-4628-87E9-942D136D72BC}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "everything", "everything.vcproj", "{2986281A-BD41-4BD1-8B43-25B7D7E7F234}" + ProjectSection(ProjectDependencies) = postProject + {8311394F-9114-4C97-80F2-51BCABA054C9} = {8311394F-9114-4C97-80F2-51BCABA054C9} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "generate_typelibs", "generate_typelibs.vcproj", "{BE771349-F11E-42AE-A23F-DA083FDC6FB8}" + ProjectSection(ProjectDependencies) = postProject + {8311394F-9114-4C97-80F2-51BCABA054C9} = {8311394F-9114-4C97-80F2-51BCABA054C9} + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774} = {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774} + EndProjectSection +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install", "install.vcproj", "{2093D218-190E-4194-9421-3BA7CBF33B10}" + ProjectSection(ProjectDependencies) = postProject + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3} = {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3} + {23E28245-8FC7-4B41-B1C5-8785BD4366A7} = {23E28245-8FC7-4B41-B1C5-8785BD4366A7} + {BE771349-F11E-42AE-A23F-DA083FDC6FB8} = {BE771349-F11E-42AE-A23F-DA083FDC6FB8} + {8311394F-9114-4C97-80F2-51BCABA054C9} = {8311394F-9114-4C97-80F2-51BCABA054C9} + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774} = {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774} + EndProjectSection +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.ActiveCfg = Debug|Win32 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|Win32.Build.0 = Debug|Win32 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.ActiveCfg = Debug|x64 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Debug|x64.Build.0 = Debug|x64 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.ActiveCfg = Release|Win32 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|Win32.Build.0 = Release|Win32 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.ActiveCfg = Release|x64 + {442C007E-D901-41DA-9706-5DB4AFB4C06B}.Release|x64.Build.0 = Release|x64 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.ActiveCfg = Debug|Win32 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|Win32.Build.0 = Debug|Win32 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.ActiveCfg = Debug|x64 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Debug|x64.Build.0 = Debug|x64 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.ActiveCfg = Release|Win32 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|Win32.Build.0 = Release|Win32 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.ActiveCfg = Release|x64 + {E41F378B-CCDD-4B1C-89C3-6D2C950FAF1A}.Release|x64.Build.0 = Release|x64 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.ActiveCfg = Debug|Win32 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|Win32.Build.0 = Debug|Win32 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.ActiveCfg = Debug|x64 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Debug|x64.Build.0 = Debug|x64 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.ActiveCfg = Release|Win32 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|Win32.Build.0 = Release|Win32 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.ActiveCfg = Release|x64 + {23E28245-8FC7-4B41-B1C5-8785BD4366A7}.Release|x64.Build.0 = Release|x64 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.ActiveCfg = Debug|Win32 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|Win32.Build.0 = Debug|Win32 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.ActiveCfg = Debug|x64 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Debug|x64.Build.0 = Debug|x64 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.ActiveCfg = Release|Win32 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|Win32.Build.0 = Release|Win32 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.ActiveCfg = Release|x64 + {8311394F-9114-4C97-80F2-51BCABA054C9}.Release|x64.Build.0 = Release|x64 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.ActiveCfg = Debug|Win32 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|Win32.Build.0 = Debug|Win32 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.ActiveCfg = Debug|x64 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Debug|x64.Build.0 = Debug|x64 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.ActiveCfg = Release|Win32 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|Win32.Build.0 = Release|Win32 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.ActiveCfg = Release|x64 + {2CCD6E09-08E7-44B9-92E6-42F0A5DBBC8B}.Release|x64.Build.0 = Release|x64 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.ActiveCfg = Debug|Win32 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|Win32.Build.0 = Debug|Win32 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.ActiveCfg = Debug|x64 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Debug|x64.Build.0 = Debug|x64 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.ActiveCfg = Release|Win32 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|Win32.Build.0 = Release|Win32 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.ActiveCfg = Release|x64 + {F4E6621F-A7DD-4863-8CCF-BA04DFC601E3}.Release|x64.Build.0 = Release|x64 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.ActiveCfg = Debug|Win32 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|Win32.Build.0 = Debug|Win32 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.ActiveCfg = Debug|x64 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Debug|x64.Build.0 = Debug|x64 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.ActiveCfg = Release|Win32 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|Win32.Build.0 = Release|Win32 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.ActiveCfg = Release|x64 + {5DCB55CE-F32C-4C77-8BF4-B4DAD3EC7774}.Release|x64.Build.0 = Release|x64 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|Win32.ActiveCfg = Debug|Win32 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|Win32.Build.0 = Debug|Win32 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|x64.ActiveCfg = Debug|x64 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Debug|x64.Build.0 = Debug|x64 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|Win32.ActiveCfg = Release|Win32 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|Win32.Build.0 = Release|Win32 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|x64.ActiveCfg = Release|x64 + {E2F8D205-0A53-4D40-9169-CE1EF2AAF203}.Release|x64.Build.0 = Release|x64 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|Win32.ActiveCfg = Debug|Win32 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|Win32.Build.0 = Debug|Win32 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|x64.ActiveCfg = Debug|x64 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Debug|x64.Build.0 = Debug|x64 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|Win32.ActiveCfg = Release|Win32 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|Win32.Build.0 = Release|Win32 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|x64.ActiveCfg = Release|x64 + {0A4F3C2B-DEF6-4EEF-A9E7-60E975722B60}.Release|x64.Build.0 = Release|x64 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|Win32.ActiveCfg = Debug|Win32 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|Win32.Build.0 = Debug|Win32 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|x64.ActiveCfg = Debug|x64 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Debug|x64.Build.0 = Debug|x64 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|Win32.ActiveCfg = Release|Win32 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|Win32.Build.0 = Release|Win32 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|x64.ActiveCfg = Release|x64 + {A1F07FDB-20BB-441E-A4D5-6C2CD3D69214}.Release|x64.Build.0 = Release|x64 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|Win32.ActiveCfg = Debug|Win32 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|Win32.Build.0 = Debug|Win32 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|x64.ActiveCfg = Debug|x64 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Debug|x64.Build.0 = Debug|x64 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|Win32.ActiveCfg = Release|Win32 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|Win32.Build.0 = Release|Win32 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|x64.ActiveCfg = Release|x64 + {A70C7D31-0019-45D9-9537-BB1DB5F31886}.Release|x64.Build.0 = Release|x64 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|Win32.ActiveCfg = Debug|Win32 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|Win32.Build.0 = Debug|Win32 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|x64.ActiveCfg = Debug|x64 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Debug|x64.Build.0 = Debug|x64 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|Win32.ActiveCfg = Release|Win32 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|Win32.Build.0 = Release|Win32 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|x64.ActiveCfg = Release|x64 + {CD6291E9-2FFA-4D71-94EB-6D1EDD52F1D1}.Release|x64.Build.0 = Release|x64 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|Win32.ActiveCfg = Debug|Win32 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|Win32.Build.0 = Debug|Win32 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|x64.ActiveCfg = Debug|x64 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Debug|x64.Build.0 = Debug|x64 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|Win32.ActiveCfg = Release|Win32 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|Win32.Build.0 = Release|Win32 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|x64.ActiveCfg = Release|x64 + {3F2C9F08-7FB7-4465-BF24-84E083EC4913}.Release|x64.Build.0 = Release|x64 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|Win32.ActiveCfg = Debug|Win32 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|Win32.Build.0 = Debug|Win32 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|x64.ActiveCfg = Debug|x64 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Debug|x64.Build.0 = Debug|x64 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|Win32.ActiveCfg = Release|Win32 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|Win32.Build.0 = Release|Win32 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|x64.ActiveCfg = Release|x64 + {F7DCF92C-A570-4E0B-A357-2FF90E5FF1BA}.Release|x64.Build.0 = Release|x64 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|Win32.ActiveCfg = Debug|Win32 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|Win32.Build.0 = Debug|Win32 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|x64.ActiveCfg = Debug|x64 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Debug|x64.Build.0 = Debug|x64 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|Win32.ActiveCfg = Release|Win32 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|Win32.Build.0 = Release|Win32 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|x64.ActiveCfg = Release|x64 + {95C833D3-6EC2-493D-969A-6082E5495F66}.Release|x64.Build.0 = Release|x64 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|Win32.ActiveCfg = Debug|Win32 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|Win32.Build.0 = Debug|Win32 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|x64.ActiveCfg = Debug|x64 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Debug|x64.Build.0 = Debug|x64 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|Win32.ActiveCfg = Release|Win32 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|Win32.Build.0 = Release|Win32 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|x64.ActiveCfg = Release|x64 + {86A35E44-E4C8-4628-87E9-942D136D72BC}.Release|x64.Build.0 = Release|x64 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|Win32.ActiveCfg = Debug|Win32 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|Win32.Build.0 = Debug|Win32 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|x64.ActiveCfg = Debug|x64 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Debug|x64.Build.0 = Debug|x64 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|Win32.ActiveCfg = Release|Win32 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|Win32.Build.0 = Release|Win32 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|x64.ActiveCfg = Release|x64 + {2986281A-BD41-4BD1-8B43-25B7D7E7F234}.Release|x64.Build.0 = Release|x64 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|Win32.ActiveCfg = Debug|Win32 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|Win32.Build.0 = Debug|Win32 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|x64.ActiveCfg = Debug|x64 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Debug|x64.Build.0 = Debug|x64 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|Win32.ActiveCfg = Release|Win32 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|Win32.Build.0 = Release|Win32 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|x64.ActiveCfg = Release|x64 + {BE771349-F11E-42AE-A23F-DA083FDC6FB8}.Release|x64.Build.0 = Release|x64 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.ActiveCfg = Debug|Win32 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|Win32.Build.0 = Debug|Win32 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.ActiveCfg = Debug|x64 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Debug|x64.Build.0 = Debug|x64 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.ActiveCfg = Release|Win32 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|Win32.Build.0 = Release|Win32 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.ActiveCfg = Release|x64 + {2093D218-190E-4194-9421-3BA7CBF33B10}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal -- cgit v1.2.1 From 7e8521749da8de8a612981ce65415bd6b7907b4c Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 21 Jan 2013 10:53:42 +0800 Subject: Visual C++ 2010 projects: Prepare for VS 2012 support Add the PlatformToolset tag to the project configs so that we can use a simple script later to the autotools files to copy the projects and change the value of that tag (v100 -> v110, and other simple changes) in order that we can quickly provide and maintain support for Visual Studio 2012 with minimal effort. Note that at the moment G-I does not yet support the API/SDK requirements for Windows 8 Modern UI (formerly known as Metro), but this paves the very initial step. --- build/win32/vs10/_giscanner.vcxproj | 4 ++++ build/win32/vs10/annotation.vcxproj | 4 ++++ build/win32/vs10/cmph-bdz-test.vcxproj | 4 ++++ build/win32/vs10/cmph.vcxprojin | 4 ++++ build/win32/vs10/everything.vcxproj | 4 ++++ build/win32/vs10/foo.vcxproj | 4 ++++ build/win32/vs10/g-ir-compiler.vcxprojin | 4 ++++ build/win32/vs10/g-ir-generate.vcxproj | 4 ++++ build/win32/vs10/generate_typelibs.vcxproj | 4 ++++ build/win32/vs10/gettype.vcxproj | 4 ++++ build/win32/vs10/gimarshallingtests.vcxproj | 4 ++++ build/win32/vs10/girepository.vcxprojin | 4 ++++ build/win32/vs10/glib-print.vcxproj | 4 ++++ build/win32/vs10/gtkfrob.vcxproj | 4 ++++ build/win32/vs10/install.vcxproj | 4 ++++ build/win32/vs10/regress.vcxproj | 4 ++++ build/win32/vs10/sletter.vcxproj | 4 ++++ build/win32/vs10/testinherit.vcxproj | 4 ++++ build/win32/vs10/utility.vcxproj | 4 ++++ 19 files changed, 76 insertions(+) diff --git a/build/win32/vs10/_giscanner.vcxproj b/build/win32/vs10/_giscanner.vcxproj index 91b28511..487ad76c 100644 --- a/build/win32/vs10/_giscanner.vcxproj +++ b/build/win32/vs10/_giscanner.vcxproj @@ -28,19 +28,23 @@ DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 diff --git a/build/win32/vs10/annotation.vcxproj b/build/win32/vs10/annotation.vcxproj index 1e9f9834..b732cadf 100644 --- a/build/win32/vs10/annotation.vcxproj +++ b/build/win32/vs10/annotation.vcxproj @@ -28,19 +28,23 @@ DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 diff --git a/build/win32/vs10/cmph-bdz-test.vcxproj b/build/win32/vs10/cmph-bdz-test.vcxproj index 8271966f..e5308e80 100644 --- a/build/win32/vs10/cmph-bdz-test.vcxproj +++ b/build/win32/vs10/cmph-bdz-test.vcxproj @@ -28,19 +28,23 @@ Application MultiByte true + v100 Application MultiByte + v100 Application MultiByte true + v100 Application MultiByte + v100 diff --git a/build/win32/vs10/cmph.vcxprojin b/build/win32/vs10/cmph.vcxprojin index 9e8d2b88..1bdbe642 100644 --- a/build/win32/vs10/cmph.vcxprojin +++ b/build/win32/vs10/cmph.vcxprojin @@ -28,19 +28,23 @@ StaticLibrary MultiByte true + v100 StaticLibrary MultiByte + v100 StaticLibrary MultiByte true + v100 StaticLibrary MultiByte + v100 diff --git a/build/win32/vs10/everything.vcxproj b/build/win32/vs10/everything.vcxproj index 5ef60b24..fe135282 100644 --- a/build/win32/vs10/everything.vcxproj +++ b/build/win32/vs10/everything.vcxproj @@ -28,19 +28,23 @@ DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 diff --git a/build/win32/vs10/foo.vcxproj b/build/win32/vs10/foo.vcxproj index f2317f71..480f11e1 100644 --- a/build/win32/vs10/foo.vcxproj +++ b/build/win32/vs10/foo.vcxproj @@ -28,19 +28,23 @@ DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 diff --git a/build/win32/vs10/g-ir-compiler.vcxprojin b/build/win32/vs10/g-ir-compiler.vcxprojin index dcaa46a2..b1f507ae 100644 --- a/build/win32/vs10/g-ir-compiler.vcxprojin +++ b/build/win32/vs10/g-ir-compiler.vcxprojin @@ -28,19 +28,23 @@ Application MultiByte true + v100 Application MultiByte + v100 Application MultiByte true + v100 Application MultiByte + v100 diff --git a/build/win32/vs10/g-ir-generate.vcxproj b/build/win32/vs10/g-ir-generate.vcxproj index bc75531c..60d468f9 100644 --- a/build/win32/vs10/g-ir-generate.vcxproj +++ b/build/win32/vs10/g-ir-generate.vcxproj @@ -28,19 +28,23 @@ Application MultiByte true + v100 Application MultiByte + v100 Application MultiByte true + v100 Application MultiByte + v100 diff --git a/build/win32/vs10/generate_typelibs.vcxproj b/build/win32/vs10/generate_typelibs.vcxproj index b284551e..8fe6789b 100644 --- a/build/win32/vs10/generate_typelibs.vcxproj +++ b/build/win32/vs10/generate_typelibs.vcxproj @@ -27,19 +27,23 @@ Utility MultiByte true + v100 Utility MultiByte + v100 Utility MultiByte true + v100 Utility MultiByte + v100 diff --git a/build/win32/vs10/gettype.vcxproj b/build/win32/vs10/gettype.vcxproj index a1126e81..197e1c92 100644 --- a/build/win32/vs10/gettype.vcxproj +++ b/build/win32/vs10/gettype.vcxproj @@ -28,19 +28,23 @@ DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 diff --git a/build/win32/vs10/gimarshallingtests.vcxproj b/build/win32/vs10/gimarshallingtests.vcxproj index 2849e439..d87fa7c4 100644 --- a/build/win32/vs10/gimarshallingtests.vcxproj +++ b/build/win32/vs10/gimarshallingtests.vcxproj @@ -28,19 +28,23 @@ DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 diff --git a/build/win32/vs10/girepository.vcxprojin b/build/win32/vs10/girepository.vcxprojin index 85aecd73..ef8b96f9 100644 --- a/build/win32/vs10/girepository.vcxprojin +++ b/build/win32/vs10/girepository.vcxprojin @@ -28,19 +28,23 @@ DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 diff --git a/build/win32/vs10/glib-print.vcxproj b/build/win32/vs10/glib-print.vcxproj index 706e777f..57dc430b 100644 --- a/build/win32/vs10/glib-print.vcxproj +++ b/build/win32/vs10/glib-print.vcxproj @@ -28,19 +28,23 @@ Application MultiByte true + v100 Application MultiByte + v100 Application MultiByte true + v100 Application MultiByte + v100 diff --git a/build/win32/vs10/gtkfrob.vcxproj b/build/win32/vs10/gtkfrob.vcxproj index f21723e7..efbbb63c 100644 --- a/build/win32/vs10/gtkfrob.vcxproj +++ b/build/win32/vs10/gtkfrob.vcxproj @@ -28,19 +28,23 @@ DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 diff --git a/build/win32/vs10/install.vcxproj b/build/win32/vs10/install.vcxproj index 541a4efb..976590e0 100644 --- a/build/win32/vs10/install.vcxproj +++ b/build/win32/vs10/install.vcxproj @@ -28,19 +28,23 @@ Utility MultiByte true + v100 Utility MultiByte + v100 Utility MultiByte true + v100 Utility MultiByte + v100 diff --git a/build/win32/vs10/regress.vcxproj b/build/win32/vs10/regress.vcxproj index 870f93ad..f4b7e288 100644 --- a/build/win32/vs10/regress.vcxproj +++ b/build/win32/vs10/regress.vcxproj @@ -28,19 +28,23 @@ DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 diff --git a/build/win32/vs10/sletter.vcxproj b/build/win32/vs10/sletter.vcxproj index d0185e92..bfaea789 100644 --- a/build/win32/vs10/sletter.vcxproj +++ b/build/win32/vs10/sletter.vcxproj @@ -28,19 +28,23 @@ DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 diff --git a/build/win32/vs10/testinherit.vcxproj b/build/win32/vs10/testinherit.vcxproj index 9006818e..65c914b8 100644 --- a/build/win32/vs10/testinherit.vcxproj +++ b/build/win32/vs10/testinherit.vcxproj @@ -28,19 +28,23 @@ DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 diff --git a/build/win32/vs10/utility.vcxproj b/build/win32/vs10/utility.vcxproj index a73d7097..8ef0fe82 100644 --- a/build/win32/vs10/utility.vcxproj +++ b/build/win32/vs10/utility.vcxproj @@ -28,19 +28,23 @@ DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 DynamicLibrary MultiByte true + v100 DynamicLibrary MultiByte + v100 -- cgit v1.2.1 From d062cfa10ab5bbaaaff9444ac909248eb645be9e Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 21 Jan 2013 11:41:21 +0800 Subject: Fix _giscanner Python module Visual C++ projects We need to force-include io.h as there is no longer a prototype for isatty() in the generated scannerlexer.c source file, which broke the build. (possibly due to a flex program or calling change/update?) --- build/win32/vs10/_giscanner.vcxproj | 4 ++++ build/win32/vs9/_giscanner.vcproj | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/build/win32/vs10/_giscanner.vcxproj b/build/win32/vs10/_giscanner.vcxproj index 487ad76c..01c46f23 100644 --- a/build/win32/vs10/_giscanner.vcxproj +++ b/build/win32/vs10/_giscanner.vcxproj @@ -76,6 +76,7 @@ Disabled ..\..\..\giscanner;$(PYTHONDIR)\include;%(AdditionalIncludeDirectories) + %(ForcedIncludeFiles);io.h _DEBUG;YY_NO_UNISTD_H;%(PreprocessorDefinitions) true EnableFastChecks @@ -98,6 +99,7 @@ MaxSpeed true ..\..\..\giscanner;$(PYTHONDIR)\include;%(AdditionalIncludeDirectories) + %(ForcedIncludeFiles);io.h YY_NO_UNISTD_H;%(PreprocessorDefinitions) MultiThreadedDLL true @@ -123,6 +125,7 @@ Disabled ..\..\..\giscanner;$(PYTHONDIR)\include;%(AdditionalIncludeDirectories) + %(ForcedIncludeFiles);io.h _DEBUG;YY_NO_UNISTD_H;%(PreprocessorDefinitions) true EnableFastChecks @@ -148,6 +151,7 @@ MaxSpeed true ..\..\..\giscanner;$(PYTHONDIR)\include;%(AdditionalIncludeDirectories) + %(ForcedIncludeFiles);io.h YY_NO_UNISTD_H;%(PreprocessorDefinitions) MultiThreadedDLL true diff --git a/build/win32/vs9/_giscanner.vcproj b/build/win32/vs9/_giscanner.vcproj index 8b0aa79a..290158ab 100644 --- a/build/win32/vs9/_giscanner.vcproj +++ b/build/win32/vs9/_giscanner.vcproj @@ -32,6 +32,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\giscanner;$(PYTHONDIR)\include" + ForcedIncludeFiles="msvc_recommended_pragmas.h;io.h" PreprocessorDefinitions="_DEBUG;YY_NO_UNISTD_H" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -65,6 +66,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\..\giscanner;$(PYTHONDIR)\include" + ForcedIncludeFiles="msvc_recommended_pragmas.h;io.h" PreprocessorDefinitions="YY_NO_UNISTD_H" RuntimeLibrary="2" EnableFunctionLevelLinking="true" @@ -101,6 +103,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="..\..\..\giscanner;$(PYTHONDIR)\include" + ForcedIncludeFiles="msvc_recommended_pragmas.h;io.h" PreprocessorDefinitions="_DEBUG;YY_NO_UNISTD_H" MinimalRebuild="true" BasicRuntimeChecks="3" @@ -138,6 +141,7 @@ Optimization="2" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="..\..\..\giscanner;$(PYTHONDIR)\include" + ForcedIncludeFiles="msvc_recommended_pragmas.h;io.h" PreprocessorDefinitions="YY_NO_UNISTD_H" RuntimeLibrary="2" EnableFunctionLevelLinking="true" -- cgit v1.2.1 From c2a5eefb00557c11019ce984da54d129cfbf91a9 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 21 Jan 2013 11:51:20 +0800 Subject: Update Visual C++ README.txt files. Be a little bit more clear on how certain environmental variables are to be set. --- build/win32/vs10/README.txt | 6 ++++-- build/win32/vs9/README.txt | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt index 5fe6192d..06f216ec 100644 --- a/build/win32/vs10/README.txt +++ b/build/win32/vs10/README.txt @@ -63,10 +63,12 @@ Please note that due to numerous possible configurations on Python, some environ variables need to be set before launching the gobject-introsection.sln solution file. These variables are namely: -PYTHONDIR: Root installation folder of your Python interpretor. +PYTHONDIR: Root installation folder of your Python interpretor, where python.exe is + located. Currently only Python 2.6.x and 2.7.x is supported. It must match your build configuration (Win32 or x64/amd64) PKG_CONFIG_PATH: Location of the .pc (pkg-config) files, especially for the GLib .pc files. -MINGWDIR: Root installation folder for your Windows GCC (such as MinGW). +MINGWDIR: Root installation folder for your Windows GCC (such as MinGW). For example, + if your gcc executable (gcc.exe) is in c:\mingw\bin, use "set MINGWDIR=c:\mingw" *** End of Note! *** The "install" project will copy build results and headers into their diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt index bb9fca65..579e5ece 100644 --- a/build/win32/vs9/README.txt +++ b/build/win32/vs9/README.txt @@ -63,10 +63,12 @@ Please note that due to numerous possible configurations on Python, some environ variables need to be set before launching the gobject-introsection.sln solution file. These variables are namely: -PYTHONDIR: Root installation folder of your Python interpretor. +PYTHONDIR: Root installation folder of your Python interpretor, where python.exe is + located. Currently only Python 2.6.x and 2.7.x is supported. It must match your build configuration (Win32 or x64/amd64) PKG_CONFIG_PATH: Location of the .pc (pkg-config) files, especially for the GLib .pc files. -MINGWDIR: Root installation folder for your Windows GCC (such as MinGW). +MINGWDIR: Root installation folder for your Windows GCC (such as MinGW). For example, + if your gcc executable (gcc.exe) is in c:\mingw\bin, use "set MINGWDIR=c:\mingw" *** End of Note! *** The "install" project will copy build results and headers into their -- cgit v1.2.1 From 14046eff3dae1bf69e1b88feed8be83622c8bcfd Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 21 Jan 2013 14:04:24 +0800 Subject: build/win32/gengir.bat: Process the bundled .gir files This will compile the .typelib files for FreeType, GL and libxml2, and copy the these .gir and their resulting .typelib files to the appropriate folder to prepare for the "install" phase. Note that the ones that aren't normally used in Windows are not processed. --- build/win32/gengir.bat | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/build/win32/gengir.bat b/build/win32/gengir.bat index ee61da3b..70c5b854 100644 --- a/build/win32/gengir.bat +++ b/build/win32/gengir.bat @@ -256,12 +256,24 @@ g-ir-compiler --includedir=. --debug --verbose GObject-2.0.gir -o GObject-2.0.ty g-ir-compiler --includedir=. --debug --verbose Gio-2.0.gir -o Gio-2.0.typelib g-ir-compiler --includedir=. --debug --verbose GIRepository-2.0.gir -o GIRepository-2.0.typelib +rem Now process the bundled .gir files +set CURRDIR=%CD% +cd ..\..\gir +g-ir-compiler --includedir=. --debug --verbose freetype2-2.0.gir -o freetype2-2.0.typelib +g-ir-compiler --includedir=. --debug --verbose GL-1.0.gir -o GL-1.0.typelib +g-ir-compiler --includedir=. --debug --verbose libxml2-2.0.gir -o libxml2-2.0.typelib +cd %CURRDIR% + rem Copy the generated .girs and .typelibs to their appropriate places mkdir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\share\gir-1.0 move /y *.gir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\share\gir-1.0\ +copy /y ..\..\gir\freetype2-2.0.gir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\share\gir-1.0\ +copy /y ..\..\gir\GL-1.0.gir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\share\gir-1.0\ +copy /y ..\..\gir\libxml2-2.0.gir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\share\gir-1.0\ mkdir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\lib\girepository-1.0 move /y *.typelib ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\lib\girepository-1.0\ +move /y ..\..\gir\*.typelib ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\lib\girepository-1.0\ :DONE -- cgit v1.2.1 From 7878dd0b7c172c5defdc6e1079b6542b2756e42e Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 22 Jan 2013 12:59:26 +0800 Subject: Visual C++ builds: "Install" gdump.c The gdump.c source/data file was missed from the "install" process, which is required for a proper installation of G-I. Make up for that. --- build/win32/vs10/gir.propsin | 4 ++++ build/win32/vs9/gir.vspropsin | 3 +++ 2 files changed, 7 insertions(+) diff --git a/build/win32/vs10/gir.propsin b/build/win32/vs10/gir.propsin index d957b5a9..47c855c3 100644 --- a/build/win32/vs10/gir.propsin +++ b/build/win32/vs10/gir.propsin @@ -135,6 +135,10 @@ mkdir $(CopyDir)\share\gir-$(GIApiVersion) copy $(SolutionDir)$(Configuration)\$(Platform)\share\gir-$(GIApiVersion)\*.gir $(CopyDir)\share\gir-$(GIApiVersion) +mkdir $(CopyDir)\share\gobject-introspection-$(GIApiVersion) + +copy ..\..\..\girepository\gdump.c $(CopyDir)\share\gobject-introspection-$(GIApiVersion) + mkdir $(CopyDir)\lib\girepository-$(GIApiVersion) diff --git a/build/win32/vs9/gir.vspropsin b/build/win32/vs9/gir.vspropsin index 60db0e6c..a42b214b 100644 --- a/build/win32/vs9/gir.vspropsin +++ b/build/win32/vs9/gir.vspropsin @@ -159,6 +159,9 @@ copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\_giscanner.pyd $(Cop mkdir $(CopyDir)\share\gir-$(GIApiVersion) copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\share\gir-$(GIApiVersion)\*.gir $(CopyDir)\share\gir-$(GIApiVersion) +mkdir $(CopyDir)\share\gobject-introspection-$(GIApiVersion) +copy ..\..\..\girepository\gdump.c $(CopyDir)\share\gobject-introspection-$(GIApiVersion) + mkdir $(CopyDir)\lib\girepository-$(GIApiVersion) copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\bin\girepository-$(GIApiVersion).lib $(CopyDir)\lib copy $(SolutionDir)$(ConfigurationName)\$(PlatformName)\lib\girepository-$(GIApiVersion)\*.typelib $(CopyDir)\lib\girepository-$(GIApiVersion) -- cgit v1.2.1 From 1fb2d14693fc7ecf74322c7f9ca7ca40907e7649 Mon Sep 17 00:00:00 2001 From: Simon Feltman Date: Wed, 2 Jan 2013 02:14:08 -0800 Subject: gimarshallingtests: Add test helpers for marshaling of object arguments Add a number of vfuncs and methods which can be used for testing marshaling of objects with different combinations of ownership transference. An important part of these test vfuncs and methods is they do not pass object returns and arguments through them. Instead the methods return reference counts and floating attributes. This allows isolation and ensures any problem with round trip object marshaling does not obscure what should be tested from the perspective of C as the caller of a vfunc. Tests and vfuncs can then be written in any language with gi bindings. https://bugzilla.gnome.org/show_bug.cgi?id=687522 --- tests/gimarshallingtests.c | 151 +++++++++++++++++++++++++++++++++++++++++++++ tests/gimarshallingtests.h | 49 +++++++++++++++ 2 files changed, 200 insertions(+) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index 7855dd71..54daa335 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -4310,6 +4310,144 @@ gi_marshalling_tests_object_vfunc_meth_with_error (GIMarshallingTestsObject *sel return ret; } +/* NOTE: + * + * The following (get_ref_info_for_*) methods are designed to call vfuncs related + * to object argument marshaling. They do not pass the resulting objects through them + * as regular vfunc wrapper method do, but rather return reference count and floating + * information back to the callers. This is useful because callers can do testing of + * expected reference counts in isolation and from the perspective of C. This is important + * because if there are bugs in the reverse marshaling, they can obfuscate or compound + * bugs in marshaling from the vfuncs. + */ + +/** + * gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_none: + * @ref_count: (out): Ref count of the object returned from the vfunc directly after vfunc call. + * @is_floating: (out): Floating state object returned from the vfunc directly after vfunc call. + */ +void +gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_none (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating) +{ + GObject *object = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_object_transfer_none (self); + *ref_count = object->ref_count; + *is_floating = g_object_is_floating(object); + + /* Attempt to sink and unref the returned object and avoid any potential leaks */ + g_object_ref_sink(object); + g_object_unref(object); +} + +/** + * gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_full: + * @ref_count: (out): Ref count of the object returned from the vfunc directly after vfunc call. + * @is_floating: (out): Floating state object returned from the vfunc directly after vfunc call. + */ +void +gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_full (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating) +{ + GObject *object = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_object_tansfer_full (self); + *ref_count = object->ref_count; + *is_floating = g_object_is_floating(object); + g_object_unref(object); +} + +/** + * gi_marshalling_tests_object_get_ref_info_for_vfunc_out_object_transfer_none: + * @ref_count: (out): Ref count of the object returned from the vfunc directly after vfunc call. + * @is_floating: (out): Floating state object returned from the vfunc directly after vfunc call. + */ +void +gi_marshalling_tests_object_get_ref_info_for_vfunc_out_object_transfer_none (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating) +{ + GObject *object = NULL; + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_out_object_transfer_none (self, &object); + *ref_count = object->ref_count; + *is_floating = g_object_is_floating(object); + + /* Attempt to sink and unref the returned object and avoid any potential leaks */ + g_object_ref_sink(object); + g_object_unref(object); +} + +/** + * gi_marshalling_tests_object_get_ref_info_for_vfunc_out_object_transfer_full: + * @ref_count: (out): Ref count of the object returned from the vfunc directly after vfunc call. + * @is_floating: (out): Floating state object returned from the vfunc directly after vfunc call. + */ +void +gi_marshalling_tests_object_get_ref_info_for_vfunc_out_object_transfer_full (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating) +{ + GObject *object = NULL; + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_out_object_tansfer_full (self, &object); + *ref_count = object->ref_count; + *is_floating = g_object_is_floating(object); + g_object_unref(object); +} + +static void +_vfunc_in_object_destroy_callback(gboolean *destroy_called, GObject *where_the_object_was) { + *destroy_called = TRUE; +} + +/** + * gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_none: + * @type: GType of object to create and pass as in argument to the vfunc + * @ref_count: (out): Ref count of the in object directly after vfunc call. + * @is_floating: (out): Floating state of in object directly after vfunc call. + * + * Calls vfunc_in_object_tansfer_none with a new object of the given type. + */ +void +gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_none (GIMarshallingTestsObject *self, GType type, guint *ref_count, gboolean *is_floating) +{ + static gboolean destroy_called; + destroy_called = FALSE; + + GObject *object = g_object_new(type, NULL); + g_object_weak_ref (object, (GWeakNotify)_vfunc_in_object_destroy_callback, &destroy_called); + + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_in_object_tansfer_none (self, object); + if (destroy_called) { + *ref_count = 0; + *is_floating = FALSE; + } else { + *ref_count = object->ref_count; + *is_floating = g_object_is_floating (object); + g_object_unref (object); + } +} + + +/** + * gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_full: + * @type: GType of object to create and pass as in argument to the vfunc + * @ref_count: (out): Ref count of the in object directly after vfunc call. + * @is_floating: (out): Floating state of in object directly after vfunc call. + */ +void +gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_full (GIMarshallingTestsObject *self, GType type, guint *ref_count, gboolean *is_floating) +{ + static gboolean destroy_called; + destroy_called = FALSE; + + GObject *object = g_object_new(type, NULL); + g_object_weak_ref (object, (GWeakNotify)_vfunc_in_object_destroy_callback, &destroy_called); + + /* Calling the vfunc takes ownership of the object, so we use a weak_ref to determine + * if the object gets destroyed after the call and appropriately return 0 as the ref count. + */ + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_in_object_tansfer_full (self, object); + if (destroy_called) { + *ref_count = 0; + *is_floating = FALSE; + } else { + *ref_count = object->ref_count; + *is_floating = g_object_is_floating (object); + } +} + + G_DEFINE_TYPE (GIMarshallingTestsSubObject, gi_marshalling_tests_sub_object, GI_MARSHALLING_TESTS_TYPE_OBJECT); static void @@ -4748,6 +4886,7 @@ enum { SOME_BOXED_STRUCT_PROPERTY, SOME_VARIANT_PROPERTY, SOME_BOXED_GLIST_PROPERTY, + SOME_OBJECT_PROPERTY, }; G_DEFINE_TYPE (GIMarshallingTestsPropertiesObject, gi_marshalling_tests_properties_object, G_TYPE_OBJECT); @@ -4814,6 +4953,9 @@ gi_marshalling_tests_properties_object_get_property (GObject * object, guint pro case SOME_VARIANT_PROPERTY: g_value_set_variant (value, self->some_variant); break; + case SOME_OBJECT_PROPERTY: + g_value_set_object (value, self->some_object); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -4878,6 +5020,11 @@ gi_marshalling_tests_properties_object_set_property (GObject * object, guint pro if (self->some_variant != NULL) g_variant_ref (self->some_variant); break; + case SOME_OBJECT_PROPERTY: + if (self->some_object != NULL) + g_object_unref (self->some_object); + self->some_object = g_value_dup_object (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); break; @@ -4961,6 +5108,10 @@ gi_marshalling_tests_properties_object_class_init (GIMarshallingTestsPropertiesO g_param_spec_variant ("some-variant", "some-variant", "some-variant", G_VARIANT_TYPE_ANY, NULL, G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, SOME_OBJECT_PROPERTY, + g_param_spec_object ("some-object", "some-object", "some-object", G_TYPE_OBJECT, + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); } GIMarshallingTestsPropertiesObject* diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index 803b02c7..82137a75 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -803,6 +803,47 @@ struct _GIMarshallingTestsObjectClass * @error: A #GError */ gboolean (*vfunc_meth_with_err) (GIMarshallingTestsObject *object, gint x, GError **error); + + + /** + * GIMarshallingTestsObjectClass::vfunc_return_object_transfer_none: + * + * Returns: (transfer none) + */ + GObject* (* vfunc_return_object_transfer_none) (GIMarshallingTestsObject *self); + + /** + * GIMarshallingTestsObjectClass::vfunc_return_object_tansfer_full: + * + * Returns: (transfer full) + */ + GObject* (* vfunc_return_object_tansfer_full) (GIMarshallingTestsObject *self); + + /** + * GIMarshallingTestsObjectClass::vfunc_out_object_transfer_none: + * @object: (out) (transfer none): + */ + void (* vfunc_out_object_transfer_none) (GIMarshallingTestsObject *self, GObject **object); + + /** + * GIMarshallingTestsObjectClass::vfunc_out_object_tansfer_full: + * @object: (out) (transfer full): + */ + void (* vfunc_out_object_tansfer_full) (GIMarshallingTestsObject *self, GObject **object); + + /** + * GIMarshallingTestsObjectClass::vfunc_in_object_tansfer_none: + * @object: (in) (transfer none): + */ + void (* vfunc_in_object_tansfer_none) (GIMarshallingTestsObject *self, GObject *object); + + /** + * GIMarshallingTestsObjectClass::vfunc_in_object_tansfer_full: + * @object: (in) (transfer full): + */ + void (* vfunc_in_object_tansfer_full) (GIMarshallingTestsObject *self, GObject *object); + + }; struct _GIMarshallingTestsObject @@ -840,6 +881,13 @@ glong gi_marshalling_tests_object_vfunc_return_value_and_one_out_parameter (GIMa glong gi_marshalling_tests_object_vfunc_return_value_and_multiple_out_parameters (GIMarshallingTestsObject *self, glong *a, glong *b); gboolean gi_marshalling_tests_object_vfunc_meth_with_error (GIMarshallingTestsObject *object, gint x, GError **error); +void gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_none (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating); +void gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_full (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating); +void gi_marshalling_tests_object_get_ref_info_for_vfunc_out_object_transfer_none (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating); +void gi_marshalling_tests_object_get_ref_info_for_vfunc_out_object_transfer_full (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating); +void gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_none (GIMarshallingTestsObject *self, GType type, guint *ref_count, gboolean *is_floating); +void gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_full (GIMarshallingTestsObject *self, GType type, guint *ref_count, gboolean *is_floating); + GIMarshallingTestsObject *gi_marshalling_tests_object_none_return (void); GIMarshallingTestsObject *gi_marshalling_tests_object_full_return (void); @@ -1085,6 +1133,7 @@ struct _GIMarshallingTestsPropertiesObject { GIMarshallingTestsBoxedStruct* some_boxed_struct; GList* some_boxed_glist; GVariant *some_variant; + GObject *some_object; }; struct _GIMarshallingTestsPropertiesObjectClass { -- cgit v1.2.1 From 7cfc4ce3321dd98b33d89d4065eeb66280e0b24a Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 30 Jan 2013 09:45:48 -0500 Subject: girparser: Remove unused method pylint was complaining about the non-existent instance member, self._filename https://bugzilla.gnome.org/show_bug.cgi?id=693040 --- giscanner/girparser.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/giscanner/girparser.py b/giscanner/girparser.py index 479eb549..ef915a79 100644 --- a/giscanner/girparser.py +++ b/giscanner/girparser.py @@ -90,9 +90,6 @@ class GIRParser(object): self._pkgconfig_packages = [] return self._pkgconfig_packages - def get_doc(self): - return parse(self._filename) - # Private def _find_first_child(self, node, name_or_names): -- cgit v1.2.1 From 40766841ac5f5319ab0ab6dd29d6fce70eaf9f1b Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 30 Jan 2013 10:52:20 -0500 Subject: Update .gitignore https://bugzilla.gnome.org/show_bug.cgi?id=693040 --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index a01821af..f728b4cf 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ compile config.guess config.h config.h.in +config.h.win32 config.log config.status config.sub @@ -58,6 +59,7 @@ gthash-test scannerlexer.c scannerparser.c scannerparser.h +test-driver tests/Everything-1.0.gir tests/GIMarshallingTests-1.0.gir tests/everything-stamp.h -- cgit v1.2.1 From de84ea0cf212c251e099f456bb675492f664e93d Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 30 Jan 2013 10:09:55 -0500 Subject: Remove the insane pre-commit hook I'm sick and tired of this. https://bugzilla.gnome.org/show_bug.cgi?id=693040 --- Makefile.am | 1 - misc/pre-commit | 86 --------------------------------------------------------- 2 files changed, 87 deletions(-) delete mode 100755 misc/pre-commit diff --git a/Makefile.am b/Makefile.am index 70164581..5a4044f1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,7 +58,6 @@ EXTRA_DIST += \ check-local: gtester --verbose $(GTESTER_PROGS) - @test ! -d $(top_srcdir)/.git || (test -f $(top_srcdir)/.git/hooks/pre-commit || install misc/pre-commit .git/hooks/pre-commit) @echo "TEST: PEP-8 INQUISITION" @find $(top_srcdir)/giscanner -name \*.py | sort | uniq | xargs $(PYTHON) $(top_srcdir)/misc/pep8.py --repeat --exclude=config.py @echo "TEST: Annotation pattern programs" diff --git a/misc/pre-commit b/misc/pre-commit deleted file mode 100755 index 1f37d866..00000000 --- a/misc/pre-commit +++ /dev/null @@ -1,86 +0,0 @@ -#!/bin/sh -# -# An example hook script to verify what is about to be committed. -# Called by git-commit with no arguments. The hook should -# exit with non-zero status after issuing an appropriate message if -# it wants to stop the commit. -# -# To enable this hook, make this file executable. - -# This is slightly modified from Andrew Morton's Perfect Patch. -# Lines you introduce should not have trailing whitespace. -# Also check for an indentation that has SP before a TAB. - -if git-rev-parse --verify HEAD 2>/dev/null -then - git-diff-index -p -M --cached HEAD -- -else - # NEEDSWORK: we should produce a diff with an empty tree here - # if we want to do the same verification for the initial import. - : -fi | -perl -e ' - my $found_bad = 0; - my $filename; - my $reported_filename = ""; - my $lineno; - sub bad_line { - my ($why, $line) = @_; - if (!$found_bad) { - print STDERR "*\n"; - print STDERR "* You have some suspicious patch lines:\n"; - print STDERR "*\n"; - $found_bad = 1; - } - if ($reported_filename ne $filename) { - print STDERR "* In $filename\n"; - $reported_filename = $filename; - } - print STDERR "* $why (line $lineno)\n"; - print STDERR "$filename:$lineno:$line\n"; - } - while (<>) { - if (m|^diff --git a/(.*) b/\1$|) { - $filename = $1; - next; - } - if (/^@@ -\S+ \+(\d+)/) { - $lineno = $1 - 1; - next; - } - if (/^ /) { - $lineno++; - next; - } - if (s/^\+//) { - $lineno++; - chomp; - if (/\s$/) { - bad_line("trailing whitespace", $_); - } - if (/^\s* \t/) { - bad_line("indent SP followed by a TAB", $_); - } - if (/^([<>])\1{6} |^={7}$/) { - bad_line("unresolved merge conflict", $_); - } - } - } - exit($found_bad); -' - -CHECK_FILE=.make-check-passed -if ! test -f $CHECK_FILE; then - echo "You need to run make check before committing" - exit 1 -fi - -# Need to run make check at least once every 20 minutes -MODIFIED=`stat -c %Y $CHECK_FILE` -NOW=`date +%s` -DELTA=$(($NOW-MODIFIED)) -if test "$DELTA" -ge "1200"; then - echo "You haven't ran make check in $((DELTA / 60)) minutes." - exit 1 -fi - -- cgit v1.2.1 From 4f8c0f49822b351d1e4bd4f733ea6eacf85e926d Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 9 Jan 2013 14:26:26 -0500 Subject: tests: %NULL-terminated is wrong This translates into "None-terminated" in Python, which is bad. We should eventually strip this phrase entirely for certain languages with a prefilter. https://bugzilla.gnome.org/show_bug.cgi?id=693040 --- tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page | 2 +- .../doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page | 2 +- tests/doctool/doc-examples-obj.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page index 0312ab98..38e4f5a5 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page @@ -70,7 +70,7 @@ created with doc_examples_obj_new.

string :

-

A NULL-terminated string.

+

A NUL-terminated string.

Returns :

diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page index ab20921a..cd805708 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page @@ -68,7 +68,7 @@ created with Obj.new.

This should

string :

-

A None-terminated string.

+

A NUL-terminated string.

Returns :

diff --git a/tests/doctool/doc-examples-obj.c b/tests/doctool/doc-examples-obj.c index bf4fcc7e..60150f89 100644 --- a/tests/doctool/doc-examples-obj.c +++ b/tests/doctool/doc-examples-obj.c @@ -110,7 +110,7 @@ doc_examples_obj_new (void) * @pointer_arg: (allow-none): If not %NULL, do a thing. * Pass @first_arg if you want to sometimes. You can * also pass @second_arg, or even @boolean_arg. - * @string: A %NULL-terminated string. + * @string: A NUL-terminated string. * * This is an example of how to document a method. * -- cgit v1.2.1 From 55815545eb163b7046fbe226dff946354f3c52d0 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 30 Jan 2013 09:57:18 -0500 Subject: ast: Track enum members by symbol The doctool eventually wants to parse inline references to constant values like %GTK_TEXT_DIRECTION_LTR, so we need to have a way to look up the original symbol value for an enum member. https://bugzilla.gnome.org/show_bug.cgi?id=693040 --- giscanner/ast.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/giscanner/ast.py b/giscanner/ast.py index e5c403e1..7076a845 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -415,6 +415,9 @@ but adds it to things like ctypes, symbols, and type_names. continue fn.namespace = self self.symbols[fn.symbol] = fn + for member in node.members: + member.namespace = self + self.symbols[member.symbol] = member if hasattr(node, 'ctype'): self.ctypes[node.ctype] = node -- cgit v1.2.1 From f027b6841164fc5c712236b3c40a90808e1b7428 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 30 Jan 2013 10:02:41 -0500 Subject: ast: Track enum/bitfield member parents We need this for the doctool so that we can link to an enum definition when we reference one of the member values. https://bugzilla.gnome.org/show_bug.cgi?id=693040 --- giscanner/ast.py | 5 +++++ giscanner/girparser.py | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/giscanner/ast.py b/giscanner/ast.py index 7076a845..50b0f29e 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -770,6 +770,8 @@ class Enum(Node, Registered): self.c_symbol_prefix = c_symbol_prefix self.ctype = ctype self.members = members + for member in members: + member.parent = self # Associated error domain name self.error_domain = None self.static_methods = [] @@ -791,6 +793,8 @@ class Bitfield(Node, Registered): self.ctype = ctype self.c_symbol_prefix = c_symbol_prefix self.members = members + for member in members: + member.parent = self self.static_methods = [] def _walk(self, callback, chain): @@ -806,6 +810,7 @@ class Member(Annotated): self.value = value self.symbol = symbol self.nick = nick + self.parent = None def __cmp__(self, other): return cmp(self.name, other.name) diff --git a/giscanner/girparser.py b/giscanner/girparser.py index ef915a79..ea8b0d6d 100644 --- a/giscanner/girparser.py +++ b/giscanner/girparser.py @@ -581,8 +581,10 @@ class GIRParser(object): self._namespace.append(obj) return - for member in self._find_children(node, _corens('member')): - members.append(self._parse_member(member)) + for member_node in self._find_children(node, _corens('member')): + member = self._parse_member(member_node) + member.parent = obj + members.append(member) for func_node in self._find_children(node, _corens('function')): func = self._parse_function_common(func_node, ast.Function) obj.static_methods.append(func) -- cgit v1.2.1 From 0f5f94ed8a86355003533452a2d6cc8077d27535 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 21:42:32 -0500 Subject: giscanner: Apply standard annotations to constant values While there's no particular reason I need to do this, there really isn't any reason to not do this, and it helps with doctool or whatever in the future if we want to document when a constant showed up. g-ir-compiler also keeps track of constant deprecations, so this fixes constants not ever being deprecated. https://bugzilla.gnome.org/show_bug.cgi?id=693040 --- giscanner/girwriter.py | 3 +++ giscanner/maintransformer.py | 9 ++++++--- giscanner/transformer.py | 5 +---- tests/scanner/Annotation-1.0-expected.gir | 5 ++++- tests/scanner/annotation.h | 2 ++ 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py index 7344488b..e9910d47 100644 --- a/giscanner/girwriter.py +++ b/giscanner/girwriter.py @@ -370,7 +370,10 @@ and/or use gtk-doc annotations. ''') attrs = [('name', constant.name), ('value', constant.value), ('c:type', constant.ctype)] + self._append_version(constant, attrs) + self._append_node_generic(constant, attrs) with self.tagcontext('constant', attrs): + self._write_generic(constant) self._write_type(constant.value_type) def _write_class(self, node): diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py index 67168d6b..d149f30a 100644 --- a/giscanner/maintransformer.py +++ b/giscanner/maintransformer.py @@ -192,7 +192,7 @@ usage is void (*_gtk_reserved1)(void);""" def _get_annotation_name(self, node): if isinstance(node, (ast.Class, ast.Interface, ast.Record, ast.Union, ast.Enum, ast.Bitfield, - ast.Callback, ast.Alias)): + ast.Callback, ast.Alias, ast.Constant)): if node.ctype is not None: return node.ctype elif isinstance(node, ast.Registered) and node.gtype_name is not None: @@ -815,9 +815,12 @@ usage is void (*_gtk_reserved1)(void);""" self._apply_annotations_return(signal, signal.retval, block) def _apply_annotations_constant(self, node): - block = self._blocks.get(node.ctype) - if not block: + block = self._get_block(node) + if block is None: return + + self._apply_annotations_annotated(node, block) + tag = block.get_tag(TAG_VALUE) if tag: node.value = tag.value diff --git a/giscanner/transformer.py b/giscanner/transformer.py index 67367999..ba7afb93 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -338,10 +338,7 @@ raise ValueError.""" elif stype == CSYMBOL_TYPE_UNION: return self._create_union(symbol) elif stype == CSYMBOL_TYPE_CONST: - # Don't parse constants which are marked (skip) - docblock = self._annotations.get(symbol.ident) - if not docblock or not 'skip' in docblock.options: - return self._create_const(symbol) + return self._create_const(symbol) # Ignore variable declarations in the header elif stype == CSYMBOL_TYPE_OBJECT: pass diff --git a/tests/scanner/Annotation-1.0-expected.gir b/tests/scanner/Annotation-1.0-expected.gir index 73d982dd..0be91d6d 100644 --- a/tests/scanner/Annotation-1.0-expected.gir +++ b/tests/scanner/Annotation-1.0-expected.gir @@ -29,12 +29,15 @@ and/or use gtk-doc annotations. --> + c:type="ANNOTATION_CALCULATED_LARGE" + version="1.4"> + Constant to define a calculated large value + Constant to define a calculated large value diff --git a/tests/scanner/annotation.h b/tests/scanner/annotation.h index b3b4bd4c..09d4f4f2 100644 --- a/tests/scanner/annotation.h +++ b/tests/scanner/annotation.h @@ -180,6 +180,8 @@ GObject * annotation_transfer_floating(void); * Constant to define a calculated large value * * Value: 10000000000UL + * + * Since: 1.4 */ #define ANNOTATION_CALCULATED_LARGE (1000 * G_GINT64_CONSTANT (10000000)) -- cgit v1.2.1 From 5a6f6a756cd5ab45389342de55d630478e7a9e9f Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 22:59:23 -0500 Subject: girparser: Move handling to passthrough https://bugzilla.gnome.org/show_bug.cgi?id=693040 --- girepository/girparser.c | 33 ++++++--------------------------- 1 file changed, 6 insertions(+), 27 deletions(-) diff --git a/girepository/girparser.c b/girepository/girparser.c index 1a83c239..6015a043 100644 --- a/girepository/girparser.c +++ b/girepository/girparser.c @@ -95,7 +95,6 @@ typedef enum STATE_ALIAS, /* 30 */ STATE_TYPE, STATE_ATTRIBUTE, - STATE_DOC, STATE_PASSTHROUGH } ParseState; @@ -2116,22 +2115,6 @@ end_type (ParseContext *ctx) } } -static gboolean -start_doc (GMarkupParseContext *context, - const gchar *element_name, - const gchar **attribute_names, - const gchar **attribute_values, - ParseContext *ctx, - GError **error) -{ - if (strcmp (element_name, "doc") != 0) - return FALSE; - - state_switch (ctx, STATE_DOC); - - return TRUE; -} - static gboolean start_attribute (GMarkupParseContext *context, const gchar *element_name, @@ -2765,9 +2748,12 @@ start_element_handler (GMarkupParseContext *context, attribute_names, attribute_values, ctx, error)) goto out; - else if (start_doc (context, element_name, attribute_names, - attribute_values, ctx, error)) - goto out; + if (strcmp (element_name, "doc") == 0) + { + state_switch (ctx, STATE_PASSTHROUGH); + ctx->unknown_depth = 1; + goto out; + } break; case 'e': @@ -3413,13 +3399,6 @@ end_element_handler (GMarkupParseContext *context, } break; - case STATE_DOC: - if (strcmp ("doc", element_name) == 0) - { - state_switch (ctx, ctx->prev_state); - } - break; - case STATE_PASSTHROUGH: ctx->unknown_depth -= 1; g_assert (ctx->unknown_depth >= 0); -- cgit v1.2.1 From 93cd5b208b19e7c532972b85a457518082e1fc2b Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 23:02:02 -0500 Subject: girparser: Clean up passthrough handling Instead of remembering to have to set unknown_depth, smarten up state_switch to do it for us. https://bugzilla.gnome.org/show_bug.cgi?id=693040 --- girepository/girparser.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/girepository/girparser.c b/girepository/girparser.c index 6015a043..d1bc81f5 100644 --- a/girepository/girparser.c +++ b/girepository/girparser.c @@ -341,6 +341,9 @@ state_switch (ParseContext *ctx, ParseState newstate) g_assert (ctx->state != newstate); ctx->prev_state = ctx->state; ctx->state = newstate; + + if (ctx->state == STATE_PASSTHROUGH) + ctx->unknown_depth = 1; } static GIrNode * @@ -724,10 +727,7 @@ introspectable_prelude (GMarkupParseContext *context, if (introspectable) state_switch (ctx, new_state); else - { - state_switch (ctx, STATE_PASSTHROUGH); - ctx->unknown_depth = 1; - } + state_switch (ctx, STATE_PASSTHROUGH); return introspectable; } @@ -2751,7 +2751,6 @@ start_element_handler (GMarkupParseContext *context, if (strcmp (element_name, "doc") == 0) { state_switch (ctx, STATE_PASSTHROUGH); - ctx->unknown_depth = 1; goto out; } break; @@ -3014,7 +3013,6 @@ start_element_handler (GMarkupParseContext *context, ctx->file_path, line_number, char_number, element_name, ctx->state); state_switch (ctx, STATE_PASSTHROUGH); - ctx->unknown_depth = 1; } out: -- cgit v1.2.1 From 9c0bd59b021e163eae191db95ce6beeb389cbd6f Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 09:36:07 -0500 Subject: girparser: Serialize and read back the instance_parameter g-ir-doc-tool wants to use the instance parameter to read docs and the parameter name, so it needs to be shuttled through the GIR. https://bugzilla.gnome.org/show_bug.cgi?id=693040 --- girepository/girparser.c | 5 + giscanner/girparser.py | 26 +++-- giscanner/girwriter.py | 18 ++-- tests/scanner/Annotation-1.0-expected.gir | 136 ++++++++++++++++++++++++ tests/scanner/Bar-1.0-expected.gir | 3 + tests/scanner/Foo-1.0-expected.gir | 121 +++++++++++++++++++++ tests/scanner/GetType-1.0-expected.gir | 6 ++ tests/scanner/Regress-1.0-expected.gir | 162 +++++++++++++++++++++++++++++ tests/scanner/TestInherit-1.0-expected.gir | 12 +++ tests/scanner/Utility-1.0-expected.gir | 3 + 10 files changed, 474 insertions(+), 18 deletions(-) diff --git a/girepository/girparser.c b/girepository/girparser.c index d1bc81f5..5aaa6dd0 100644 --- a/girepository/girparser.c +++ b/girepository/girparser.c @@ -2831,6 +2831,11 @@ start_element_handler (GMarkupParseContext *context, attribute_names, attribute_values, ctx, error)) goto out; + else if (strcmp (element_name, "instance-parameter") == 0) + { + state_switch (ctx, STATE_PASSTHROUGH); + goto out; + } else if (strcmp (element_name, "c:include") == 0) { state_switch (ctx, STATE_C_INCLUDE); diff --git a/giscanner/girparser.py b/giscanner/girparser.py index ea8b0d6d..bd259b87 100644 --- a/giscanner/girparser.py +++ b/giscanner/girparser.py @@ -286,6 +286,18 @@ class GIRParser(object): function = self._parse_function_common(node, ast.Function) self._namespace.append(function) + def _parse_parameter(self, node): + typeval = self._parse_type(node) + param = ast.Parameter(node.attrib.get('name'), + typeval, + node.attrib.get('direction') or ast.PARAM_DIRECTION_IN, + node.attrib.get('transfer-ownership'), + node.attrib.get('allow-none') == '1', + node.attrib.get('scope'), + node.attrib.get('caller-allocates') == '1') + self._parse_generic_attribs(node, param) + return param + def _parse_function_common(self, node, klass, parent=None): name = node.attrib['name'] returnnode = node.find(_corens('return-value')) @@ -323,17 +335,11 @@ class GIRParser(object): parameters_node = node.find(_corens('parameters')) if (parameters_node is not None): + paramnode = self._find_first_child(parameters_node, _corens('instance-parameter')) + if paramnode: + func.instance_parameter = self._parse_parameter(paramnode) for paramnode in self._find_children(parameters_node, _corens('parameter')): - typeval = self._parse_type(paramnode) - param = ast.Parameter(paramnode.attrib.get('name'), - typeval, - paramnode.attrib.get('direction') or ast.PARAM_DIRECTION_IN, - paramnode.attrib.get('transfer-ownership'), - paramnode.attrib.get('allow-none') == '1', - paramnode.attrib.get('scope'), - paramnode.attrib.get('caller-allocates') == '1') - self._parse_generic_attribs(paramnode, param) - parameters.append(param) + parameters.append(self._parse_parameter(paramnode)) for i, paramnode in enumerate(self._find_children(parameters_node, _corens('parameter'))): param = parameters[i] diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py index e9910d47..c54a5389 100644 --- a/giscanner/girwriter.py +++ b/giscanner/girwriter.py @@ -170,7 +170,7 @@ and/or use gtk-doc annotations. ''') with self.tagcontext(tag_name, attrs): self._write_generic(callable) self._write_return_type(callable.retval, parent=callable) - self._write_parameters(callable, callable.parameters) + self._write_parameters(callable) def _write_function(self, func, tag_name='function'): attrs = [] @@ -206,14 +206,16 @@ and/or use gtk-doc annotations. ''') self._write_generic(return_) self._write_type(return_.type, function=parent) - def _write_parameters(self, parent, parameters): - if not parameters: + def _write_parameters(self, callable): + if not callable.parameters and callable.instance_parameter is None: return with self.tagcontext('parameters'): - for parameter in parameters: - self._write_parameter(parent, parameter) + if callable.instance_parameter: + self._write_parameter(callable, callable.instance_parameter, 'instance-parameter') + for parameter in callable.parameters: + self._write_parameter(callable, parameter) - def _write_parameter(self, parent, parameter): + def _write_parameter(self, parent, parameter, nodename='parameter'): attrs = [] if parameter.argname is not None: attrs.append(('name', parameter.argname)) @@ -236,7 +238,7 @@ and/or use gtk-doc annotations. ''') attrs.append(('destroy', '%d' % (idx, ))) if parameter.skip: attrs.append(('skip', '1')) - with self.tagcontext('parameter', attrs): + with self.tagcontext(nodename, attrs): self._write_generic(parameter) self._write_type(parameter.type, function=parent) @@ -585,4 +587,4 @@ and/or use gtk-doc annotations. ''') with self.tagcontext('glib:signal', attrs): self._write_generic(signal) self._write_return_type(signal.retval) - self._write_parameters(signal, signal.parameters) + self._write_parameters(signal) diff --git a/tests/scanner/Annotation-1.0-expected.gir b/tests/scanner/Annotation-1.0-expected.gir index 0be91d6d..bc0ae090 100644 --- a/tests/scanner/Annotation-1.0-expected.gir +++ b/tests/scanner/Annotation-1.0-expected.gir @@ -114,6 +114,10 @@ and/or use gtk-doc annotations. --> + + a #GObject + + @@ -126,6 +130,10 @@ and/or use gtk-doc annotations. --> + + a #GObject + + + + a #GObject + + + + a #GObject + + Sequence of numbers @@ -179,6 +195,10 @@ and/or use gtk-doc annotations. --> + + a #GObject + + Sequence of numbers that are zero-terminated @@ -198,6 +218,10 @@ and/or use gtk-doc annotations. --> + + a #AnnotationObject + + Sequence of numbers that are zero-terminated @@ -217,6 +241,12 @@ and/or use gtk-doc annotations. --> The object + + + a #GObject + + + %NULL always + + + a #GObject + + + + + + + + Test taking a call-scoped callback @@ -239,6 +280,10 @@ and/or use gtk-doc annotations. --> + + a #AnnotationObject + + + + + a #GObject + + + This is a test for returning a list of objects. @@ -273,6 +324,12 @@ intentionally similar example to gtk_container_get_children + + + a #GObject + + + This is a test for returning a list of strings, where @@ -283,11 +340,23 @@ each string needs to be freed. + + + a #GObject + + + + + + A #AnnotationObject + + + This is a test for in arguments @@ -296,6 +365,10 @@ each string needs to be freed. + + a #GObject + + This is an argument test @@ -309,6 +382,10 @@ each string needs to be freed. + + a #GObject + + + + a #GObject + + + + a #GObject + + an int + + + a #GObject + + + An object, not referenced + + + a #GObject + + + This is a test for out arguments @@ -370,6 +467,10 @@ each string needs to be freed. + + a #GObject + + + + a #AnnotationObject + + + + a #AnnotationObject + + The data @@ -427,6 +536,10 @@ each string needs to be freed. + + a #AnnotationObject + + The data @@ -446,6 +559,10 @@ type. + + a #AnnotationObject + + The data @@ -465,6 +582,10 @@ type. + + a #AnnotationObject + + + + a #GObject + + @@ -494,6 +619,10 @@ annotation_object_watch_full(). + + A #AnnotationObject + + The callback @@ -512,6 +641,10 @@ annotation_object_watch_full(). + + A #AnnotationObject + + + + + Opaque pointer handle diff --git a/tests/scanner/Bar-1.0-expected.gir b/tests/scanner/Bar-1.0-expected.gir index 392a3031..ef92fcc4 100644 --- a/tests/scanner/Bar-1.0-expected.gir +++ b/tests/scanner/Bar-1.0-expected.gir @@ -44,6 +44,9 @@ and/or use gtk-doc annotations. --> + + + diff --git a/tests/scanner/Foo-1.0-expected.gir b/tests/scanner/Foo-1.0-expected.gir index 048ed42f..bfab2661 100644 --- a/tests/scanner/Foo-1.0-expected.gir +++ b/tests/scanner/Foo-1.0-expected.gir @@ -66,6 +66,9 @@ and/or use gtk-doc annotations. --> + + + @@ -96,6 +99,11 @@ and/or use gtk-doc annotations. --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -348,6 +379,9 @@ and/or use gtk-doc annotations. --> + + + @@ -424,6 +458,9 @@ uses a C sugar return type. + + + offset @@ -439,6 +476,9 @@ uses a C sugar return type. + + + @@ -451,6 +491,9 @@ uses a C sugar return type. + + + @@ -460,23 +503,42 @@ uses a C sugar return type. + + + + + %NULL always + + + a #FooObject + + + + + + + + + + + @@ -487,6 +549,9 @@ uses a C sugar return type. + + + @@ -500,6 +565,9 @@ uses a C sugar return type. + + + @@ -511,6 +579,10 @@ uses a C sugar return type. + + obj + + offset @@ -528,6 +600,12 @@ uses a C sugar return type. + + + obj + + + + + + @@ -550,6 +631,9 @@ uses a C sugar return type. + + + @@ -563,6 +647,9 @@ uses a C sugar return type. + + + @@ -682,6 +769,13 @@ uses a C sugar return type. + + add to this rect + + source rectangle @@ -768,17 +862,30 @@ exposed to language bindings. + + + + + + + + + + + + + + + + @@ -807,12 +917,20 @@ exposed to language bindings. + + + + + + + + + + + diff --git a/tests/scanner/GetType-1.0-expected.gir b/tests/scanner/GetType-1.0-expected.gir index 3b1dd193..872ebe42 100644 --- a/tests/scanner/GetType-1.0-expected.gir +++ b/tests/scanner/GetType-1.0-expected.gir @@ -53,6 +53,12 @@ arguments. 0 + + + self + + + diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index f3f9a034..e5f9e3bb 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -212,12 +212,20 @@ use it should be. + + + + + + + + @@ -252,6 +260,11 @@ use it should be. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -778,6 +820,9 @@ use it should be. + + + Another object @@ -792,6 +837,9 @@ case. + + + Meaningless string @@ -806,6 +854,10 @@ case. + + A #RegressTestObj + + Meaningless string @@ -817,35 +869,66 @@ case. + + + + + + + + + + + + + + + + + + + + + + + A #RegressTestObj + + + + + + + + @@ -853,6 +936,9 @@ case. + + + + + + @@ -880,6 +969,10 @@ case. + + A #RegressTestObj. + + Parameter. @@ -929,6 +1022,10 @@ case. + + A #RegressTestObj. + + Parameter. @@ -978,6 +1075,10 @@ case. + + A #RegressTestObj. + + Parameter. @@ -1026,6 +1127,10 @@ case. + + a #RegressTestObj + + Parameter. @@ -1075,6 +1180,10 @@ raise an error. + + a #RegressTestObj + + Parameter. @@ -1087,6 +1196,10 @@ raise an error. + + A #RegressTestObj + + @@ -1124,6 +1237,10 @@ raise an error. + + A #RegressTestObj + + @@ -1507,12 +1624,20 @@ the introspection client langage. + + + + + + + + @@ -1541,6 +1666,11 @@ the introspection client langage. + + + + + @@ -1567,6 +1697,10 @@ the introspection client langage. + + the structure + + + + the structure + + + + + + + + + + + + + + + + + @@ -1790,6 +1944,11 @@ the introspection client langage. + + + + + @@ -1797,6 +1956,9 @@ the introspection client langage. + + + diff --git a/tests/scanner/TestInherit-1.0-expected.gir b/tests/scanner/TestInherit-1.0-expected.gir index 6b16ab70..1f1a3286 100644 --- a/tests/scanner/TestInherit-1.0-expected.gir +++ b/tests/scanner/TestInherit-1.0-expected.gir @@ -29,6 +29,9 @@ and/or use gtk-doc annotations. --> + + + @@ -41,6 +44,9 @@ and/or use gtk-doc annotations. --> + + + @@ -52,6 +58,9 @@ and/or use gtk-doc annotations. --> + + + + + + + + + -- cgit v1.2.1 From 4c407e38bbd3a373f0f1fec7ace91ff6bc26569b Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 12:58:15 -0500 Subject: mallardwriter: Use mkdtemp We should not litter /tmp --- giscanner/mallardwriter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py index 5a9f094c..c4c88e94 100644 --- a/giscanner/mallardwriter.py +++ b/giscanner/mallardwriter.py @@ -444,7 +444,7 @@ class MallardWriter(object): template_dir = os.path.join(srcdir, 'doctemplates', self._language) return TemplateLookup(directories=[template_dir], - module_directory=tempfile.gettempdir(), + module_directory=tempfile.mkdtemp(), output_encoding='utf-8') def write(self, output): -- cgit v1.2.1 From 9d1eb5f5c937d1bd687828ee897b7cd42e470571 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 30 Jan 2013 09:50:43 -0500 Subject: mallardwriter: Use the same code to lookup fundamentals as the rest Also, put blocks around fundamentals. --- giscanner/mallardwriter.py | 6 +++++- .../doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page | 6 +++--- .../DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page | 4 ++-- .../DocExamples-1.0-Python-expected/DocExamples.Obj.method.page | 6 +++--- .../DocExamples.Obj.static_method.page | 4 ++-- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py index c4c88e94..74bb3d67 100644 --- a/giscanner/mallardwriter.py +++ b/giscanner/mallardwriter.py @@ -239,7 +239,11 @@ class MallardFormatter(object): return self.format_xref(type_) def _process_fundamental(self, node, match, props): - return self.fundamentals.get(props['fundamental'], match) + fundamental = props['fundamental'] + try: + return '%s' % (self.fundamentals[fundamental],) + except KeyError: + return match def _process_parameter(self, node, match, props): try: diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page index 38e4f5a5..1c52955e 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page @@ -62,11 +62,11 @@ created with doc_examples_obj_new.

boolean_arg :

-

You should always pass TRUE.

+

You should always pass TRUE.

pointer_arg :

-

If not NULL, do a thing. Pass first_arg if you want to sometimes. You can also pass second_arg, or even boolean_arg.

+

If not NULL, do a thing. Pass first_arg if you want to sometimes. You can also pass second_arg, or even boolean_arg.

string :

@@ -74,7 +74,7 @@ created with doc_examples_obj_new.

Returns :

-

Either FALSE or something FALSE-y.

+

Either FALSE or something FALSE-y.

Since 0.99

diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page index f5f2145b..f0c917f5 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page @@ -29,11 +29,11 @@ and a return value.

- + - +

out_arg :

a pointer to int, or NULL to ignore

a pointer to int, or NULL to ignore

Returns :

TRUE if out_arg is valid, FALSE otherwise

TRUE if out_arg is valid, FALSE otherwise
diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page index cd805708..3f51bf32 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page @@ -60,11 +60,11 @@ created with Obj.new.

This should

boolean_arg :

-

You should always pass True.

+

You should always pass True.

pointer_arg :

-

If not None, do a thing. Pass self if you want to sometimes. You can also pass second_arg, or even boolean_arg.

+

If not None, do a thing. Pass self if you want to sometimes. You can also pass second_arg, or even boolean_arg.

string :

@@ -72,7 +72,7 @@ created with Obj.new.

This should

Returns :

-

Either False or something False-y.

+

Either False or something False-y.

Since 0.99

diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page index 35c6c7b9..2577eb89 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page @@ -32,11 +32,11 @@ and a return value.

- + - +

out_arg :

a pointer to int, or None to ignore

a pointer to int, or None to ignore

Returns :

True if out_arg is valid, False otherwise

True if out_arg is valid, False otherwise
-- cgit v1.2.1 From edec66f3826b160065db575c3dc9c81031dfb075 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 30 Jan 2013 10:07:59 -0500 Subject: mallardwriter: Parse %ENUM_FIELDs --- giscanner/mallardwriter.py | 25 ++++++++++++++++------ .../DocExamples.callback_function.page | 10 ++++----- .../DocExamples.callback_function.page | 8 +++++-- tests/doctool/doc-examples-obj.c | 7 +++++- tests/doctool/doc-examples-obj.h | 6 +++--- 5 files changed, 38 insertions(+), 18 deletions(-) diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py index 74bb3d67..b7385fed 100644 --- a/giscanner/mallardwriter.py +++ b/giscanner/mallardwriter.py @@ -150,7 +150,7 @@ class DocstringScanner(TemplatedScanner): ('property', r'#<>:(<>)'), ('signal', r'#<>::(<>)'), ('type_name', r'#(<>)'), - ('fundamental', r'%(<>)'), + ('enum_value', r'%(<>)'), ('parameter', r'@<>'), ('function_call', r'<>\(\)'), ] @@ -238,12 +238,19 @@ class MallardFormatter(object): return self.format_xref(type_) - def _process_fundamental(self, node, match, props): - fundamental = props['fundamental'] + def _process_enum_value(self, node, match, props): + member_name = props['member_name'] + try: - return '%s' % (self.fundamentals[fundamental],) + return '%s' % (self.fundamentals[member_name], ) except KeyError: - return match + pass + + enum_value = self._resolve_symbol(member_name) + if enum_value: + return self.format_xref(enum_value) + + return match def _process_parameter(self, node, match, props): try: @@ -268,7 +275,7 @@ class MallardFormatter(object): 'property': self._process_property, 'signal': self._process_signal, 'type_name': self._process_type_name, - 'fundamental': self._process_fundamental, + 'enum_value': self._process_enum_value, 'parameter': self._process_parameter, 'function_call': self._process_function_call, } @@ -305,7 +312,11 @@ class MallardFormatter(object): return make_page_id(node) def format_xref(self, node): - return '%s' % (make_page_id(node), self.format_page_name(node)) + if isinstance(node, ast.Member): + # Enum/BitField members are linked to the main enum page. + return self.format_xref(node.parent) + '.' + node.name + else: + return '%s' % (make_page_id(node), self.format_page_name(node)) def format_property_flags(self, property_, construct_only=False): flags = [] diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page index 436d825f..19d10b2e 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page @@ -10,7 +10,7 @@ - void + DocExamplesEnum doc_examples_callback_function @@ -29,9 +29,9 @@ doc_examples_callback_function -void doc_examples_callback_function (DocExamplesCallback callback, - gpointer user_data, - GDestroyNotify destroy_notify); +DocExamplesEnum doc_examples_callback_function (DocExamplesCallback callback, + gpointer user_data, + GDestroyNotify destroy_notify);

This is a function that takes a callback. Different languages will expose this in different ways (e.g. Python keeps the @@ -52,7 +52,7 @@ will expose this in different ways (e.g. Python keeps the

Returns :

- +

DocExamples.Enum.foo sometimes, DocExamples.Enum.bar other times.

diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page index f1b49051..a834cfb5 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page @@ -10,7 +10,7 @@ - none + DocExamples.Enum doc_examples_callback_function @@ -30,7 +30,7 @@ callback_function @accepts(DocExamples.Callback, gpointer, GLib.DestroyNotify) -@returns(none) +@returns(DocExamples.Enum) def callback_function(callback, user_data, destroy_notify): # Python wrapper for doc_examples_callback_function() @@ -51,5 +51,9 @@ will expose this in different ways (e.g. Python keeps the

destroy_notify :

how to get rid of user_data

+ +

Returns :

+

DocExamples.Enum.foo sometimes, DocExamples.Enum.bar other times.

+ diff --git a/tests/doctool/doc-examples-obj.c b/tests/doctool/doc-examples-obj.c index 60150f89..08341c83 100644 --- a/tests/doctool/doc-examples-obj.c +++ b/tests/doctool/doc-examples-obj.c @@ -180,8 +180,11 @@ doc_examples_array_function (gint *out_len) * This is a function that takes a callback. Different languages * will expose this in different ways (e.g. Python keeps the * @user_data parameter, while JS doesn't) + * + * Returns: %DOC_EXAMPLES_FOO sometimes, %DOC_EXAMPLES_BAR + * other times. */ -void +DocExamplesEnum doc_examples_callback_function (DocExamplesCallback callback, gpointer user_data, GDestroyNotify destroy_notify) @@ -193,4 +196,6 @@ doc_examples_callback_function (DocExamplesCallback callback, if (user_data && destroy_notify) destroy_notify (user_data); + + return DOC_EXAMPLES_FOO; } diff --git a/tests/doctool/doc-examples-obj.h b/tests/doctool/doc-examples-obj.h index e7aba555..641aa813 100644 --- a/tests/doctool/doc-examples-obj.h +++ b/tests/doctool/doc-examples-obj.h @@ -84,9 +84,9 @@ typedef enum { */ typedef gchar * (*DocExamplesCallback) (int one, int two); -void doc_examples_callback_function (DocExamplesCallback callback, - gpointer user_data, - GDestroyNotify destroy_notify); +DocExamplesEnum doc_examples_callback_function (DocExamplesCallback callback, + gpointer user_data, + GDestroyNotify destroy_notify); G_END_DECLS -- cgit v1.2.1 From 5559be3d6458f2c83173fe4735daa83c9532e837 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 10:54:20 -0500 Subject: mallardwriter: Remove unused import --- giscanner/mallardwriter.py | 1 - 1 file changed, 1 deletion(-) diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py index b7385fed..8a29f249 100644 --- a/giscanner/mallardwriter.py +++ b/giscanner/mallardwriter.py @@ -26,7 +26,6 @@ import re import tempfile from xml.sax import saxutils -from mako.template import Template from mako.lookup import TemplateLookup from . import ast -- cgit v1.2.1 From eed71caaf397b596a0e98c7eaf13525d74fe06da Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 11:14:19 -0500 Subject: doctool: Switch to a computed page_style for all page templates This is a quick cleanup before we inherit from a common template for all pages. --- Makefile-giscanner.am | 4 ++++ giscanner/doctemplates/C/mallard-C-class.tmpl | 2 +- giscanner/doctemplates/C/mallard-C-constructor.tmpl | 1 + giscanner/doctemplates/C/mallard-C-default.tmpl | 2 +- giscanner/doctemplates/C/mallard-C-enum.tmpl | 2 +- giscanner/doctemplates/C/mallard-C-function.tmpl | 7 ------- giscanner/doctemplates/C/mallard-C-method.tmpl | 1 + giscanner/doctemplates/C/mallard-C-namespace.tmpl | 2 +- giscanner/doctemplates/C/mallard-C-property.tmpl | 2 +- giscanner/doctemplates/C/mallard-C-record.tmpl | 2 +- giscanner/doctemplates/C/mallard-C-signal.tmpl | 2 +- giscanner/doctemplates/C/mallard-C-vfunc.tmpl | 2 +- giscanner/doctemplates/Python/mallard-Python-class.tmpl | 2 +- .../doctemplates/Python/mallard-Python-constructor.tmpl | 1 + giscanner/doctemplates/Python/mallard-Python-default.tmpl | 2 +- giscanner/doctemplates/Python/mallard-Python-enum.tmpl | 2 +- .../doctemplates/Python/mallard-Python-function.tmpl | 7 ------- giscanner/doctemplates/Python/mallard-Python-method.tmpl | 1 + .../doctemplates/Python/mallard-Python-namespace.tmpl | 2 +- .../doctemplates/Python/mallard-Python-property.tmpl | 2 +- giscanner/doctemplates/Python/mallard-Python-record.tmpl | 2 +- giscanner/doctemplates/Python/mallard-Python-signal.tmpl | 2 +- giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl | 2 +- giscanner/mallardwriter.py | 15 +++++++++++---- .../DocExamples-1.0-C-expected/DocExamples.Callback.page | 2 +- .../DocExamples.Obj.method.page | 1 - .../DocExamples-1.0-C-expected/DocExamples.Obj.new.page | 1 - .../DocExamples.Obj.static_method.page | 1 - .../DocExamples.array_function.page | 1 - .../DocExamples.callback_function.page | 1 - .../DocExamples.Callback.page | 2 +- .../DocExamples.Obj.method.page | 1 - .../DocExamples.Obj.static_method.page | 1 - .../DocExamples.array_function.page | 1 - .../DocExamples.callback_function.page | 1 - 35 files changed, 37 insertions(+), 45 deletions(-) create mode 100644 giscanner/doctemplates/C/mallard-C-constructor.tmpl create mode 100644 giscanner/doctemplates/C/mallard-C-method.tmpl create mode 100644 giscanner/doctemplates/Python/mallard-Python-constructor.tmpl create mode 100644 giscanner/doctemplates/Python/mallard-Python-method.tmpl diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am index c43b5bdf..9865eced 100644 --- a/Makefile-giscanner.am +++ b/Makefile-giscanner.am @@ -55,18 +55,22 @@ pkgpyexec_PYTHON = \ templatedir = $(pkglibdir) nobase_template_DATA = \ giscanner/doctemplates/C/mallard-C-class.tmpl \ + giscanner/doctemplates/C/mallard-C-constructor.tmpl \ giscanner/doctemplates/C/mallard-C-default.tmpl \ giscanner/doctemplates/C/mallard-C-enum.tmpl \ giscanner/doctemplates/C/mallard-C-function.tmpl \ + giscanner/doctemplates/C/mallard-C-method.tmpl \ giscanner/doctemplates/C/mallard-C-namespace.tmpl \ giscanner/doctemplates/C/mallard-C-property.tmpl \ giscanner/doctemplates/C/mallard-C-record.tmpl \ giscanner/doctemplates/C/mallard-C-signal.tmpl \ giscanner/doctemplates/C/mallard-C-vfunc.tmpl \ giscanner/doctemplates/Python/mallard-Python-class.tmpl \ + giscanner/doctemplates/Python/mallard-Python-constructor.tmpl \ giscanner/doctemplates/Python/mallard-Python-default.tmpl \ giscanner/doctemplates/Python/mallard-Python-enum.tmpl \ giscanner/doctemplates/Python/mallard-Python-function.tmpl \ + giscanner/doctemplates/Python/mallard-Python-method.tmpl \ giscanner/doctemplates/Python/mallard-Python-namespace.tmpl \ giscanner/doctemplates/Python/mallard-Python-property.tmpl \ giscanner/doctemplates/Python/mallard-Python-record.tmpl \ diff --git a/giscanner/doctemplates/C/mallard-C-class.tmpl b/giscanner/doctemplates/C/mallard-C-class.tmpl index b0f703f9..5081f857 100644 --- a/giscanner/doctemplates/C/mallard-C-class.tmpl +++ b/giscanner/doctemplates/C/mallard-C-class.tmpl @@ -1,7 +1,7 @@ diff --git a/giscanner/doctemplates/C/mallard-C-constructor.tmpl b/giscanner/doctemplates/C/mallard-C-constructor.tmpl new file mode 100644 index 00000000..f373dfbe --- /dev/null +++ b/giscanner/doctemplates/C/mallard-C-constructor.tmpl @@ -0,0 +1 @@ +<%inherit file="mallard-C-function.tmpl"/> diff --git a/giscanner/doctemplates/C/mallard-C-default.tmpl b/giscanner/doctemplates/C/mallard-C-default.tmpl index 8326343e..c6ce1760 100644 --- a/giscanner/doctemplates/C/mallard-C-default.tmpl +++ b/giscanner/doctemplates/C/mallard-C-default.tmpl @@ -1,7 +1,7 @@ diff --git a/giscanner/doctemplates/C/mallard-C-enum.tmpl b/giscanner/doctemplates/C/mallard-C-enum.tmpl index b59f27e6..393fae4f 100644 --- a/giscanner/doctemplates/C/mallard-C-enum.tmpl +++ b/giscanner/doctemplates/C/mallard-C-enum.tmpl @@ -1,7 +1,7 @@ diff --git a/giscanner/doctemplates/C/mallard-C-function.tmpl b/giscanner/doctemplates/C/mallard-C-function.tmpl index 051fb0b0..853a7619 100644 --- a/giscanner/doctemplates/C/mallard-C-function.tmpl +++ b/giscanner/doctemplates/C/mallard-C-function.tmpl @@ -1,11 +1,4 @@ -<% -page_style = 'function' -if node.is_constructor: - page_style = 'constructor' -elif node.is_method: - page_style = 'method' -%> diff --git a/giscanner/doctemplates/C/mallard-C-namespace.tmpl b/giscanner/doctemplates/C/mallard-C-namespace.tmpl index 284ba238..5d39dbcb 100644 --- a/giscanner/doctemplates/C/mallard-C-namespace.tmpl +++ b/giscanner/doctemplates/C/mallard-C-namespace.tmpl @@ -1,7 +1,7 @@ diff --git a/giscanner/doctemplates/C/mallard-C-property.tmpl b/giscanner/doctemplates/C/mallard-C-property.tmpl index a4719952..68f09ec8 100644 --- a/giscanner/doctemplates/C/mallard-C-property.tmpl +++ b/giscanner/doctemplates/C/mallard-C-property.tmpl @@ -1,7 +1,7 @@ diff --git a/giscanner/doctemplates/C/mallard-C-record.tmpl b/giscanner/doctemplates/C/mallard-C-record.tmpl index 1c7223a8..f0c80dc0 100644 --- a/giscanner/doctemplates/C/mallard-C-record.tmpl +++ b/giscanner/doctemplates/C/mallard-C-record.tmpl @@ -1,7 +1,7 @@ diff --git a/giscanner/doctemplates/C/mallard-C-signal.tmpl b/giscanner/doctemplates/C/mallard-C-signal.tmpl index 69ecaad4..33ed5c2d 100644 --- a/giscanner/doctemplates/C/mallard-C-signal.tmpl +++ b/giscanner/doctemplates/C/mallard-C-signal.tmpl @@ -1,7 +1,7 @@ diff --git a/giscanner/doctemplates/C/mallard-C-vfunc.tmpl b/giscanner/doctemplates/C/mallard-C-vfunc.tmpl index a35c7b52..3a00d992 100644 --- a/giscanner/doctemplates/C/mallard-C-vfunc.tmpl +++ b/giscanner/doctemplates/C/mallard-C-vfunc.tmpl @@ -1,7 +1,7 @@ diff --git a/giscanner/doctemplates/Python/mallard-Python-class.tmpl b/giscanner/doctemplates/Python/mallard-Python-class.tmpl index 6edf25db..6eef692e 100644 --- a/giscanner/doctemplates/Python/mallard-Python-class.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-class.tmpl @@ -1,7 +1,7 @@ diff --git a/giscanner/doctemplates/Python/mallard-Python-constructor.tmpl b/giscanner/doctemplates/Python/mallard-Python-constructor.tmpl new file mode 100644 index 00000000..0b740414 --- /dev/null +++ b/giscanner/doctemplates/Python/mallard-Python-constructor.tmpl @@ -0,0 +1 @@ +<%inherit file="mallard-Python-function.tmpl"/> diff --git a/giscanner/doctemplates/Python/mallard-Python-default.tmpl b/giscanner/doctemplates/Python/mallard-Python-default.tmpl index 87791059..7bc55d8d 100644 --- a/giscanner/doctemplates/Python/mallard-Python-default.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-default.tmpl @@ -1,7 +1,7 @@ diff --git a/giscanner/doctemplates/Python/mallard-Python-enum.tmpl b/giscanner/doctemplates/Python/mallard-Python-enum.tmpl index 9e44ede9..55ebdf51 100644 --- a/giscanner/doctemplates/Python/mallard-Python-enum.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-enum.tmpl @@ -1,7 +1,7 @@ diff --git a/giscanner/doctemplates/Python/mallard-Python-function.tmpl b/giscanner/doctemplates/Python/mallard-Python-function.tmpl index 5ccc800a..405f2c3c 100644 --- a/giscanner/doctemplates/Python/mallard-Python-function.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-function.tmpl @@ -1,11 +1,4 @@ -<% -page_style = 'function' -if node.is_constructor: - page_style = 'constructor' -elif node.is_method: - page_style = 'method' -%> diff --git a/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl b/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl index 935cd440..4ccf452e 100644 --- a/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl @@ -1,7 +1,7 @@ diff --git a/giscanner/doctemplates/Python/mallard-Python-property.tmpl b/giscanner/doctemplates/Python/mallard-Python-property.tmpl index 7ef72ccb..47187a73 100644 --- a/giscanner/doctemplates/Python/mallard-Python-property.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-property.tmpl @@ -1,7 +1,7 @@ diff --git a/giscanner/doctemplates/Python/mallard-Python-record.tmpl b/giscanner/doctemplates/Python/mallard-Python-record.tmpl index 1b00e3be..f6abd116 100644 --- a/giscanner/doctemplates/Python/mallard-Python-record.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-record.tmpl @@ -1,7 +1,7 @@ diff --git a/giscanner/doctemplates/Python/mallard-Python-signal.tmpl b/giscanner/doctemplates/Python/mallard-Python-signal.tmpl index f26934fb..7bfaf9c5 100644 --- a/giscanner/doctemplates/Python/mallard-Python-signal.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-signal.tmpl @@ -1,7 +1,7 @@ diff --git a/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl b/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl index 0c93abbc..2437e56a 100644 --- a/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl @@ -1,7 +1,7 @@ diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py index 8a29f249..58689227 100644 --- a/giscanner/mallardwriter.py +++ b/giscanner/mallardwriter.py @@ -56,7 +56,7 @@ def make_page_id(node): else: return '%s.%s' % (namespace.name, node.name) -def make_template_name(node, language): +def get_node_kind(node): if isinstance(node, ast.Namespace): node_kind = 'namespace' elif isinstance(node, (ast.Class, ast.Interface)): @@ -64,7 +64,12 @@ def make_template_name(node, language): elif isinstance(node, ast.Record): node_kind = 'record' elif isinstance(node, ast.Function): - node_kind = 'function' + if node.is_method: + node_kind = 'method' + elif node.is_constructor: + node_kind = 'constructor' + else: + node_kind = 'function' elif isinstance(node, ast.Enum): node_kind = 'enum' elif isinstance(node, ast.Property) and node.parent is not None: @@ -76,7 +81,7 @@ def make_template_name(node, language): else: node_kind = 'default' - return 'mallard-%s-%s.tmpl' % (language, node_kind) + return node_kind class TemplatedScanner(object): def __init__(self, specs): @@ -487,13 +492,15 @@ class MallardWriter(object): def _render_node(self, node, output): namespace = self._transformer.namespace - template_name = make_template_name(node, self._language) + node_kind = get_node_kind(node) + template_name = 'mallard-%s-%s.tmpl' % (self._language, node_kind) page_id = make_page_id(node) template = self._lookup.get_template(template_name) result = template.render(namespace=namespace, node=node, page_id=page_id, + page_style=node_kind, formatter=self._formatter) output_file_name = os.path.join(os.path.abspath(output), diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page index 22d30c24..b79b93aa 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page @@ -1,7 +1,7 @@ diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page index 1c52955e..2015098f 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page @@ -1,5 +1,4 @@ - - - - - diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page index 3f51bf32..748add82 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page @@ -1,5 +1,4 @@ - - - - Date: Thu, 31 Jan 2013 11:32:16 -0500 Subject: mallardwriter: Fix format_page_name for Namespace Namespace doesn't have a namespace member. --- giscanner/mallardwriter.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py index 58689227..ccd65f0d 100644 --- a/giscanner/mallardwriter.py +++ b/giscanner/mallardwriter.py @@ -301,10 +301,12 @@ class MallardFormatter(object): raise NotImplementedError def format_page_name(self, node): - namespace = node.namespace if isinstance(node, ast.Namespace): return 'Index' - elif isinstance(node, ast.Function): + + namespace = node.namespace + + if isinstance(node, ast.Function): return self.format_function_name(node) elif isinstance(node, ast.Property) and node.parent is not None: return '%s.%s:%s' % (namespace.name, node.parent.name, node.name) -- cgit v1.2.1 From 6b270e16dd8fb4a23b0a96115537a921aed4a4e1 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 11:33:57 -0500 Subject: doctool: Use a standard title for both links and for page titles --- giscanner/doctemplates/C/mallard-C-class.tmpl | 2 +- giscanner/doctemplates/C/mallard-C-default.tmpl | 2 +- giscanner/doctemplates/C/mallard-C-enum.tmpl | 2 +- giscanner/doctemplates/C/mallard-C-function.tmpl | 2 +- giscanner/doctemplates/C/mallard-C-namespace.tmpl | 2 +- giscanner/doctemplates/C/mallard-C-property.tmpl | 2 +- giscanner/doctemplates/C/mallard-C-record.tmpl | 2 +- giscanner/doctemplates/C/mallard-C-signal.tmpl | 2 +- giscanner/doctemplates/C/mallard-C-vfunc.tmpl | 2 +- giscanner/doctemplates/Python/mallard-Python-class.tmpl | 2 +- giscanner/doctemplates/Python/mallard-Python-default.tmpl | 2 +- giscanner/doctemplates/Python/mallard-Python-enum.tmpl | 2 +- giscanner/doctemplates/Python/mallard-Python-function.tmpl | 2 +- giscanner/doctemplates/Python/mallard-Python-namespace.tmpl | 2 +- giscanner/doctemplates/Python/mallard-Python-property.tmpl | 2 +- giscanner/doctemplates/Python/mallard-Python-record.tmpl | 2 +- giscanner/doctemplates/Python/mallard-Python-signal.tmpl | 2 +- giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl | 2 +- .../DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page | 2 +- .../DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page | 2 +- tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page | 2 +- tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page | 2 +- tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page | 2 +- tests/doctool/DocExamples-1.0-C-expected/index.page | 2 +- .../doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page | 2 +- .../doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page | 2 +- .../DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page | 2 +- tests/doctool/DocExamples-1.0-Python-expected/index.page | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/giscanner/doctemplates/C/mallard-C-class.tmpl b/giscanner/doctemplates/C/mallard-C-class.tmpl index 5081f857..3a208447 100644 --- a/giscanner/doctemplates/C/mallard-C-class.tmpl +++ b/giscanner/doctemplates/C/mallard-C-class.tmpl @@ -8,7 +8,7 @@ - ${node.ctype} + ${formatter.format_page_name(node)} ${formatter.format(node, node.doc)} % if node.version:

Since ${node.version}

diff --git a/giscanner/doctemplates/C/mallard-C-default.tmpl b/giscanner/doctemplates/C/mallard-C-default.tmpl index c6ce1760..d2c41056 100644 --- a/giscanner/doctemplates/C/mallard-C-default.tmpl +++ b/giscanner/doctemplates/C/mallard-C-default.tmpl @@ -6,6 +6,6 @@ xmlns:ui="http://projectmallard.org/experimental/ui/"> - ${namespace.name}.${node.name} + ${formatter.format_page_name(node)} ${formatter.format(node, node.doc)} diff --git a/giscanner/doctemplates/C/mallard-C-enum.tmpl b/giscanner/doctemplates/C/mallard-C-enum.tmpl index 393fae4f..7283366d 100644 --- a/giscanner/doctemplates/C/mallard-C-enum.tmpl +++ b/giscanner/doctemplates/C/mallard-C-enum.tmpl @@ -7,6 +7,6 @@ - ${node.namespace.name}.${node.name} + ${formatter.format_page_name(node)} ${formatter.format(node, node.doc)} diff --git a/giscanner/doctemplates/C/mallard-C-function.tmpl b/giscanner/doctemplates/C/mallard-C-function.tmpl index 853a7619..d433aa56 100644 --- a/giscanner/doctemplates/C/mallard-C-function.tmpl +++ b/giscanner/doctemplates/C/mallard-C-function.tmpl @@ -34,7 +34,7 @@ % endfor - ${node.symbol} + ${formatter.format_page_name(node)} ${node.retval.type.ctype} ${node.symbol} (\ % if node.is_method: diff --git a/giscanner/doctemplates/C/mallard-C-namespace.tmpl b/giscanner/doctemplates/C/mallard-C-namespace.tmpl index 5d39dbcb..39d02619 100644 --- a/giscanner/doctemplates/C/mallard-C-namespace.tmpl +++ b/giscanner/doctemplates/C/mallard-C-namespace.tmpl @@ -6,7 +6,7 @@ xmlns:ui="http://projectmallard.org/experimental/ui/"> - ${node.name} Documentation + ${formatter.format_page_name(node)} Classes diff --git a/giscanner/doctemplates/C/mallard-C-property.tmpl b/giscanner/doctemplates/C/mallard-C-property.tmpl index 68f09ec8..a253160d 100644 --- a/giscanner/doctemplates/C/mallard-C-property.tmpl +++ b/giscanner/doctemplates/C/mallard-C-property.tmpl @@ -8,6 +8,6 @@ ${node.name} - ${node.parent.ctype}:${node.name} + ${formatter.format_page_name(node)} ${formatter.format(node, node.doc)} diff --git a/giscanner/doctemplates/C/mallard-C-record.tmpl b/giscanner/doctemplates/C/mallard-C-record.tmpl index f0c80dc0..7283366d 100644 --- a/giscanner/doctemplates/C/mallard-C-record.tmpl +++ b/giscanner/doctemplates/C/mallard-C-record.tmpl @@ -7,6 +7,6 @@ - ${node.namespace.name}${node.name} + ${formatter.format_page_name(node)} ${formatter.format(node, node.doc)} diff --git a/giscanner/doctemplates/C/mallard-C-signal.tmpl b/giscanner/doctemplates/C/mallard-C-signal.tmpl index 33ed5c2d..49ee9852 100644 --- a/giscanner/doctemplates/C/mallard-C-signal.tmpl +++ b/giscanner/doctemplates/C/mallard-C-signal.tmpl @@ -8,6 +8,6 @@ ${node.name} - ${node.parent.ctype}::${node.name} + ${formatter.format_page_name(node)} ${formatter.format(node, node.doc)} diff --git a/giscanner/doctemplates/C/mallard-C-vfunc.tmpl b/giscanner/doctemplates/C/mallard-C-vfunc.tmpl index 3a00d992..3363ea8c 100644 --- a/giscanner/doctemplates/C/mallard-C-vfunc.tmpl +++ b/giscanner/doctemplates/C/mallard-C-vfunc.tmpl @@ -8,7 +8,7 @@ - ${node.name} + ${formatter.format_page_name(node)} ${formatter.format(node, node.doc)} diff --git a/giscanner/doctemplates/Python/mallard-Python-class.tmpl b/giscanner/doctemplates/Python/mallard-Python-class.tmpl index 6eef692e..800d241f 100644 --- a/giscanner/doctemplates/Python/mallard-Python-class.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-class.tmpl @@ -8,7 +8,7 @@ - ${namespace.name}.${node.name} + ${formatter.format_page_name(node)} ${formatter.format(node, node.doc)} diff --git a/giscanner/doctemplates/Python/mallard-Python-default.tmpl b/giscanner/doctemplates/Python/mallard-Python-default.tmpl index 7bc55d8d..1d202109 100644 --- a/giscanner/doctemplates/Python/mallard-Python-default.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-default.tmpl @@ -6,6 +6,6 @@ xmlns:ui="http://projectmallard.org/experimental/ui/"> - ${namespace.name}.${node.name} + ${formatter.format_page_name(node)} ${formatter.format(node, node.doc)} diff --git a/giscanner/doctemplates/Python/mallard-Python-enum.tmpl b/giscanner/doctemplates/Python/mallard-Python-enum.tmpl index 55ebdf51..c1a4d8c5 100644 --- a/giscanner/doctemplates/Python/mallard-Python-enum.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-enum.tmpl @@ -7,7 +7,7 @@ - ${node.namespace.name}.${node.name} + ${formatter.format_page_name(node)} ${formatter.format(node, node.doc)} % if node.members: diff --git a/giscanner/doctemplates/Python/mallard-Python-function.tmpl b/giscanner/doctemplates/Python/mallard-Python-function.tmpl index 405f2c3c..1976a1ca 100644 --- a/giscanner/doctemplates/Python/mallard-Python-function.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-function.tmpl @@ -34,7 +34,7 @@ % endfor - ${node.name} + ${formatter.format_page_name(node)} % if len(node.parameters) != 0: @accepts(\ diff --git a/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl b/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl index 4ccf452e..97bd7132 100644 --- a/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl @@ -6,7 +6,7 @@ xmlns:ui="http://projectmallard.org/experimental/ui/"> - ${node.name} Documentation + ${formatter.format_page_name(node)} Classes diff --git a/giscanner/doctemplates/Python/mallard-Python-property.tmpl b/giscanner/doctemplates/Python/mallard-Python-property.tmpl index 47187a73..7f4138cd 100644 --- a/giscanner/doctemplates/Python/mallard-Python-property.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-property.tmpl @@ -8,7 +8,7 @@ ${node.name} - ${namespace.name}.${node.parent.name}:${node.name} + ${formatter.format_page_name(node)} "${node.name}" ${formatter.format_type(node.type)} : ${formatter.format_property_flags(node)} diff --git a/giscanner/doctemplates/Python/mallard-Python-record.tmpl b/giscanner/doctemplates/Python/mallard-Python-record.tmpl index f6abd116..43bea043 100644 --- a/giscanner/doctemplates/Python/mallard-Python-record.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-record.tmpl @@ -7,6 +7,6 @@ - ${node.namespace.name}${node.name} + ${formatter.format_page_name(node)}

${node.doc}

diff --git a/giscanner/doctemplates/Python/mallard-Python-signal.tmpl b/giscanner/doctemplates/Python/mallard-Python-signal.tmpl index 7bfaf9c5..8dda89be 100644 --- a/giscanner/doctemplates/Python/mallard-Python-signal.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-signal.tmpl @@ -8,7 +8,7 @@ ${node.name} - ${namespace.name}.${node.parent.name}::${node.name} + ${formatter.format_page_name(node)} def callback(${formatter.to_underscores(node.parent.name).lower()}, \ % for arg, ix in zip(node.parameters, range(len(node.parameters))): diff --git a/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl b/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl index 2437e56a..86dc685b 100644 --- a/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl @@ -9,7 +9,7 @@ ${node.name} - ${namespace.name}.${node.parent.name}.${node.name} + ${formatter.format_page_name(node)} % if len(node.parameters) != 0: @accepts(\ diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page index e7702a21..fde0ffb4 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page @@ -8,6 +8,6 @@ property-example - DocExamplesObj:property-example + DocExamples.Obj:property-example

This is an example of how to document a property.

diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page index 548588c8..7f63fa40 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page @@ -8,6 +8,6 @@ signal-example - DocExamplesObj::signal-example + DocExamples.Obj::signal-example

This is an example of how to document a signal.

diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page index 345d64b9..c9b47666 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page @@ -8,7 +8,7 @@ - vfunc + DocExamples.Obj::vfunc

This is an example of how to document a vfunc.

diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page index 0a46bd23..6014906c 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page @@ -8,7 +8,7 @@ - DocExamplesObj + DocExamples.Obj

This is an example of how to document a class

This class has a signal: DocExamples.Obj::signal-example.

And also has a property: DocExamples.Obj:property-example.

Since 0.99

diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page index c3a958d6..c8e43755 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page @@ -7,6 +7,6 @@ - DocExamplesObjClass + DocExamples.ObjClass diff --git a/tests/doctool/DocExamples-1.0-C-expected/index.page b/tests/doctool/DocExamples-1.0-C-expected/index.page index a61ea759..c87a104b 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/index.page +++ b/tests/doctool/DocExamples-1.0-C-expected/index.page @@ -6,7 +6,7 @@ xmlns:ui="http://projectmallard.org/experimental/ui/"> - DocExamples Documentation + Index Classes diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page index 4f56baed..8a02f616 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page @@ -9,7 +9,7 @@ vfunc - DocExamples.Obj.vfunc + DocExamples.Obj::vfunc @accepts(int) @returns(none) diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page index 748add82..2477e451 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page @@ -38,7 +38,7 @@ - method + Obj.method @accepts(int, float, bool, gpointer, unicode) @returns(bool) diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page index efbdc41a..e040414f 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page @@ -18,7 +18,7 @@ - static_method + Obj.static_method @accepts(int) @returns(bool) diff --git a/tests/doctool/DocExamples-1.0-Python-expected/index.page b/tests/doctool/DocExamples-1.0-Python-expected/index.page index fc6a9b7d..bbf9d2d7 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/index.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/index.page @@ -6,7 +6,7 @@ xmlns:ui="http://projectmallard.org/experimental/ui/"> - DocExamples Documentation + Index Classes -- cgit v1.2.1 From 0667d9f124c1da66376e774e2e96b76cdc70700a Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 10:52:53 -0500 Subject: tests: Ignore whitespace differences in template comparisons Adding more Mako code to reduce duplicate code will add newlines to the output. Ignore these. --- tests/doctool/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/doctool/Makefile.am b/tests/doctool/Makefile.am index 1e61cbbf..9a0734c4 100644 --- a/tests/doctool/Makefile.am +++ b/tests/doctool/Makefile.am @@ -41,10 +41,10 @@ GIRS += DocExamples-1.0.gir $(AM_V_at)$(INTROSPECTION_DOCTOOL) --language Python $*.gir -o $*-Python/ %-C.page.check: %-C - @diff -u -U 10 $(srcdir)/$*-C-expected $*-C && echo " TEST $*-C" && rm -rf $*-C + @diff -u -w -B -U 10 $(srcdir)/$*-C-expected $*-C && echo " TEST $*-C" && rm -rf $*-C %-Python.page.check: %-Python - @diff -u -U 10 $(srcdir)/$*-Python-expected $*-Python && echo " TEST $*-Python" && rm -rf $*-Python + @diff -u -w -B -U 10 $(srcdir)/$*-Python-expected $*-Python && echo " TEST $*-Python" && rm -rf $*-Python check-local: $(CHECK_TARGETS) $(TYPELIBS) clean-local: -- cgit v1.2.1 From bfeac67a02b618e1e771db3e05601bde9b0fb5d8 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 19:25:43 -0500 Subject: tests: Don't remove the built doctool directories if we're done --- tests/doctool/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/doctool/Makefile.am b/tests/doctool/Makefile.am index 9a0734c4..127b2585 100644 --- a/tests/doctool/Makefile.am +++ b/tests/doctool/Makefile.am @@ -41,10 +41,10 @@ GIRS += DocExamples-1.0.gir $(AM_V_at)$(INTROSPECTION_DOCTOOL) --language Python $*.gir -o $*-Python/ %-C.page.check: %-C - @diff -u -w -B -U 10 $(srcdir)/$*-C-expected $*-C && echo " TEST $*-C" && rm -rf $*-C + @diff -u -w -B -U 10 $(srcdir)/$*-C-expected $*-C && echo " TEST $*-C" %-Python.page.check: %-Python - @diff -u -w -B -U 10 $(srcdir)/$*-Python-expected $*-Python && echo " TEST $*-Python" && rm -rf $*-Python + @diff -u -w -B -U 10 $(srcdir)/$*-Python-expected $*-Python && echo " TEST $*-Python" check-local: $(CHECK_TARGETS) $(TYPELIBS) clean-local: -- cgit v1.2.1 From 9c68ba7c6f8b6b7367ccad1877d28cd526045961 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 11:46:13 -0500 Subject: doctool: Use a base template for all pages --- Makefile-giscanner.am | 1 + giscanner/doctemplates/C/mallard-C-class.tmpl | 22 ++++++--------------- giscanner/doctemplates/C/mallard-C-default.tmpl | 12 +---------- giscanner/doctemplates/C/mallard-C-enum.tmpl | 14 ++----------- giscanner/doctemplates/C/mallard-C-function.tmpl | 23 +++++++--------------- giscanner/doctemplates/C/mallard-C-namespace.tmpl | 14 ++++--------- giscanner/doctemplates/C/mallard-C-property.tmpl | 14 +++---------- giscanner/doctemplates/C/mallard-C-record.tmpl | 13 +----------- giscanner/doctemplates/C/mallard-C-signal.tmpl | 16 ++++----------- giscanner/doctemplates/C/mallard-C-vfunc.tmpl | 23 +++++++--------------- .../doctemplates/Python/mallard-Python-class.tmpl | 22 +++++---------------- .../Python/mallard-Python-default.tmpl | 12 +---------- .../doctemplates/Python/mallard-Python-enum.tmpl | 15 +++----------- .../Python/mallard-Python-function.tmpl | 22 +++++++-------------- .../Python/mallard-Python-namespace.tmpl | 20 +++++++------------ .../Python/mallard-Python-property.tmpl | 17 ++++++---------- .../doctemplates/Python/mallard-Python-record.tmpl | 14 ++----------- .../doctemplates/Python/mallard-Python-signal.tmpl | 20 +++++++------------ .../doctemplates/Python/mallard-Python-vfunc.tmpl | 22 +++++---------------- giscanner/doctemplates/mallard-base.tmpl | 23 ++++++++++++++++++++++ giscanner/mallardwriter.py | 5 +++-- .../DocExamples.Callback.page | 9 ++++++++- .../DocExamples.Enum.page | 10 ++++++++-- .../DocExamples.Obj-property-example.page | 10 ++++++++-- .../DocExamples.Obj-signal-example.page | 12 ++++++++--- .../DocExamples.Obj-vfunc.page | 12 +++++++++-- .../DocExamples.Obj.method.page | 14 ++++++++++--- .../DocExamples.Obj.new.page | 10 +++++++++- .../DocExamples.Obj.page | 15 +++++++++++--- .../DocExamples.Obj.static_method.page | 12 +++++++++-- .../DocExamples.ObjClass.page | 12 ++++++++--- .../DocExamples.array_function.page | 12 +++++++++-- .../DocExamples.callback_function.page | 12 +++++++++-- .../doctool/DocExamples-1.0-C-expected/index.page | 7 +++++++ .../DocExamples.Callback.page | 9 ++++++++- .../DocExamples.Enum.page | 9 +++++++-- .../DocExamples.Obj-property-example.page | 10 +++++++++- .../DocExamples.Obj-signal-example.page | 10 +++++++++- .../DocExamples.Obj-vfunc.page | 16 +++++++++++---- .../DocExamples.Obj.method.page | 13 ++++++++++-- .../DocExamples.Obj.page | 18 ++++++++++++----- .../DocExamples.Obj.static_method.page | 11 ++++++++++- .../DocExamples.array_function.page | 11 ++++++++++- .../DocExamples.callback_function.page | 11 ++++++++++- .../DocExamples-1.0-Python-expected/index.page | 13 +++++++++--- 45 files changed, 335 insertions(+), 287 deletions(-) create mode 100644 giscanner/doctemplates/mallard-base.tmpl diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am index 9865eced..35eac1d6 100644 --- a/Makefile-giscanner.am +++ b/Makefile-giscanner.am @@ -54,6 +54,7 @@ pkgpyexec_PYTHON = \ templatedir = $(pkglibdir) nobase_template_DATA = \ + giscanner/doctemplates/mallard-base.tmpl \ giscanner/doctemplates/C/mallard-C-class.tmpl \ giscanner/doctemplates/C/mallard-C-constructor.tmpl \ giscanner/doctemplates/C/mallard-C-default.tmpl \ diff --git a/giscanner/doctemplates/C/mallard-C-class.tmpl b/giscanner/doctemplates/C/mallard-C-class.tmpl index 3a208447..b1be35e4 100644 --- a/giscanner/doctemplates/C/mallard-C-class.tmpl +++ b/giscanner/doctemplates/C/mallard-C-class.tmpl @@ -1,18 +1,8 @@ - - - - - - ${formatter.format_page_name(node)} -${formatter.format(node, node.doc)} -% if node.version: -

Since ${node.version}

-% endif +<%! page_type="guide" %>\ +<%inherit file="mallard-base.tmpl"/> +<%block name="content"> +${parent.content()} +${self.since_version()} Hierarchy @@ -45,4 +35,4 @@ ${formatter.format(node, node.doc)} Other - + diff --git a/giscanner/doctemplates/C/mallard-C-default.tmpl b/giscanner/doctemplates/C/mallard-C-default.tmpl index d2c41056..991f29be 100644 --- a/giscanner/doctemplates/C/mallard-C-default.tmpl +++ b/giscanner/doctemplates/C/mallard-C-default.tmpl @@ -1,11 +1 @@ - - - - - ${formatter.format_page_name(node)} -${formatter.format(node, node.doc)} - +<%inherit file="mallard-base.tmpl"/> diff --git a/giscanner/doctemplates/C/mallard-C-enum.tmpl b/giscanner/doctemplates/C/mallard-C-enum.tmpl index 7283366d..cfe71c15 100644 --- a/giscanner/doctemplates/C/mallard-C-enum.tmpl +++ b/giscanner/doctemplates/C/mallard-C-enum.tmpl @@ -1,12 +1,2 @@ - - - - - - ${formatter.format_page_name(node)} -${formatter.format(node, node.doc)} - +<%! page_type="guide" %>\ +<%inherit file="mallard-base.tmpl"/> diff --git a/giscanner/doctemplates/C/mallard-C-function.tmpl b/giscanner/doctemplates/C/mallard-C-function.tmpl index d433aa56..f93fc31d 100644 --- a/giscanner/doctemplates/C/mallard-C-function.tmpl +++ b/giscanner/doctemplates/C/mallard-C-function.tmpl @@ -1,11 +1,5 @@ - - - +<%inherit file="mallard-base.tmpl"/> +<%block name="info"> % if node.parent is not None: % else: @@ -33,8 +27,8 @@ % endif % endfor - - ${formatter.format_page_name(node)} + +<%block name="content"> ${node.retval.type.ctype} ${node.symbol} (\ % if node.is_method: @@ -64,8 +58,7 @@ ${formatter.format_type(arg.type) | x} ${arg.argname}\ %endif % endfor -${formatter.format(node, node.doc)} - +${parent.content()} % if node.parameters or node.retval:
% for arg, ix in zip(node.parameters, range(len(node.parameters))): @@ -82,7 +75,5 @@ ${formatter.format(node, node.doc)} % endif
% endif -% if node.version: -

Since ${node.version}

-% endif - +${self.since_version()} + diff --git a/giscanner/doctemplates/C/mallard-C-namespace.tmpl b/giscanner/doctemplates/C/mallard-C-namespace.tmpl index 39d02619..372cd33f 100644 --- a/giscanner/doctemplates/C/mallard-C-namespace.tmpl +++ b/giscanner/doctemplates/C/mallard-C-namespace.tmpl @@ -1,12 +1,6 @@ - - - - - ${formatter.format_page_name(node)} +<%! page_type="guide" %>\ +<%inherit file="mallard-base.tmpl"/> +<%block name="content"> Classes @@ -16,4 +10,4 @@ Other - + diff --git a/giscanner/doctemplates/C/mallard-C-property.tmpl b/giscanner/doctemplates/C/mallard-C-property.tmpl index a253160d..cceb62de 100644 --- a/giscanner/doctemplates/C/mallard-C-property.tmpl +++ b/giscanner/doctemplates/C/mallard-C-property.tmpl @@ -1,13 +1,5 @@ - - - +<%inherit file="mallard-base.tmpl"/> +<%block name="info"> ${node.name} - - ${formatter.format_page_name(node)} -${formatter.format(node, node.doc)} - + diff --git a/giscanner/doctemplates/C/mallard-C-record.tmpl b/giscanner/doctemplates/C/mallard-C-record.tmpl index 7283366d..991f29be 100644 --- a/giscanner/doctemplates/C/mallard-C-record.tmpl +++ b/giscanner/doctemplates/C/mallard-C-record.tmpl @@ -1,12 +1 @@ - - - - - - ${formatter.format_page_name(node)} -${formatter.format(node, node.doc)} - +<%inherit file="mallard-base.tmpl"/> diff --git a/giscanner/doctemplates/C/mallard-C-signal.tmpl b/giscanner/doctemplates/C/mallard-C-signal.tmpl index 49ee9852..cceb62de 100644 --- a/giscanner/doctemplates/C/mallard-C-signal.tmpl +++ b/giscanner/doctemplates/C/mallard-C-signal.tmpl @@ -1,13 +1,5 @@ - - - - +<%inherit file="mallard-base.tmpl"/> +<%block name="info"> + ${node.name} - - ${formatter.format_page_name(node)} -${formatter.format(node, node.doc)} - + diff --git a/giscanner/doctemplates/C/mallard-C-vfunc.tmpl b/giscanner/doctemplates/C/mallard-C-vfunc.tmpl index 3363ea8c..b27b2cef 100644 --- a/giscanner/doctemplates/C/mallard-C-vfunc.tmpl +++ b/giscanner/doctemplates/C/mallard-C-vfunc.tmpl @@ -1,18 +1,11 @@ - - - +<%inherit file="mallard-base.tmpl"/> +<%block name="info"> - - ${formatter.format_page_name(node)} + +<%block name="content"> -${formatter.format(node, node.doc)} - +${parent.content()} % if node.parameters or node.retval: % for arg, ix in zip(node.parameters, range(len(node.parameters))): @@ -29,7 +22,5 @@ ${formatter.format(node, node.doc)} % endif
% endif -% if node.version: -

Since ${node.version}

-% endif - +${self.since_version()} + diff --git a/giscanner/doctemplates/Python/mallard-Python-class.tmpl b/giscanner/doctemplates/Python/mallard-Python-class.tmpl index 800d241f..3f0d67a1 100644 --- a/giscanner/doctemplates/Python/mallard-Python-class.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-class.tmpl @@ -1,16 +1,6 @@ - - - - - - ${formatter.format_page_name(node)} -${formatter.format(node, node.doc)} - +<%inherit file="mallard-base.tmpl"/> +<%block name="content"> + ${parent.content()} from gi.repository import ${namespace.name} @@ -26,9 +16,7 @@ ${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}( )\ -% if node.version: -

Since ${node.version}

-% endif + ${self.since_version()} Hierarchy @@ -63,4 +51,4 @@ ${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}( Other - + diff --git a/giscanner/doctemplates/Python/mallard-Python-default.tmpl b/giscanner/doctemplates/Python/mallard-Python-default.tmpl index 1d202109..991f29be 100644 --- a/giscanner/doctemplates/Python/mallard-Python-default.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-default.tmpl @@ -1,11 +1 @@ - - - - - ${formatter.format_page_name(node)} -${formatter.format(node, node.doc)} - +<%inherit file="mallard-base.tmpl"/> diff --git a/giscanner/doctemplates/Python/mallard-Python-enum.tmpl b/giscanner/doctemplates/Python/mallard-Python-enum.tmpl index c1a4d8c5..09f4d9a8 100644 --- a/giscanner/doctemplates/Python/mallard-Python-enum.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-enum.tmpl @@ -1,13 +1,5 @@ - - - - - - ${formatter.format_page_name(node)} +<%inherit file="mallard-base.tmpl"/> +<%block name="content"> ${formatter.format(node, node.doc)} % if node.members: @@ -19,5 +11,4 @@ % endfor
% endif - - + diff --git a/giscanner/doctemplates/Python/mallard-Python-function.tmpl b/giscanner/doctemplates/Python/mallard-Python-function.tmpl index 1976a1ca..683ca835 100644 --- a/giscanner/doctemplates/Python/mallard-Python-function.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-function.tmpl @@ -1,11 +1,5 @@ - - - +<%inherit file="mallard-base.tmpl"/> +<%block name="info"> % if node.parent is not None: % else: @@ -33,8 +27,8 @@ % endif % endfor - - ${formatter.format_page_name(node)} + +<%block name="content"> % if len(node.parameters) != 0: @accepts(\ @@ -51,7 +45,7 @@ ${', '.join((arg.argname for arg in node.parameters))}\ ): # Python wrapper for ${node.symbol}() -${formatter.format(node, node.doc)} +${parent.content()} % if node.parameters or node.retval: @@ -69,7 +63,5 @@ ${formatter.format(node, node.doc)} % endif
% endif -% if node.version: -

Since ${node.version}

-% endif - +${self.since_version()} + diff --git a/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl b/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl index 97bd7132..372cd33f 100644 --- a/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl @@ -1,19 +1,13 @@ - - - - - ${formatter.format_page_name(node)} - +<%! page_type="guide" %>\ +<%inherit file="mallard-base.tmpl"/> +<%block name="content"> + Classes - + Functions - + Other - + diff --git a/giscanner/doctemplates/Python/mallard-Python-property.tmpl b/giscanner/doctemplates/Python/mallard-Python-property.tmpl index 7f4138cd..db78f2b9 100644 --- a/giscanner/doctemplates/Python/mallard-Python-property.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-property.tmpl @@ -1,16 +1,11 @@ - - - +<%inherit file="mallard-base.tmpl"/> +<%block name="info"> ${node.name} - - ${formatter.format_page_name(node)} + +<%block name="content"> "${node.name}" ${formatter.format_type(node.type)} : ${formatter.format_property_flags(node)} -${formatter.format(node, node.doc)} - +${parent.content()} + diff --git a/giscanner/doctemplates/Python/mallard-Python-record.tmpl b/giscanner/doctemplates/Python/mallard-Python-record.tmpl index 43bea043..cfe71c15 100644 --- a/giscanner/doctemplates/Python/mallard-Python-record.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-record.tmpl @@ -1,12 +1,2 @@ - - - - - - ${formatter.format_page_name(node)} -

${node.doc}

- +<%! page_type="guide" %>\ +<%inherit file="mallard-base.tmpl"/> diff --git a/giscanner/doctemplates/Python/mallard-Python-signal.tmpl b/giscanner/doctemplates/Python/mallard-Python-signal.tmpl index 8dda89be..a430d9b9 100644 --- a/giscanner/doctemplates/Python/mallard-Python-signal.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-signal.tmpl @@ -1,14 +1,9 @@ - - - +<%inherit file="mallard-base.tmpl"/> +<%block name="info"> ${node.name} - - ${formatter.format_page_name(node)} + +<%block name="content"> def callback(${formatter.to_underscores(node.parent.name).lower()}, \ % for arg, ix in zip(node.parameters, range(len(node.parameters))): @@ -46,7 +41,6 @@ ${formatter.format(node, node.doc)} % endif -% if node.version: -

Since ${node.version}

-% endif - +${self.since_version()} + + diff --git a/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl b/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl index 86dc685b..65af0058 100644 --- a/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl @@ -1,15 +1,5 @@ - - - - - ${node.name} - - ${formatter.format_page_name(node)} +<%inherit file="mallard-base.tmpl"/> +<%block name="content"> % if len(node.parameters) != 0: @accepts(\ @@ -22,7 +12,7 @@ do_${node.name}(self, \ ${', '.join((arg.argname for arg in node.parameters))}\ ): -${formatter.format(node, node.doc)} +${parent.content()} % if node.parameters or node.retval: @@ -40,7 +30,5 @@ ${formatter.format(node, node.doc)} % endif
% endif -% if node.version: -

Since ${node.version}

-% endif - +${self.since_version()} + diff --git a/giscanner/doctemplates/mallard-base.tmpl b/giscanner/doctemplates/mallard-base.tmpl new file mode 100644 index 00000000..07eb4468 --- /dev/null +++ b/giscanner/doctemplates/mallard-base.tmpl @@ -0,0 +1,23 @@ +<%! page_type="topic" %>\ + + + + <%block name="info"> + + + + <%block name="title">${formatter.format_page_name(node)}</%block> + <%block name="content"> + ${formatter.format(node, node.doc)} + + <%def name="since_version()"> + % if node.version: +

Since ${node.version}

+ % endif + + diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py index ccd65f0d..f40bf881 100644 --- a/giscanner/mallardwriter.py +++ b/giscanner/mallardwriter.py @@ -462,9 +462,10 @@ class MallardWriter(object): else: srcdir = os.path.dirname(__file__) - template_dir = os.path.join(srcdir, 'doctemplates', self._language) + template_dir = os.path.join(srcdir, 'doctemplates') + language_dir = os.path.join(template_dir, self._language) - return TemplateLookup(directories=[template_dir], + return TemplateLookup(directories=[template_dir, language_dir], module_directory=tempfile.mkdtemp(), output_encoding='utf-8') diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page index b79b93aa..c2c171b3 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page @@ -3,9 +3,16 @@ type="topic" style="default" xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/experimental/ui/"> + + + DocExamples.Callback - + + + + diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page index 56ebc4bb..06fec31b 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page @@ -3,10 +3,16 @@ type="guide" style="enum" xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/experimental/ui/"> - + + + DocExamples.Enum -

This is an example to document an enumeration.

+ +

This is an example to document an enumeration.

+ + diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page index fde0ffb4..465c018f 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page @@ -1,13 +1,19 @@ - + property-example + DocExamples.Obj:property-example -

This is an example of how to document a property.

+ +

This is an example of how to document a property.

+ + diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page index 7f63fa40..7d40713a 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page @@ -1,13 +1,19 @@ - - + + signal-example + DocExamples.Obj::signal-example -

This is an example of how to document a signal.

+ +

This is an example of how to document a signal.

+ + diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page index c9b47666..23a7c654 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page @@ -6,13 +6,17 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/experimental/ui/"> + + DocExamples.Obj::vfunc + -

This is an example of how to document a vfunc.

+

This is an example of how to document a vfunc.

+ @@ -23,5 +27,9 @@

first_arg :
-

Since 0.99

+ +

Since 0.99

+ + + diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page index 2015098f..4d2f6cd3 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page @@ -6,6 +6,7 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/experimental/ui/"> + @@ -37,8 +38,10 @@ string + doc_examples_obj_method + gboolean doc_examples_obj_method (DocExamplesObj *self, gint first_arg, @@ -47,9 +50,10 @@ gint first_arg, gpointer pointer_arg, gchar* string); -

This is an example of how to document a method.

You should call this on a DocExamples.Obj that was -created with doc_examples_obj_new.

This should be a %FALSEALARM.

+

This is an example of how to document a method.

You should call this on a DocExamples.Obj that was +created with doc_examples_obj_new.

This should be a %FALSEALARM.

+ @@ -76,5 +80,9 @@ created with doc_examples_obj_new.

Either FALSE or something FALSE-y.

first_arg :
-

Since 0.99

+ +

Since 0.99

+ + + diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page index 0e010cf3..0f8c297a 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page @@ -6,6 +6,7 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/experimental/ui/"> + @@ -13,17 +14,24 @@ doc_examples_obj_new + doc_examples_obj_new + DocExamplesObj* doc_examples_obj_new (void); - + +

Returns :
+ + + + diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page index 6014906c..9937b79b 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page @@ -6,11 +6,18 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/experimental/ui/"> - + + + DocExamples.Obj -

This is an example of how to document a class

This class has a signal: DocExamples.Obj::signal-example.

And also has a property: DocExamples.Obj:property-example.

-

Since 0.99

+ + +

This is an example of how to document a class

This class has a signal: DocExamples.Obj::signal-example.

And also has a property: DocExamples.Obj:property-example.

+ + +

Since 0.99

+ Hierarchy @@ -43,4 +50,6 @@ Other + + diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page index ebf23d55..358a220c 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page @@ -6,6 +6,7 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/experimental/ui/"> + @@ -17,14 +18,17 @@ out_arg + doc_examples_obj_static_method + gboolean doc_examples_obj_static_method (gint* out_arg); -

This is an example of a function with an out argument -and a return value.

+

This is an example of a function with an out argument +and a return value.

+ @@ -35,4 +39,8 @@ and a return value.

out_arg :

TRUE if out_arg is valid, FALSE otherwise
+ + + + diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page index c8e43755..cd8021ba 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page @@ -1,12 +1,18 @@ - + + + DocExamples.ObjClass - + + + + diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page index 2b19e8d0..f24da60e 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page @@ -6,6 +6,7 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/experimental/ui/"> + @@ -17,14 +18,17 @@ out_len + doc_examples_array_function + gint* doc_examples_array_function (gint* out_len); -

This function returns an array with an explicit length, -and the length should be invisible in most introspected bindings.

+

This function returns an array with an explicit length, +and the length should be invisible in most introspected bindings.

+ @@ -35,4 +39,8 @@ and the length should be invisible in most introspected bindings.

out_len :

an array of numbers.
+ + + + diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page index 89e00a65..2af93305 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page @@ -6,6 +6,7 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/experimental/ui/"> + @@ -25,17 +26,20 @@ destroy_notify + doc_examples_callback_function + DocExamplesEnum doc_examples_callback_function (DocExamplesCallback callback, gpointer user_data, GDestroyNotify destroy_notify); -

This is a function that takes a callback. Different languages + +

This is a function that takes a callback. Different languages will expose this in different ways (e.g. Python keeps the user_data parameter, while JS doesn't)

- + @@ -54,4 +58,8 @@ will expose this in different ways (e.g. Python keeps the

callback :

DocExamples.Enum.foo sometimes, DocExamples.Enum.bar other times.
+ + + + diff --git a/tests/doctool/DocExamples-1.0-C-expected/index.page b/tests/doctool/DocExamples-1.0-C-expected/index.page index c87a104b..5143b432 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/index.page +++ b/tests/doctool/DocExamples-1.0-C-expected/index.page @@ -3,10 +3,15 @@ type="guide" style="namespace" xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/experimental/ui/"> + + + Index + Classes @@ -16,4 +21,6 @@ Other + + diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page index b79b93aa..c2c171b3 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page @@ -3,9 +3,16 @@ type="topic" style="default" xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/experimental/ui/"> + + + DocExamples.Callback - + + + + diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page index 0f496063..614b855e 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page @@ -1,13 +1,17 @@ - + + + DocExamples.Enum +

This is an example to document an enumeration.

@@ -20,4 +24,5 @@
+ diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-property-example.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-property-example.page index 43f4b560..3b791bd0 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-property-example.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-property-example.page @@ -3,14 +3,22 @@ type="topic" style="property" xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/experimental/ui/"> + property-example + DocExamples.Obj:property-example + "property-example" {unicode: gint8} : Read / Write -

This is an example of how to document a property.

+ +

This is an example of how to document a property.

+ + + diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page index 0304b135..8cac161f 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page @@ -3,12 +3,16 @@ type="topic" style="signal" xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/experimental/ui/"> + signal-example + DocExamples.Obj::signal-example + def callback(obj, int_param, float_param, pointer_param, user_param1, ...) @@ -40,5 +44,9 @@ def callback(obj, int_param, float_param, pointer_param, user_param1, ...)

additional user parameters (if any)

-

Since 0.99

+ +

Since 0.99

+ + + diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page index 8a02f616..11d693f3 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page @@ -6,16 +6,20 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/experimental/ui/"> - - vfunc + + + DocExamples.Obj::vfunc + @accepts(int) @returns(none) def do_vfunc(self, first_arg): -

This is an example of how to document a vfunc.

+ +

This is an example of how to document a vfunc.

+ @@ -23,5 +27,9 @@ def do_vfunc(self, first_arg):

first argument
-

Since 0.99

+ +

Since 0.99

+ + + diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page index 2477e451..89f73d08 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page @@ -6,6 +6,7 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/experimental/ui/"> + @@ -37,16 +38,20 @@ string + Obj.method + @accepts(int, float, bool, gpointer, unicode) @returns(bool) def method(self, first_arg, second_arg, boolean_arg, pointer_arg, string): # Python wrapper for doc_examples_obj_method() -

This is an example of how to document a method.

You should call this on a DocExamples.Obj that was + +

This is an example of how to document a method.

You should call this on a DocExamples.Obj that was created with Obj.new.

This should be a %FALSEALARM.

+ @@ -74,5 +79,9 @@ created with Obj.new.

This should

Either False or something False-y.
-

Since 0.99

+ +

Since 0.99

+ + + diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page index 071abf1a..6278c649 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page @@ -1,22 +1,28 @@ - + + + DocExamples.Obj -

This is an example of how to document a class

This class has a signal: DocExamples.Obj::signal-example.

And also has a property: DocExamples.Obj:property-example.

- + + +

This is an example of how to document a class

This class has a signal: DocExamples.Obj::signal-example.

And also has a property: DocExamples.Obj:property-example.

+ from gi.repository import DocExamples obj = DocExamples.Obj(property_example=value) -

Since 0.99

+ +

Since 0.99

+ Hierarchy @@ -50,4 +56,6 @@ obj = DocExamples.Obj(property_exa Other + + diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page index e040414f..3bc402b2 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page @@ -6,6 +6,7 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/experimental/ui/"> + @@ -17,16 +18,20 @@ out_arg + Obj.static_method + @accepts(int) @returns(bool) def static_method(out_arg): # Python wrapper for doc_examples_obj_static_method() -

This is an example of a function with an out argument + +

This is an example of a function with an out argument and a return value.

+ @@ -38,4 +43,8 @@ and a return value.

True if out_arg is valid, False otherwise
+ + + + diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page index 3c8e86cd..6dd79093 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page @@ -6,6 +6,7 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/experimental/ui/"> + @@ -17,16 +18,20 @@ out_len + array_function + @accepts(int) @returns([int]) def array_function(out_len): # Python wrapper for doc_examples_array_function() -

This function returns an array with an explicit length, + +

This function returns an array with an explicit length, and the length should be invisible in most introspected bindings.

+ @@ -38,4 +43,8 @@ and the length should be invisible in most introspected bindings.

an array of numbers.
+ + + + diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page index 58323eba..7c15a0c9 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page @@ -6,6 +6,7 @@ xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/experimental/ui/"> + @@ -25,17 +26,21 @@ destroy_notify + callback_function + @accepts(DocExamples.Callback, gpointer, GLib.DestroyNotify) @returns(DocExamples.Enum) def callback_function(callback, user_data, destroy_notify): # Python wrapper for doc_examples_callback_function() -

This is a function that takes a callback. Different languages + +

This is a function that takes a callback. Different languages will expose this in different ways (e.g. Python keeps the user_data parameter, while JS doesn't)

+ @@ -55,4 +60,8 @@ will expose this in different ways (e.g. Python keeps the

DocExamples.Enum.foo sometimes, DocExamples.Enum.bar other times.
+ + + + diff --git a/tests/doctool/DocExamples-1.0-Python-expected/index.page b/tests/doctool/DocExamples-1.0-Python-expected/index.page index bbf9d2d7..5143b432 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/index.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/index.page @@ -3,17 +3,24 @@ type="guide" style="namespace" xmlns="http://projectmallard.org/1.0/" + xmlns:api="http://projectmallard.org/experimental/api/" xmlns:ui="http://projectmallard.org/experimental/ui/"> + + + Index - + + Classes - + Functions - + Other + + -- cgit v1.2.1 From 7e0ab2b629691c5904e00f4890a2da052a0a9c37 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 12:52:23 -0500 Subject: doctool: Define a standard order of items for all pages --- giscanner/doctemplates/C/mallard-C-class.tmpl | 6 +++--- giscanner/doctemplates/C/mallard-C-function.tmpl | 6 +++--- giscanner/doctemplates/C/mallard-C-namespace.tmpl | 6 +++++- giscanner/doctemplates/C/mallard-C-vfunc.tmpl | 6 +++--- giscanner/doctemplates/Python/mallard-Python-class.tmpl | 9 +++++---- giscanner/doctemplates/Python/mallard-Python-enum.tmpl | 3 +-- .../doctemplates/Python/mallard-Python-function.tmpl | 7 +++---- .../doctemplates/Python/mallard-Python-namespace.tmpl | 6 +++++- .../doctemplates/Python/mallard-Python-property.tmpl | 3 +-- .../doctemplates/Python/mallard-Python-signal.tmpl | 7 +++---- giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl | 7 +++---- giscanner/doctemplates/mallard-base.tmpl | 12 +++++++++--- .../DocExamples.Callback.page | 7 +++++++ .../DocExamples-1.0-C-expected/DocExamples.Enum.page | 7 +++++++ .../DocExamples.Obj-property-example.page | 8 ++++++++ .../DocExamples.Obj-signal-example.page | 8 ++++++++ .../DocExamples.Obj-vfunc.page | 7 +++++-- .../DocExamples.Obj.method.page | 7 +++++-- .../DocExamples-1.0-C-expected/DocExamples.Obj.new.page | 5 ++++- .../DocExamples-1.0-C-expected/DocExamples.Obj.page | 17 ++++++++++------- .../DocExamples.Obj.static_method.page | 5 ++++- .../DocExamples.ObjClass.page | 7 +++++++ .../DocExamples.array_function.page | 5 ++++- .../DocExamples.callback_function.page | 5 ++++- tests/doctool/DocExamples-1.0-C-expected/index.page | 9 ++++++++- .../DocExamples.Callback.page | 7 +++++++ .../DocExamples.Enum.page | 9 ++++++++- .../DocExamples.Obj-property-example.page | 8 +++++++- .../DocExamples.Obj-signal-example.page | 10 +++++++--- .../DocExamples.Obj-vfunc.page | 8 +++++--- .../DocExamples.Obj.method.page | 8 +++++--- .../DocExamples.Obj.page | 10 ++++++---- .../DocExamples.Obj.static_method.page | 6 ++++-- .../DocExamples.array_function.page | 6 ++++-- .../DocExamples.callback_function.page | 6 ++++-- .../doctool/DocExamples-1.0-Python-expected/index.page | 9 ++++++++- 36 files changed, 190 insertions(+), 72 deletions(-) diff --git a/giscanner/doctemplates/C/mallard-C-class.tmpl b/giscanner/doctemplates/C/mallard-C-class.tmpl index b1be35e4..a627ace4 100644 --- a/giscanner/doctemplates/C/mallard-C-class.tmpl +++ b/giscanner/doctemplates/C/mallard-C-class.tmpl @@ -1,8 +1,6 @@ <%! page_type="guide" %>\ <%inherit file="mallard-base.tmpl"/> -<%block name="content"> -${parent.content()} -${self.since_version()} +<%block name="synopsis"> Hierarchy @@ -11,6 +9,8 @@ ${self.since_version()} + +<%block name="links"> diff --git a/giscanner/doctemplates/C/mallard-C-function.tmpl b/giscanner/doctemplates/C/mallard-C-function.tmpl index f93fc31d..e0af6413 100644 --- a/giscanner/doctemplates/C/mallard-C-function.tmpl +++ b/giscanner/doctemplates/C/mallard-C-function.tmpl @@ -28,7 +28,7 @@ % endfor -<%block name="content"> +<%block name="synopsis"> ${node.retval.type.ctype} ${node.symbol} (\ % if node.is_method: @@ -58,7 +58,8 @@ ${formatter.format_type(arg.type) | x} ${arg.argname}\ %endif % endfor -${parent.content()} + +<%block name="details"> % if node.parameters or node.retval: % for arg, ix in zip(node.parameters, range(len(node.parameters))): @@ -75,5 +76,4 @@ ${parent.content()} % endif
% endif -${self.since_version()} diff --git a/giscanner/doctemplates/C/mallard-C-namespace.tmpl b/giscanner/doctemplates/C/mallard-C-namespace.tmpl index 372cd33f..28cd4708 100644 --- a/giscanner/doctemplates/C/mallard-C-namespace.tmpl +++ b/giscanner/doctemplates/C/mallard-C-namespace.tmpl @@ -1,6 +1,8 @@ <%! page_type="guide" %>\ <%inherit file="mallard-base.tmpl"/> -<%block name="content"> +<%block name="doc"> + +<%block name="links"> Classes @@ -11,3 +13,5 @@ Other +<%block name="since_version"> + diff --git a/giscanner/doctemplates/C/mallard-C-vfunc.tmpl b/giscanner/doctemplates/C/mallard-C-vfunc.tmpl index b27b2cef..9cea1676 100644 --- a/giscanner/doctemplates/C/mallard-C-vfunc.tmpl +++ b/giscanner/doctemplates/C/mallard-C-vfunc.tmpl @@ -2,10 +2,11 @@ <%block name="info"> -<%block name="content"> +<%block name="synopsis"> -${parent.content()} + +<%block name="details"> % if node.parameters or node.retval: % for arg, ix in zip(node.parameters, range(len(node.parameters))): @@ -22,5 +23,4 @@ ${parent.content()} % endif
% endif -${self.since_version()} diff --git a/giscanner/doctemplates/Python/mallard-Python-class.tmpl b/giscanner/doctemplates/Python/mallard-Python-class.tmpl index 3f0d67a1..f4de812d 100644 --- a/giscanner/doctemplates/Python/mallard-Python-class.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-class.tmpl @@ -1,6 +1,5 @@ <%inherit file="mallard-base.tmpl"/> -<%block name="content"> - ${parent.content()} +<%block name="synopsis"> from gi.repository import ${namespace.name} @@ -15,8 +14,8 @@ ${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}( % endfor )\ - - ${self.since_version()} + +<%block name="details"> Hierarchy @@ -29,6 +28,8 @@ ${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}( % endfor + +<%block name="links"> diff --git a/giscanner/doctemplates/Python/mallard-Python-enum.tmpl b/giscanner/doctemplates/Python/mallard-Python-enum.tmpl index 09f4d9a8..3c38f884 100644 --- a/giscanner/doctemplates/Python/mallard-Python-enum.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-enum.tmpl @@ -1,6 +1,5 @@ <%inherit file="mallard-base.tmpl"/> -<%block name="content"> - ${formatter.format(node, node.doc)} +<%block name="details"> % if node.members: % for member, ix in zip(node.members, range(len(node.members))): diff --git a/giscanner/doctemplates/Python/mallard-Python-function.tmpl b/giscanner/doctemplates/Python/mallard-Python-function.tmpl index 683ca835..1dbba1ee 100644 --- a/giscanner/doctemplates/Python/mallard-Python-function.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-function.tmpl @@ -28,7 +28,7 @@ % endfor -<%block name="content"> +<%block name="synopsis"> % if len(node.parameters) != 0: @accepts(\ @@ -45,8 +45,8 @@ ${', '.join((arg.argname for arg in node.parameters))}\ ): # Python wrapper for ${node.symbol}() -${parent.content()} - + +<%block name="details"> % if node.parameters or node.retval:
% for arg, ix in zip(node.parameters, range(len(node.parameters))): @@ -63,5 +63,4 @@ ${parent.content()} % endif
% endif -${self.since_version()} diff --git a/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl b/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl index 372cd33f..28cd4708 100644 --- a/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl @@ -1,6 +1,8 @@ <%! page_type="guide" %>\ <%inherit file="mallard-base.tmpl"/> -<%block name="content"> +<%block name="doc"> + +<%block name="links"> Classes @@ -11,3 +13,5 @@ Other +<%block name="since_version"> + diff --git a/giscanner/doctemplates/Python/mallard-Python-property.tmpl b/giscanner/doctemplates/Python/mallard-Python-property.tmpl index db78f2b9..32d673b2 100644 --- a/giscanner/doctemplates/Python/mallard-Python-property.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-property.tmpl @@ -3,9 +3,8 @@ ${node.name} -<%block name="content"> +<%block name="synopsis"> "${node.name}" ${formatter.format_type(node.type)} : ${formatter.format_property_flags(node)} -${parent.content()} diff --git a/giscanner/doctemplates/Python/mallard-Python-signal.tmpl b/giscanner/doctemplates/Python/mallard-Python-signal.tmpl index a430d9b9..eccede7c 100644 --- a/giscanner/doctemplates/Python/mallard-Python-signal.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-signal.tmpl @@ -3,7 +3,7 @@ ${node.name} -<%block name="content"> +<%block name="synopsis"> def callback(${formatter.to_underscores(node.parent.name).lower()}, \ % for arg, ix in zip(node.parameters, range(len(node.parameters))): @@ -11,8 +11,8 @@ ${arg.argname}, \ % endfor user_param1, ...) -${formatter.format(node, node.doc)} - + +<%block name="details"> @@ -41,6 +41,5 @@ ${formatter.format(node, node.doc)} % endif

${formatter.to_underscores(node.parent.name).lower()} :

-${self.since_version()} diff --git a/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl b/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl index 65af0058..32230704 100644 --- a/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl @@ -1,5 +1,5 @@ <%inherit file="mallard-base.tmpl"/> -<%block name="content"> +<%block name="synopsis"> % if len(node.parameters) != 0: @accepts(\ @@ -12,8 +12,8 @@ do_${node.name}(self, \ ${', '.join((arg.argname for arg in node.parameters))}\ ): -${parent.content()} - + +<%block name="details"> % if node.parameters or node.retval: % for arg, ix in zip(node.parameters, range(len(node.parameters))): @@ -30,5 +30,4 @@ ${parent.content()} % endif
% endif -${self.since_version()} diff --git a/giscanner/doctemplates/mallard-base.tmpl b/giscanner/doctemplates/mallard-base.tmpl index 07eb4468..e40739c3 100644 --- a/giscanner/doctemplates/mallard-base.tmpl +++ b/giscanner/doctemplates/mallard-base.tmpl @@ -12,12 +12,18 @@ <%block name="title">${formatter.format_page_name(node)}</%block> - <%block name="content"> + <%block name="synopsis"> + + <%block name="doc"> ${formatter.format(node, node.doc)} - <%def name="since_version()"> + <%block name="since_version"> % if node.version:

Since ${node.version}

% endif - + + <%block name="details"> + + <%block name="links"> + diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page index c2c171b3..98d30f8c 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page @@ -12,7 +12,14 @@ DocExamples.Callback + + + + + + + diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page index 06fec31b..97b15866 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page @@ -12,7 +12,14 @@ DocExamples.Enum + +

This is an example to document an enumeration.

+ + + + + diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page index 465c018f..d1f44d49 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page @@ -13,7 +13,15 @@ DocExamples.Obj:property-example + +

This is an example of how to document a property.

+

Since 0.99

+ + + + + diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page index 7d40713a..63d86354 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page @@ -13,7 +13,15 @@ DocExamples.Obj::signal-example + +

This is an example of how to document a signal.

+

Since 0.99

+ + + + + diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page index 23a7c654..c4acf2c2 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page @@ -15,8 +15,13 @@ +

This is an example of how to document a vfunc.

+ +

Since 0.99

+ + @@ -28,8 +33,6 @@

first_arg :

-

Since 0.99

- diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page index 4d2f6cd3..a08ecaa8 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page @@ -51,9 +51,14 @@ gint first_arg, gchar* string); +

This is an example of how to document a method.

You should call this on a DocExamples.Obj that was created with doc_examples_obj_new.

This should be a %FALSEALARM.

+ +

Since 0.99

+ + @@ -81,8 +86,6 @@ created with doc_examples_obj_new.

first_arg :

-

Since 0.99

- diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page index 0f8c297a..4058a9a3 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page @@ -22,8 +22,12 @@ DocExamplesObj* doc_examples_obj_new (void); + + + + @@ -32,6 +36,5 @@ DocExamplesObj* doc_examples_obj_new (void);

Returns :

- diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page index 9937b79b..eb90ad3f 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page @@ -12,12 +12,6 @@ DocExamples.Obj - -

This is an example of how to document a class

This class has a signal: DocExamples.Obj::signal-example.

And also has a property: DocExamples.Obj:property-example.

- - -

Since 0.99

- Hierarchy @@ -26,6 +20,16 @@ + + +

This is an example of how to document a class

This class has a signal: DocExamples.Obj::signal-example.

And also has a property: DocExamples.Obj:property-example.

+ + +

Since 0.99

+ + + + @@ -51,5 +55,4 @@ Other - diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page index 358a220c..9de699a3 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page @@ -26,9 +26,13 @@ gboolean doc_examples_obj_static_method (gint* out_arg); +

This is an example of a function with an out argument and a return value.

+ + + @@ -41,6 +45,5 @@ and a return value.

out_arg :
- diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page index cd8021ba..75bf1299 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page @@ -12,7 +12,14 @@ DocExamples.ObjClass + + + + + + + diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page index f24da60e..bdae1415 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page @@ -26,9 +26,13 @@ gint* doc_examples_array_function (gint* out_len); +

This function returns an array with an explicit length, and the length should be invisible in most introspected bindings.

+ + + @@ -41,6 +45,5 @@ and the length should be invisible in most introspected bindings.

out_len :
- diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page index 2af93305..93e77203 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page @@ -36,10 +36,14 @@ DocExamplesEnum doc_examples_callback_function (DocExamplesCallback callback, GDestroyNotify destroy_notify); +

This is a function that takes a callback. Different languages will expose this in different ways (e.g. Python keeps the user_data parameter, while JS doesn't)

+ + + @@ -60,6 +64,5 @@ will expose this in different ways (e.g. Python keeps the

callback :

- diff --git a/tests/doctool/DocExamples-1.0-C-expected/index.page b/tests/doctool/DocExamples-1.0-C-expected/index.page index 5143b432..de98563c 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/index.page +++ b/tests/doctool/DocExamples-1.0-C-expected/index.page @@ -12,6 +12,14 @@ Index + + + + + + + + Classes @@ -22,5 +30,4 @@ Other - diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page index c2c171b3..98d30f8c 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page @@ -12,7 +12,14 @@ DocExamples.Callback + + + + + + + diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page index 614b855e..3a5c17e1 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page @@ -12,7 +12,13 @@ DocExamples.Enum -

This is an example to document an enumeration.

+ + +

This is an example to document an enumeration.

+ + + + @@ -25,4 +31,5 @@

Enum.FOO :

+ diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-property-example.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-property-example.page index 3b791bd0..3665e432 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-property-example.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-property-example.page @@ -17,8 +17,14 @@ "property-example" {unicode: gint8} : Read / Write +

This is an example of how to document a property.

- + +

Since 0.99

+ + + + diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page index 8cac161f..1c43387d 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page @@ -16,8 +16,14 @@ def callback(obj, int_param, float_param, pointer_param, user_param1, ...) -

This is an example of how to document a signal.

+ +

This is an example of how to document a signal.

+ + +

Since 0.99

+ + @@ -45,8 +51,6 @@ def callback(obj, int_param, float_param, pointer_param, user_param1, ...)

obj :

-

Since 0.99

- diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page index 11d693f3..502ba220 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page @@ -18,9 +18,13 @@ def do_vfunc(self, first_arg): +

This is an example of how to document a vfunc.

- + +

Since 0.99

+ + @@ -28,8 +32,6 @@ def do_vfunc(self, first_arg):

first_arg :

-

Since 0.99

- diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page index 89f73d08..7f12c10f 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page @@ -49,10 +49,14 @@ def method(self, first_arg, second_arg, boolean_arg, pointer_arg, string): # Python wrapper for doc_examples_obj_method() +

This is an example of how to document a method.

You should call this on a DocExamples.Obj that was created with Obj.new.

This should be a %FALSEALARM.

- + +

Since 0.99

+ + @@ -80,8 +84,6 @@ created with Obj.new.

This should

first_arg :

-

Since 0.99

- diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page index 6278c649..8a0e3c2b 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page @@ -12,17 +12,18 @@ DocExamples.Obj - -

This is an example of how to document a class

This class has a signal: DocExamples.Obj::signal-example.

And also has a property: DocExamples.Obj:property-example.

- from gi.repository import DocExamples obj = DocExamples.Obj(property_example=value) +

This is an example of how to document a class

This class has a signal: DocExamples.Obj::signal-example.

And also has a property: DocExamples.Obj:property-example.

+ +

Since 0.99

+ Hierarchy @@ -34,6 +35,8 @@ obj = DocExamples.Obj(property_exa + + @@ -57,5 +60,4 @@ obj = DocExamples.Obj(property_exa Other - diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page index 3bc402b2..32c53163 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page @@ -29,10 +29,13 @@ def static_method(out_arg): # Python wrapper for doc_examples_obj_static_method() +

This is an example of a function with an out argument and a return value.

- + + + @@ -45,6 +48,5 @@ and a return value.

out_arg :
- diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page index 6dd79093..a4bb49d2 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page @@ -29,10 +29,13 @@ def array_function(out_len): # Python wrapper for doc_examples_array_function() +

This function returns an array with an explicit length, and the length should be invisible in most introspected bindings.

- + + + @@ -45,6 +48,5 @@ and the length should be invisible in most introspected bindings.

out_len :
- diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page index 7c15a0c9..a8416e78 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page @@ -37,11 +37,14 @@ def callback_function(callback, user_data, destroy_notify): # Python wrapper for doc_examples_callback_function() +

This is a function that takes a callback. Different languages will expose this in different ways (e.g. Python keeps the user_data parameter, while JS doesn't)

- + + + @@ -62,6 +65,5 @@ will expose this in different ways (e.g. Python keeps the

callback :

- diff --git a/tests/doctool/DocExamples-1.0-Python-expected/index.page b/tests/doctool/DocExamples-1.0-Python-expected/index.page index 5143b432..de98563c 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/index.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/index.page @@ -12,6 +12,14 @@ Index + + + + + + + + Classes @@ -22,5 +30,4 @@ Other - -- cgit v1.2.1 From ac3d35bd4fcf07f86b4ea5a0d71569cc7a49e1c8 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 18:15:35 -0500 Subject: doctool: Use definition lists instead of tables --- giscanner/doctemplates/C/mallard-C-function.tmpl | 16 ++++----- giscanner/doctemplates/C/mallard-C-vfunc.tmpl | 16 ++++----- .../doctemplates/Python/mallard-Python-enum.tmpl | 10 +++--- .../Python/mallard-Python-function.tmpl | 16 ++++----- .../doctemplates/Python/mallard-Python-signal.tmpl | 34 +++++++----------- .../doctemplates/Python/mallard-Python-vfunc.tmpl | 16 ++++----- .../DocExamples.Obj-vfunc.page | 16 ++++----- .../DocExamples.Obj.method.page | 40 ++++++++-------------- .../DocExamples.Obj.new.page | 10 +++--- .../DocExamples.Obj.static_method.page | 16 ++++----- .../DocExamples.array_function.page | 16 ++++----- .../DocExamples.callback_function.page | 28 ++++++--------- .../DocExamples.Enum.page | 16 ++++----- .../DocExamples.Obj-signal-example.page | 40 ++++++++-------------- .../DocExamples.Obj-vfunc.page | 10 +++--- .../DocExamples.Obj.method.page | 40 ++++++++-------------- .../DocExamples.Obj.static_method.page | 16 ++++----- .../DocExamples.array_function.page | 16 ++++----- .../DocExamples.callback_function.page | 28 ++++++--------- 19 files changed, 146 insertions(+), 254 deletions(-) diff --git a/giscanner/doctemplates/C/mallard-C-function.tmpl b/giscanner/doctemplates/C/mallard-C-function.tmpl index e0af6413..84cace06 100644 --- a/giscanner/doctemplates/C/mallard-C-function.tmpl +++ b/giscanner/doctemplates/C/mallard-C-function.tmpl @@ -61,19 +61,15 @@ ${formatter.format_type(arg.type) | x} ${arg.argname}\ <%block name="details"> % if node.parameters or node.retval: - +
% for arg, ix in zip(node.parameters, range(len(node.parameters))): -
- - - +

${arg.argname} :

+
${formatter.format(node, arg.doc)}
% endfor % if node.retval: - - - - +

Returns :

+
${formatter.format(node, node.retval.doc)}
% endif -

${arg.argname} :

${formatter.format(node, arg.doc)}

Returns :

${formatter.format(node, node.retval.doc)}
+ % endif diff --git a/giscanner/doctemplates/C/mallard-C-vfunc.tmpl b/giscanner/doctemplates/C/mallard-C-vfunc.tmpl index 9cea1676..34c25b19 100644 --- a/giscanner/doctemplates/C/mallard-C-vfunc.tmpl +++ b/giscanner/doctemplates/C/mallard-C-vfunc.tmpl @@ -8,19 +8,15 @@ <%block name="details"> % if node.parameters or node.retval: - +
% for arg, ix in zip(node.parameters, range(len(node.parameters))): -
- - - +

${arg.argname} :

+
${formatter.format(node, arg.doc)}
% endfor % if node.retval: - - - - +

Returns :

+
${formatter.format(node, node.retval.doc)}
% endif -

${arg.argname} :

${formatter.format(node, arg.doc)}

Returns :

${formatter.format(node, node.retval.doc)}
+ % endif diff --git a/giscanner/doctemplates/Python/mallard-Python-enum.tmpl b/giscanner/doctemplates/Python/mallard-Python-enum.tmpl index 3c38f884..69d2c339 100644 --- a/giscanner/doctemplates/Python/mallard-Python-enum.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-enum.tmpl @@ -1,13 +1,11 @@ <%inherit file="mallard-base.tmpl"/> <%block name="details"> % if node.members: - +
% for member, ix in zip(node.members, range(len(node.members))): -
- - - +

${node.name}.${member.name.upper()} :

+
${formatter.format(node, member.doc)}
% endfor -

${node.name}.${member.name.upper()} :

${formatter.format(node, member.doc)}
+ % endif diff --git a/giscanner/doctemplates/Python/mallard-Python-function.tmpl b/giscanner/doctemplates/Python/mallard-Python-function.tmpl index 1dbba1ee..65adb1d7 100644 --- a/giscanner/doctemplates/Python/mallard-Python-function.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-function.tmpl @@ -48,19 +48,15 @@ ${', '.join((arg.argname for arg in node.parameters))}\ <%block name="details"> % if node.parameters or node.retval: - +
% for arg, ix in zip(node.parameters, range(len(node.parameters))): -
- - - +

${arg.argname} :

+
${formatter.format(node, arg.doc)}
% endfor % if node.retval and node.retval.type.ctype != 'void': - - - - +

Returns :

+
${formatter.format(node, node.retval.doc)}
% endif -

${arg.argname} :

${formatter.format(node, arg.doc)}

Returns :

${formatter.format(node, node.retval.doc)}
+ % endif diff --git a/giscanner/doctemplates/Python/mallard-Python-signal.tmpl b/giscanner/doctemplates/Python/mallard-Python-signal.tmpl index eccede7c..8c721b94 100644 --- a/giscanner/doctemplates/Python/mallard-Python-signal.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-signal.tmpl @@ -13,33 +13,23 @@ user_param1, ...) <%block name="details"> - - - - - +
+

${formatter.to_underscores(node.parent.name).lower()} :

+

instance of ${namespace.name}.${node.parent.name} that is emitting the signal

% for arg, ix in zip(node.parameters, range(len(node.parameters))): -
- - - +

${arg.argname} :

+
${formatter.format(node, arg.doc)}
% endfor - - - - - - - - +

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

% if node.retval and \ node.retval.type.ctype != 'void' and \ node.retval.type.ctype is not None: - - - - +

Returns :

+
${node.retval.type.ctype} ${formatter.format(node, node.retval.doc)}
% endif -

${formatter.to_underscores(node.parent.name).lower()} :

instance of ${namespace.name}.${node.parent.name} that is emitting the signal

${arg.argname} :

${formatter.format(node, arg.doc)}

user_param1 :

first user parameter (if any) specified with the connect() method

... :

additional user parameters (if any)

Returns :

${node.retval.type.ctype} ${formatter.format(node, node.retval.doc)}
+ diff --git a/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl b/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl index 32230704..cf51f7c7 100644 --- a/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl +++ b/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl @@ -15,19 +15,15 @@ ${', '.join((arg.argname for arg in node.parameters))}\ <%block name="details"> % if node.parameters or node.retval: - +
% for arg, ix in zip(node.parameters, range(len(node.parameters))): -
- - - +

${arg.argname} :

+
${formatter.format(node, arg.doc)}
% endfor % if node.retval and node.retval.type.ctype != 'void': - - - - +

Returns :

+
${formatter.format(node, node.retval.doc)}
% endif -

${arg.argname} :

${formatter.format(node, arg.doc)}

Returns :

${formatter.format(node, node.retval.doc)}
+ % endif diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page index c4acf2c2..ec5d7fe6 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page @@ -22,16 +22,12 @@

Since 0.99

- - - - - - - - - -

first_arg :

first argument

Returns :

+
+

first_arg :

+

first argument

+

Returns :

+
+
diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page index a08ecaa8..23fe6e5f 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page @@ -59,32 +59,20 @@ created with doc_examples_obj_new.

Since 0.99

- - - - - - - - - - - - - - - - - - - - - - - - - -

first_arg :

A DocExamples.Obj.

second_arg :

second argument

boolean_arg :

You should always pass TRUE.

pointer_arg :

If not NULL, do a thing. Pass first_arg if you want to sometimes. You can also pass second_arg, or even boolean_arg.

string :

A NUL-terminated string.

Returns :

Either FALSE or something FALSE-y.

+
+

first_arg :

+

A DocExamples.Obj.

+

second_arg :

+

second argument

+

boolean_arg :

+

You should always pass TRUE.

+

pointer_arg :

+

If not NULL, do a thing. Pass first_arg if you want to sometimes. You can also pass second_arg, or even boolean_arg.

+

string :

+

A NUL-terminated string.

+

Returns :

+

Either FALSE or something FALSE-y.

+
diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page index 4058a9a3..bb4fc10f 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page @@ -28,12 +28,10 @@ DocExamplesObj* doc_examples_obj_new (void); - - - - - -

Returns :

+
+

Returns :

+
+
diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page index 9de699a3..5fd3c740 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page @@ -33,16 +33,12 @@ and a return value.

- - - - - - - - - -

out_arg :

a pointer to int, or NULL to ignore

Returns :

TRUE if out_arg is valid, FALSE otherwise

+
+

out_arg :

+

a pointer to int, or NULL to ignore

+

Returns :

+

TRUE if out_arg is valid, FALSE otherwise

+
diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page index bdae1415..f596786a 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page @@ -33,16 +33,12 @@ and the length should be invisible in most introspected bindings.

- - - - - - - - - -

out_len :

the length of the returned array

Returns :

an array of numbers.

+
+

out_len :

+

the length of the returned array

+

Returns :

+

an array of numbers.

+
diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page index 93e77203..57e2f72e 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page @@ -44,24 +44,16 @@ will expose this in different ways (e.g. Python keeps the - - - - - - - - - - - - - - - - - -

callback :

Just Call Me Maybe

user_data :

your stuff

destroy_notify :

how to get rid of user_data

Returns :

DocExamples.Enum.foo sometimes, DocExamples.Enum.bar other times.

+
+

callback :

+

Just Call Me Maybe

+

user_data :

+

your stuff

+

destroy_notify :

+

how to get rid of user_data

+

Returns :

+

DocExamples.Enum.foo sometimes, DocExamples.Enum.bar other times.

+
diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page index 3a5c17e1..79ea6370 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page @@ -19,16 +19,12 @@ - - - - - - - - - -

Enum.FOO :

a foo

Enum.BAR :

a bar

+
+

Enum.FOO :

+

a foo

+

Enum.BAR :

+

a bar

+
diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page index 1c43387d..8b7e5d5d 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page @@ -24,32 +24,20 @@ def callback(obj, int_param, float_param, pointer_param, user_param1, ...)

Since 0.99

- - - - - - - - - - - - - - - - - - - - - - - - - -

obj :

instance of DocExamples.Obj that is emitting the signal

int_param :

a parameter of type int

float_param :

a parameter of type float

pointer_param :

A pointer to @obj's thingy -- pass int_param if you really want to.

user_param1 :

first user parameter (if any) specified with the connect() method

... :

additional user parameters (if any)

+
+

obj :

+

instance of DocExamples.Obj that is emitting the signal

+

int_param :

+

a parameter of type int

+

float_param :

+

a parameter of type float

+

pointer_param :

+

A pointer to @obj's thingy -- pass int_param if you really want to.

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page index 502ba220..98c9bfcb 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page @@ -25,12 +25,10 @@ def do_vfunc(self, first_arg):

Since 0.99

- - - - - -

first_arg :

first argument

+
+

first_arg :

+

first argument

+
diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page index 7f12c10f..54a57c40 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page @@ -57,32 +57,20 @@ created with Obj.new.

This should

Since 0.99

- - - - - - - - - - - - - - - - - - - - - - - - - -

first_arg :

A DocExamples.Obj.

second_arg :

second argument

boolean_arg :

You should always pass True.

pointer_arg :

If not None, do a thing. Pass self if you want to sometimes. You can also pass second_arg, or even boolean_arg.

string :

A NUL-terminated string.

Returns :

Either False or something False-y.

+
+

first_arg :

+

A DocExamples.Obj.

+

second_arg :

+

second argument

+

boolean_arg :

+

You should always pass True.

+

pointer_arg :

+

If not None, do a thing. Pass self if you want to sometimes. You can also pass second_arg, or even boolean_arg.

+

string :

+

A NUL-terminated string.

+

Returns :

+

Either False or something False-y.

+
diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page index 32c53163..e23e90d7 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page @@ -36,16 +36,12 @@ and a return value.

- - - - - - - - - -

out_arg :

a pointer to int, or None to ignore

Returns :

True if out_arg is valid, False otherwise

+
+

out_arg :

+

a pointer to int, or None to ignore

+

Returns :

+

True if out_arg is valid, False otherwise

+
diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page index a4bb49d2..1b2b4146 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page @@ -36,16 +36,12 @@ and the length should be invisible in most introspected bindings.

- - - - - - - - - -

out_len :

the length of the returned array

Returns :

an array of numbers.

+
+

out_len :

+

the length of the returned array

+

Returns :

+

an array of numbers.

+
diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page index a8416e78..80ee488a 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page @@ -45,24 +45,16 @@ will expose this in different ways (e.g. Python keeps the - - - - - - - - - - - - - - - - - -

callback :

Just Call Me Maybe

user_data :

your stuff

destroy_notify :

how to get rid of user_data

Returns :

DocExamples.Enum.foo sometimes, DocExamples.Enum.bar other times.

+
+

callback :

+

Just Call Me Maybe

+

user_data :

+

your stuff

+

destroy_notify :

+

how to get rid of user_data

+

Returns :

+

DocExamples.Enum.foo sometimes, DocExamples.Enum.bar other times.

+
-- cgit v1.2.1 From 9ca1a568c38e6cae4aa1ab55fe09a63a3892ad18 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 18:23:07 -0500 Subject: mallardwriter: Don't use function symbols for vfuncs/signals --- giscanner/mallardwriter.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py index f40bf881..844c3198 100644 --- a/giscanner/mallardwriter.py +++ b/giscanner/mallardwriter.py @@ -368,7 +368,10 @@ class MallardFormatterC(MallardFormatter): return type_.target_fundamental def format_function_name(self, func): - return func.symbol + if isinstance(func, (ast.Function)): + return func.symbol + else: + return func.name class MallardFormatterPython(MallardFormatter): language = "Python" -- cgit v1.2.1 From 6b05869529ee7aeb7ccb5787339a70657b6ef0f5 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 18:23:46 -0500 Subject: mallardwriter: Simply use the parent page name for nested pages If we have a parent page, we might as well use it so that parent names are consistent across pages. --- giscanner/mallardwriter.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py index 844c3198..191a47f9 100644 --- a/giscanner/mallardwriter.py +++ b/giscanner/mallardwriter.py @@ -303,17 +303,14 @@ class MallardFormatter(object): def format_page_name(self, node): if isinstance(node, ast.Namespace): return 'Index' - - namespace = node.namespace - - if isinstance(node, ast.Function): + elif isinstance(node, ast.Function): return self.format_function_name(node) elif isinstance(node, ast.Property) and node.parent is not None: - return '%s.%s:%s' % (namespace.name, node.parent.name, node.name) + return '%s:%s' % (self.format_page_name(node.parent), node.name) elif isinstance(node, ast.Signal) and node.parent is not None: - return '%s.%s::%s' % (namespace.name, node.parent.name, node.name) + return '%s::%s' % (self.format_page_name(node.parent), node.name) elif isinstance(node, ast.VFunction) and node.parent is not None: - return '%s.%s::%s' % (namespace.name, node.parent.name, node.name) + return '%s::%s' % (self.format_page_name(node.parent), node.name) else: return make_page_id(node) -- cgit v1.2.1 From 217916ca496827aa494d956787e2700b21c66aaa Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 18:35:01 -0500 Subject: mallardwriter: Use lookup_typenode to look up a Type node Functions that do what we want? What a concept! --- giscanner/mallardwriter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py index 191a47f9..2d435aa3 100644 --- a/giscanner/mallardwriter.py +++ b/giscanner/mallardwriter.py @@ -341,7 +341,7 @@ class MallardFormatter(object): parent_chain = [node] while node.parent: - node = self._transformer.lookup_giname(str(node.parent)) + node = self._transformer.lookup_typenode(node.parent) parent_chain.append(node) parent_chain.reverse() -- cgit v1.2.1 From 44dea29977be349304a905e01b3ec89f7bdc6168 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 18:44:09 -0500 Subject: doctool: Rename templates to exclude mallard/the language As templates are in their own directory and segregated into language already, this is sort of repeating the issue. At the same time, always explicitly use relative ("./") or absolute ("/") lookups for templates. We want to eventually have base templates to share between languages, so to do so without namespace clashes makes sense. --- Makefile-giscanner.am | 46 ++++++------- giscanner/doctemplates/C/class.tmpl | 38 +++++++++++ giscanner/doctemplates/C/constructor.tmpl | 1 + giscanner/doctemplates/C/default.tmpl | 1 + giscanner/doctemplates/C/enum.tmpl | 2 + giscanner/doctemplates/C/function.tmpl | 75 ++++++++++++++++++++++ giscanner/doctemplates/C/mallard-C-class.tmpl | 38 ----------- .../doctemplates/C/mallard-C-constructor.tmpl | 1 - giscanner/doctemplates/C/mallard-C-default.tmpl | 1 - giscanner/doctemplates/C/mallard-C-enum.tmpl | 2 - giscanner/doctemplates/C/mallard-C-function.tmpl | 75 ---------------------- giscanner/doctemplates/C/mallard-C-method.tmpl | 1 - giscanner/doctemplates/C/mallard-C-namespace.tmpl | 17 ----- giscanner/doctemplates/C/mallard-C-property.tmpl | 5 -- giscanner/doctemplates/C/mallard-C-record.tmpl | 1 - giscanner/doctemplates/C/mallard-C-signal.tmpl | 5 -- giscanner/doctemplates/C/mallard-C-vfunc.tmpl | 22 ------- giscanner/doctemplates/C/method.tmpl | 1 + giscanner/doctemplates/C/namespace.tmpl | 17 +++++ giscanner/doctemplates/C/property.tmpl | 5 ++ giscanner/doctemplates/C/record.tmpl | 1 + giscanner/doctemplates/C/signal.tmpl | 5 ++ giscanner/doctemplates/C/vfunc.tmpl | 22 +++++++ giscanner/doctemplates/Python/class.tmpl | 55 ++++++++++++++++ giscanner/doctemplates/Python/constructor.tmpl | 1 + giscanner/doctemplates/Python/default.tmpl | 1 + giscanner/doctemplates/Python/enum.tmpl | 11 ++++ giscanner/doctemplates/Python/function.tmpl | 62 ++++++++++++++++++ .../doctemplates/Python/mallard-Python-class.tmpl | 55 ---------------- .../Python/mallard-Python-constructor.tmpl | 1 - .../Python/mallard-Python-default.tmpl | 1 - .../doctemplates/Python/mallard-Python-enum.tmpl | 11 ---- .../Python/mallard-Python-function.tmpl | 62 ------------------ .../doctemplates/Python/mallard-Python-method.tmpl | 1 - .../Python/mallard-Python-namespace.tmpl | 17 ----- .../Python/mallard-Python-property.tmpl | 10 --- .../doctemplates/Python/mallard-Python-record.tmpl | 2 - .../doctemplates/Python/mallard-Python-signal.tmpl | 35 ---------- .../doctemplates/Python/mallard-Python-vfunc.tmpl | 29 --------- giscanner/doctemplates/Python/method.tmpl | 1 + giscanner/doctemplates/Python/namespace.tmpl | 17 +++++ giscanner/doctemplates/Python/property.tmpl | 10 +++ giscanner/doctemplates/Python/record.tmpl | 2 + giscanner/doctemplates/Python/signal.tmpl | 35 ++++++++++ giscanner/doctemplates/Python/vfunc.tmpl | 29 +++++++++ giscanner/doctemplates/base.tmpl | 29 +++++++++ giscanner/doctemplates/mallard-base.tmpl | 29 --------- giscanner/mallardwriter.py | 5 +- 48 files changed, 446 insertions(+), 447 deletions(-) create mode 100644 giscanner/doctemplates/C/class.tmpl create mode 100644 giscanner/doctemplates/C/constructor.tmpl create mode 100644 giscanner/doctemplates/C/default.tmpl create mode 100644 giscanner/doctemplates/C/enum.tmpl create mode 100644 giscanner/doctemplates/C/function.tmpl delete mode 100644 giscanner/doctemplates/C/mallard-C-class.tmpl delete mode 100644 giscanner/doctemplates/C/mallard-C-constructor.tmpl delete mode 100644 giscanner/doctemplates/C/mallard-C-default.tmpl delete mode 100644 giscanner/doctemplates/C/mallard-C-enum.tmpl delete mode 100644 giscanner/doctemplates/C/mallard-C-function.tmpl delete mode 100644 giscanner/doctemplates/C/mallard-C-method.tmpl delete mode 100644 giscanner/doctemplates/C/mallard-C-namespace.tmpl delete mode 100644 giscanner/doctemplates/C/mallard-C-property.tmpl delete mode 100644 giscanner/doctemplates/C/mallard-C-record.tmpl delete mode 100644 giscanner/doctemplates/C/mallard-C-signal.tmpl delete mode 100644 giscanner/doctemplates/C/mallard-C-vfunc.tmpl create mode 100644 giscanner/doctemplates/C/method.tmpl create mode 100644 giscanner/doctemplates/C/namespace.tmpl create mode 100644 giscanner/doctemplates/C/property.tmpl create mode 100644 giscanner/doctemplates/C/record.tmpl create mode 100644 giscanner/doctemplates/C/signal.tmpl create mode 100644 giscanner/doctemplates/C/vfunc.tmpl create mode 100644 giscanner/doctemplates/Python/class.tmpl create mode 100644 giscanner/doctemplates/Python/constructor.tmpl create mode 100644 giscanner/doctemplates/Python/default.tmpl create mode 100644 giscanner/doctemplates/Python/enum.tmpl create mode 100644 giscanner/doctemplates/Python/function.tmpl delete mode 100644 giscanner/doctemplates/Python/mallard-Python-class.tmpl delete mode 100644 giscanner/doctemplates/Python/mallard-Python-constructor.tmpl delete mode 100644 giscanner/doctemplates/Python/mallard-Python-default.tmpl delete mode 100644 giscanner/doctemplates/Python/mallard-Python-enum.tmpl delete mode 100644 giscanner/doctemplates/Python/mallard-Python-function.tmpl delete mode 100644 giscanner/doctemplates/Python/mallard-Python-method.tmpl delete mode 100644 giscanner/doctemplates/Python/mallard-Python-namespace.tmpl delete mode 100644 giscanner/doctemplates/Python/mallard-Python-property.tmpl delete mode 100644 giscanner/doctemplates/Python/mallard-Python-record.tmpl delete mode 100644 giscanner/doctemplates/Python/mallard-Python-signal.tmpl delete mode 100644 giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl create mode 100644 giscanner/doctemplates/Python/method.tmpl create mode 100644 giscanner/doctemplates/Python/namespace.tmpl create mode 100644 giscanner/doctemplates/Python/property.tmpl create mode 100644 giscanner/doctemplates/Python/record.tmpl create mode 100644 giscanner/doctemplates/Python/signal.tmpl create mode 100644 giscanner/doctemplates/Python/vfunc.tmpl create mode 100644 giscanner/doctemplates/base.tmpl delete mode 100644 giscanner/doctemplates/mallard-base.tmpl diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am index 35eac1d6..b5864392 100644 --- a/Makefile-giscanner.am +++ b/Makefile-giscanner.am @@ -54,29 +54,29 @@ pkgpyexec_PYTHON = \ templatedir = $(pkglibdir) nobase_template_DATA = \ - giscanner/doctemplates/mallard-base.tmpl \ - giscanner/doctemplates/C/mallard-C-class.tmpl \ - giscanner/doctemplates/C/mallard-C-constructor.tmpl \ - giscanner/doctemplates/C/mallard-C-default.tmpl \ - giscanner/doctemplates/C/mallard-C-enum.tmpl \ - giscanner/doctemplates/C/mallard-C-function.tmpl \ - giscanner/doctemplates/C/mallard-C-method.tmpl \ - giscanner/doctemplates/C/mallard-C-namespace.tmpl \ - giscanner/doctemplates/C/mallard-C-property.tmpl \ - giscanner/doctemplates/C/mallard-C-record.tmpl \ - giscanner/doctemplates/C/mallard-C-signal.tmpl \ - giscanner/doctemplates/C/mallard-C-vfunc.tmpl \ - giscanner/doctemplates/Python/mallard-Python-class.tmpl \ - giscanner/doctemplates/Python/mallard-Python-constructor.tmpl \ - giscanner/doctemplates/Python/mallard-Python-default.tmpl \ - giscanner/doctemplates/Python/mallard-Python-enum.tmpl \ - giscanner/doctemplates/Python/mallard-Python-function.tmpl \ - giscanner/doctemplates/Python/mallard-Python-method.tmpl \ - giscanner/doctemplates/Python/mallard-Python-namespace.tmpl \ - giscanner/doctemplates/Python/mallard-Python-property.tmpl \ - giscanner/doctemplates/Python/mallard-Python-record.tmpl \ - giscanner/doctemplates/Python/mallard-Python-signal.tmpl \ - giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl + giscanner/doctemplates/base.tmpl \ + giscanner/doctemplates/C/class.tmpl \ + giscanner/doctemplates/C/constructor.tmpl \ + giscanner/doctemplates/C/default.tmpl \ + giscanner/doctemplates/C/enum.tmpl \ + giscanner/doctemplates/C/function.tmpl \ + giscanner/doctemplates/C/method.tmpl \ + giscanner/doctemplates/C/namespace.tmpl \ + giscanner/doctemplates/C/property.tmpl \ + giscanner/doctemplates/C/record.tmpl \ + giscanner/doctemplates/C/signal.tmpl \ + giscanner/doctemplates/C/vfunc.tmpl \ + giscanner/doctemplates/Python/class.tmpl \ + giscanner/doctemplates/Python/constructor.tmpl \ + giscanner/doctemplates/Python/default.tmpl \ + giscanner/doctemplates/Python/enum.tmpl \ + giscanner/doctemplates/Python/function.tmpl \ + giscanner/doctemplates/Python/method.tmpl \ + giscanner/doctemplates/Python/namespace.tmpl \ + giscanner/doctemplates/Python/property.tmpl \ + giscanner/doctemplates/Python/record.tmpl \ + giscanner/doctemplates/Python/signal.tmpl \ + giscanner/doctemplates/Python/vfunc.tmpl _giscanner_la_CFLAGS = \ $(PYTHON_INCLUDES) \ diff --git a/giscanner/doctemplates/C/class.tmpl b/giscanner/doctemplates/C/class.tmpl new file mode 100644 index 00000000..22a086cc --- /dev/null +++ b/giscanner/doctemplates/C/class.tmpl @@ -0,0 +1,38 @@ +<%! page_type="guide" %>\ +<%inherit file="/base.tmpl"/> +<%block name="synopsis"> + + Hierarchy + + + GObjectObject + + + + +<%block name="links"> + + Constructors + + + Methods + + + Functions + + + Properties + + + Signals + + + Other + + diff --git a/giscanner/doctemplates/C/constructor.tmpl b/giscanner/doctemplates/C/constructor.tmpl new file mode 100644 index 00000000..a03d2825 --- /dev/null +++ b/giscanner/doctemplates/C/constructor.tmpl @@ -0,0 +1 @@ +<%inherit file="./function.tmpl"/> diff --git a/giscanner/doctemplates/C/default.tmpl b/giscanner/doctemplates/C/default.tmpl new file mode 100644 index 00000000..b66ae926 --- /dev/null +++ b/giscanner/doctemplates/C/default.tmpl @@ -0,0 +1 @@ +<%inherit file="/base.tmpl"/> diff --git a/giscanner/doctemplates/C/enum.tmpl b/giscanner/doctemplates/C/enum.tmpl new file mode 100644 index 00000000..1523e0df --- /dev/null +++ b/giscanner/doctemplates/C/enum.tmpl @@ -0,0 +1,2 @@ +<%! page_type="guide" %>\ +<%inherit file="/base.tmpl"/> diff --git a/giscanner/doctemplates/C/function.tmpl b/giscanner/doctemplates/C/function.tmpl new file mode 100644 index 00000000..01c653b9 --- /dev/null +++ b/giscanner/doctemplates/C/function.tmpl @@ -0,0 +1,75 @@ +<%inherit file="/base.tmpl"/> +<%block name="info"> +% if node.parent is not None: + +% else: + +% endif + + + ${formatter.format_type(node.retval.type) | x} + + ${node.symbol} +% if node.is_method: + + ${node.parent.ctype} * + self + +% endif +% for arg in node.parameters: +% if arg.type.ctype == '': + +% else: + + ${formatter.format_type(arg.type) | x} + ${arg.argname} + +% endif +% endfor + + +<%block name="synopsis"> + +${node.retval.type.ctype} ${node.symbol} (\ +% if node.is_method: +${node.parent.ctype} *self\ +%endif +% if len(node.parameters) == 0: +% if not node.is_method: +void\ +%endif +); +% elif node.is_method: +, +% endif +% for arg, ix in zip(node.parameters, range(len(node.parameters))): +% if ix != 0: +${' ' * (len(formatter.format_type(node.retval.type)) + len(node.symbol) + 3)}\ +% endif +% if arg.type.ctype == '': +...\ +% else: +${formatter.format_type(arg.type) | x} ${arg.argname}\ +% endif +% if ix == len(node.parameters) - 1: +); +% else: +, +%endif +% endfor + + +<%block name="details"> +% if node.parameters or node.retval: +
+% for arg, ix in zip(node.parameters, range(len(node.parameters))): +

${arg.argname} :

+
${formatter.format(node, arg.doc)}
+% endfor +% if node.retval: +

Returns :

+
${formatter.format(node, node.retval.doc)}
+% endif +
+% endif + diff --git a/giscanner/doctemplates/C/mallard-C-class.tmpl b/giscanner/doctemplates/C/mallard-C-class.tmpl deleted file mode 100644 index a627ace4..00000000 --- a/giscanner/doctemplates/C/mallard-C-class.tmpl +++ /dev/null @@ -1,38 +0,0 @@ -<%! page_type="guide" %>\ -<%inherit file="mallard-base.tmpl"/> -<%block name="synopsis"> - - Hierarchy - - - GObjectObject - - - - -<%block name="links"> - - Constructors - - - Methods - - - Functions - - - Properties - - - Signals - - - Other - - diff --git a/giscanner/doctemplates/C/mallard-C-constructor.tmpl b/giscanner/doctemplates/C/mallard-C-constructor.tmpl deleted file mode 100644 index f373dfbe..00000000 --- a/giscanner/doctemplates/C/mallard-C-constructor.tmpl +++ /dev/null @@ -1 +0,0 @@ -<%inherit file="mallard-C-function.tmpl"/> diff --git a/giscanner/doctemplates/C/mallard-C-default.tmpl b/giscanner/doctemplates/C/mallard-C-default.tmpl deleted file mode 100644 index 991f29be..00000000 --- a/giscanner/doctemplates/C/mallard-C-default.tmpl +++ /dev/null @@ -1 +0,0 @@ -<%inherit file="mallard-base.tmpl"/> diff --git a/giscanner/doctemplates/C/mallard-C-enum.tmpl b/giscanner/doctemplates/C/mallard-C-enum.tmpl deleted file mode 100644 index cfe71c15..00000000 --- a/giscanner/doctemplates/C/mallard-C-enum.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -<%! page_type="guide" %>\ -<%inherit file="mallard-base.tmpl"/> diff --git a/giscanner/doctemplates/C/mallard-C-function.tmpl b/giscanner/doctemplates/C/mallard-C-function.tmpl deleted file mode 100644 index 84cace06..00000000 --- a/giscanner/doctemplates/C/mallard-C-function.tmpl +++ /dev/null @@ -1,75 +0,0 @@ -<%inherit file="mallard-base.tmpl"/> -<%block name="info"> -% if node.parent is not None: - -% else: - -% endif - - - ${formatter.format_type(node.retval.type) | x} - - ${node.symbol} -% if node.is_method: - - ${node.parent.ctype} * - self - -% endif -% for arg in node.parameters: -% if arg.type.ctype == '': - -% else: - - ${formatter.format_type(arg.type) | x} - ${arg.argname} - -% endif -% endfor - - -<%block name="synopsis"> - -${node.retval.type.ctype} ${node.symbol} (\ -% if node.is_method: -${node.parent.ctype} *self\ -%endif -% if len(node.parameters) == 0: -% if not node.is_method: -void\ -%endif -); -% elif node.is_method: -, -% endif -% for arg, ix in zip(node.parameters, range(len(node.parameters))): -% if ix != 0: -${' ' * (len(formatter.format_type(node.retval.type)) + len(node.symbol) + 3)}\ -% endif -% if arg.type.ctype == '': -...\ -% else: -${formatter.format_type(arg.type) | x} ${arg.argname}\ -% endif -% if ix == len(node.parameters) - 1: -); -% else: -, -%endif -% endfor - - -<%block name="details"> -% if node.parameters or node.retval: -
-% for arg, ix in zip(node.parameters, range(len(node.parameters))): -

${arg.argname} :

-
${formatter.format(node, arg.doc)}
-% endfor -% if node.retval: -

Returns :

-
${formatter.format(node, node.retval.doc)}
-% endif -
-% endif - diff --git a/giscanner/doctemplates/C/mallard-C-method.tmpl b/giscanner/doctemplates/C/mallard-C-method.tmpl deleted file mode 100644 index f373dfbe..00000000 --- a/giscanner/doctemplates/C/mallard-C-method.tmpl +++ /dev/null @@ -1 +0,0 @@ -<%inherit file="mallard-C-function.tmpl"/> diff --git a/giscanner/doctemplates/C/mallard-C-namespace.tmpl b/giscanner/doctemplates/C/mallard-C-namespace.tmpl deleted file mode 100644 index 28cd4708..00000000 --- a/giscanner/doctemplates/C/mallard-C-namespace.tmpl +++ /dev/null @@ -1,17 +0,0 @@ -<%! page_type="guide" %>\ -<%inherit file="mallard-base.tmpl"/> -<%block name="doc"> - -<%block name="links"> - - Classes - - - Functions - - - Other - - -<%block name="since_version"> - diff --git a/giscanner/doctemplates/C/mallard-C-property.tmpl b/giscanner/doctemplates/C/mallard-C-property.tmpl deleted file mode 100644 index cceb62de..00000000 --- a/giscanner/doctemplates/C/mallard-C-property.tmpl +++ /dev/null @@ -1,5 +0,0 @@ -<%inherit file="mallard-base.tmpl"/> -<%block name="info"> - - ${node.name} - diff --git a/giscanner/doctemplates/C/mallard-C-record.tmpl b/giscanner/doctemplates/C/mallard-C-record.tmpl deleted file mode 100644 index 991f29be..00000000 --- a/giscanner/doctemplates/C/mallard-C-record.tmpl +++ /dev/null @@ -1 +0,0 @@ -<%inherit file="mallard-base.tmpl"/> diff --git a/giscanner/doctemplates/C/mallard-C-signal.tmpl b/giscanner/doctemplates/C/mallard-C-signal.tmpl deleted file mode 100644 index cceb62de..00000000 --- a/giscanner/doctemplates/C/mallard-C-signal.tmpl +++ /dev/null @@ -1,5 +0,0 @@ -<%inherit file="mallard-base.tmpl"/> -<%block name="info"> - - ${node.name} - diff --git a/giscanner/doctemplates/C/mallard-C-vfunc.tmpl b/giscanner/doctemplates/C/mallard-C-vfunc.tmpl deleted file mode 100644 index 34c25b19..00000000 --- a/giscanner/doctemplates/C/mallard-C-vfunc.tmpl +++ /dev/null @@ -1,22 +0,0 @@ -<%inherit file="mallard-base.tmpl"/> -<%block name="info"> - - -<%block name="synopsis"> - - - -<%block name="details"> -% if node.parameters or node.retval: -
-% for arg, ix in zip(node.parameters, range(len(node.parameters))): -

${arg.argname} :

-
${formatter.format(node, arg.doc)}
-% endfor -% if node.retval: -

Returns :

-
${formatter.format(node, node.retval.doc)}
-% endif -
-% endif - diff --git a/giscanner/doctemplates/C/method.tmpl b/giscanner/doctemplates/C/method.tmpl new file mode 100644 index 00000000..a03d2825 --- /dev/null +++ b/giscanner/doctemplates/C/method.tmpl @@ -0,0 +1 @@ +<%inherit file="./function.tmpl"/> diff --git a/giscanner/doctemplates/C/namespace.tmpl b/giscanner/doctemplates/C/namespace.tmpl new file mode 100644 index 00000000..10745fae --- /dev/null +++ b/giscanner/doctemplates/C/namespace.tmpl @@ -0,0 +1,17 @@ +<%! page_type="guide" %>\ +<%inherit file="/base.tmpl"/> +<%block name="doc"> + +<%block name="links"> + + Classes + + + Functions + + + Other + + +<%block name="since_version"> + diff --git a/giscanner/doctemplates/C/property.tmpl b/giscanner/doctemplates/C/property.tmpl new file mode 100644 index 00000000..e3eb0511 --- /dev/null +++ b/giscanner/doctemplates/C/property.tmpl @@ -0,0 +1,5 @@ +<%inherit file="/base.tmpl"/> +<%block name="info"> + + ${node.name} + diff --git a/giscanner/doctemplates/C/record.tmpl b/giscanner/doctemplates/C/record.tmpl new file mode 100644 index 00000000..b66ae926 --- /dev/null +++ b/giscanner/doctemplates/C/record.tmpl @@ -0,0 +1 @@ +<%inherit file="/base.tmpl"/> diff --git a/giscanner/doctemplates/C/signal.tmpl b/giscanner/doctemplates/C/signal.tmpl new file mode 100644 index 00000000..e3eb0511 --- /dev/null +++ b/giscanner/doctemplates/C/signal.tmpl @@ -0,0 +1,5 @@ +<%inherit file="/base.tmpl"/> +<%block name="info"> + + ${node.name} + diff --git a/giscanner/doctemplates/C/vfunc.tmpl b/giscanner/doctemplates/C/vfunc.tmpl new file mode 100644 index 00000000..902b8864 --- /dev/null +++ b/giscanner/doctemplates/C/vfunc.tmpl @@ -0,0 +1,22 @@ +<%inherit file="/base.tmpl"/> +<%block name="info"> + + +<%block name="synopsis"> + + + +<%block name="details"> +% if node.parameters or node.retval: +
+% for arg, ix in zip(node.parameters, range(len(node.parameters))): +

${arg.argname} :

+
${formatter.format(node, arg.doc)}
+% endfor +% if node.retval: +

Returns :

+
${formatter.format(node, node.retval.doc)}
+% endif +
+% endif + diff --git a/giscanner/doctemplates/Python/class.tmpl b/giscanner/doctemplates/Python/class.tmpl new file mode 100644 index 00000000..41e6e499 --- /dev/null +++ b/giscanner/doctemplates/Python/class.tmpl @@ -0,0 +1,55 @@ +<%inherit file="/base.tmpl"/> +<%block name="synopsis"> + +from gi.repository import ${namespace.name} + +${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}(\ +% for property_, ix in zip(node.properties, range(len(node.properties))): +% if property_.construct or property_.construct_only or property_.writable: +${property_.name.replace('-', '_')}=value\ +% if ix != len(node.properties) - 1: +, \ +% endif +% endif +% endfor +)\ + + +<%block name="details"> + + Hierarchy + +% for class_ in formatter.get_class_hierarchy(node): + + ${class_.namespace.name}.${class_.name} +% endfor +% for class_ in formatter.get_class_hierarchy(node): + +% endfor + + + +<%block name="links"> + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + diff --git a/giscanner/doctemplates/Python/constructor.tmpl b/giscanner/doctemplates/Python/constructor.tmpl new file mode 100644 index 00000000..a03d2825 --- /dev/null +++ b/giscanner/doctemplates/Python/constructor.tmpl @@ -0,0 +1 @@ +<%inherit file="./function.tmpl"/> diff --git a/giscanner/doctemplates/Python/default.tmpl b/giscanner/doctemplates/Python/default.tmpl new file mode 100644 index 00000000..b66ae926 --- /dev/null +++ b/giscanner/doctemplates/Python/default.tmpl @@ -0,0 +1 @@ +<%inherit file="/base.tmpl"/> diff --git a/giscanner/doctemplates/Python/enum.tmpl b/giscanner/doctemplates/Python/enum.tmpl new file mode 100644 index 00000000..840f79f5 --- /dev/null +++ b/giscanner/doctemplates/Python/enum.tmpl @@ -0,0 +1,11 @@ +<%inherit file="/base.tmpl"/> +<%block name="details"> +% if node.members: +
+% for member, ix in zip(node.members, range(len(node.members))): +

${node.name}.${member.name.upper()} :

+
${formatter.format(node, member.doc)}
+% endfor +
+% endif + diff --git a/giscanner/doctemplates/Python/function.tmpl b/giscanner/doctemplates/Python/function.tmpl new file mode 100644 index 00000000..467cfcbe --- /dev/null +++ b/giscanner/doctemplates/Python/function.tmpl @@ -0,0 +1,62 @@ +<%inherit file="/base.tmpl"/> +<%block name="info"> +% if node.parent is not None: + +% else: + +% endif + + + ${formatter.format_type(node.retval.type) | x} + + ${node.symbol} +% if node.is_method: + + ${node.parent.ctype} * + self + +% endif +% for arg in node.parameters: +% if arg.type.ctype == '': + +% else: + + ${formatter.format_type(arg.type) | x} + ${arg.argname} + +% endif +% endfor + + +<%block name="synopsis"> + +% if len(node.parameters) != 0: +@accepts(\ +${', '.join((formatter.format_type(arg.type) for arg in node.parameters))}\ +) +% endif +@returns(${formatter.format_type(node.retval.type) | x}) +def \ +${node.name}(\ +% if node.is_method: +self, \ +% endif +${', '.join((arg.argname for arg in node.parameters))}\ +): + # Python wrapper for ${node.symbol}() + + +<%block name="details"> +% if node.parameters or node.retval: +
+% for arg, ix in zip(node.parameters, range(len(node.parameters))): +

${arg.argname} :

+
${formatter.format(node, arg.doc)}
+% endfor +% if node.retval and node.retval.type.ctype != 'void': +

Returns :

+
${formatter.format(node, node.retval.doc)}
+% endif +
+% endif + diff --git a/giscanner/doctemplates/Python/mallard-Python-class.tmpl b/giscanner/doctemplates/Python/mallard-Python-class.tmpl deleted file mode 100644 index f4de812d..00000000 --- a/giscanner/doctemplates/Python/mallard-Python-class.tmpl +++ /dev/null @@ -1,55 +0,0 @@ -<%inherit file="mallard-base.tmpl"/> -<%block name="synopsis"> - -from gi.repository import ${namespace.name} - -${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}(\ -% for property_, ix in zip(node.properties, range(len(node.properties))): -% if property_.construct or property_.construct_only or property_.writable: -${property_.name.replace('-', '_')}=value\ -% if ix != len(node.properties) - 1: -, \ -% endif -% endif -% endfor -)\ - - -<%block name="details"> - - Hierarchy - -% for class_ in formatter.get_class_hierarchy(node): - - ${class_.namespace.name}.${class_.name} -% endfor -% for class_ in formatter.get_class_hierarchy(node): - -% endfor - - - -<%block name="links"> - - Methods - - - Functions - - - Properties - - - Signals - - - Virtual functions - - - Other - - diff --git a/giscanner/doctemplates/Python/mallard-Python-constructor.tmpl b/giscanner/doctemplates/Python/mallard-Python-constructor.tmpl deleted file mode 100644 index 0b740414..00000000 --- a/giscanner/doctemplates/Python/mallard-Python-constructor.tmpl +++ /dev/null @@ -1 +0,0 @@ -<%inherit file="mallard-Python-function.tmpl"/> diff --git a/giscanner/doctemplates/Python/mallard-Python-default.tmpl b/giscanner/doctemplates/Python/mallard-Python-default.tmpl deleted file mode 100644 index 991f29be..00000000 --- a/giscanner/doctemplates/Python/mallard-Python-default.tmpl +++ /dev/null @@ -1 +0,0 @@ -<%inherit file="mallard-base.tmpl"/> diff --git a/giscanner/doctemplates/Python/mallard-Python-enum.tmpl b/giscanner/doctemplates/Python/mallard-Python-enum.tmpl deleted file mode 100644 index 69d2c339..00000000 --- a/giscanner/doctemplates/Python/mallard-Python-enum.tmpl +++ /dev/null @@ -1,11 +0,0 @@ -<%inherit file="mallard-base.tmpl"/> -<%block name="details"> -% if node.members: -
-% for member, ix in zip(node.members, range(len(node.members))): -

${node.name}.${member.name.upper()} :

-
${formatter.format(node, member.doc)}
-% endfor -
-% endif - diff --git a/giscanner/doctemplates/Python/mallard-Python-function.tmpl b/giscanner/doctemplates/Python/mallard-Python-function.tmpl deleted file mode 100644 index 65adb1d7..00000000 --- a/giscanner/doctemplates/Python/mallard-Python-function.tmpl +++ /dev/null @@ -1,62 +0,0 @@ -<%inherit file="mallard-base.tmpl"/> -<%block name="info"> -% if node.parent is not None: - -% else: - -% endif - - - ${formatter.format_type(node.retval.type) | x} - - ${node.symbol} -% if node.is_method: - - ${node.parent.ctype} * - self - -% endif -% for arg in node.parameters: -% if arg.type.ctype == '': - -% else: - - ${formatter.format_type(arg.type) | x} - ${arg.argname} - -% endif -% endfor - - -<%block name="synopsis"> - -% if len(node.parameters) != 0: -@accepts(\ -${', '.join((formatter.format_type(arg.type) for arg in node.parameters))}\ -) -% endif -@returns(${formatter.format_type(node.retval.type) | x}) -def \ -${node.name}(\ -% if node.is_method: -self, \ -% endif -${', '.join((arg.argname for arg in node.parameters))}\ -): - # Python wrapper for ${node.symbol}() - - -<%block name="details"> -% if node.parameters or node.retval: -
-% for arg, ix in zip(node.parameters, range(len(node.parameters))): -

${arg.argname} :

-
${formatter.format(node, arg.doc)}
-% endfor -% if node.retval and node.retval.type.ctype != 'void': -

Returns :

-
${formatter.format(node, node.retval.doc)}
-% endif -
-% endif - diff --git a/giscanner/doctemplates/Python/mallard-Python-method.tmpl b/giscanner/doctemplates/Python/mallard-Python-method.tmpl deleted file mode 100644 index 0b740414..00000000 --- a/giscanner/doctemplates/Python/mallard-Python-method.tmpl +++ /dev/null @@ -1 +0,0 @@ -<%inherit file="mallard-Python-function.tmpl"/> diff --git a/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl b/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl deleted file mode 100644 index 28cd4708..00000000 --- a/giscanner/doctemplates/Python/mallard-Python-namespace.tmpl +++ /dev/null @@ -1,17 +0,0 @@ -<%! page_type="guide" %>\ -<%inherit file="mallard-base.tmpl"/> -<%block name="doc"> - -<%block name="links"> - - Classes - - - Functions - - - Other - - -<%block name="since_version"> - diff --git a/giscanner/doctemplates/Python/mallard-Python-property.tmpl b/giscanner/doctemplates/Python/mallard-Python-property.tmpl deleted file mode 100644 index 32d673b2..00000000 --- a/giscanner/doctemplates/Python/mallard-Python-property.tmpl +++ /dev/null @@ -1,10 +0,0 @@ -<%inherit file="mallard-base.tmpl"/> -<%block name="info"> - - ${node.name} - -<%block name="synopsis"> - -"${node.name}" ${formatter.format_type(node.type)} : ${formatter.format_property_flags(node)} - - diff --git a/giscanner/doctemplates/Python/mallard-Python-record.tmpl b/giscanner/doctemplates/Python/mallard-Python-record.tmpl deleted file mode 100644 index cfe71c15..00000000 --- a/giscanner/doctemplates/Python/mallard-Python-record.tmpl +++ /dev/null @@ -1,2 +0,0 @@ -<%! page_type="guide" %>\ -<%inherit file="mallard-base.tmpl"/> diff --git a/giscanner/doctemplates/Python/mallard-Python-signal.tmpl b/giscanner/doctemplates/Python/mallard-Python-signal.tmpl deleted file mode 100644 index 8c721b94..00000000 --- a/giscanner/doctemplates/Python/mallard-Python-signal.tmpl +++ /dev/null @@ -1,35 +0,0 @@ -<%inherit file="mallard-base.tmpl"/> -<%block name="info"> - - ${node.name} - -<%block name="synopsis"> - -def callback(${formatter.to_underscores(node.parent.name).lower()}, \ -% for arg, ix in zip(node.parameters, range(len(node.parameters))): -${arg.argname}, \ -% endfor -user_param1, ...) - - -<%block name="details"> -
-

${formatter.to_underscores(node.parent.name).lower()} :

-

instance of ${namespace.name}.${node.parent.name} that is emitting the signal

-% for arg, ix in zip(node.parameters, range(len(node.parameters))): -

${arg.argname} :

-
${formatter.format(node, arg.doc)}
-% endfor -

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-% if node.retval and \ - node.retval.type.ctype != 'void' and \ - node.retval.type.ctype is not None: -

Returns :

-
${node.retval.type.ctype} ${formatter.format(node, node.retval.doc)}
-% endif -
- - diff --git a/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl b/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl deleted file mode 100644 index cf51f7c7..00000000 --- a/giscanner/doctemplates/Python/mallard-Python-vfunc.tmpl +++ /dev/null @@ -1,29 +0,0 @@ -<%inherit file="mallard-base.tmpl"/> -<%block name="synopsis"> - -% if len(node.parameters) != 0: -@accepts(\ -${', '.join((formatter.format_type(arg.type) for arg in node.parameters))}\ -) -% endif -@returns(${formatter.format_type(node.retval.type) | x}) -def \ -do_${node.name}(self, \ -${', '.join((arg.argname for arg in node.parameters))}\ -): - - -<%block name="details"> -% if node.parameters or node.retval: -
-% for arg, ix in zip(node.parameters, range(len(node.parameters))): -

${arg.argname} :

-
${formatter.format(node, arg.doc)}
-% endfor -% if node.retval and node.retval.type.ctype != 'void': -

Returns :

-
${formatter.format(node, node.retval.doc)}
-% endif -
-% endif - diff --git a/giscanner/doctemplates/Python/method.tmpl b/giscanner/doctemplates/Python/method.tmpl new file mode 100644 index 00000000..a03d2825 --- /dev/null +++ b/giscanner/doctemplates/Python/method.tmpl @@ -0,0 +1 @@ +<%inherit file="./function.tmpl"/> diff --git a/giscanner/doctemplates/Python/namespace.tmpl b/giscanner/doctemplates/Python/namespace.tmpl new file mode 100644 index 00000000..10745fae --- /dev/null +++ b/giscanner/doctemplates/Python/namespace.tmpl @@ -0,0 +1,17 @@ +<%! page_type="guide" %>\ +<%inherit file="/base.tmpl"/> +<%block name="doc"> + +<%block name="links"> + + Classes + + + Functions + + + Other + + +<%block name="since_version"> + diff --git a/giscanner/doctemplates/Python/property.tmpl b/giscanner/doctemplates/Python/property.tmpl new file mode 100644 index 00000000..f05bc820 --- /dev/null +++ b/giscanner/doctemplates/Python/property.tmpl @@ -0,0 +1,10 @@ +<%inherit file="/base.tmpl"/> +<%block name="info"> + + ${node.name} + +<%block name="synopsis"> + +"${node.name}" ${formatter.format_type(node.type)} : ${formatter.format_property_flags(node)} + + diff --git a/giscanner/doctemplates/Python/record.tmpl b/giscanner/doctemplates/Python/record.tmpl new file mode 100644 index 00000000..1523e0df --- /dev/null +++ b/giscanner/doctemplates/Python/record.tmpl @@ -0,0 +1,2 @@ +<%! page_type="guide" %>\ +<%inherit file="/base.tmpl"/> diff --git a/giscanner/doctemplates/Python/signal.tmpl b/giscanner/doctemplates/Python/signal.tmpl new file mode 100644 index 00000000..9b277466 --- /dev/null +++ b/giscanner/doctemplates/Python/signal.tmpl @@ -0,0 +1,35 @@ +<%inherit file="/base.tmpl"/> +<%block name="info"> + + ${node.name} + +<%block name="synopsis"> + +def callback(${formatter.to_underscores(node.parent.name).lower()}, \ +% for arg, ix in zip(node.parameters, range(len(node.parameters))): +${arg.argname}, \ +% endfor +user_param1, ...) + + +<%block name="details"> +
+

${formatter.to_underscores(node.parent.name).lower()} :

+

instance of ${namespace.name}.${node.parent.name} that is emitting the signal

+% for arg, ix in zip(node.parameters, range(len(node.parameters))): +

${arg.argname} :

+
${formatter.format(node, arg.doc)}
+% endfor +

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+% if node.retval and \ + node.retval.type.ctype != 'void' and \ + node.retval.type.ctype is not None: +

Returns :

+
${node.retval.type.ctype} ${formatter.format(node, node.retval.doc)}
+% endif +
+ + diff --git a/giscanner/doctemplates/Python/vfunc.tmpl b/giscanner/doctemplates/Python/vfunc.tmpl new file mode 100644 index 00000000..65f856a5 --- /dev/null +++ b/giscanner/doctemplates/Python/vfunc.tmpl @@ -0,0 +1,29 @@ +<%inherit file="/base.tmpl"/> +<%block name="synopsis"> + +% if len(node.parameters) != 0: +@accepts(\ +${', '.join((formatter.format_type(arg.type) for arg in node.parameters))}\ +) +% endif +@returns(${formatter.format_type(node.retval.type) | x}) +def \ +do_${node.name}(self, \ +${', '.join((arg.argname for arg in node.parameters))}\ +): + + +<%block name="details"> +% if node.parameters or node.retval: +
+% for arg, ix in zip(node.parameters, range(len(node.parameters))): +

${arg.argname} :

+
${formatter.format(node, arg.doc)}
+% endfor +% if node.retval and node.retval.type.ctype != 'void': +

Returns :

+
${formatter.format(node, node.retval.doc)}
+% endif +
+% endif + diff --git a/giscanner/doctemplates/base.tmpl b/giscanner/doctemplates/base.tmpl new file mode 100644 index 00000000..e40739c3 --- /dev/null +++ b/giscanner/doctemplates/base.tmpl @@ -0,0 +1,29 @@ +<%! page_type="topic" %>\ + + + + <%block name="info"> + + + + <%block name="title">${formatter.format_page_name(node)}</%block> + <%block name="synopsis"> + + <%block name="doc"> + ${formatter.format(node, node.doc)} + + <%block name="since_version"> + % if node.version: +

Since ${node.version}

+ % endif + + <%block name="details"> + + <%block name="links"> + + diff --git a/giscanner/doctemplates/mallard-base.tmpl b/giscanner/doctemplates/mallard-base.tmpl deleted file mode 100644 index e40739c3..00000000 --- a/giscanner/doctemplates/mallard-base.tmpl +++ /dev/null @@ -1,29 +0,0 @@ -<%! page_type="topic" %>\ - - - - <%block name="info"> - - - - <%block name="title">${formatter.format_page_name(node)}</%block> - <%block name="synopsis"> - - <%block name="doc"> - ${formatter.format(node, node.doc)} - - <%block name="since_version"> - % if node.version: -

Since ${node.version}

- % endif - - <%block name="details"> - - <%block name="links"> - - diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py index 2d435aa3..b00de1f4 100644 --- a/giscanner/mallardwriter.py +++ b/giscanner/mallardwriter.py @@ -463,9 +463,8 @@ class MallardWriter(object): srcdir = os.path.dirname(__file__) template_dir = os.path.join(srcdir, 'doctemplates') - language_dir = os.path.join(template_dir, self._language) - return TemplateLookup(directories=[template_dir, language_dir], + return TemplateLookup(directories=[template_dir], module_directory=tempfile.mkdtemp(), output_encoding='utf-8') @@ -496,7 +495,7 @@ class MallardWriter(object): namespace = self._transformer.namespace node_kind = get_node_kind(node) - template_name = 'mallard-%s-%s.tmpl' % (self._language, node_kind) + template_name = '%s/%s.tmpl' % (self._language, node_kind) page_id = make_page_id(node) template = self._lookup.get_template(template_name) -- cgit v1.2.1 From ae6f1592d4e423abc749e8d9f9a27191bcb1b85b Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 18:58:13 -0500 Subject: doctool: Use a base template for all node kinds that make sense --- Makefile-giscanner.am | 2 ++ giscanner/doctemplates/C/class.tmpl | 38 +------------------- giscanner/doctemplates/C/namespace.tmpl | 18 +--------- giscanner/doctemplates/Python/class.tmpl | 40 +--------------------- giscanner/doctemplates/Python/namespace.tmpl | 17 +-------- giscanner/doctemplates/class.tmpl | 40 ++++++++++++++++++++++ giscanner/doctemplates/namespace.tmpl | 17 +++++++++ giscanner/mallardwriter.py | 2 ++ .../DocExamples.Obj.page | 31 +++++++++-------- .../DocExamples.Obj.page | 6 ++-- 10 files changed, 84 insertions(+), 127 deletions(-) create mode 100644 giscanner/doctemplates/class.tmpl create mode 100644 giscanner/doctemplates/namespace.tmpl diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am index b5864392..d5402f6d 100644 --- a/Makefile-giscanner.am +++ b/Makefile-giscanner.am @@ -55,6 +55,8 @@ pkgpyexec_PYTHON = \ templatedir = $(pkglibdir) nobase_template_DATA = \ giscanner/doctemplates/base.tmpl \ + giscanner/doctemplates/class.tmpl \ + giscanner/doctemplates/namespace.tmpl \ giscanner/doctemplates/C/class.tmpl \ giscanner/doctemplates/C/constructor.tmpl \ giscanner/doctemplates/C/default.tmpl \ diff --git a/giscanner/doctemplates/C/class.tmpl b/giscanner/doctemplates/C/class.tmpl index 22a086cc..3f18b021 100644 --- a/giscanner/doctemplates/C/class.tmpl +++ b/giscanner/doctemplates/C/class.tmpl @@ -1,38 +1,2 @@ <%! page_type="guide" %>\ -<%inherit file="/base.tmpl"/> -<%block name="synopsis"> - - Hierarchy - - - GObjectObject - - - - -<%block name="links"> - - Constructors - - - Methods - - - Functions - - - Properties - - - Signals - - - Other - - +<%inherit file="/class.tmpl"/> diff --git a/giscanner/doctemplates/C/namespace.tmpl b/giscanner/doctemplates/C/namespace.tmpl index 10745fae..cb8195da 100644 --- a/giscanner/doctemplates/C/namespace.tmpl +++ b/giscanner/doctemplates/C/namespace.tmpl @@ -1,17 +1 @@ -<%! page_type="guide" %>\ -<%inherit file="/base.tmpl"/> -<%block name="doc"> - -<%block name="links"> - - Classes - - - Functions - - - Other - - -<%block name="since_version"> - +<%inherit file="/namespace.tmpl"/> diff --git a/giscanner/doctemplates/Python/class.tmpl b/giscanner/doctemplates/Python/class.tmpl index 41e6e499..3991ff31 100644 --- a/giscanner/doctemplates/Python/class.tmpl +++ b/giscanner/doctemplates/Python/class.tmpl @@ -1,4 +1,4 @@ -<%inherit file="/base.tmpl"/> +<%inherit file="/class.tmpl"/> <%block name="synopsis"> from gi.repository import ${namespace.name} @@ -15,41 +15,3 @@ ${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}( )\ -<%block name="details"> - - Hierarchy - -% for class_ in formatter.get_class_hierarchy(node): - - ${class_.namespace.name}.${class_.name} -% endfor -% for class_ in formatter.get_class_hierarchy(node): - -% endfor - - - -<%block name="links"> - - Methods - - - Functions - - - Properties - - - Signals - - - Virtual functions - - - Other - - diff --git a/giscanner/doctemplates/Python/namespace.tmpl b/giscanner/doctemplates/Python/namespace.tmpl index 10745fae..4d80c2a5 100644 --- a/giscanner/doctemplates/Python/namespace.tmpl +++ b/giscanner/doctemplates/Python/namespace.tmpl @@ -1,17 +1,2 @@ <%! page_type="guide" %>\ -<%inherit file="/base.tmpl"/> -<%block name="doc"> - -<%block name="links"> - - Classes - - - Functions - - - Other - - -<%block name="since_version"> - +<%inherit file="/namespace.tmpl"/> diff --git a/giscanner/doctemplates/class.tmpl b/giscanner/doctemplates/class.tmpl new file mode 100644 index 00000000..f264bc2d --- /dev/null +++ b/giscanner/doctemplates/class.tmpl @@ -0,0 +1,40 @@ +<%! page_type="guide" %>\ +<%inherit file="/base.tmpl"/> +<%block name="details"> + + Hierarchy + +% for class_ in formatter.get_class_hierarchy(node): + + ${class_.namespace.name}.${class_.name} +% endfor +% for class_ in formatter.get_class_hierarchy(node): + +% endfor + + + +<%block name="links"> + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + diff --git a/giscanner/doctemplates/namespace.tmpl b/giscanner/doctemplates/namespace.tmpl new file mode 100644 index 00000000..10745fae --- /dev/null +++ b/giscanner/doctemplates/namespace.tmpl @@ -0,0 +1,17 @@ +<%! page_type="guide" %>\ +<%inherit file="/base.tmpl"/> +<%block name="doc"> + +<%block name="links"> + + Classes + + + Functions + + + Other + + +<%block name="since_version"> + diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py index b00de1f4..bb5f8936 100644 --- a/giscanner/mallardwriter.py +++ b/giscanner/mallardwriter.py @@ -349,6 +349,7 @@ class MallardFormatter(object): class MallardFormatterC(MallardFormatter): language = "C" + mime_type = "text/x-csrc" fundamentals = { "TRUE": "TRUE", @@ -372,6 +373,7 @@ class MallardFormatterC(MallardFormatter): class MallardFormatterPython(MallardFormatter): language = "Python" + mime_type = "text/python" fundamentals = { "TRUE": "True", diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page index eb90ad3f..d3aeb465 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page @@ -12,15 +12,7 @@ DocExamples.Obj - - Hierarchy - - - GObjectObject - - - - +

This is an example of how to document a class

This class has a signal: DocExamples.Obj::signal-example.

And also has a property: DocExamples.Obj:property-example.

@@ -28,13 +20,19 @@

Since 0.99

- + + Hierarchy + + + GObject.Object + + DocExamples.Obj + + + + + - - Constructors - @@ -51,6 +49,9 @@ Signals + + Virtual functions + Other diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page index 8a0e3c2b..ad02f506 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page @@ -1,6 +1,6 @@ property_exa Methods Functions -- cgit v1.2.1 From b4ce0aec3b74adbe996ea0489d9dd5dfe91ba11d Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 19:10:11 -0500 Subject: mallardwriter: Use xmlwriter for xrefs --- giscanner/mallardwriter.py | 6 ++++-- giscanner/xmlwriter.py | 34 +++++++++++++++++++--------------- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py index bb5f8936..6526a4a8 100644 --- a/giscanner/mallardwriter.py +++ b/giscanner/mallardwriter.py @@ -28,7 +28,7 @@ import tempfile from xml.sax import saxutils from mako.lookup import TemplateLookup -from . import ast +from . import ast, xmlwriter from .utils import to_underscores def make_page_id(node): @@ -319,7 +319,9 @@ class MallardFormatter(object): # Enum/BitField members are linked to the main enum page. return self.format_xref(node.parent) + '.' + node.name else: - return '%s' % (make_page_id(node), self.format_page_name(node)) + return xmlwriter.build_xml_tag('link', + [('xref', make_page_id(node))], + self.format_page_name(node)) def format_property_flags(self, property_, construct_only=False): flags = [] diff --git a/giscanner/xmlwriter.py b/giscanner/xmlwriter.py index fb34adf1..11f84859 100755 --- a/giscanner/xmlwriter.py +++ b/giscanner/xmlwriter.py @@ -68,6 +68,23 @@ def collect_attributes(tag_name, attributes, self_indent, first = False return attr_value +def build_xml_tag(tag_name, attributes=None, data=None, self_indent=0, + self_indent_char=' '): + if attributes is None: + attributes = [] + prefix = u'<%s' % (tag_name, ) + if data is not None: + if isinstance(data, str): + data = data.decode('UTF-8') + suffix = u'>%s' % (escape(data), tag_name) + else: + suffix = u'/>' + attrs = collect_attributes( + tag_name, attributes, + self_indent, + self_indent_char, + len(prefix) + len(suffix)) + return prefix + attrs + suffix with LibtoolImporter(None, None): if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ: @@ -131,21 +148,8 @@ class XMLWriter(object): self.write_line('' % (text, )) def write_tag(self, tag_name, attributes, data=None): - if attributes is None: - attributes = [] - prefix = u'<%s' % (tag_name, ) - if data is not None: - if isinstance(data, str): - data = data.decode('UTF-8') - suffix = u'>%s' % (escape(data), tag_name) - else: - suffix = u'/>' - attrs = collect_attributes( - tag_name, attributes, - self._indent, - self._indent_char, - len(prefix) + len(suffix)) - self.write_line(prefix + attrs + suffix) + self.write_line(build_xml_tag(tag_name, attributes, data, + self._indent, self._indent_char)) def push_tag(self, tag_name, attributes=None): if attributes is None: -- cgit v1.2.1 From e8fff809b66f3afa86d6e0c7c09cfa3e7698ebe3 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 19:19:28 -0500 Subject: mallardwriter: Don't set content for links These are set automatically. --- giscanner/mallardwriter.py | 4 +--- .../doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page | 6 +++--- tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page | 2 +- .../DocExamples-1.0-C-expected/DocExamples.callback_function.page | 2 +- .../DocExamples-1.0-Python-expected/DocExamples.Obj.method.page | 6 +++--- tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page | 2 +- .../DocExamples.callback_function.page | 2 +- 7 files changed, 11 insertions(+), 13 deletions(-) diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py index 6526a4a8..e136570a 100644 --- a/giscanner/mallardwriter.py +++ b/giscanner/mallardwriter.py @@ -319,9 +319,7 @@ class MallardFormatter(object): # Enum/BitField members are linked to the main enum page. return self.format_xref(node.parent) + '.' + node.name else: - return xmlwriter.build_xml_tag('link', - [('xref', make_page_id(node))], - self.format_page_name(node)) + return xmlwriter.build_xml_tag('link', [('xref', make_page_id(node))]) def format_property_flags(self, property_, construct_only=False): flags = [] diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page index 23fe6e5f..344b36f3 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page @@ -52,8 +52,8 @@ gint first_arg, -

This is an example of how to document a method.

You should call this on a DocExamples.Obj that was -created with doc_examples_obj_new.

This should be a %FALSEALARM.

+

This is an example of how to document a method.

You should call this on a that was +created with .

This should be a %FALSEALARM.

Since 0.99

@@ -61,7 +61,7 @@ created with doc_examples_obj_new.

first_arg :

-

A DocExamples.Obj.

+

A .

second_arg :

second argument

boolean_arg :

diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page index d3aeb465..85132de6 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page @@ -14,7 +14,7 @@ -

This is an example of how to document a class

This class has a signal: DocExamples.Obj::signal-example.

And also has a property: DocExamples.Obj:property-example.

+

This is an example of how to document a class

This class has a signal: .

And also has a property: .

Since 0.99

diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page index 57e2f72e..0ae97913 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page @@ -52,7 +52,7 @@ will expose this in different ways (e.g. Python keeps the

destroy_notify :

how to get rid of user_data

Returns :

-

DocExamples.Enum.foo sometimes, DocExamples.Enum.bar other times.

+

.foo sometimes, .bar other times.

diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page index 54a57c40..245b2586 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page @@ -50,8 +50,8 @@ def method(self, first_arg, second_arg, boolean_arg, pointer_arg, string): -

This is an example of how to document a method.

You should call this on a DocExamples.Obj that was -created with Obj.new.

This should be a %FALSEALARM.

+

This is an example of how to document a method.

You should call this on a that was +created with .

This should be a %FALSEALARM.

Since 0.99

@@ -59,7 +59,7 @@ created with Obj.new.

This should

first_arg :

-

A DocExamples.Obj.

+

A .

second_arg :

second argument

boolean_arg :

diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page index ad02f506..14eedd4a 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page @@ -18,7 +18,7 @@ from gi.repository import DocExamples obj = DocExamples.Obj(property_example=value) -

This is an example of how to document a class

This class has a signal: DocExamples.Obj::signal-example.

And also has a property: DocExamples.Obj:property-example.

+

This is an example of how to document a class

This class has a signal: .

And also has a property: .

Since 0.99

diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page index 80ee488a..9b805712 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page @@ -53,7 +53,7 @@ will expose this in different ways (e.g. Python keeps the

destroy_notify :

how to get rid of user_data

Returns :

-

DocExamples.Enum.foo sometimes, DocExamples.Enum.bar other times.

+

.foo sometimes, .bar other times.

-- cgit v1.2.1 From 34fcb259c51997360bca967095dd1e1282140f6d Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 23:25:26 -0500 Subject: mallardwriter: Clean up node filtering Instead of checking strings, pass this to the Formatter, which is really mostly about language semantics now. --- giscanner/mallardwriter.py | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py index e136570a..08d52c84 100644 --- a/giscanner/mallardwriter.py +++ b/giscanner/mallardwriter.py @@ -169,6 +169,9 @@ class MallardFormatter(object): def escape(self, text): return saxutils.escape(text) + def should_render_node(self, node): + return True + def format(self, node, doc): if doc is None: return '' @@ -381,6 +384,15 @@ class MallardFormatterPython(MallardFormatter): "NULL": "None", } + def should_render_node(self, node): + if getattr(node, "is_constructor", False): + return False + + if isinstance(node, ast.Record) and node.is_gtype_struct_for is not None: + return False + + return True + def is_method(self, node): if getattr(node, "is_method", False): return True @@ -477,10 +489,6 @@ class MallardWriter(object): continue if getattr(node, 'disguised', False): continue - if isinstance(node, ast.Record) and \ - self._language == 'Python' and \ - node.is_gtype_struct_for is not None: - continue nodes.append(node) if isinstance(node, (ast.Class, ast.Interface, ast.Record)): nodes += getattr(node, 'methods', []) @@ -488,10 +496,10 @@ class MallardWriter(object): nodes += getattr(node, 'virtual_methods', []) nodes += getattr(node, 'properties', []) nodes += getattr(node, 'signals', []) - if self._language == 'C': - nodes += getattr(node, 'constructors', []) + nodes += getattr(node, 'constructors', []) for node in nodes: - self._render_node(node, output) + if self._formatter.should_render_node(node): + self._render_node(node, output) def _render_node(self, node, output): namespace = self._transformer.namespace -- cgit v1.2.1 From 3209fdf04bdff42033e1f833913c394adcaa2e67 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 1 Feb 2013 00:17:39 -0500 Subject: ast: Make sure to export c:type for signals and properties --- giscanner/ast.py | 3 +- tests/scanner/Annotation-1.0-expected.gir | 24 ++++++++-------- tests/scanner/Foo-1.0-expected.gir | 8 +++--- tests/scanner/Regress-1.0-expected.gir | 46 +++++++++++++++---------------- 4 files changed, 41 insertions(+), 40 deletions(-) diff --git a/giscanner/ast.py b/giscanner/ast.py index 50b0f29e..18313320 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -95,7 +95,8 @@ in contrast to the other create_type() functions.""" # First, is it a fundamental? fundamental = type_names.get(gtype_name) if fundamental is not None: - return cls(target_fundamental=fundamental.target_fundamental) + return cls(target_fundamental=fundamental.target_fundamental, + ctype=fundamental.ctype) if gtype_name == 'GHashTable': return Map(TYPE_ANY, TYPE_ANY, gtype_name=gtype_name) elif gtype_name in ('GArray', 'GPtrArray', 'GByteArray'): diff --git a/tests/scanner/Annotation-1.0-expected.gir b/tests/scanner/Annotation-1.0-expected.gir index bc0ae090..3abec0e3 100644 --- a/tests/scanner/Annotation-1.0-expected.gir +++ b/tests/scanner/Annotation-1.0-expected.gir @@ -681,7 +681,7 @@ annotation_object_watch_full(). writable="1" construct="1" transfer-ownership="none"> - + construct="1" transfer-ownership="none"> This is a property which is a string - + transfer-ownership="none"> This is a property annotation intentionally indented with a mix of tabs and strings to test the tab handling capabilities of the scanner. - + @@ -710,29 +710,29 @@ of tabs and strings to test the tab handling capabilities of the scanner. the return value - + a value - + another value - + This signal tests an empty document argument (@arg1) - + - + @@ -740,12 +740,12 @@ of tabs and strings to test the tab handling capabilities of the scanner. This is a signal which takes a list of strings, but it's not known by GObject as it's only marked as G_TYPE_POINTER - + a list of strings - + @@ -759,12 +759,12 @@ known by GObject as it's only marked as G_TYPE_POINTER This is a signal which has a broken signal handler, it says it's pointer but it's actually a string. - + a string - + diff --git a/tests/scanner/Foo-1.0-expected.gir b/tests/scanner/Foo-1.0-expected.gir index bfab2661..40186dfd 100644 --- a/tests/scanner/Foo-1.0-expected.gir +++ b/tests/scanner/Foo-1.0-expected.gir @@ -666,7 +666,7 @@ uses a C sugar return type. writable="1" construct="1" transfer-ownership="none"> - + @@ -676,14 +676,14 @@ uses a C sugar return type. - + - + @@ -960,7 +960,7 @@ exposed to language bindings. - + diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index e5f9e3bb..4f285eb4 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -1277,13 +1277,13 @@ raise an error. - + - + - + @@ -1300,20 +1300,20 @@ raise an error. - + - + - + - + @@ -1357,24 +1357,24 @@ raise an error. action="1" no-hooks="1"> - + - + - + This test signal is like TelepathyGlib's TpChannel:: group-members-changed-detailed: - + @@ -1387,7 +1387,7 @@ raise an error. - + @@ -1400,7 +1400,7 @@ raise an error. This test signal is like TelepathyGlib's TpAccount::status-changed - + @@ -1415,12 +1415,12 @@ raise an error. You can use this with regress_test_obj_emit_sig_with_int64, or raise from the introspection client langage. - + an integer - + @@ -1433,7 +1433,7 @@ the introspection client langage. an integer - + @@ -1441,7 +1441,7 @@ the introspection client langage. Test transfer none GObject as a param (tests refcounting). Use with regress_test_obj_emit_sig_with_obj - + @@ -1453,7 +1453,7 @@ Use with regress_test_obj_emit_sig_with_obj Test GStrv as a param. - + @@ -1468,18 +1468,18 @@ Use with regress_test_obj_emit_sig_with_obj You can use this with regress_test_obj_emit_sig_with_uint64, or raise from the introspection client langage. - + an integer - + - + no-recurse="1" no-hooks="1"> - + @@ -1965,7 +1965,7 @@ the introspection client langage. - + -- cgit v1.2.1 From 7169562133632e11fb4f564211a1db1aa61bab5c Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 31 Jan 2013 23:40:20 -0500 Subject: doctool: Initial import of a Gjs language that we support Copy/pasted from Python. --- Makefile-giscanner.am | 13 +++- giscanner/doctemplates/Gjs/class.tmpl | 17 +++++ giscanner/doctemplates/Gjs/constructor.tmpl | 1 + giscanner/doctemplates/Gjs/default.tmpl | 1 + giscanner/doctemplates/Gjs/enum.tmpl | 11 ++++ giscanner/doctemplates/Gjs/function.tmpl | 54 +++++++++++++++ giscanner/doctemplates/Gjs/method.tmpl | 1 + giscanner/doctemplates/Gjs/namespace.tmpl | 2 + giscanner/doctemplates/Gjs/property.tmpl | 10 +++ giscanner/doctemplates/Gjs/record.tmpl | 2 + giscanner/doctemplates/Gjs/signal.tmpl | 35 ++++++++++ giscanner/doctemplates/Gjs/vfunc.tmpl | 23 +++++++ giscanner/mallardwriter.py | 71 ++++++++++++++++++++ .../DocExamples.Callback.page | 25 +++++++ .../DocExamples.Enum.page | 31 +++++++++ .../DocExamples.Obj-property-example.page | 30 +++++++++ .../DocExamples.Obj-signal-example.page | 44 +++++++++++++ .../DocExamples.Obj-vfunc.page | 35 ++++++++++ .../DocExamples.Obj.method.page | 77 ++++++++++++++++++++++ .../DocExamples.Obj.new.page | 40 +++++++++++ .../DocExamples.Obj.page | 63 ++++++++++++++++++ .../DocExamples.Obj.static_method.page | 48 ++++++++++++++ .../DocExamples.array_function.page | 48 ++++++++++++++ .../DocExamples.callback_function.page | 61 +++++++++++++++++ .../DocExamples-1.0-Gjs-expected/index.page | 33 ++++++++++ tests/doctool/Makefile.am | 13 +++- 26 files changed, 786 insertions(+), 3 deletions(-) create mode 100644 giscanner/doctemplates/Gjs/class.tmpl create mode 100644 giscanner/doctemplates/Gjs/constructor.tmpl create mode 100644 giscanner/doctemplates/Gjs/default.tmpl create mode 100644 giscanner/doctemplates/Gjs/enum.tmpl create mode 100644 giscanner/doctemplates/Gjs/function.tmpl create mode 100644 giscanner/doctemplates/Gjs/method.tmpl create mode 100644 giscanner/doctemplates/Gjs/namespace.tmpl create mode 100644 giscanner/doctemplates/Gjs/property.tmpl create mode 100644 giscanner/doctemplates/Gjs/record.tmpl create mode 100644 giscanner/doctemplates/Gjs/signal.tmpl create mode 100644 giscanner/doctemplates/Gjs/vfunc.tmpl create mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Callback.page create mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Enum.page create mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-property-example.page create mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-signal-example.page create mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-vfunc.page create mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page create mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.new.page create mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.page create mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.static_method.page create mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.array_function.page create mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.callback_function.page create mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/index.page diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am index d5402f6d..728ff10d 100644 --- a/Makefile-giscanner.am +++ b/Makefile-giscanner.am @@ -78,7 +78,18 @@ nobase_template_DATA = \ giscanner/doctemplates/Python/property.tmpl \ giscanner/doctemplates/Python/record.tmpl \ giscanner/doctemplates/Python/signal.tmpl \ - giscanner/doctemplates/Python/vfunc.tmpl + giscanner/doctemplates/Python/vfunc.tmpl \ + giscanner/doctemplates/Gjs/class.tmpl \ + giscanner/doctemplates/Gjs/constructor.tmpl \ + giscanner/doctemplates/Gjs/default.tmpl \ + giscanner/doctemplates/Gjs/enum.tmpl \ + giscanner/doctemplates/Gjs/function.tmpl \ + giscanner/doctemplates/Gjs/method.tmpl \ + giscanner/doctemplates/Gjs/namespace.tmpl \ + giscanner/doctemplates/Gjs/property.tmpl \ + giscanner/doctemplates/Gjs/record.tmpl \ + giscanner/doctemplates/Gjs/signal.tmpl \ + giscanner/doctemplates/Gjs/vfunc.tmpl _giscanner_la_CFLAGS = \ $(PYTHON_INCLUDES) \ diff --git a/giscanner/doctemplates/Gjs/class.tmpl b/giscanner/doctemplates/Gjs/class.tmpl new file mode 100644 index 00000000..3991ff31 --- /dev/null +++ b/giscanner/doctemplates/Gjs/class.tmpl @@ -0,0 +1,17 @@ +<%inherit file="/class.tmpl"/> +<%block name="synopsis"> + +from gi.repository import ${namespace.name} + +${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}(\ +% for property_, ix in zip(node.properties, range(len(node.properties))): +% if property_.construct or property_.construct_only or property_.writable: +${property_.name.replace('-', '_')}=value\ +% if ix != len(node.properties) - 1: +, \ +% endif +% endif +% endfor +)\ + + diff --git a/giscanner/doctemplates/Gjs/constructor.tmpl b/giscanner/doctemplates/Gjs/constructor.tmpl new file mode 100644 index 00000000..a03d2825 --- /dev/null +++ b/giscanner/doctemplates/Gjs/constructor.tmpl @@ -0,0 +1 @@ +<%inherit file="./function.tmpl"/> diff --git a/giscanner/doctemplates/Gjs/default.tmpl b/giscanner/doctemplates/Gjs/default.tmpl new file mode 100644 index 00000000..b66ae926 --- /dev/null +++ b/giscanner/doctemplates/Gjs/default.tmpl @@ -0,0 +1 @@ +<%inherit file="/base.tmpl"/> diff --git a/giscanner/doctemplates/Gjs/enum.tmpl b/giscanner/doctemplates/Gjs/enum.tmpl new file mode 100644 index 00000000..840f79f5 --- /dev/null +++ b/giscanner/doctemplates/Gjs/enum.tmpl @@ -0,0 +1,11 @@ +<%inherit file="/base.tmpl"/> +<%block name="details"> +% if node.members: +
+% for member, ix in zip(node.members, range(len(node.members))): +

${node.name}.${member.name.upper()} :

+
${formatter.format(node, member.doc)}
+% endfor +
+% endif + diff --git a/giscanner/doctemplates/Gjs/function.tmpl b/giscanner/doctemplates/Gjs/function.tmpl new file mode 100644 index 00000000..92bfb3a9 --- /dev/null +++ b/giscanner/doctemplates/Gjs/function.tmpl @@ -0,0 +1,54 @@ +<%inherit file="/base.tmpl"/> +<%block name="info"> +% if node.parent is not None: + +% else: + +% endif + + + ${formatter.format_type(node.retval.type) | x} + + ${node.symbol} +% if node.is_method: + + ${node.parent.ctype} * + self + +% endif +% for arg in node.parameters: +% if arg.type.ctype == '': + +% else: + + ${formatter.format_type(arg.type) | x} + ${arg.argname} + +% endif +% endfor + + +<%block name="synopsis"> + +function \ +${node.name}(\ +${', '.join('%s:%s' % (arg.argname, formatter.format_type(arg.type)) for arg in node.parameters)}\ +):${formatter.format_type(node.retval.type)} { + // Gjs wrapper for ${node.symbol}() +} + + +<%block name="details"> +% if node.parameters or node.retval: +
+% for arg, ix in zip(node.parameters, range(len(node.parameters))): +

${arg.argname} :

+
${formatter.format(node, arg.doc)}
+% endfor +% if node.retval and node.retval.type.ctype != 'void': +

Returns :

+
${formatter.format(node, node.retval.doc)}
+% endif +
+% endif + diff --git a/giscanner/doctemplates/Gjs/method.tmpl b/giscanner/doctemplates/Gjs/method.tmpl new file mode 100644 index 00000000..a03d2825 --- /dev/null +++ b/giscanner/doctemplates/Gjs/method.tmpl @@ -0,0 +1 @@ +<%inherit file="./function.tmpl"/> diff --git a/giscanner/doctemplates/Gjs/namespace.tmpl b/giscanner/doctemplates/Gjs/namespace.tmpl new file mode 100644 index 00000000..4d80c2a5 --- /dev/null +++ b/giscanner/doctemplates/Gjs/namespace.tmpl @@ -0,0 +1,2 @@ +<%! page_type="guide" %>\ +<%inherit file="/namespace.tmpl"/> diff --git a/giscanner/doctemplates/Gjs/property.tmpl b/giscanner/doctemplates/Gjs/property.tmpl new file mode 100644 index 00000000..f05bc820 --- /dev/null +++ b/giscanner/doctemplates/Gjs/property.tmpl @@ -0,0 +1,10 @@ +<%inherit file="/base.tmpl"/> +<%block name="info"> + + ${node.name} + +<%block name="synopsis"> + +"${node.name}" ${formatter.format_type(node.type)} : ${formatter.format_property_flags(node)} + + diff --git a/giscanner/doctemplates/Gjs/record.tmpl b/giscanner/doctemplates/Gjs/record.tmpl new file mode 100644 index 00000000..1523e0df --- /dev/null +++ b/giscanner/doctemplates/Gjs/record.tmpl @@ -0,0 +1,2 @@ +<%! page_type="guide" %>\ +<%inherit file="/base.tmpl"/> diff --git a/giscanner/doctemplates/Gjs/signal.tmpl b/giscanner/doctemplates/Gjs/signal.tmpl new file mode 100644 index 00000000..f2eb5868 --- /dev/null +++ b/giscanner/doctemplates/Gjs/signal.tmpl @@ -0,0 +1,35 @@ +<%inherit file="/base.tmpl"/> +<%block name="info"> + + ${node.name} + +<%block name="synopsis"> + +function callback(${formatter.to_underscores(node.parent.name).lower()}, \ +% for arg in node.parameters: +${arg.argname}:${formatter.format_type(arg.type)}, \ +% endfor +user_param1, ...):${formatter.format_type(node.retval.type)}; + + +<%block name="details"> +
+

${formatter.to_underscores(node.parent.name).lower()} :

+

instance of ${namespace.name}.${node.parent.name} that is emitting the signal

+% for arg in node.parameters: +

${arg.argname} :

+
${formatter.format(node, arg.doc)}
+% endfor +

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+% if node.retval and \ + node.retval.type.ctype != 'void' and \ + node.retval.type.ctype is not None: +

Returns :

+
${node.retval.type.ctype} ${formatter.format(node, node.retval.doc)}
+% endif +
+ + diff --git a/giscanner/doctemplates/Gjs/vfunc.tmpl b/giscanner/doctemplates/Gjs/vfunc.tmpl new file mode 100644 index 00000000..bba3f38d --- /dev/null +++ b/giscanner/doctemplates/Gjs/vfunc.tmpl @@ -0,0 +1,23 @@ +<%inherit file="/base.tmpl"/> +<%block name="synopsis"> + +function vfunc_${node.name}(\ +${', '.join('%s:%s' % (arg.argname, formatter.format_type(arg.type)) for arg in node.parameters)}\ +):${formatter.format_type(node.retval.type)} { +} + + +<%block name="details"> +% if node.parameters or node.retval: +
+% for arg, ix in zip(node.parameters, range(len(node.parameters))): +

${arg.argname} :

+
${formatter.format(node, arg.doc)}
+% endfor +% if node.retval and node.retval.type.ctype != 'void': +

Returns :

+
${formatter.format(node, node.retval.doc)}
+% endif +
+% endif + diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py index 08d52c84..ece54a9b 100644 --- a/giscanner/mallardwriter.py +++ b/giscanner/mallardwriter.py @@ -450,9 +450,80 @@ class MallardFormatterPython(MallardFormatter): else: return func.name +class MallardFormatterGjs(MallardFormatter): + language = "Gjs" + mime_type = "text/x-gjs" + + fundamentals = { + "TRUE": "true", + "FALSE": "false", + "NULL": "null", + } + + def should_render_node(self, node): + if isinstance(node, ast.Record) and node.is_gtype_struct_for is not None: + return False + + return True + + def is_method(self, node): + if getattr(node, "is_method", False): + return True + + if isinstance(node, (ast.VFunction)): + return True + + return False + + def format_fundamental_type(self, name): + fundamental_types = { + "utf8": "String", + "gunichar": "String", + "gchar": "String", + "guchar": "String", + "gboolean": "Boolean", + "gint": "Number", + "guint": "Number", + "glong": "Number", + "gulong": "Number", + "gint64": "Number", + "guint64": "Number", + "gfloat": "Number", + "gdouble": "Number", + "gchararray": "String", + "GParam": "GLib.Param", + "PyObject": "Object", + "GStrv": "[String]", + "GVariant": "GLib.Variant", + } + + return fundamental_types.get(name, name) + + def format_type(self, type_): + if isinstance(type_, ast.Array): + return '[' + self.format_type(type_.element_type) + ']' + elif isinstance(type_, ast.Map): + return '{%s: %s}' % (self.format_type(type_.key_type), + self.format_type(type_.value_type)) + elif type_.target_fundamental == "none": + return "void" + elif type_.target_giname is not None: + return type_.target_giname + else: + return self.format_fundamental_type(type_.target_fundamental) + + def format_function_name(self, func): + if func.is_method: + return "%s.prototype.%s" % (func.parent.name, func.name) + elif func.is_constructor: + return "%s.%s" % (func.parent.name, func.name) + else: + return func.name + LANGUAGES = { "c": MallardFormatterC, "python": MallardFormatterPython, + "gjs": MallardFormatterGjs, } class MallardWriter(object): diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Callback.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Callback.page new file mode 100644 index 00000000..98d30f8c --- /dev/null +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Callback.page @@ -0,0 +1,25 @@ + + + + + + + + DocExamples.Callback + + + + + + + + + + + + diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Enum.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Enum.page new file mode 100644 index 00000000..79ea6370 --- /dev/null +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Enum.page @@ -0,0 +1,31 @@ + + + + + + + + DocExamples.Enum + + + +

This is an example to document an enumeration.

+ + + + +
+

Enum.FOO :

+

a foo

+

Enum.BAR :

+

a bar

+
+ + + + diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-property-example.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-property-example.page new file mode 100644 index 00000000..398fc4cc --- /dev/null +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-property-example.page @@ -0,0 +1,30 @@ + + + + + + property-example + + + DocExamples.Obj:property-example + + +"property-example" {String: gint8} : Read / Write + + + +

This is an example of how to document a property.

+ + +

Since 0.99

+ + + + + + diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-signal-example.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-signal-example.page new file mode 100644 index 00000000..8b7e5d5d --- /dev/null +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-signal-example.page @@ -0,0 +1,44 @@ + + + + + + signal-example + + + DocExamples.Obj::signal-example + + +def callback(obj, int_param, float_param, pointer_param, user_param1, ...) + + + +

This is an example of how to document a signal.

+ + +

Since 0.99

+ + +
+

obj :

+

instance of DocExamples.Obj that is emitting the signal

+

int_param :

+

a parameter of type int

+

float_param :

+

a parameter of type float

+

pointer_param :

+

A pointer to @obj's thingy -- pass int_param if you really want to.

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-vfunc.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-vfunc.page new file mode 100644 index 00000000..bd876ca8 --- /dev/null +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-vfunc.page @@ -0,0 +1,35 @@ + + + + + + + + DocExamples.Obj::vfunc + + +@accepts(Number) +@returns(none) +def do_vfunc(self, first_arg): + + + +

This is an example of how to document a vfunc.

+ + +

Since 0.99

+ + +
+

first_arg :

+

first argument

+
+ + + + diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page new file mode 100644 index 00000000..4e049123 --- /dev/null +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page @@ -0,0 +1,77 @@ + + + + + + + + Boolean + + doc_examples_obj_method + + DocExamplesObj * + self + + + Number + first_arg + + + Number + second_arg + + + Boolean + boolean_arg + + + gpointer + pointer_arg + + + String + string + + + + + Obj.prototype.method + + +@accepts(Number, Number, Boolean, gpointer, String) +@returns(Boolean) +def method(self, first_arg, second_arg, boolean_arg, pointer_arg, string): + # Python wrapper for doc_examples_obj_method() + + + +

This is an example of how to document a method.

You should call this on a that was +created with .

This should be a %FALSEALARM.

+ + +

Since 0.99

+ + +
+

first_arg :

+

A .

+

second_arg :

+

second argument

+

boolean_arg :

+

You should always pass true.

+

pointer_arg :

+

If not null, do a thing. Pass first_arg if you want to sometimes. You can also pass second_arg, or even boolean_arg.

+

string :

+

A NUL-terminated string.

+

Returns :

+

Either false or something false-y.

+
+ + + + diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.new.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.new.page new file mode 100644 index 00000000..16dbd65a --- /dev/null +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.new.page @@ -0,0 +1,40 @@ + + + + + + + + DocExamples.Obj + + doc_examples_obj_new + + + + Obj.new + + +@returns(DocExamples.Obj) +def new(): + # Python wrapper for doc_examples_obj_new() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.page new file mode 100644 index 00000000..c040d0e3 --- /dev/null +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.page @@ -0,0 +1,63 @@ + + + + + + + + DocExamples.Obj + + +from gi.repository import DocExamples + +obj = DocExamples.Obj(property_example=value) + + +

This is an example of how to document a class

This class has a signal: .

And also has a property: .

+ + +

Since 0.99

+ + + + Hierarchy + + + GObject.Object + + DocExamples.Obj + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.static_method.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.static_method.page new file mode 100644 index 00000000..6577e9b5 --- /dev/null +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.static_method.page @@ -0,0 +1,48 @@ + + + + + + + + Boolean + + doc_examples_obj_static_method + + Number + out_arg + + + + + static_method + + +@accepts(Number) +@returns(Boolean) +def static_method(out_arg): + # Python wrapper for doc_examples_obj_static_method() + + + +

This is an example of a function with an out argument +and a return value.

+ + + + +
+

out_arg :

+

a pointer to int, or null to ignore

+

Returns :

+

true if out_arg is valid, false otherwise

+
+ + + + diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.array_function.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.array_function.page new file mode 100644 index 00000000..f41047b2 --- /dev/null +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.array_function.page @@ -0,0 +1,48 @@ + + + + + + + + [Number] + + doc_examples_array_function + + Number + out_len + + + + + array_function + + +@accepts(Number) +@returns([Number]) +def array_function(out_len): + # Python wrapper for doc_examples_array_function() + + + +

This function returns an array with an explicit length, +and the length should be invisible in most introspected bindings.

+ + + + +
+

out_len :

+

the length of the returned array

+

Returns :

+

an array of numbers.

+
+ + + + diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.callback_function.page new file mode 100644 index 00000000..9b805712 --- /dev/null +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.callback_function.page @@ -0,0 +1,61 @@ + + + + + + + + DocExamples.Enum + + doc_examples_callback_function + + DocExamples.Callback + callback + + + gpointer + user_data + + + GLib.DestroyNotify + destroy_notify + + + + + callback_function + + +@accepts(DocExamples.Callback, gpointer, GLib.DestroyNotify) +@returns(DocExamples.Enum) +def callback_function(callback, user_data, destroy_notify): + # Python wrapper for doc_examples_callback_function() + + + +

This is a function that takes a callback. Different languages +will expose this in different ways (e.g. Python keeps the +user_data parameter, while JS doesn't)

+ + + + +
+

callback :

+

Just Call Me Maybe

+

user_data :

+

your stuff

+

destroy_notify :

+

how to get rid of user_data

+

Returns :

+

.foo sometimes, .bar other times.

+
+ + + + diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/index.page b/tests/doctool/DocExamples-1.0-Gjs-expected/index.page new file mode 100644 index 00000000..de98563c --- /dev/null +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/index.page @@ -0,0 +1,33 @@ + + + + + + + + Index + + + + + + + + + + + Classes + + + Functions + + + Other + + + diff --git a/tests/doctool/Makefile.am b/tests/doctool/Makefile.am index 127b2585..4d2b9d7f 100644 --- a/tests/doctool/Makefile.am +++ b/tests/doctool/Makefile.am @@ -14,8 +14,8 @@ libdocexamples_la_SOURCES = $(srcdir)/doc-examples-obj.c $(srcdir)/doc-examples- GIRS = TYPELIBS = $(GIRS:.gir=.typelib) INTROSPECTION_GIRS = $(GIRS) -CHECK_TARGETS = $(GIRS:.gir=-C.page.check) $(GIRS:.gir=-Python.page.check) -MALLARD_DIRS = $(GIRS:.gir=-C) $(GIRS:.gir=-Python) +CHECK_TARGETS = $(GIRS:.gir=-C.page.check) $(GIRS:.gir=-Python.page.check) $(GIRS:.gir=-Gjs.page.check) +MALLARD_DIRS = $(GIRS:.gir=-C) $(GIRS:.gir=-Python) $(GIRS:.gir=-Gjs) EXPECTED_MALLARD_DIRS = $(MALLARD_DIRS:=-expected) CLEANFILES = $(TYPELIBS) $(GIRS) BUILT_SOURCES = $(MALLARD_DIRS) @@ -40,12 +40,21 @@ GIRS += DocExamples-1.0.gir $(AM_V_at)rm -f $*-Python/*.page $(AM_V_at)$(INTROSPECTION_DOCTOOL) --language Python $*.gir -o $*-Python/ +%-Gjs: %.gir + $(AM_V_GEN) + $(AM_V_at)$(MKDIR_P) $*-Gjs + $(AM_V_at)rm -f $*-Gjs/*.page + $(AM_V_at)$(INTROSPECTION_DOCTOOL) --language Gjs $*.gir -o $*-Gjs/ + %-C.page.check: %-C @diff -u -w -B -U 10 $(srcdir)/$*-C-expected $*-C && echo " TEST $*-C" %-Python.page.check: %-Python @diff -u -w -B -U 10 $(srcdir)/$*-Python-expected $*-Python && echo " TEST $*-Python" +%-Gjs.page.check: %-Gjs + @diff -u -w -B -U 10 $(srcdir)/$*-Gjs-expected $*-Gjs && echo " TEST $*-Gjs" + check-local: $(CHECK_TARGETS) $(TYPELIBS) clean-local: @rm -rf $(MALLARD_DIRS) -- cgit v1.2.1 From fb550201b36b49035d11a7d25b93d2191b6481f8 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 1 Feb 2013 01:11:23 -0500 Subject: doctool: Switch to UI v1.0 This is to shut yelp up about experimental UI and expanded. --- giscanner/doctemplates/base.tmpl | 2 +- giscanner/doctemplates/class.tmpl | 12 ++++++------ giscanner/doctemplates/namespace.tmpl | 6 +++--- .../DocExamples-1.0-C-expected/DocExamples.Callback.page | 2 +- .../DocExamples-1.0-C-expected/DocExamples.Enum.page | 2 +- .../DocExamples.Obj-property-example.page | 2 +- .../DocExamples.Obj-signal-example.page | 2 +- .../DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page | 2 +- .../DocExamples-1.0-C-expected/DocExamples.Obj.method.page | 2 +- .../DocExamples-1.0-C-expected/DocExamples.Obj.new.page | 2 +- .../DocExamples-1.0-C-expected/DocExamples.Obj.page | 14 +++++++------- .../DocExamples.Obj.static_method.page | 2 +- .../DocExamples-1.0-C-expected/DocExamples.ObjClass.page | 2 +- .../DocExamples.array_function.page | 2 +- .../DocExamples.callback_function.page | 2 +- tests/doctool/DocExamples-1.0-C-expected/index.page | 8 ++++---- .../DocExamples-1.0-Gjs-expected/DocExamples.Callback.page | 2 +- .../DocExamples-1.0-Gjs-expected/DocExamples.Enum.page | 2 +- .../DocExamples.Obj-property-example.page | 2 +- .../DocExamples.Obj-signal-example.page | 4 ++-- .../DocExamples.Obj-vfunc.page | 9 ++++----- .../DocExamples.Obj.method.page | 11 +++++------ .../DocExamples-1.0-Gjs-expected/DocExamples.Obj.new.page | 10 +++++----- .../DocExamples-1.0-Gjs-expected/DocExamples.Obj.page | 14 +++++++------- .../DocExamples.Obj.static_method.page | 11 +++++------ .../DocExamples.array_function.page | 11 +++++------ .../DocExamples.callback_function.page | 11 +++++------ tests/doctool/DocExamples-1.0-Gjs-expected/index.page | 8 ++++---- .../DocExamples.Callback.page | 2 +- .../DocExamples-1.0-Python-expected/DocExamples.Enum.page | 2 +- .../DocExamples.Obj-property-example.page | 2 +- .../DocExamples.Obj-signal-example.page | 2 +- .../DocExamples.Obj-vfunc.page | 2 +- .../DocExamples.Obj.method.page | 2 +- .../DocExamples-1.0-Python-expected/DocExamples.Obj.page | 14 +++++++------- .../DocExamples.Obj.static_method.page | 2 +- .../DocExamples.array_function.page | 2 +- .../DocExamples.callback_function.page | 2 +- tests/doctool/DocExamples-1.0-Python-expected/index.page | 8 ++++---- 39 files changed, 97 insertions(+), 102 deletions(-) diff --git a/giscanner/doctemplates/base.tmpl b/giscanner/doctemplates/base.tmpl index e40739c3..0fe84651 100644 --- a/giscanner/doctemplates/base.tmpl +++ b/giscanner/doctemplates/base.tmpl @@ -5,7 +5,7 @@ style="${page_style}" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> <%block name="info"> diff --git a/giscanner/doctemplates/class.tmpl b/giscanner/doctemplates/class.tmpl index f264bc2d..7f8b6869 100644 --- a/giscanner/doctemplates/class.tmpl +++ b/giscanner/doctemplates/class.tmpl @@ -15,26 +15,26 @@ <%block name="links"> - Methods - Functions - + Properties - + Signals - + Virtual functions - + Other diff --git a/giscanner/doctemplates/namespace.tmpl b/giscanner/doctemplates/namespace.tmpl index 10745fae..48ae1d91 100644 --- a/giscanner/doctemplates/namespace.tmpl +++ b/giscanner/doctemplates/namespace.tmpl @@ -3,13 +3,13 @@ <%block name="doc"> <%block name="links"> - + Classes - + Functions - + Other diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page index 98d30f8c..621485cf 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page @@ -4,7 +4,7 @@ style="default" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page index 97b15866..6957f4b7 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page @@ -4,7 +4,7 @@ style="enum" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page index d1f44d49..90982bf2 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page @@ -4,7 +4,7 @@ style="property" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page index 63d86354..5b54651a 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page @@ -4,7 +4,7 @@ style="signal" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page index ec5d7fe6..c06c5e7a 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page @@ -4,7 +4,7 @@ style="vfunc" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page index 344b36f3..df3168c1 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page @@ -4,7 +4,7 @@ style="method" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page index bb4fc10f..ceef763d 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page @@ -4,7 +4,7 @@ style="constructor" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page index 85132de6..9448bbb6 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page @@ -4,7 +4,7 @@ style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> @@ -33,26 +33,26 @@ - Methods - Functions - + Properties - + Signals - + Virtual functions - + Other diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page index 5fd3c740..99345e0e 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page @@ -4,7 +4,7 @@ style="function" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page index 75bf1299..fe95df74 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page @@ -4,7 +4,7 @@ style="record" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page index f596786a..c3dfc238 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page @@ -4,7 +4,7 @@ style="function" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page index 0ae97913..0688cbb9 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page @@ -4,7 +4,7 @@ style="function" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-C-expected/index.page b/tests/doctool/DocExamples-1.0-C-expected/index.page index de98563c..1d89dedd 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/index.page +++ b/tests/doctool/DocExamples-1.0-C-expected/index.page @@ -4,7 +4,7 @@ style="namespace" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> @@ -20,13 +20,13 @@ - + Classes - + Functions - + Other diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Callback.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Callback.page index 98d30f8c..621485cf 100644 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Callback.page +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Callback.page @@ -4,7 +4,7 @@ style="default" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Enum.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Enum.page index 79ea6370..a3e64bc5 100644 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Enum.page +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Enum.page @@ -4,7 +4,7 @@ style="enum" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-property-example.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-property-example.page index 398fc4cc..59d90f4d 100644 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-property-example.page +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-property-example.page @@ -4,7 +4,7 @@ style="property" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-signal-example.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-signal-example.page index 8b7e5d5d..074ccd2b 100644 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-signal-example.page +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-signal-example.page @@ -4,7 +4,7 @@ style="signal" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> @@ -14,7 +14,7 @@ DocExamples.Obj::signal-example -def callback(obj, int_param, float_param, pointer_param, user_param1, ...) +function callback(obj, int_param:Number, float_param:Number, pointer_param:gpointer, user_param1, ...):void; diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-vfunc.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-vfunc.page index bd876ca8..87c38e63 100644 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-vfunc.page +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-vfunc.page @@ -4,7 +4,7 @@ style="vfunc" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> @@ -12,10 +12,9 @@ DocExamples.Obj::vfunc - -@accepts(Number) -@returns(none) -def do_vfunc(self, first_arg): + +function vfunc_vfunc(first_arg:Number):void { +} diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page index 4e049123..16f951bc 100644 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page @@ -4,7 +4,7 @@ style="method" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> @@ -42,11 +42,10 @@ Obj.prototype.method - -@accepts(Number, Number, Boolean, gpointer, String) -@returns(Boolean) -def method(self, first_arg, second_arg, boolean_arg, pointer_arg, string): - # Python wrapper for doc_examples_obj_method() + +function method(first_arg:Number, second_arg:Number, boolean_arg:Boolean, pointer_arg:gpointer, string:String):Boolean { + // Gjs wrapper for doc_examples_obj_method() +} diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.new.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.new.page index 16dbd65a..2dab7439 100644 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.new.page +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.new.page @@ -4,7 +4,7 @@ style="constructor" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> @@ -18,10 +18,10 @@ Obj.new - -@returns(DocExamples.Obj) -def new(): - # Python wrapper for doc_examples_obj_new() + +function new():DocExamples.Obj { + // Gjs wrapper for doc_examples_obj_new() +} diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.page index c040d0e3..378f27d1 100644 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.page +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.page @@ -4,7 +4,7 @@ style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> @@ -37,26 +37,26 @@ obj = DocExamples.Obj(property_exa - Methods - Functions - + Properties - + Signals - + Virtual functions - + Other diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.static_method.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.static_method.page index 6577e9b5..fd9e1007 100644 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.static_method.page +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.static_method.page @@ -4,7 +4,7 @@ style="function" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> @@ -22,11 +22,10 @@ static_method - -@accepts(Number) -@returns(Boolean) -def static_method(out_arg): - # Python wrapper for doc_examples_obj_static_method() + +function static_method(out_arg:Number):Boolean { + // Gjs wrapper for doc_examples_obj_static_method() +} diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.array_function.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.array_function.page index f41047b2..05583a26 100644 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.array_function.page +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.array_function.page @@ -4,7 +4,7 @@ style="function" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> @@ -22,11 +22,10 @@ array_function - -@accepts(Number) -@returns([Number]) -def array_function(out_len): - # Python wrapper for doc_examples_array_function() + +function array_function(out_len:Number):[Number] { + // Gjs wrapper for doc_examples_array_function() +} diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.callback_function.page index 9b805712..4e3de123 100644 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.callback_function.page +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.callback_function.page @@ -4,7 +4,7 @@ style="function" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> @@ -30,11 +30,10 @@ callback_function - -@accepts(DocExamples.Callback, gpointer, GLib.DestroyNotify) -@returns(DocExamples.Enum) -def callback_function(callback, user_data, destroy_notify): - # Python wrapper for doc_examples_callback_function() + +function callback_function(callback:DocExamples.Callback, user_data:gpointer, destroy_notify:GLib.DestroyNotify):DocExamples.Enum { + // Gjs wrapper for doc_examples_callback_function() +} diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/index.page b/tests/doctool/DocExamples-1.0-Gjs-expected/index.page index de98563c..1d89dedd 100644 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/index.page +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/index.page @@ -4,7 +4,7 @@ style="namespace" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> @@ -20,13 +20,13 @@ - + Classes - + Functions - + Other diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page index 98d30f8c..621485cf 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page @@ -4,7 +4,7 @@ style="default" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page index 79ea6370..a3e64bc5 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page @@ -4,7 +4,7 @@ style="enum" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-property-example.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-property-example.page index 3665e432..98cafdf5 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-property-example.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-property-example.page @@ -4,7 +4,7 @@ style="property" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page index 8b7e5d5d..1dc5d60d 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page @@ -4,7 +4,7 @@ style="signal" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page index 98c9bfcb..a4864631 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page @@ -4,7 +4,7 @@ style="vfunc" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page index 245b2586..8ebcb732 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page @@ -4,7 +4,7 @@ style="method" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page index 14eedd4a..12cfad8c 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page @@ -4,7 +4,7 @@ style="class" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> @@ -37,26 +37,26 @@ obj = DocExamples.Obj(property_exa - Methods - Functions - + Properties - + Signals - + Virtual functions - + Other diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page index e23e90d7..6088a5e2 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page @@ -4,7 +4,7 @@ style="function" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page index 1b2b4146..506e40f3 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page @@ -4,7 +4,7 @@ style="function" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page index 9b805712..53f5861d 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page @@ -4,7 +4,7 @@ style="function" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> diff --git a/tests/doctool/DocExamples-1.0-Python-expected/index.page b/tests/doctool/DocExamples-1.0-Python-expected/index.page index de98563c..1d89dedd 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/index.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/index.page @@ -4,7 +4,7 @@ style="namespace" xmlns="http://projectmallard.org/1.0/" xmlns:api="http://projectmallard.org/experimental/api/" - xmlns:ui="http://projectmallard.org/experimental/ui/"> + xmlns:ui="http://projectmallard.org/1.0/ui/"> @@ -20,13 +20,13 @@ - + Classes - + Functions - + Other -- cgit v1.2.1 From 54734b195dda07a935470b64e0654101f5528b94 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 1 Feb 2013 20:01:39 -0500 Subject: ast: Add a new all_parameters property to Callable This will be used by the doctool to show the self parameter in C and Python docs. --- giscanner/ast.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/giscanner/ast.py b/giscanner/ast.py index 18313320..3092d67a 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -582,6 +582,14 @@ class Callable(Node): self.instance_parameter = None # Parameter self.parent = None # A Class or Interface + # Returns all parameters, including the instance parameter + @property + def all_parameters(self): + if self.instance_parameter is not None: + return [self.instance_parameter] + self.parameters + else: + return self.parameters + def get_parameter_index(self, name): for i, parameter in enumerate(self.parameters): if parameter.argname == name: -- cgit v1.2.1 From 2a30f0be17b6244119ef20dcc9bdfabba3c0817f Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 1 Feb 2013 20:08:34 -0500 Subject: doc-examples-obj: Fix documentation for doc_examples_obj_method We need to properly document the first argument, here. We don't actually iterate over the instance parameter yet, so this will just affect the documentation for @first_arg. --- tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page | 2 +- tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page | 2 +- .../DocExamples-1.0-Python-expected/DocExamples.Obj.method.page | 2 +- tests/doctool/doc-examples-obj.c | 3 ++- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page index df3168c1..54d59f1e 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page @@ -61,7 +61,7 @@ created with .

This should be a %FALSEAL

first_arg :

-

A .

+

first argument

second_arg :

second argument

boolean_arg :

diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page index 16f951bc..7d474ec7 100644 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page @@ -58,7 +58,7 @@ created with .

This should be a %FALSEAL

first_arg :

-

A .

+

first argument

second_arg :

second argument

boolean_arg :

diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page index 8ebcb732..c1900905 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page @@ -59,7 +59,7 @@ created with .

This should be a %FALSEAL

first_arg :

-

A .

+

first argument

second_arg :

second argument

boolean_arg :

diff --git a/tests/doctool/doc-examples-obj.c b/tests/doctool/doc-examples-obj.c index 08341c83..bd134816 100644 --- a/tests/doctool/doc-examples-obj.c +++ b/tests/doctool/doc-examples-obj.c @@ -104,7 +104,8 @@ doc_examples_obj_new (void) /** * doc_examples_obj_method: - * @first_arg: A #DocExamplesObj. + * @self: A #DocExamplesObj. + * @first_arg: first argument * @second_arg: second argument * @boolean_arg: You should always pass %TRUE. * @pointer_arg: (allow-none): If not %NULL, do a thing. -- cgit v1.2.1 From d1ac20f7920e788face9c8d32bd554287d7861da Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 1 Feb 2013 20:10:06 -0500 Subject: ast: Allow lookup of the instance parameter by name This will be used by the doctool to properly identify the instance parameter. --- giscanner/ast.py | 2 +- tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page | 3 ++- tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page | 3 ++- .../DocExamples-1.0-Python-expected/DocExamples.Obj.method.page | 3 ++- tests/doctool/doc-examples-obj.c | 3 ++- 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/giscanner/ast.py b/giscanner/ast.py index 3092d67a..aae9ee2e 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -597,7 +597,7 @@ class Callable(Node): raise ValueError("Unknown argument %s" % (name, )) def get_parameter(self, name): - for parameter in self.parameters: + for parameter in self.all_parameters: if parameter.argname == name: return parameter raise ValueError("Unknown argument %s" % (name, )) diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page index 54d59f1e..d1be796a 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page @@ -53,7 +53,8 @@ gint first_arg,

This is an example of how to document a method.

You should call this on a that was -created with .

This should be a %FALSEALARM.

+created with , by passing it +in as self.

This should be a %FALSEALARM.

Since 0.99

diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page index 7d474ec7..9eae46c1 100644 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page @@ -50,7 +50,8 @@ function method(first_arg:Number, second_arg:Number, boolean_arg:Boolean, pointe

This is an example of how to document a method.

You should call this on a that was -created with .

This should be a %FALSEALARM.

+created with , by passing it +in as self.

This should be a %FALSEALARM.

Since 0.99

diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page index c1900905..050d7b38 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page @@ -51,7 +51,8 @@ def method(self, first_arg, second_arg, boolean_arg, pointer_arg, string):

This is an example of how to document a method.

You should call this on a that was -created with .

This should be a %FALSEALARM.

+created with , by passing it +in as self.

This should be a %FALSEALARM.

Since 0.99

diff --git a/tests/doctool/doc-examples-obj.c b/tests/doctool/doc-examples-obj.c index bd134816..3b571101 100644 --- a/tests/doctool/doc-examples-obj.c +++ b/tests/doctool/doc-examples-obj.c @@ -116,7 +116,8 @@ doc_examples_obj_new (void) * This is an example of how to document a method. * * You should call this on a #DocExamplesObj that was - * created with doc_examples_obj_new(). + * created with doc_examples_obj_new(), by passing it + * in as @self. * * This should be a %FALSEALARM. * -- cgit v1.2.1 From 8577f17cde7db54584dea9e722fc065341fc2f8e Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 1 Feb 2013 20:15:32 -0500 Subject: doc-examples-obj: Rename @self to @obj in doc_examples_obj_method This will be used to test Python "self" parameter forcing. --- .../doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page | 2 +- .../DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page | 2 +- .../DocExamples-1.0-Python-expected/DocExamples.Obj.method.page | 2 +- tests/doctool/doc-examples-obj.c | 6 +++--- tests/doctool/doc-examples-obj.h | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page index d1be796a..10477538 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page @@ -54,7 +54,7 @@ gint first_arg,

This is an example of how to document a method.

You should call this on a that was created with , by passing it -in as self.

This should be a %FALSEALARM.

+in as obj.

This should be a %FALSEALARM.

Since 0.99

diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page index 9eae46c1..b3dad03f 100644 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page @@ -51,7 +51,7 @@ function method(first_arg:Number, second_arg:Number, boolean_arg:Boolean, pointe

This is an example of how to document a method.

You should call this on a that was created with , by passing it -in as self.

This should be a %FALSEALARM.

+in as obj.

This should be a %FALSEALARM.

Since 0.99

diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page index 050d7b38..0b5681eb 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page @@ -52,7 +52,7 @@ def method(self, first_arg, second_arg, boolean_arg, pointer_arg, string):

This is an example of how to document a method.

You should call this on a that was created with , by passing it -in as self.

This should be a %FALSEALARM.

+in as obj.

This should be a %FALSEALARM.

Since 0.99

diff --git a/tests/doctool/doc-examples-obj.c b/tests/doctool/doc-examples-obj.c index 3b571101..fff1aaa5 100644 --- a/tests/doctool/doc-examples-obj.c +++ b/tests/doctool/doc-examples-obj.c @@ -104,7 +104,7 @@ doc_examples_obj_new (void) /** * doc_examples_obj_method: - * @self: A #DocExamplesObj. + * @obj: A #DocExamplesObj. * @first_arg: first argument * @second_arg: second argument * @boolean_arg: You should always pass %TRUE. @@ -117,7 +117,7 @@ doc_examples_obj_new (void) * * You should call this on a #DocExamplesObj that was * created with doc_examples_obj_new(), by passing it - * in as @self. + * in as @obj. * * This should be a %FALSEALARM. * @@ -126,7 +126,7 @@ doc_examples_obj_new (void) * Returns: Either %FALSE or something %FALSE-y. */ gboolean -doc_examples_obj_method (DocExamplesObj *self, gint first_arg, gfloat second_arg, +doc_examples_obj_method (DocExamplesObj *obj, gint first_arg, gfloat second_arg, gboolean boolean_arg, gpointer pointer_arg, gchar *string) { return FALSE; diff --git a/tests/doctool/doc-examples-obj.h b/tests/doctool/doc-examples-obj.h index 641aa813..543a8c29 100644 --- a/tests/doctool/doc-examples-obj.h +++ b/tests/doctool/doc-examples-obj.h @@ -56,7 +56,7 @@ struct _DocExamplesObjClass GType doc_examples_obj_get_type (void) G_GNUC_CONST; DocExamplesObj *doc_examples_obj_new (void); -gboolean doc_examples_obj_method (DocExamplesObj *self, gint first_arg, gfloat second_arg, +gboolean doc_examples_obj_method (DocExamplesObj *obj, gint first_arg, gfloat second_arg, gboolean boolean_arg, gpointer pointer_arg, gchar *string); gboolean doc_examples_obj_static_method (gint *out_arg); -- cgit v1.2.1 From 607ec4a55fce7e8e73a901420745b2c80df164f6 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 1 Feb 2013 20:01:56 -0500 Subject: mallardwriter: Fix code for self-parameter forcing --- giscanner/mallardwriter.py | 2 +- .../DocExamples-1.0-Python-expected/DocExamples.Obj.method.page | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py index ece54a9b..a4e9c073 100644 --- a/giscanner/mallardwriter.py +++ b/giscanner/mallardwriter.py @@ -404,7 +404,7 @@ class MallardFormatterPython(MallardFormatter): def format_parameter_name(self, node, parameter): # Force "self" for the first parameter of a method - if self.is_method(node) and parameter is node.parameters[0]: + if self.is_method(node) and parameter is node.instance_parameter: return "self" else: return parameter.argname diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page index 0b5681eb..390c40c2 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page @@ -52,7 +52,7 @@ def method(self, first_arg, second_arg, boolean_arg, pointer_arg, string):

This is an example of how to document a method.

You should call this on a that was created with , by passing it -in as obj.

This should be a %FALSEALARM.

+in as self.

This should be a %FALSEALARM.

Since 0.99

@@ -66,7 +66,7 @@ in as obj.

This should be a %FALSEALARM.

boolean_arg :

You should always pass True.

pointer_arg :

-

If not None, do a thing. Pass self if you want to sometimes. You can also pass second_arg, or even boolean_arg.

+

If not None, do a thing. Pass first_arg if you want to sometimes. You can also pass second_arg, or even boolean_arg.

string :

A NUL-terminated string.

Returns :

-- cgit v1.2.1 From d1e368a22c8b9a9a7b260f7077142233b1a3e189 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 1 Feb 2013 20:19:12 -0500 Subject: doctool: Update templates to include the actual instance parameter Rather than fabricating one with a fake name. --- giscanner/doctemplates/C/function.tmpl | 34 +++++++--------------- giscanner/doctemplates/Gjs/function.tmpl | 8 +---- giscanner/doctemplates/Python/function.tmpl | 25 +++++----------- .../DocExamples.Obj.method.page | 8 ++--- .../DocExamples.Obj.method.page | 4 --- .../DocExamples.Obj.method.page | 6 ++-- 6 files changed, 27 insertions(+), 58 deletions(-) diff --git a/giscanner/doctemplates/C/function.tmpl b/giscanner/doctemplates/C/function.tmpl index 01c653b9..4472ec5f 100644 --- a/giscanner/doctemplates/C/function.tmpl +++ b/giscanner/doctemplates/C/function.tmpl @@ -10,19 +10,13 @@ ${formatter.format_type(node.retval.type) | x} ${node.symbol} -% if node.is_method: - - ${node.parent.ctype} * - self - -% endif -% for arg in node.parameters: +% for arg in node.all_parameters: % if arg.type.ctype == '': % else: ${formatter.format_type(arg.type) | x} - ${arg.argname} + ${formatter.format_parameter_name(node, arg)} % endif % endfor @@ -31,18 +25,10 @@ <%block name="synopsis"> ${node.retval.type.ctype} ${node.symbol} (\ -% if node.is_method: -${node.parent.ctype} *self\ -%endif -% if len(node.parameters) == 0: -% if not node.is_method: +% if len(node.all_parameters) == 0: void\ -%endif -); -% elif node.is_method: -, -% endif -% for arg, ix in zip(node.parameters, range(len(node.parameters))): +% else: +% for arg, ix in zip(node.all_parameters, range(len(node.all_parameters))): % if ix != 0: ${' ' * (len(formatter.format_type(node.retval.type)) + len(node.symbol) + 3)}\ % endif @@ -51,16 +37,16 @@ ${' ' * (len(formatter.format_type(node.retval.type)) + len(node.symbol) + 3)}\ % else: ${formatter.format_type(arg.type) | x} ${arg.argname}\ % endif -% if ix == len(node.parameters) - 1: -); -% else: +% if ix != len(node.all_parameters) - 1: , -%endif +% endif % endfor +% endif +); <%block name="details"> -% if node.parameters or node.retval: +% if node.all_parameters or node.retval:
% for arg, ix in zip(node.parameters, range(len(node.parameters))):

${arg.argname} :

diff --git a/giscanner/doctemplates/Gjs/function.tmpl b/giscanner/doctemplates/Gjs/function.tmpl index 92bfb3a9..d0fa096e 100644 --- a/giscanner/doctemplates/Gjs/function.tmpl +++ b/giscanner/doctemplates/Gjs/function.tmpl @@ -10,19 +10,13 @@ ${formatter.format_type(node.retval.type) | x} ${node.symbol} -% if node.is_method: - - ${node.parent.ctype} * - self - -% endif % for arg in node.parameters: % if arg.type.ctype == '': % else: ${formatter.format_type(arg.type) | x} - ${arg.argname} + ${formatter.format_parameter_name(node, arg)} % endif % endfor diff --git a/giscanner/doctemplates/Python/function.tmpl b/giscanner/doctemplates/Python/function.tmpl index 467cfcbe..fa705bd0 100644 --- a/giscanner/doctemplates/Python/function.tmpl +++ b/giscanner/doctemplates/Python/function.tmpl @@ -10,19 +10,13 @@ ${formatter.format_type(node.retval.type) | x} ${node.symbol} -% if node.is_method: - - ${node.parent.ctype} * - self - -% endif -% for arg in node.parameters: +% for arg in node.all_parameters: % if arg.type.ctype == '': % else: ${formatter.format_type(arg.type) | x} - ${arg.argname} + ${formatter.format_parameter_name(node, arg)} % endif % endfor @@ -30,27 +24,24 @@ <%block name="synopsis"> -% if len(node.parameters) != 0: +% if len(node.all_parameters) != 0: @accepts(\ -${', '.join((formatter.format_type(arg.type) for arg in node.parameters))}\ +${', '.join((formatter.format_type(arg.type) for arg in node.all_parameters))}\ ) % endif @returns(${formatter.format_type(node.retval.type) | x}) def \ ${node.name}(\ -% if node.is_method: -self, \ -% endif -${', '.join((arg.argname for arg in node.parameters))}\ +${', '.join((formatter.format_parameter_name(node, arg) for arg in node.all_parameters))}\ ): # Python wrapper for ${node.symbol}() <%block name="details"> -% if node.parameters or node.retval: +% if node.all_parameters or node.retval:
-% for arg, ix in zip(node.parameters, range(len(node.parameters))): -

${arg.argname} :

+% for arg, ix in zip(node.all_parameters, range(len(node.all_parameters))): +

${formatter.format_parameter_name(node, arg)} :

${formatter.format(node, arg.doc)}
% endfor % if node.retval and node.retval.type.ctype != 'void': diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page index 10477538..8dbe8a73 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page @@ -14,8 +14,8 @@ doc_examples_obj_method - DocExamplesObj * - self + DocExamplesObj* + obj gint @@ -43,8 +43,8 @@ doc_examples_obj_method -gboolean doc_examples_obj_method (DocExamplesObj *self, -gint first_arg, +gboolean doc_examples_obj_method (DocExamplesObj* obj, + gint first_arg, gfloat second_arg, gboolean boolean_arg, gpointer pointer_arg, diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page index b3dad03f..abe38df2 100644 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page @@ -13,10 +13,6 @@ Boolean doc_examples_obj_method - - DocExamplesObj * - self - Number first_arg diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page index 390c40c2..7b7c8fa0 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page @@ -14,7 +14,7 @@ doc_examples_obj_method - DocExamplesObj * + DocExamples.Obj self @@ -43,7 +43,7 @@ Obj.method -@accepts(int, float, bool, gpointer, unicode) +@accepts(DocExamples.Obj, int, float, bool, gpointer, unicode) @returns(bool) def method(self, first_arg, second_arg, boolean_arg, pointer_arg, string): # Python wrapper for doc_examples_obj_method() @@ -59,6 +59,8 @@ in as self.

This should be a %FALSEALARM.

+

self :

+

A .

first_arg :

first argument

second_arg :

-- cgit v1.2.1 From 911339b844bfe41b404f197924bb92a9060031ee Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 1 Feb 2013 20:41:53 -0500 Subject: doctool: Move signal/vfunc templates to extend function.tmpl --- giscanner/doctemplates/C/function.tmpl | 6 +++--- giscanner/doctemplates/C/signal.tmpl | 2 +- giscanner/doctemplates/C/vfunc.tmpl | 20 +------------------- .../DocExamples.Obj-signal-example.page | 19 +++++++++++++++++-- .../DocExamples.Obj-vfunc.page | 2 ++ 5 files changed, 24 insertions(+), 25 deletions(-) diff --git a/giscanner/doctemplates/C/function.tmpl b/giscanner/doctemplates/C/function.tmpl index 4472ec5f..94036986 100644 --- a/giscanner/doctemplates/C/function.tmpl +++ b/giscanner/doctemplates/C/function.tmpl @@ -9,7 +9,7 @@ ${formatter.format_type(node.retval.type) | x} - ${node.symbol} + ${formatter.format_function_name(node)} % for arg in node.all_parameters: % if arg.type.ctype == '': @@ -24,13 +24,13 @@ <%block name="synopsis"> -${node.retval.type.ctype} ${node.symbol} (\ +${node.retval.type.ctype} ${formatter.format_function_name(node)} (\ % if len(node.all_parameters) == 0: void\ % else: % for arg, ix in zip(node.all_parameters, range(len(node.all_parameters))): % if ix != 0: -${' ' * (len(formatter.format_type(node.retval.type)) + len(node.symbol) + 3)}\ +${' ' * (len(formatter.format_type(node.retval.type)) + len(formatter.format_function_name(node)) + 3)}\ % endif % if arg.type.ctype == '': ...\ diff --git a/giscanner/doctemplates/C/signal.tmpl b/giscanner/doctemplates/C/signal.tmpl index e3eb0511..20e28e18 100644 --- a/giscanner/doctemplates/C/signal.tmpl +++ b/giscanner/doctemplates/C/signal.tmpl @@ -1,4 +1,4 @@ -<%inherit file="/base.tmpl"/> +<%inherit file="./function.tmpl"/> <%block name="info"> ${node.name} diff --git a/giscanner/doctemplates/C/vfunc.tmpl b/giscanner/doctemplates/C/vfunc.tmpl index 902b8864..85427de8 100644 --- a/giscanner/doctemplates/C/vfunc.tmpl +++ b/giscanner/doctemplates/C/vfunc.tmpl @@ -1,22 +1,4 @@ -<%inherit file="/base.tmpl"/> +<%inherit file="./function.tmpl"/> <%block name="info"> -<%block name="synopsis"> - - - -<%block name="details"> -% if node.parameters or node.retval: -
-% for arg, ix in zip(node.parameters, range(len(node.parameters))): -

${arg.argname} :

-
${formatter.format(node, arg.doc)}
-% endfor -% if node.retval: -

Returns :

-
${formatter.format(node, node.retval.doc)}
-% endif -
-% endif - diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page index 5b54651a..8502865c 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page @@ -13,7 +13,12 @@ DocExamples.Obj::signal-example - + +void signal-example (guint int_param, + guint float_param, + gpointer pointer_param); + +

This is an example of how to document a signal.

@@ -21,7 +26,17 @@

Since 0.99

- +
+

int_param :

+

a parameter of type int

+

float_param :

+

a parameter of type float

+

pointer_param :

+

A pointer to @obj's thingy -- pass int_param if you really want to.

+

Returns :

+
+
+ diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page index c06c5e7a..6a71a87c 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page @@ -13,6 +13,8 @@ DocExamples.Obj::vfunc +void vfunc (DocExamplesObj* self, + gint first_arg); -- cgit v1.2.1 From 9871097019082c323b98cc752b568e614fce6d6e Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 1 Feb 2013 21:13:16 -0500 Subject: giscanner: Add a new quick hack module for scanning section files This will be used to group symbols into documentation sections. --- Makefile-giscanner.am | 1 + giscanner/sectionparser.py | 78 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 giscanner/sectionparser.py diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am index 728ff10d..02bb3ec6 100644 --- a/Makefile-giscanner.am +++ b/Makefile-giscanner.am @@ -46,6 +46,7 @@ pkgpyexec_PYTHON = \ giscanner/message.py \ giscanner/shlibs.py \ giscanner/scannermain.py \ + giscanner/sectionparser.py \ giscanner/sourcescanner.py \ giscanner/testcodegen.py \ giscanner/transformer.py \ diff --git a/giscanner/sectionparser.py b/giscanner/sectionparser.py new file mode 100644 index 00000000..caf6bf2d --- /dev/null +++ b/giscanner/sectionparser.py @@ -0,0 +1,78 @@ +# -*- Mode: Python -*- +# Copyright (C) 2013 Hat, Inc. +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the +# Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. +# + +import re +import sys + +class SectionFile(object): + def __init__(self, sections): + self.sections = sections + +class Section(object): + def __init__(self): + self.file = None + self.title = None + self.main_subsection = Subsection(None) + self.subsections = [] + +class Subsection(object): + def __init__(self, name): + self.name = name + self.symbols = [] + +def parse_sections_file(lines): + sections = [] + current_section = None + current_subsection = None + + for line in lines: + line = line.rstrip() + + if not line or line.isspace(): + continue + + if line == "
": + current_section = Section() + sections.append(current_section) + current_subsection = current_section.main_subsection + continue + + if line == "
": + current_section = None + continue + + match = re.match(line, r"(?P.*)") + if match: + current_section.file = match.groupdict['contents'] + continue + + match = re.match(line, r"(?P<contents>.*)") + if match: + current_section.title = match.groupdict['contents'] + continue + + match = re.match(line, r").*>") + if match: + current_subsection = Section(match.groupdict['name']) + current_section.subsections.append(current_subsection) + continue + + current_subsection.symbols.append(line) + + return SectionFile(sections) -- cgit v1.2.1 From 7d9dfaad59b20419d41eb2503474ad1445109223 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 1 Feb 2013 21:15:27 -0500 Subject: doctool: Rebrand mallardwriter as docwriter We eventually want to stop using Mallard as a documentation language. Rationale incoming when I convert all templates back to DocBook. --- Makefile-giscanner.am | 2 +- giscanner/docmain.py | 4 +- giscanner/docwriter.py | 593 +++++++++++++++++++++++++++++++++++++++++++++ giscanner/mallardwriter.py | 593 --------------------------------------------- 4 files changed, 596 insertions(+), 596 deletions(-) create mode 100644 giscanner/docwriter.py delete mode 100644 giscanner/mallardwriter.py diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am index 02bb3ec6..b2fad457 100644 --- a/Makefile-giscanner.am +++ b/Makefile-giscanner.am @@ -34,6 +34,7 @@ pkgpyexec_PYTHON = \ giscanner/cachestore.py \ giscanner/codegen.py \ giscanner/docmain.py \ + giscanner/docwriter.py \ giscanner/dumper.py \ giscanner/introspectablepass.py \ giscanner/girparser.py \ @@ -41,7 +42,6 @@ pkgpyexec_PYTHON = \ giscanner/gdumpparser.py \ giscanner/libtoolimporter.py \ giscanner/odict.py \ - giscanner/mallardwriter.py \ giscanner/maintransformer.py \ giscanner/message.py \ giscanner/shlibs.py \ diff --git a/giscanner/docmain.py b/giscanner/docmain.py index 8089a6b3..8919eabb 100644 --- a/giscanner/docmain.py +++ b/giscanner/docmain.py @@ -21,7 +21,7 @@ import os import optparse -from .mallardwriter import MallardWriter +from .docwriter import DocWriter from .transformer import Transformer def doc_main(args): @@ -52,7 +52,7 @@ def doc_main(args): extra_include_dirs = [] transformer = Transformer.parse_from_gir(args[1], extra_include_dirs) - writer = MallardWriter(transformer, options.language) + writer = DocWriter(transformer, options.language) writer.write(options.output) return 0 diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py new file mode 100644 index 00000000..2b9cb0fc --- /dev/null +++ b/giscanner/docwriter.py @@ -0,0 +1,593 @@ +#!/usr/bin/env python +# -*- Mode: Python -*- +# GObject-Introspection - a framework for introspecting GObject libraries +# Copyright (C) 2010 Zach Goldberg +# Copyright (C) 2011 Johan Dahlin +# Copyright (C) 2011 Shaun McCance +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. +# + +import os +import re +import tempfile + +from xml.sax import saxutils +from mako.lookup import TemplateLookup + +from . import ast, xmlwriter +from .utils import to_underscores + +def make_page_id(node): + if isinstance(node, ast.Namespace): + return 'index' + + namespace = node.namespace + if isinstance(node, (ast.Class, ast.Interface)): + return '%s.%s' % (namespace.name, node.name) + elif isinstance(node, ast.Record): + return '%s.%s' % (namespace.name, node.name) + elif isinstance(node, ast.Function): + if node.parent is not None: + return '%s.%s.%s' % (namespace.name, node.parent.name, node.name) + else: + return '%s.%s' % (namespace.name, node.name) + elif isinstance(node, ast.Enum): + return '%s.%s' % (namespace.name, node.name) + elif isinstance(node, ast.Property) and node.parent is not None: + return '%s.%s-%s' % (namespace.name, node.parent.name, node.name) + elif isinstance(node, ast.Signal) and node.parent is not None: + return '%s.%s-%s' % (namespace.name, node.parent.name, node.name) + elif isinstance(node, ast.VFunction) and node.parent is not None: + return '%s.%s-%s' % (namespace.name, node.parent.name, node.name) + else: + return '%s.%s' % (namespace.name, node.name) + +def get_node_kind(node): + if isinstance(node, ast.Namespace): + node_kind = 'namespace' + elif isinstance(node, (ast.Class, ast.Interface)): + node_kind = 'class' + elif isinstance(node, ast.Record): + node_kind = 'record' + elif isinstance(node, ast.Function): + if node.is_method: + node_kind = 'method' + elif node.is_constructor: + node_kind = 'constructor' + else: + node_kind = 'function' + elif isinstance(node, ast.Enum): + node_kind = 'enum' + elif isinstance(node, ast.Property) and node.parent is not None: + node_kind = 'property' + elif isinstance(node, ast.Signal) and node.parent is not None: + node_kind = 'signal' + elif isinstance(node, ast.VFunction) and node.parent is not None: + node_kind = 'vfunc' + else: + node_kind = 'default' + + return node_kind + +class TemplatedScanner(object): + def __init__(self, specs): + self.specs = self.unmangle_specs(specs) + self.regex = self.make_regex(self.specs) + + def unmangle_specs(self, specs): + mangled = re.compile('<<([a-zA-Z_:]+)>>') + specdict = dict((name.lstrip('!'), spec) for name, spec in specs) + + def unmangle(spec, name=None): + def replace_func(match): + child_spec_name = match.group(1) + + if ':' in child_spec_name: + pattern_name, child_spec_name = child_spec_name.split(':', 1) + else: + pattern_name = None + + child_spec = specdict[child_spec_name] + # Force all child specs of this one to be unnamed + unmangled = unmangle(child_spec, None) + if pattern_name and name: + return '(?P<%s_%s>%s)' % (name, pattern_name, unmangled) + else: + return unmangled + + return mangled.sub(replace_func, spec) + + return [(name, unmangle(spec, name)) for name, spec in specs] + + def make_regex(self, specs): + regex = '|'.join('(?P<%s>%s)' % (name, spec) for name, spec in specs + if not name.startswith('!')) + return re.compile(regex) + + def get_properties(self, name, match): + groupdict = match.groupdict() + properties = {name: groupdict.pop(name)} + name = name + "_" + for group, value in groupdict.iteritems(): + if group.startswith(name): + key = group[len(name):] + properties[key] = value + return properties + + def scan(self, text): + pos = 0 + while True: + match = self.regex.search(text, pos) + if match is None: + break + + start = match.start() + if start > pos: + yield ('other', text[pos:start], None) + + pos = match.end() + name = match.lastgroup + yield (name, match.group(0), self.get_properties(name, match)) + + if pos < len(text): + yield ('other', text[pos:], None) + +class DocstringScanner(TemplatedScanner): + def __init__(self): + specs = [ + ('!alpha', r'[a-zA-Z0-9_]+'), + ('!alpha_dash', r'[a-zA-Z0-9_-]+'), + ('property', r'#<>:(<>)'), + ('signal', r'#<>::(<>)'), + ('type_name', r'#(<>)'), + ('enum_value', r'%(<>)'), + ('parameter', r'@<>'), + ('function_call', r'<>\(\)'), + ] + + super(DocstringScanner, self).__init__(specs) + +class DocFormatter(object): + def __init__(self, transformer): + self._transformer = transformer + self._scanner = DocstringScanner() + + def escape(self, text): + return saxutils.escape(text) + + def should_render_node(self, node): + return True + + def format(self, node, doc): + if doc is None: + return '' + + result = '' + for para in doc.split('\n\n'): + result += '

' + result += self.format_inline(node, para) + result += '

' + return result + + def _resolve_type(self, ident): + try: + matches = self._transformer.split_ctype_namespaces(ident) + except ValueError: + return None + for namespace, name in matches: + node = namespace.get(name) + if node: + return node + return None + + def _resolve_symbol(self, symbol): + try: + matches = self._transformer.split_csymbol_namespaces(symbol) + except ValueError: + return None + for namespace, name in matches: + node = namespace.get_by_symbol(symbol) + if node: + return node + return None + + def _find_thing(self, list_, name): + for item in list_: + if item.name == name: + return item + raise KeyError("Could not find %s" % (name, )) + + def _process_other(self, node, match, props): + return self.escape(match) + + def _process_property(self, node, match, props): + type_node = self._resolve_type(props['type_name']) + if type_node is None: + return match + + try: + prop = self._find_thing(type_node.properties, props['property_name']) + except (AttributeError, KeyError), e: + return match + + return self.format_xref(prop) + + def _process_signal(self, node, match, props): + type_node = self._resolve_type(props['type_name']) + if type_node is None: + return match + + try: + signal = self._find_thing(type_node.signals, props['signal_name']) + except (AttributeError, KeyError), e: + return match + + return self.format_xref(signal) + + def _process_type_name(self, node, match, props): + type_ = self._resolve_type(props['type_name']) + if type_ is None: + return match + + return self.format_xref(type_) + + def _process_enum_value(self, node, match, props): + member_name = props['member_name'] + + try: + return '%s' % (self.fundamentals[member_name], ) + except KeyError: + pass + + enum_value = self._resolve_symbol(member_name) + if enum_value: + return self.format_xref(enum_value) + + return match + + def _process_parameter(self, node, match, props): + try: + parameter = node.get_parameter(props['param_name']) + except (AttributeError, ValueError), e: + return match + + return '%s' % (self.format_parameter_name(node, parameter), ) + + def _process_function_call(self, node, match, props): + func = self._resolve_symbol(props['symbol_name']) + if func is None: + return match + + return self.format_xref(func) + + def _process_token(self, node, tok): + kind, match, props = tok + + dispatch = { + 'other': self._process_other, + 'property': self._process_property, + 'signal': self._process_signal, + 'type_name': self._process_type_name, + 'enum_value': self._process_enum_value, + 'parameter': self._process_parameter, + 'function_call': self._process_function_call, + } + + return dispatch[kind](node, match, props) + + def format_inline(self, node, para): + tokens = self._scanner.scan(para) + words = [self._process_token(node, tok) for tok in tokens] + return ''.join(words) + + def format_parameter_name(self, node, parameter): + return parameter.argname + + def format_function_name(self, func): + raise NotImplementedError + + def format_type(self, type_): + raise NotImplementedError + + def format_page_name(self, node): + if isinstance(node, ast.Namespace): + return 'Index' + elif isinstance(node, ast.Function): + return self.format_function_name(node) + elif isinstance(node, ast.Property) and node.parent is not None: + return '%s:%s' % (self.format_page_name(node.parent), node.name) + elif isinstance(node, ast.Signal) and node.parent is not None: + return '%s::%s' % (self.format_page_name(node.parent), node.name) + elif isinstance(node, ast.VFunction) and node.parent is not None: + return '%s::%s' % (self.format_page_name(node.parent), node.name) + else: + return make_page_id(node) + + def format_xref(self, node): + if isinstance(node, ast.Member): + # Enum/BitField members are linked to the main enum page. + return self.format_xref(node.parent) + '.' + node.name + else: + return xmlwriter.build_xml_tag('link', [('xref', make_page_id(node))]) + + def format_property_flags(self, property_, construct_only=False): + flags = [] + if property_.readable and not construct_only: + flags.append("Read") + if property_.writable and not construct_only: + flags.append("Write") + if property_.construct: + flags.append("Construct") + if property_.construct_only: + flags.append("Construct Only") + + return " / ".join(flags) + + def to_underscores(self, string): + return to_underscores(string) + + def get_class_hierarchy(self, node): + parent_chain = [node] + + while node.parent: + node = self._transformer.lookup_typenode(node.parent) + parent_chain.append(node) + + parent_chain.reverse() + return parent_chain + +class DocFormatterC(DocFormatter): + language = "C" + mime_type = "text/x-csrc" + + fundamentals = { + "TRUE": "TRUE", + "FALSE": "FALSE", + "NULL": "NULL", + } + + def format_type(self, type_): + if isinstance(type_, ast.Array): + return self.format_type(type_.element_type) + '*' + elif type_.ctype is not None: + return type_.ctype + else: + return type_.target_fundamental + + def format_function_name(self, func): + if isinstance(func, (ast.Function)): + return func.symbol + else: + return func.name + +class DocFormatterPython(DocFormatter): + language = "Python" + mime_type = "text/python" + + fundamentals = { + "TRUE": "True", + "FALSE": "False", + "NULL": "None", + } + + def should_render_node(self, node): + if getattr(node, "is_constructor", False): + return False + + if isinstance(node, ast.Record) and node.is_gtype_struct_for is not None: + return False + + return True + + def is_method(self, node): + if getattr(node, "is_method", False): + return True + + if isinstance(node, (ast.VFunction)): + return True + + return False + + def format_parameter_name(self, node, parameter): + # Force "self" for the first parameter of a method + if self.is_method(node) and parameter is node.instance_parameter: + return "self" + else: + return parameter.argname + + def format_fundamental_type(self, name): + fundamental_types = { + "utf8": "unicode", + "gunichar": "unicode", + "gchar": "str", + "guchar": "str", + "gboolean": "bool", + "gint": "int", + "guint": "int", + "glong": "int", + "gulong": "int", + "gint64": "int", + "guint64": "int", + "gfloat": "float", + "gdouble": "float", + "gchararray": "str", + "GParam": "GLib.Param", + "PyObject": "object", + "GStrv": "[str]", + "GVariant": "GLib.Variant", + } + + return fundamental_types.get(name, name) + + def format_type(self, type_): + if isinstance(type_, ast.Array): + return '[' + self.format_type(type_.element_type) + ']' + elif isinstance(type_, ast.Map): + return '{%s: %s}' % (self.format_type(type_.key_type), + self.format_type(type_.value_type)) + elif type_.target_giname is not None: + return type_.target_giname + else: + return self.format_fundamental_type(type_.target_fundamental) + + def format_function_name(self, func): + if func.parent is not None: + return "%s.%s" % (func.parent.name, func.name) + else: + return func.name + +class DocFormatterGjs(DocFormatter): + language = "Gjs" + mime_type = "text/x-gjs" + + fundamentals = { + "TRUE": "true", + "FALSE": "false", + "NULL": "null", + } + + def should_render_node(self, node): + if isinstance(node, ast.Record) and node.is_gtype_struct_for is not None: + return False + + return True + + def is_method(self, node): + if getattr(node, "is_method", False): + return True + + if isinstance(node, (ast.VFunction)): + return True + + return False + + def format_fundamental_type(self, name): + fundamental_types = { + "utf8": "String", + "gunichar": "String", + "gchar": "String", + "guchar": "String", + "gboolean": "Boolean", + "gint": "Number", + "guint": "Number", + "glong": "Number", + "gulong": "Number", + "gint64": "Number", + "guint64": "Number", + "gfloat": "Number", + "gdouble": "Number", + "gchararray": "String", + "GParam": "GLib.Param", + "PyObject": "Object", + "GStrv": "[String]", + "GVariant": "GLib.Variant", + } + + return fundamental_types.get(name, name) + + def format_type(self, type_): + if isinstance(type_, ast.Array): + return '[' + self.format_type(type_.element_type) + ']' + elif isinstance(type_, ast.Map): + return '{%s: %s}' % (self.format_type(type_.key_type), + self.format_type(type_.value_type)) + elif type_.target_fundamental == "none": + return "void" + elif type_.target_giname is not None: + return type_.target_giname + else: + return self.format_fundamental_type(type_.target_fundamental) + + def format_function_name(self, func): + if func.is_method: + return "%s.prototype.%s" % (func.parent.name, func.name) + elif func.is_constructor: + return "%s.%s" % (func.parent.name, func.name) + else: + return func.name + +LANGUAGES = { + "c": DocFormatterC, + "python": DocFormatterPython, + "gjs": DocFormatterGjs, +} + +class DocWriter(object): + def __init__(self, transformer, language): + self._transformer = transformer + + try: + formatter_class = LANGUAGES[language.lower()] + except KeyError: + raise SystemExit("Unsupported language: %s" % (language, )) + + self._formatter = formatter_class(self._transformer) + self._language = self._formatter.language + + self._lookup = self._get_template_lookup() + + def _get_template_lookup(self): + if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ: + top_srcdir = os.environ['UNINSTALLED_INTROSPECTION_SRCDIR'] + srcdir = os.path.join(top_srcdir, 'giscanner') + else: + srcdir = os.path.dirname(__file__) + + template_dir = os.path.join(srcdir, 'doctemplates') + + return TemplateLookup(directories=[template_dir], + module_directory=tempfile.mkdtemp(), + output_encoding='utf-8') + + def write(self, output): + nodes = [self._transformer.namespace] + for node in self._transformer.namespace.itervalues(): + if isinstance(node, ast.Function) and node.moved_to is not None: + continue + if getattr(node, 'disguised', False): + continue + nodes.append(node) + if isinstance(node, (ast.Class, ast.Interface, ast.Record)): + nodes += getattr(node, 'methods', []) + nodes += getattr(node, 'static_methods', []) + nodes += getattr(node, 'virtual_methods', []) + nodes += getattr(node, 'properties', []) + nodes += getattr(node, 'signals', []) + nodes += getattr(node, 'constructors', []) + for node in nodes: + if self._formatter.should_render_node(node): + self._render_node(node, output) + + def _render_node(self, node, output): + namespace = self._transformer.namespace + + node_kind = get_node_kind(node) + template_name = '%s/%s.tmpl' % (self._language, node_kind) + page_id = make_page_id(node) + + template = self._lookup.get_template(template_name) + result = template.render(namespace=namespace, + node=node, + page_id=page_id, + page_style=node_kind, + formatter=self._formatter) + + output_file_name = os.path.join(os.path.abspath(output), + page_id + '.page') + fp = open(output_file_name, 'w') + fp.write(result) + fp.close() diff --git a/giscanner/mallardwriter.py b/giscanner/mallardwriter.py deleted file mode 100644 index a4e9c073..00000000 --- a/giscanner/mallardwriter.py +++ /dev/null @@ -1,593 +0,0 @@ -#!/usr/bin/env python -# -*- Mode: Python -*- -# GObject-Introspection - a framework for introspecting GObject libraries -# Copyright (C) 2010 Zach Goldberg -# Copyright (C) 2011 Johan Dahlin -# Copyright (C) 2011 Shaun McCance -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. -# - -import os -import re -import tempfile - -from xml.sax import saxutils -from mako.lookup import TemplateLookup - -from . import ast, xmlwriter -from .utils import to_underscores - -def make_page_id(node): - if isinstance(node, ast.Namespace): - return 'index' - - namespace = node.namespace - if isinstance(node, (ast.Class, ast.Interface)): - return '%s.%s' % (namespace.name, node.name) - elif isinstance(node, ast.Record): - return '%s.%s' % (namespace.name, node.name) - elif isinstance(node, ast.Function): - if node.parent is not None: - return '%s.%s.%s' % (namespace.name, node.parent.name, node.name) - else: - return '%s.%s' % (namespace.name, node.name) - elif isinstance(node, ast.Enum): - return '%s.%s' % (namespace.name, node.name) - elif isinstance(node, ast.Property) and node.parent is not None: - return '%s.%s-%s' % (namespace.name, node.parent.name, node.name) - elif isinstance(node, ast.Signal) and node.parent is not None: - return '%s.%s-%s' % (namespace.name, node.parent.name, node.name) - elif isinstance(node, ast.VFunction) and node.parent is not None: - return '%s.%s-%s' % (namespace.name, node.parent.name, node.name) - else: - return '%s.%s' % (namespace.name, node.name) - -def get_node_kind(node): - if isinstance(node, ast.Namespace): - node_kind = 'namespace' - elif isinstance(node, (ast.Class, ast.Interface)): - node_kind = 'class' - elif isinstance(node, ast.Record): - node_kind = 'record' - elif isinstance(node, ast.Function): - if node.is_method: - node_kind = 'method' - elif node.is_constructor: - node_kind = 'constructor' - else: - node_kind = 'function' - elif isinstance(node, ast.Enum): - node_kind = 'enum' - elif isinstance(node, ast.Property) and node.parent is not None: - node_kind = 'property' - elif isinstance(node, ast.Signal) and node.parent is not None: - node_kind = 'signal' - elif isinstance(node, ast.VFunction) and node.parent is not None: - node_kind = 'vfunc' - else: - node_kind = 'default' - - return node_kind - -class TemplatedScanner(object): - def __init__(self, specs): - self.specs = self.unmangle_specs(specs) - self.regex = self.make_regex(self.specs) - - def unmangle_specs(self, specs): - mangled = re.compile('<<([a-zA-Z_:]+)>>') - specdict = dict((name.lstrip('!'), spec) for name, spec in specs) - - def unmangle(spec, name=None): - def replace_func(match): - child_spec_name = match.group(1) - - if ':' in child_spec_name: - pattern_name, child_spec_name = child_spec_name.split(':', 1) - else: - pattern_name = None - - child_spec = specdict[child_spec_name] - # Force all child specs of this one to be unnamed - unmangled = unmangle(child_spec, None) - if pattern_name and name: - return '(?P<%s_%s>%s)' % (name, pattern_name, unmangled) - else: - return unmangled - - return mangled.sub(replace_func, spec) - - return [(name, unmangle(spec, name)) for name, spec in specs] - - def make_regex(self, specs): - regex = '|'.join('(?P<%s>%s)' % (name, spec) for name, spec in specs - if not name.startswith('!')) - return re.compile(regex) - - def get_properties(self, name, match): - groupdict = match.groupdict() - properties = {name: groupdict.pop(name)} - name = name + "_" - for group, value in groupdict.iteritems(): - if group.startswith(name): - key = group[len(name):] - properties[key] = value - return properties - - def scan(self, text): - pos = 0 - while True: - match = self.regex.search(text, pos) - if match is None: - break - - start = match.start() - if start > pos: - yield ('other', text[pos:start], None) - - pos = match.end() - name = match.lastgroup - yield (name, match.group(0), self.get_properties(name, match)) - - if pos < len(text): - yield ('other', text[pos:], None) - -class DocstringScanner(TemplatedScanner): - def __init__(self): - specs = [ - ('!alpha', r'[a-zA-Z0-9_]+'), - ('!alpha_dash', r'[a-zA-Z0-9_-]+'), - ('property', r'#<>:(<>)'), - ('signal', r'#<>::(<>)'), - ('type_name', r'#(<>)'), - ('enum_value', r'%(<>)'), - ('parameter', r'@<>'), - ('function_call', r'<>\(\)'), - ] - - super(DocstringScanner, self).__init__(specs) - -class MallardFormatter(object): - def __init__(self, transformer): - self._transformer = transformer - self._scanner = DocstringScanner() - - def escape(self, text): - return saxutils.escape(text) - - def should_render_node(self, node): - return True - - def format(self, node, doc): - if doc is None: - return '' - - result = '' - for para in doc.split('\n\n'): - result += '

' - result += self.format_inline(node, para) - result += '

' - return result - - def _resolve_type(self, ident): - try: - matches = self._transformer.split_ctype_namespaces(ident) - except ValueError: - return None - for namespace, name in matches: - node = namespace.get(name) - if node: - return node - return None - - def _resolve_symbol(self, symbol): - try: - matches = self._transformer.split_csymbol_namespaces(symbol) - except ValueError: - return None - for namespace, name in matches: - node = namespace.get_by_symbol(symbol) - if node: - return node - return None - - def _find_thing(self, list_, name): - for item in list_: - if item.name == name: - return item - raise KeyError("Could not find %s" % (name, )) - - def _process_other(self, node, match, props): - return self.escape(match) - - def _process_property(self, node, match, props): - type_node = self._resolve_type(props['type_name']) - if type_node is None: - return match - - try: - prop = self._find_thing(type_node.properties, props['property_name']) - except (AttributeError, KeyError), e: - return match - - return self.format_xref(prop) - - def _process_signal(self, node, match, props): - type_node = self._resolve_type(props['type_name']) - if type_node is None: - return match - - try: - signal = self._find_thing(type_node.signals, props['signal_name']) - except (AttributeError, KeyError), e: - return match - - return self.format_xref(signal) - - def _process_type_name(self, node, match, props): - type_ = self._resolve_type(props['type_name']) - if type_ is None: - return match - - return self.format_xref(type_) - - def _process_enum_value(self, node, match, props): - member_name = props['member_name'] - - try: - return '%s' % (self.fundamentals[member_name], ) - except KeyError: - pass - - enum_value = self._resolve_symbol(member_name) - if enum_value: - return self.format_xref(enum_value) - - return match - - def _process_parameter(self, node, match, props): - try: - parameter = node.get_parameter(props['param_name']) - except (AttributeError, ValueError), e: - return match - - return '%s' % (self.format_parameter_name(node, parameter), ) - - def _process_function_call(self, node, match, props): - func = self._resolve_symbol(props['symbol_name']) - if func is None: - return match - - return self.format_xref(func) - - def _process_token(self, node, tok): - kind, match, props = tok - - dispatch = { - 'other': self._process_other, - 'property': self._process_property, - 'signal': self._process_signal, - 'type_name': self._process_type_name, - 'enum_value': self._process_enum_value, - 'parameter': self._process_parameter, - 'function_call': self._process_function_call, - } - - return dispatch[kind](node, match, props) - - def format_inline(self, node, para): - tokens = self._scanner.scan(para) - words = [self._process_token(node, tok) for tok in tokens] - return ''.join(words) - - def format_parameter_name(self, node, parameter): - return parameter.argname - - def format_function_name(self, func): - raise NotImplementedError - - def format_type(self, type_): - raise NotImplementedError - - def format_page_name(self, node): - if isinstance(node, ast.Namespace): - return 'Index' - elif isinstance(node, ast.Function): - return self.format_function_name(node) - elif isinstance(node, ast.Property) and node.parent is not None: - return '%s:%s' % (self.format_page_name(node.parent), node.name) - elif isinstance(node, ast.Signal) and node.parent is not None: - return '%s::%s' % (self.format_page_name(node.parent), node.name) - elif isinstance(node, ast.VFunction) and node.parent is not None: - return '%s::%s' % (self.format_page_name(node.parent), node.name) - else: - return make_page_id(node) - - def format_xref(self, node): - if isinstance(node, ast.Member): - # Enum/BitField members are linked to the main enum page. - return self.format_xref(node.parent) + '.' + node.name - else: - return xmlwriter.build_xml_tag('link', [('xref', make_page_id(node))]) - - def format_property_flags(self, property_, construct_only=False): - flags = [] - if property_.readable and not construct_only: - flags.append("Read") - if property_.writable and not construct_only: - flags.append("Write") - if property_.construct: - flags.append("Construct") - if property_.construct_only: - flags.append("Construct Only") - - return " / ".join(flags) - - def to_underscores(self, string): - return to_underscores(string) - - def get_class_hierarchy(self, node): - parent_chain = [node] - - while node.parent: - node = self._transformer.lookup_typenode(node.parent) - parent_chain.append(node) - - parent_chain.reverse() - return parent_chain - -class MallardFormatterC(MallardFormatter): - language = "C" - mime_type = "text/x-csrc" - - fundamentals = { - "TRUE": "TRUE", - "FALSE": "FALSE", - "NULL": "NULL", - } - - def format_type(self, type_): - if isinstance(type_, ast.Array): - return self.format_type(type_.element_type) + '*' - elif type_.ctype is not None: - return type_.ctype - else: - return type_.target_fundamental - - def format_function_name(self, func): - if isinstance(func, (ast.Function)): - return func.symbol - else: - return func.name - -class MallardFormatterPython(MallardFormatter): - language = "Python" - mime_type = "text/python" - - fundamentals = { - "TRUE": "True", - "FALSE": "False", - "NULL": "None", - } - - def should_render_node(self, node): - if getattr(node, "is_constructor", False): - return False - - if isinstance(node, ast.Record) and node.is_gtype_struct_for is not None: - return False - - return True - - def is_method(self, node): - if getattr(node, "is_method", False): - return True - - if isinstance(node, (ast.VFunction)): - return True - - return False - - def format_parameter_name(self, node, parameter): - # Force "self" for the first parameter of a method - if self.is_method(node) and parameter is node.instance_parameter: - return "self" - else: - return parameter.argname - - def format_fundamental_type(self, name): - fundamental_types = { - "utf8": "unicode", - "gunichar": "unicode", - "gchar": "str", - "guchar": "str", - "gboolean": "bool", - "gint": "int", - "guint": "int", - "glong": "int", - "gulong": "int", - "gint64": "int", - "guint64": "int", - "gfloat": "float", - "gdouble": "float", - "gchararray": "str", - "GParam": "GLib.Param", - "PyObject": "object", - "GStrv": "[str]", - "GVariant": "GLib.Variant", - } - - return fundamental_types.get(name, name) - - def format_type(self, type_): - if isinstance(type_, ast.Array): - return '[' + self.format_type(type_.element_type) + ']' - elif isinstance(type_, ast.Map): - return '{%s: %s}' % (self.format_type(type_.key_type), - self.format_type(type_.value_type)) - elif type_.target_giname is not None: - return type_.target_giname - else: - return self.format_fundamental_type(type_.target_fundamental) - - def format_function_name(self, func): - if func.parent is not None: - return "%s.%s" % (func.parent.name, func.name) - else: - return func.name - -class MallardFormatterGjs(MallardFormatter): - language = "Gjs" - mime_type = "text/x-gjs" - - fundamentals = { - "TRUE": "true", - "FALSE": "false", - "NULL": "null", - } - - def should_render_node(self, node): - if isinstance(node, ast.Record) and node.is_gtype_struct_for is not None: - return False - - return True - - def is_method(self, node): - if getattr(node, "is_method", False): - return True - - if isinstance(node, (ast.VFunction)): - return True - - return False - - def format_fundamental_type(self, name): - fundamental_types = { - "utf8": "String", - "gunichar": "String", - "gchar": "String", - "guchar": "String", - "gboolean": "Boolean", - "gint": "Number", - "guint": "Number", - "glong": "Number", - "gulong": "Number", - "gint64": "Number", - "guint64": "Number", - "gfloat": "Number", - "gdouble": "Number", - "gchararray": "String", - "GParam": "GLib.Param", - "PyObject": "Object", - "GStrv": "[String]", - "GVariant": "GLib.Variant", - } - - return fundamental_types.get(name, name) - - def format_type(self, type_): - if isinstance(type_, ast.Array): - return '[' + self.format_type(type_.element_type) + ']' - elif isinstance(type_, ast.Map): - return '{%s: %s}' % (self.format_type(type_.key_type), - self.format_type(type_.value_type)) - elif type_.target_fundamental == "none": - return "void" - elif type_.target_giname is not None: - return type_.target_giname - else: - return self.format_fundamental_type(type_.target_fundamental) - - def format_function_name(self, func): - if func.is_method: - return "%s.prototype.%s" % (func.parent.name, func.name) - elif func.is_constructor: - return "%s.%s" % (func.parent.name, func.name) - else: - return func.name - -LANGUAGES = { - "c": MallardFormatterC, - "python": MallardFormatterPython, - "gjs": MallardFormatterGjs, -} - -class MallardWriter(object): - def __init__(self, transformer, language): - self._transformer = transformer - - try: - formatter_class = LANGUAGES[language.lower()] - except KeyError: - raise SystemExit("Unsupported language: %s" % (language, )) - - self._formatter = formatter_class(self._transformer) - self._language = self._formatter.language - - self._lookup = self._get_template_lookup() - - def _get_template_lookup(self): - if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ: - top_srcdir = os.environ['UNINSTALLED_INTROSPECTION_SRCDIR'] - srcdir = os.path.join(top_srcdir, 'giscanner') - else: - srcdir = os.path.dirname(__file__) - - template_dir = os.path.join(srcdir, 'doctemplates') - - return TemplateLookup(directories=[template_dir], - module_directory=tempfile.mkdtemp(), - output_encoding='utf-8') - - def write(self, output): - nodes = [self._transformer.namespace] - for node in self._transformer.namespace.itervalues(): - if isinstance(node, ast.Function) and node.moved_to is not None: - continue - if getattr(node, 'disguised', False): - continue - nodes.append(node) - if isinstance(node, (ast.Class, ast.Interface, ast.Record)): - nodes += getattr(node, 'methods', []) - nodes += getattr(node, 'static_methods', []) - nodes += getattr(node, 'virtual_methods', []) - nodes += getattr(node, 'properties', []) - nodes += getattr(node, 'signals', []) - nodes += getattr(node, 'constructors', []) - for node in nodes: - if self._formatter.should_render_node(node): - self._render_node(node, output) - - def _render_node(self, node, output): - namespace = self._transformer.namespace - - node_kind = get_node_kind(node) - template_name = '%s/%s.tmpl' % (self._language, node_kind) - page_id = make_page_id(node) - - template = self._lookup.get_template(template_name) - result = template.render(namespace=namespace, - node=node, - page_id=page_id, - page_style=node_kind, - formatter=self._formatter) - - output_file_name = os.path.join(os.path.abspath(output), - page_id + '.page') - fp = open(output_file_name, 'w') - fp.write(result) - fp.close() -- cgit v1.2.1 From 0fd6e485a07411bdd73d7a03103ae3fd162aee1a Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 4 Feb 2013 19:08:09 +0100 Subject: Update annotations from glib git --- gir/gio-2.0.c | 29 ++++++++- gir/glib-2.0.c | 203 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 227 insertions(+), 5 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 4a8148fd..46532435 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -9276,6 +9276,31 @@ */ +/** + * _g_io_module_get_default_type: + * @extension_point: the name of an extension point + * @envvar: (allow-none): the name of an environment variable to override the default implementation. + * @is_supported_offset: a vtable offset, or zero + * + * Retrieves the default class implementing @extension_point. + * + * If @envvar is not %NULL, and the environment variable with that + * name is set, then the implementation it specifies will be tried + * first. After that, or if @envvar is not set, all other + * implementations will be tried in order of decreasing priority. + * + * If @is_supported_offset is non-zero, then it is the offset into the + * class vtable at which there is a function that takes no arguments and + * returns a boolean. This function will be called on each candidate + * implementation to check if it is actually usable or not. + * + * The result is cached after it is generated the first time, and + * the function is thread-safe. + * + * Returns: (transfer none): an object implementing @extension_point, or %NULL if there are no usable implementations. + */ + + /** * g_action_activate: * @action: a #GAction @@ -10461,7 +10486,7 @@ /** - * g_application_command_line_get_stdin_data: + * g_application_command_line_get_stdin: * @cmdline: a #GApplicationCommandLine * * Gets the stdin of the invoking process. @@ -13554,7 +13579,7 @@ * The implemented D-Bus API should be considered private. * It is subject to change in the future. * - * An object path can only have one action group exported on it. If this + * An object path can only have one menu model exported on it. If this * constraint is violated, the export will fail and 0 will be * returned (with @error set accordingly). * diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 180577be..ae5aaf4c 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -11213,6 +11213,21 @@ */ +/** + * g_close: + * @fd: A file descriptor + * @error: a #GError + * + * This wraps the close() call; in case of error, %errno will be + * preserved, but the error will also be stored as a #GError in @error. + * + * Besides using #GError, there is another major reason to prefer this + * function over the call provided by the system; on Unix, it will + * attempt to correctly handle %EINTR, which has platform-specific + * semantics. + */ + + /** * g_compute_checksum_for_bytes: * @checksum_type: a #GChecksumType @@ -18160,7 +18175,7 @@ * * Adds a file descriptor to the set of file descriptors polled for * this context. This will very seldom be used directly. Instead - * a typical event source will use g_source_add_poll() instead. + * a typical event source will use g_source_add_unix_fd() instead. */ @@ -23815,7 +23830,7 @@ * doing unsorted insertions. * * - * Returns: an #GSequenceIter pointing to the position of the first item found equal to @data according to @cmp_func and @cmp_data. + * Returns: an #GSequenceIter pointing to the position of the first item found equal to @data according to @cmp_func and @cmp_data, or %NULL if no such item exists. * Since: 2.28 */ @@ -23843,7 +23858,7 @@ * doing unsorted insertions. * * - * Returns: an #GSequenceIter pointing to the position of the first item found equal to @data according to @cmp_func and @cmp_data. + * Returns: an #GSequenceIter pointing to the position of the first item found equal to @data according to @cmp_func and @cmp_data, or %NULL if no such item exists. * Since: 2.28 */ @@ -25001,6 +25016,32 @@ * event source. The event source's check function will typically test * the @revents field in the #GPollFD struct and return %TRUE if events need * to be processed. + * + * Using this API forces the linear scanning of event sources on each + * main loop iteration. Newly-written event sources should try to use + * g_source_add_unix_fd() instead of this API. + */ + + +/** + * g_source_add_unix_fd: + * @source: a #GSource + * @fd: the fd to monitor + * @events: an event mask + * + * Monitors @fd for the IO events in @events. + * + * The tag returned by this function can be used to remove or modify the + * monitoring of the fd using g_source_remove_unix_fd() or + * g_source_modify_unix_fd(). + * + * It is not necessary to remove the fd before destroying the source; it + * will be cleaned up automatically. + * + * As the name suggests, this function is not available on Windows. + * + * Returns: an opaque tag + * Since: 2.36 */ @@ -25102,6 +25143,20 @@ */ +/** + * g_source_get_ready_time: + * @source: a #GSource + * + * Gets the "ready time" of @source, as set by + * g_source_set_ready_time(). + * + * Any time before the current monotonic time (including 0) is an + * indication that the source will fire immediately. + * + * Returns: the monotonic ready time, -1 for "never" + */ + + /** * g_source_get_time: * @source: a #GSource @@ -25189,6 +25244,25 @@ */ +/** + * g_source_modify_unix_fd: + * @source: a #GSource + * @tag: the tag from g_source_add_unix_fd() + * @new_events: the new event mask to watch + * + * Updates the event mask to watch for the fd identified by @tag. + * + * @tag is the tag returned from g_source_add_unix_fd(). + * + * If you want to remove a fd, don't set its event mask to zero. + * Instead, call g_source_remove_unix_fd(). + * + * As the name suggests, this function is not available on Windows. + * + * Since: 2.36 + */ + + /** * g_source_new: * @source_funcs: structure containing functions that implement the sources behavior. @@ -25207,6 +25281,24 @@ */ +/** + * g_source_query_unix_fd: + * @source: a #GSource + * @tag: the tag from g_source_add_unix_fd() + * + * Queries the events reported for the fd corresponding to @tag on + * @source during the last poll. + * + * The return value of this function is only defined when the function + * is called from the check or dispatch functions for @source. + * + * As the name suggests, this function is not available on Windows. + * + * Returns: the conditions reported on the fd + * Since: 2.36 + */ + + /** * g_source_ref: * @source: a #GSource @@ -25281,6 +25373,23 @@ */ +/** + * g_source_remove_unix_fd: + * @source: a #GSource + * @tag: the tag from g_source_add_unix_fd() + * + * Reverses the effect of a previous call to g_source_add_unix_fd(). + * + * You only need to call this if you want to remove an fd from being + * watched while keeping the same source around. In the normal case you + * will just want to destroy the source. + * + * As the name suggests, this function is not available on Windows. + * + * Since: 2.36 + */ + + /** * g_source_set_callback: * @source: the source @@ -25386,6 +25495,32 @@ */ +/** + * g_source_set_ready_time: + * @source: a #GSource + * @ready_time: the monotonic time at which the source will be ready, 0 for "immediately", -1 for "never" + * + * Sets a #GSource to be dispatched when the given monotonic time is + * reached (or passed). If the monotonic time is in the past (as it + * always will be if @ready_time is 0) then the source will be + * dispatched immediately. + * + * If @ready_time is -1 then the source is never woken up on the basis + * of the passage of time. + * + * Dispatching the source does not reset the ready time. You should do + * so yourself, from the source dispatch function. + * + * Note that if you have a pair of sources where the ready time of one + * suggests that it will be delivered first but the priority for the + * other suggests that it would be delivered first, and the ready time + * for both sources is reached during the same main context iteration + * then the order of dispatch is undefined. + * + * Since: 2.36 + */ + + /** * g_source_unref: * @source: a #GSource @@ -29715,6 +29850,68 @@ */ +/** + * g_unix_fd_add: + * @fd: a file descriptor + * @condition: IO conditions to watch for on @fd + * @function: a #GPollFDFunc + * @user_data: data to pass to @function + * + * Sets a function to be called when the IO condition, as specified by + * @condition becomes true for @fd. + * + * @function will be called when the specified IO condition becomes + * %TRUE. The function is expected to clear whatever event caused the + * IO condition to become true and return %TRUE in order to be notified + * when it happens again. If @function returns %FALSE then the watch + * will be cancelled. + * + * The return value of this function can be passed to g_source_remove() + * to cancel the watch at any time that it exists. + * + * The source will never close the fd -- you must do it yourself. + * + * Returns: the ID (greater than 0) of the event source + * Since: 2.36 + */ + + +/** + * g_unix_fd_add_full: + * @priority: the priority of the source + * @fd: a file descriptor + * @condition: IO conditions to watch for on @fd + * @function: a #GUnixFDSourceFunc + * @user_data: data to pass to @function + * @notify: function to call when the idle is removed, or %NULL + * + * Sets a function to be called when the IO condition, as specified by + * @condition becomes true for @fd. + * + * This is the same as g_unix_fd_add(), except that it allows you to + * specify a non-default priority and a provide a #GDestroyNotify for + * @user_data. + * + * Returns: the ID (greater than 0) of the event source + * Since: 2.36 + */ + + +/** + * g_unix_fd_source_new: + * @fd: a file descriptor + * @condition: IO conditions to watch for on @fd + * + * Creates a #GSource to watch for a particular IO condition on a file + * descriptor. + * + * The source will never close the fd -- you must do it yourself. + * + * Returns: the newly created #GSource + * Since: 2.36 + */ + + /** * g_unix_open_pipe: * @fds: Array of two integers -- cgit v1.2.1 From 44da2fd3f8cc19ba6fdd7cf740c31cdd692da6f2 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Tue, 5 Feb 2013 08:44:14 +0100 Subject: build: Fix make dist --- Makefile.am | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 5a4044f1..736f3adb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -53,7 +53,6 @@ EXTRA_DIST += \ $(man_MANS) \ $(m4_DATA) \ misc/pep8.py \ - misc/pre-commit \ misc/pyflakes.py check-local: -- cgit v1.2.1 From 8079124d854dff898e6010df6819f5b20ba8e004 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Tue, 5 Feb 2013 09:12:38 +0100 Subject: build: Really fix make dist --- Makefile-giscanner.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am index b2fad457..e8def0ee 100644 --- a/Makefile-giscanner.am +++ b/Makefile-giscanner.am @@ -54,7 +54,7 @@ pkgpyexec_PYTHON = \ giscanner/xmlwriter.py templatedir = $(pkglibdir) -nobase_template_DATA = \ +nobase_dist_template_DATA = \ giscanner/doctemplates/base.tmpl \ giscanner/doctemplates/class.tmpl \ giscanner/doctemplates/namespace.tmpl \ -- cgit v1.2.1 From 7f144d32095a0901e4bbe3a22b22487887cd53eb Mon Sep 17 00:00:00 2001 From: Simon Feltman Date: Wed, 6 Feb 2013 12:54:14 -0800 Subject: gimarshalingtests: fix spelling mistake in new vfunc object helpers --- tests/gimarshallingtests.c | 10 +++++----- tests/gimarshallingtests.h | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index 54daa335..2e1279a2 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -4346,7 +4346,7 @@ gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_none ( void gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_full (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating) { - GObject *object = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_object_tansfer_full (self); + GObject *object = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_object_transfer_full (self); *ref_count = object->ref_count; *is_floating = g_object_is_floating(object); g_object_unref(object); @@ -4379,7 +4379,7 @@ void gi_marshalling_tests_object_get_ref_info_for_vfunc_out_object_transfer_full (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating) { GObject *object = NULL; - GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_out_object_tansfer_full (self, &object); + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_out_object_transfer_full (self, &object); *ref_count = object->ref_count; *is_floating = g_object_is_floating(object); g_object_unref(object); @@ -4396,7 +4396,7 @@ _vfunc_in_object_destroy_callback(gboolean *destroy_called, GObject *where_the_o * @ref_count: (out): Ref count of the in object directly after vfunc call. * @is_floating: (out): Floating state of in object directly after vfunc call. * - * Calls vfunc_in_object_tansfer_none with a new object of the given type. + * Calls vfunc_in_object_transfer_none with a new object of the given type. */ void gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_none (GIMarshallingTestsObject *self, GType type, guint *ref_count, gboolean *is_floating) @@ -4407,7 +4407,7 @@ gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_none (GIMa GObject *object = g_object_new(type, NULL); g_object_weak_ref (object, (GWeakNotify)_vfunc_in_object_destroy_callback, &destroy_called); - GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_in_object_tansfer_none (self, object); + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_in_object_transfer_none (self, object); if (destroy_called) { *ref_count = 0; *is_floating = FALSE; @@ -4437,7 +4437,7 @@ gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_full (GIMa /* Calling the vfunc takes ownership of the object, so we use a weak_ref to determine * if the object gets destroyed after the call and appropriately return 0 as the ref count. */ - GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_in_object_tansfer_full (self, object); + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_in_object_transfer_full (self, object); if (destroy_called) { *ref_count = 0; *is_floating = FALSE; diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index 82137a75..a361de02 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -813,11 +813,11 @@ struct _GIMarshallingTestsObjectClass GObject* (* vfunc_return_object_transfer_none) (GIMarshallingTestsObject *self); /** - * GIMarshallingTestsObjectClass::vfunc_return_object_tansfer_full: + * GIMarshallingTestsObjectClass::vfunc_return_object_transfer_full: * * Returns: (transfer full) */ - GObject* (* vfunc_return_object_tansfer_full) (GIMarshallingTestsObject *self); + GObject* (* vfunc_return_object_transfer_full) (GIMarshallingTestsObject *self); /** * GIMarshallingTestsObjectClass::vfunc_out_object_transfer_none: @@ -826,22 +826,22 @@ struct _GIMarshallingTestsObjectClass void (* vfunc_out_object_transfer_none) (GIMarshallingTestsObject *self, GObject **object); /** - * GIMarshallingTestsObjectClass::vfunc_out_object_tansfer_full: + * GIMarshallingTestsObjectClass::vfunc_out_object_transfer_full: * @object: (out) (transfer full): */ - void (* vfunc_out_object_tansfer_full) (GIMarshallingTestsObject *self, GObject **object); + void (* vfunc_out_object_transfer_full) (GIMarshallingTestsObject *self, GObject **object); /** - * GIMarshallingTestsObjectClass::vfunc_in_object_tansfer_none: + * GIMarshallingTestsObjectClass::vfunc_in_object_transfer_none: * @object: (in) (transfer none): */ - void (* vfunc_in_object_tansfer_none) (GIMarshallingTestsObject *self, GObject *object); + void (* vfunc_in_object_transfer_none) (GIMarshallingTestsObject *self, GObject *object); /** - * GIMarshallingTestsObjectClass::vfunc_in_object_tansfer_full: + * GIMarshallingTestsObjectClass::vfunc_in_object_transfer_full: * @object: (in) (transfer full): */ - void (* vfunc_in_object_tansfer_full) (GIMarshallingTestsObject *self, GObject *object); + void (* vfunc_in_object_transfer_full) (GIMarshallingTestsObject *self, GObject *object); }; -- cgit v1.2.1 From e31308794bcf5bd5513bcb57dae6d243495608bf Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 3 Feb 2013 07:02:25 -0500 Subject: tests: Update Makefile.am https://bugzilla.gnome.org/show_bug.cgi?id=693096 --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index b6d6ebd2..676d485f 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -12,7 +12,7 @@ EXTRA_DIST= BUILT_SOURCES= CLEANFILES= -INCLUDES = $(GOBJECT_CFLAGS) +AM_CFLAGS = $(GOBJECT_CFLAGS) LIBADD = $(GOBJECT_LIBS) testsdir = $(datadir)/gobject-introspection-1.0/tests -- cgit v1.2.1 From bdcc80155a6eb275e7ed73fbf506b2c0bb76ac4d Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 3 Feb 2013 08:24:19 -0500 Subject: tests: Support warning tests in modern automake https://bugzilla.gnome.org/show_bug.cgi?id=693096 --- tests/warn/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/warn/Makefile.am b/tests/warn/Makefile.am index c4354223..80702300 100644 --- a/tests/warn/Makefile.am +++ b/tests/warn/Makefile.am @@ -19,4 +19,5 @@ TESTS = \ EXTRA_DIST = warningtester.py common.h $(TESTS) -TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) $(PYTHON) $(srcdir)/warningtester.py +TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) +LOG_COMPILER = $(PYTHON) $(srcdir)/warningtester.py -- cgit v1.2.1 From 5bfabd8c81b2c4b301d191fa1bf9573d2b6243be Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 3 Feb 2013 08:24:54 -0500 Subject: Update .gitignore https://bugzilla.gnome.org/show_bug.cgi?id=693096 --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index f728b4cf..d07a66dd 100644 --- a/.gitignore +++ b/.gitignore @@ -88,6 +88,8 @@ tests/offsets/offsets.compiled tests/offsets/offsets.introspected tests/doctool/DocExamples-1.0-C tests/doctool/DocExamples-1.0-Python +tests/*/*.log +tests/*/*.trs .make-check-passed #GTK-Doc output -- cgit v1.2.1 From 2df621c53cdffbc3c43c3745947ee859020c8338 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sat, 2 Feb 2013 11:49:48 -0500 Subject: tests: Move Annotation into Regress The goal here is to have one master library for testing lots of edge cases for GIRs rather than lots of individual libraries. https://bugzilla.gnome.org/show_bug.cgi?id=693097 --- .gitignore | 1 - tests/scanner/Annotation-1.0-expected.gir | 994 ---------------------------- tests/scanner/Makefile.am | 12 +- tests/scanner/Regress-1.0-expected.gir | 1005 +++++++++++++++++++++++++++++ tests/scanner/annotation.c | 372 +++++------ tests/scanner/annotation.h | 152 ++--- 6 files changed, 1268 insertions(+), 1268 deletions(-) delete mode 100644 tests/scanner/Annotation-1.0-expected.gir diff --git a/.gitignore b/.gitignore index d07a66dd..7051e4f4 100644 --- a/.gitignore +++ b/.gitignore @@ -69,7 +69,6 @@ tests/offsets/gitestoffsets.c tests/repository/gitestrepo tests/repository/gitestthrows tests/repository/gitypelibtest -tests/scanner/Annotation-1.0.gir tests/scanner/Bar-1.0.gir tests/scanner/Foo-1.0.gir tests/scanner/GetType-1.0.gir diff --git a/tests/scanner/Annotation-1.0-expected.gir b/tests/scanner/Annotation-1.0-expected.gir deleted file mode 100644 index 3abec0e3..00000000 --- a/tests/scanner/Annotation-1.0-expected.gir +++ /dev/null @@ -1,994 +0,0 @@ - - - - - - - - - - - - - - - - - - - - Constant to define a calculated large value - - - - Constant to define a calculated large value - - - - This is a callback. - - array of ints - - - - - array of ints - - - - - - - - - - - - - - - - - - - - - - This is a callback taking a list. - - list of strings - - - - - - - list of strings - - - - - - - - This is a callback with a 'closure' argument that is not named -'user_data' and hence has to be annotated. - - - - - - The user data - - - - - - - This is an object used to test annotations. - - - %NULL always - - - - - a #GObject - - - - - - - - - This is a test for out arguments; GObject defaults to transfer - - an int - - - - - a #GObject - - - - a #GObject - - - - - - This is a test for out arguments, one transferred, other not - - an int - - - - - a #GObject - - - - a #GObject - - - - a #GObject - - - - - - Test taking a zero-terminated array - - - - - - a #GObject - - - - Sequence of numbers - - - - - - - - Test taking an array with length parameter - - - - - - a #GObject - - - - Sequence of numbers that are zero-terminated - - - - - - Length of number array - - - - - - Test taking a zero-terminated array with length parameter - - - - - - a #AnnotationObject - - - - Sequence of numbers that are zero-terminated - - - - - - Length of number array - - - - - - Test returning a caller-owned object - - The object - - - - - a #GObject - - - - - - - %NULL always - - - - - a #GObject - - - - - - - - - - - - - - - - - Test taking a call-scoped callback - - - - - - a #AnnotationObject - - - - Callback to invoke - - - - Callback user data - - - - - - This is a test for returning a hash table mapping strings to -objects. - - hash table - - - - - - - - a #GObject - - - - - - This is a test for returning a list of objects. -The list itself should be freed, but not the internal objects, -intentionally similar example to gtk_container_get_children - - list of objects - - - - - - - a #GObject - - - - - - This is a test for returning a list of strings, where -each string needs to be freed. - - list of strings - - - - - - - a #GObject - - - - - - - - - - - A #AnnotationObject - - - - - - This is a test for in arguments - - an int - - - - - a #GObject - - - - This is an argument test - - - - - - This is a test for out arguments - - an int - - - - - a #GObject - - - - This is an argument test - - - - - - This is a second test for out arguments - - an int - - - - - a #GObject - - - - This is an argument test - - - - - - This is a 3th test for out arguments - - an int - - - - - a #GObject - - - - This is an argument test - - - - - - - an int - - - - - a #GObject - - - - - - - An object, not referenced - - - - - a #GObject - - - - - - This is a test for out arguments - - an int - - - - - a #GObject - - - - This is an argument test - - - - - - Test taking a zero-terminated array with length parameter - - - - - - a #AnnotationObject - - - - Length of the argument vector - - - - Argument vector - - - - - - - - Test taking a guchar * with a length. - - - - - - a #AnnotationObject - - - - The data - - - - - - Length of the data - - - - - - Test taking a gchar * with a length. - - - - - - a #AnnotationObject - - - - The data - - - - - - Length of the data - - - - - - Test taking a gchar * with a length, overriding the array element -type. - - - - - - a #AnnotationObject - - - - The data - - - - - - Length of the data - - - - - - Test returning a string as an out parameter - - some boolean - - - - - a #AnnotationObject - - - - string return value - - - - - - - - - - - a #GObject - - - - - - - - - This is here just for the sake of being overriden by its -annotation_object_watch_full(). - - - - - - A #AnnotationObject - - - - The callback - - - - The callback data - - - - - - Test overriding via the "Rename To" annotation. - - - - - - A #AnnotationObject - - - - The callback - - - - The callback data - - - - Destroy notification - - - - - - - - - - - - - - Opaque pointer handle - - - - - - - - - This is a property which is a string - - - - This is a property annotation intentionally indented with a mix -of tabs and strings to test the tab handling capabilities of the scanner. - - - - - - - This signal tests a signal with attributes. - - - the return value - - - - - - a value - - - - - another value - - - - - - This signal tests an empty document argument (@arg1) - - - - - - - - - - - This is a signal which takes a list of strings, but it's not -known by GObject as it's only marked as G_TYPE_POINTER - - - - - - a list of strings - - - - - - - - This is a signal which has a broken signal handler, -it says it's pointer but it's actually a string. - - - - - - a string - - - - - - - - - - - - This is a test of an array of object in an field of a struct. - - - - - - - - - - - The return value. - - - - - A #AnnotationObject. - - - - - - Some data. - - - - - - Test messing up the heuristic of closure/destroy-notification -detection, and fixing it via annotations. - - - - - - Destroy notification - - - - - - - - - - - - - Source file - - - - - - - - - - The number of args. - - - - The arguments. - - - - - - - - - - - - - some text (e.g. example) or else - - - - - - - - - - - the array - - - - - - - - - The return value - - - - - - - Number of return values - - - - - - - An annotated filename - - - - - - - - - - Source file - - - - - - Explicitly test having a space after the ** here. - - - - - - - - - - - - - - - - - - - - - - The return value - - - - - - - - - - - - - - - - - - - See https://bugzilla.gnome.org/show_bug.cgi?id=630862 - - An object, note the colon:in here - - - - - - A floating object - - - - - - - - - - diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index 2753c505..91ab9a8f 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -7,7 +7,6 @@ INTROSPECTION_SCANNER_ARGS += --warn-all check_LTLIBRARIES = \ libsletter.la \ - libannotation.la \ libtestinherit.la \ libfoo.la \ libutility.la \ @@ -29,13 +28,12 @@ libsletter_la_LIBADD = $(GIO_LIBS) libsletter_la_CFLAGS = $(AM_CFLAGS) libsletter_la_LDFLAGS = $(AM_LDFLAGS) -libannotation_la_SOURCES = $(srcdir)/annotation.c $(srcdir)/annotation.h libtestinherit_la_SOURCES = $(srcdir)/drawable.c $(srcdir)/drawable.h libfoo_la_SOURCES = $(srcdir)/foo.c $(srcdir)/foo.h libfoo_la_LIBADD = $(top_builddir)/libgirepository-1.0.la libutility_la_SOURCES = $(srcdir)/utility.c $(srcdir)/utility.h libgtkfrob_la_SOURCES = $(srcdir)/gtkfrob.c $(srcdir)/gtkfrob.h -libregress_la_SOURCES = $(srcdir)/regress.c $(srcdir)/regress.h +libregress_la_SOURCES = $(srcdir)/regress.c $(srcdir)/regress.h $(srcdir)/annotation.c $(srcdir)/annotation.h libregress_la_LIBADD = $(GIO_LIBS) if HAVE_CAIRO libregress_la_LIBADD += $(CAIRO_LIBS) @@ -97,14 +95,6 @@ WarnLib_1_0_gir_FILES = $(libwarnlib_la_SOURCES) WarnLib_1_0_gir_SCANNERFLAGS = --c-include="warnlib.h" --symbol-prefix=warnlib_ GIRS += WarnLib-1.0.gir -Annotation-1.0.gir: Utility-1.0.gir libannotation.la -Annotation_1_0_gir_PACKAGES = gobject-2.0 -Annotation_1_0_gir_LIBS = libannotation.la -Annotation_1_0_gir_INCLUDES = GObject-2.0 Utility-1.0 -Annotation_1_0_gir_FILES = $(libannotation_la_SOURCES) -Annotation_1_0_gir_SCANNERFLAGS = --c-include="annotation.h" --warn-error -GIRS += Annotation-1.0.gir - TestInherit-1.0.gir: Utility-1.0.gir libtestinherit.la TestInherit_1_0_gir_PACKAGES = gobject-2.0 TestInherit_1_0_gir_LIBS = libtestinherit.la diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 4f285eb4..61fb07ab 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -35,6 +35,24 @@ and/or use gtk-doc annotations. --> Typedef'd va_list for additional reasons + + + + + Constant to define a calculated large value + + + + Constant to define a calculated large value + + @@ -45,6 +63,779 @@ and/or use gtk-doc annotations. --> + + + + + + + + This is a callback. + + array of ints + + + + + array of ints + + + + + + + + + + + + + + + + + + + + + + This is a callback taking a list. + + list of strings + + + + + + + list of strings + + + + + + + + This is a callback with a 'closure' argument that is not named +'user_data' and hence has to be annotated. + + + + + + The user data + + + + + + + This is an object used to test regress_annotations. + + + %NULL always + + + + + a #GObject + + + + + + + + + This is a test for out arguments; GObject defaults to transfer + + an int + + + + + a #GObject + + + + a #GObject + + + + + + This is a test for out arguments, one transferred, other not + + an int + + + + + a #GObject + + + + a #GObject + + + + a #GObject + + + + + + Test taking a zero-terminated array + + + + + + a #GObject + + + + Sequence of numbers + + + + + + + + Test taking an array with length parameter + + + + + + a #GObject + + + + Sequence of numbers that are zero-terminated + + + + + + Length of number array + + + + + + Test taking a zero-terminated array with length parameter + + + + + + a #RegressAnnotationObject + + + + Sequence of numbers that are zero-terminated + + + + + + Length of number array + + + + + + Test returning a caller-owned object + + The object + + + + + a #GObject + + + + + + + %NULL always + + + + + a #GObject + + + + + + + + + + + + + + + + + Test taking a call-scoped callback + + + + + + a #RegressAnnotationObject + + + + Callback to invoke + + + + Callback user data + + + + + + This is a test for returning a hash table mapping strings to +objects. + + hash table + + + + + + + + a #GObject + + + + + + This is a test for returning a list of objects. +The list itself should be freed, but not the internal objects, +intentionally similar example to gtk_container_get_children + + list of objects + + + + + + + a #GObject + + + + + + This is a test for returning a list of strings, where +each string needs to be freed. + + list of strings + + + + + + + a #GObject + + + + + + + + + + + A #RegressAnnotationObject + + + + + + This is a test for in arguments + + an int + + + + + a #GObject + + + + This is an argument test + + + + + + This is a test for out arguments + + an int + + + + + a #GObject + + + + This is an argument test + + + + + + This is a second test for out arguments + + an int + + + + + a #GObject + + + + This is an argument test + + + + + + This is a 3th test for out arguments + + an int + + + + + a #GObject + + + + This is an argument test + + + + + + + an int + + + + + a #GObject + + + + + + + An object, not referenced + + + + + a #GObject + + + + + + This is a test for out arguments + + an int + + + + + a #GObject + + + + This is an argument test + + + + + + Test taking a zero-terminated array with length parameter + + + + + + a #RegressAnnotationObject + + + + Length of the argument vector + + + + Argument vector + + + + + + + + Test taking a guchar * with a length. + + + + + + a #RegressAnnotationObject + + + + The data + + + + + + Length of the data + + + + + + Test taking a gchar * with a length. + + + + + + a #RegressAnnotationObject + + + + The data + + + + + + Length of the data + + + + + + Test taking a gchar * with a length, overriding the array element +type. + + + + + + a #RegressAnnotationObject + + + + The data + + + + + + Length of the data + + + + + + Test returning a string as an out parameter + + some boolean + + + + + a #RegressAnnotationObject + + + + string return value + + + + + + + + + + + a #GObject + + + + + + + + + This is here just for the sake of being overriden by its +regress_annotation_object_watch_full(). + + + + + + A #RegressAnnotationObject + + + + The callback + + + + The callback data + + + + + + Test overriding via the "Rename To" regress_annotation. + + + + + + A #RegressAnnotationObject + + + + The callback + + + + The callback data + + + + Destroy notification + + + + + + + + + + + + + + Opaque pointer handle + + + + + + + + + This is a property which is a string + + + + This is a property regress_annotation intentionally indented with a mix +of tabs and strings to test the tab handling capabilities of the scanner. + + + + + + + This signal tests a signal with attributes. + + + the return value + + + + + + a value + + + + + another value + + + + + + This signal tests an empty document argument (@arg1) + + + + + + + + + + + This is a signal which takes a list of strings, but it's not +known by GObject as it's only marked as G_TYPE_POINTER + + + + + + a list of strings + + + + + + + + This is a signal which has a broken signal handler, +it says it's pointer but it's actually a string. + + + + + + a string + + + + + + + + + + + + This is a test of an array of object in an field of a struct. + + + + + + @@ -2000,6 +2791,220 @@ the introspection client langage. + + + + + The return value. + + + + + A #RegressAnnotationObject. + + + + + + Some data. + + + + + + Test messing up the heuristic of closure/destroy-notification +detection, and fixing it via regress_annotations. + + + + + + Destroy notification + + + + + + + + + + + + + Source file + + + + + + + + + + The number of args. + + + + The arguments. + + + + + + + + + + + + + some text (e.g. example) or else + + + + + + + + + + + the array + + + + + + + + + The return value + + + + + + + Number of return values + + + + + + + An annotated filename + + + + + + + + + + Source file + + + + + + Explicitly test having a space after the ** here. + + + + + + + + + + + + + + + + + + + + + + The return value + + + + + + + + + + + + + + + + + + + See https://bugzilla.gnome.org/show_bug.cgi?id=630862 + + An object, note the colon:in here + + + + + + A floating object + + + + + + + + diff --git a/tests/scanner/annotation.c b/tests/scanner/annotation.c index d23239d5..1181644a 100644 --- a/tests/scanner/annotation.c +++ b/tests/scanner/annotation.c @@ -3,7 +3,7 @@ char backslash_parsing_tester = '\\'; -G_DEFINE_TYPE (AnnotationObject, annotation_object, G_TYPE_OBJECT); +G_DEFINE_TYPE (RegressAnnotationObject, regress_annotation_object, G_TYPE_OBJECT); enum { PROP_0, @@ -20,13 +20,13 @@ enum { LAST_SIGNAL }; -static guint annotation_object_signals[LAST_SIGNAL] = { 0 }; +static guint regress_annotation_object_signals[LAST_SIGNAL] = { 0 }; static void -annotation_object_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) +regress_annotation_object_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) { switch (prop_id) { @@ -43,10 +43,10 @@ annotation_object_set_property (GObject *object, } static void -annotation_object_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) +regress_annotation_object_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) { switch (prop_id) { @@ -63,18 +63,18 @@ annotation_object_get_property (GObject *object, } static void -annotation_object_class_init (AnnotationObjectClass *klass) +regress_annotation_object_class_init (RegressAnnotationObjectClass *klass) { GObjectClass *gobject_class; gobject_class = G_OBJECT_CLASS (klass); - gobject_class->set_property = annotation_object_set_property; - gobject_class->get_property = annotation_object_get_property; + gobject_class->set_property = regress_annotation_object_set_property; + gobject_class->get_property = regress_annotation_object_get_property; /** - * AnnotationObject::string-signal: - * @annotation: the annotation object + * RegressAnnotationObject::string-signal: + * @regress_annotation: the regress_annotation object * @string: (type utf8): a string * * This is a signal which has a broken signal handler, @@ -83,7 +83,7 @@ annotation_object_class_init (AnnotationObjectClass *klass) * Since: 1.0 * Deprecated: 1.2: Use other-signal instead */ - annotation_object_signals[STRING_SIGNAL] = + regress_annotation_object_signals[STRING_SIGNAL] = g_signal_new ("string-signal", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, @@ -93,14 +93,14 @@ annotation_object_class_init (AnnotationObjectClass *klass) G_TYPE_NONE, 1, G_TYPE_POINTER); /** - * AnnotationObject::list-signal: - * @annotation: the annotation object + * RegressAnnotationObject::list-signal: + * @regress_annotation: the regress_annotation object * @list: (type GLib.List) (element-type utf8) (transfer container): a list of strings * * This is a signal which takes a list of strings, but it's not * known by GObject as it's only marked as G_TYPE_POINTER */ - annotation_object_signals[LIST_SIGNAL] = + regress_annotation_object_signals[LIST_SIGNAL] = g_signal_new ("list-signal", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, @@ -110,13 +110,13 @@ annotation_object_class_init (AnnotationObjectClass *klass) G_TYPE_NONE, 1, G_TYPE_POINTER); /** - * AnnotationObject::doc-empty-arg-parsing: - * @annotation: the annotation object + * RegressAnnotationObject::doc-empty-arg-parsing: + * @regress_annotation: the regress_annotation object * @arg1: * * This signal tests an empty document argument (@arg1) */ - annotation_object_signals[DOC_EMPTY_ARG_PARSING] = + regress_annotation_object_signals[DOC_EMPTY_ARG_PARSING] = g_signal_new ("doc-empty-arg-parsing", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, @@ -126,16 +126,16 @@ annotation_object_class_init (AnnotationObjectClass *klass) G_TYPE_NONE, 1, G_TYPE_POINTER); /** - * AnnotationObject::attribute-signal: - * @annotation: the annotation object - * @arg1: (attribute some.annotation.foo1 val1): a value - * @arg2: (attribute some.annotation.foo2 val2): another value + * RegressAnnotationObject::attribute-signal: + * @regress_annotation: the regress_annotation object + * @arg1: (attribute some.regress_annotation.foo1 val1): a value + * @arg2: (attribute some.regress_annotation.foo2 val2): another value * * This signal tests a signal with attributes. * - * Returns: (attribute some.annotation.foo3 val3): the return value + * Returns: (attribute some.regress_annotation.foo3 val3): the return value */ - annotation_object_signals[ATTRIBUTE_SIGNAL] = + regress_annotation_object_signals[ATTRIBUTE_SIGNAL] = g_signal_new ("attribute-signal", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, @@ -148,7 +148,7 @@ annotation_object_class_init (AnnotationObjectClass *klass) G_TYPE_STRING); /** - * AnnotationObject:string-property: + * RegressAnnotationObject:string-property: * * This is a property which is a string * @@ -163,9 +163,9 @@ annotation_object_class_init (AnnotationObjectClass *klass) NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); /** - * AnnotationObject:function-property: + * RegressAnnotationObject:function-property: * - * Type: AnnotationCallback + * Type: RegressAnnotationCallback */ g_object_class_install_property (gobject_class, PROP_FUNCTION_PROPERTY, @@ -174,14 +174,14 @@ annotation_object_class_init (AnnotationObjectClass *klass) "This property is a function pointer", G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - /** - * AnnotationObject:tab-property: - * - * This is a property annotation intentionally indented with a mix - * of tabs and strings to test the tab handling capabilities of the scanner. - * - * Since: 1.2 - */ + /** + * RegressAnnotationObject:tab-property: + * + * This is a property regress_annotation intentionally indented with a mix + * of tabs and strings to test the tab handling capabilities of the scanner. + * + * Since: 1.2 + */ g_object_class_install_property (gobject_class, PROP_TAB_PROPERTY, g_param_spec_string ("tab-property", @@ -192,25 +192,25 @@ annotation_object_class_init (AnnotationObjectClass *klass) } static void -annotation_object_init (AnnotationObject *object) +regress_annotation_object_init (RegressAnnotationObject *object) { } /** - * annotation_object_method: + * regress_annotation_object_method: * @object: a #GObject * * Return value: an int **/ gint -annotation_object_method (AnnotationObject *object) +regress_annotation_object_method (RegressAnnotationObject *object) { return 1; } /** - * annotation_object_out: + * regress_annotation_object_out: * @object: a #GObject * @outarg: (out): This is an argument test * @@ -219,14 +219,14 @@ annotation_object_method (AnnotationObject *object) * Return value: an int */ gint -annotation_object_out (AnnotationObject *object, int *outarg) +regress_annotation_object_out (RegressAnnotationObject *object, int *outarg) { *outarg = 2; return 1; } /** - * annotation_object_in: + * regress_annotation_object_in: * @object: a #GObject * @inarg: (in) (transfer none): This is an argument test * @@ -235,14 +235,14 @@ annotation_object_out (AnnotationObject *object, int *outarg) * Return value: an int */ gint -annotation_object_in (AnnotationObject *object, int *inarg) +regress_annotation_object_in (RegressAnnotationObject *object, int *inarg) { return *inarg; } /** - * annotation_object_inout: + * regress_annotation_object_inout: * @object: a #GObject * @inoutarg: (inout): This is an argument test * @@ -251,13 +251,13 @@ annotation_object_in (AnnotationObject *object, int *inarg) * Return value: an int */ gint -annotation_object_inout (AnnotationObject *object, int *inoutarg) +regress_annotation_object_inout (RegressAnnotationObject *object, int *inoutarg) { return *inoutarg += 1; } /** - * annotation_object_inout2: + * regress_annotation_object_inout2: * @object: a #GObject * @inoutarg: (inout): This is an argument test * @@ -266,14 +266,14 @@ annotation_object_inout (AnnotationObject *object, int *inoutarg) * Return value: an int */ gint -annotation_object_inout2 (AnnotationObject *object, int *inoutarg) +regress_annotation_object_inout2 (RegressAnnotationObject *object, int *inoutarg) { return *inoutarg += 1; } /** - * annotation_object_inout3: + * regress_annotation_object_inout3: * @object: a #GObject * @inoutarg: (inout) (allow-none): This is an argument test * @@ -282,7 +282,7 @@ annotation_object_inout2 (AnnotationObject *object, int *inoutarg) * Return value: an int */ gint -annotation_object_inout3 (AnnotationObject *object, int *inoutarg) +regress_annotation_object_inout3 (RegressAnnotationObject *object, int *inoutarg) { if (inoutarg) return *inoutarg + 1; @@ -290,7 +290,7 @@ annotation_object_inout3 (AnnotationObject *object, int *inoutarg) } /** - * annotation_object_calleeowns: + * regress_annotation_object_calleeowns: * @object: a #GObject * @toown: (out): a #GObject * @@ -299,14 +299,14 @@ annotation_object_inout3 (AnnotationObject *object, int *inoutarg) * Return value: an int */ gint -annotation_object_calleeowns (AnnotationObject *object, GObject **toown) +regress_annotation_object_calleeowns (RegressAnnotationObject *object, GObject **toown) { return 1; } /** - * annotation_object_calleesowns: + * regress_annotation_object_calleesowns: * @object: a #GObject * @toown1: (out) (transfer full): a #GObject * @toown2: (out) (transfer none): a #GObject @@ -316,16 +316,16 @@ annotation_object_calleeowns (AnnotationObject *object, GObject **toown) * Return value: an int */ gint -annotation_object_calleesowns (AnnotationObject *object, - GObject **toown1, - GObject **toown2) +regress_annotation_object_calleesowns (RegressAnnotationObject *object, + GObject **toown1, + GObject **toown2) { return 1; } /** - * annotation_object_get_strings: + * regress_annotation_object_get_strings: * @object: a #GObject * * This is a test for returning a list of strings, where @@ -334,16 +334,16 @@ annotation_object_calleesowns (AnnotationObject *object, * Return value: (element-type utf8) (transfer full): list of strings */ GList* -annotation_object_get_strings (AnnotationObject *object) +regress_annotation_object_get_strings (RegressAnnotationObject *object) { GList *list = NULL; - list = g_list_prepend (list, g_strdup ("annotation")); + list = g_list_prepend (list, g_strdup ("regress_annotation")); list = g_list_prepend (list, g_strdup ("bar")); return list; } /** - * annotation_object_get_hash: + * regress_annotation_object_get_hash: * @object: a #GObject * * This is a test for returning a hash table mapping strings to @@ -352,7 +352,7 @@ annotation_object_get_strings (AnnotationObject *object) * Return value: (element-type utf8 GObject) (transfer full): hash table */ GHashTable* -annotation_object_get_hash (AnnotationObject *object) +regress_annotation_object_get_hash (RegressAnnotationObject *object) { GHashTable *hash = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref); @@ -362,27 +362,27 @@ annotation_object_get_hash (AnnotationObject *object) } /** - * annotation_object_with_voidp: + * regress_annotation_object_with_voidp: * @data: Opaque pointer handle */ void -annotation_object_with_voidp (AnnotationObject *object, void *data) +regress_annotation_object_with_voidp (RegressAnnotationObject *object, void *data) { } /** - * annotation_object_get_objects: + * regress_annotation_object_get_objects: * @object: a #GObject * * This is a test for returning a list of objects. * The list itself should be freed, but not the internal objects, * intentionally similar example to gtk_container_get_children * - * Return value: (element-type AnnotationObject) (transfer container): list of objects + * Return value: (element-type RegressAnnotationObject) (transfer container): list of objects */ GSList* -annotation_object_get_objects (AnnotationObject *object) +regress_annotation_object_get_objects (RegressAnnotationObject *object) { GSList *list = NULL; list = g_slist_prepend (list, object); @@ -390,7 +390,7 @@ annotation_object_get_objects (AnnotationObject *object) } /** - * annotation_object_create_object: + * regress_annotation_object_create_object: * @object: a #GObject * * Test returning a caller-owned object @@ -398,39 +398,39 @@ annotation_object_get_objects (AnnotationObject *object) * Return value: (transfer full): The object **/ GObject* -annotation_object_create_object (AnnotationObject *object) +regress_annotation_object_create_object (RegressAnnotationObject *object) { - return g_object_ref (object); + return g_object_ref (object); } /** - * annotation_object_use_buffer: + * regress_annotation_object_use_buffer: * @object: a #GObject * **/ void -annotation_object_use_buffer (AnnotationObject *object, - guchar *bytes) +regress_annotation_object_use_buffer (RegressAnnotationObject *object, + guchar *bytes) { } /** - * annotation_object_compute_sum: + * regress_annotation_object_compute_sum: * @object: a #GObject * @nums: (array): Sequence of numbers * * Test taking a zero-terminated array **/ void -annotation_object_compute_sum (AnnotationObject *object, - int *nums) +regress_annotation_object_compute_sum (RegressAnnotationObject *object, + int *nums) { } /** - * annotation_object_compute_sum_n: + * regress_annotation_object_compute_sum_n: * @object: a #GObject * @nums: (array length=n_nums zero-terminated=0): Sequence of * numbers that are zero-terminated @@ -439,16 +439,16 @@ annotation_object_compute_sum (AnnotationObject *object, * Test taking an array with length parameter **/ void -annotation_object_compute_sum_n(AnnotationObject *object, - int *nums, - int n_nums) +regress_annotation_object_compute_sum_n(RegressAnnotationObject *object, + int *nums, + int n_nums) { } /** - * annotation_object_compute_sum_nz: - * @object: a #AnnotationObject + * regress_annotation_object_compute_sum_nz: + * @object: a #RegressAnnotationObject * @nums: (array length=n_nums zero-terminated=1): Sequence of numbers that * are zero-terminated * @n_nums: Length of number array @@ -456,32 +456,32 @@ annotation_object_compute_sum_n(AnnotationObject *object, * Test taking a zero-terminated array with length parameter **/ void -annotation_object_compute_sum_nz(AnnotationObject *object, - int *nums, - int n_nums) +regress_annotation_object_compute_sum_nz(RegressAnnotationObject *object, + int *nums, + int n_nums) { } /** - * annotation_object_parse_args: - * @object: a #AnnotationObject + * regress_annotation_object_parse_args: + * @object: a #RegressAnnotationObject * @argc: (inout): Length of the argument vector * @argv: (inout) (array length=argc zero-terminated=1): Argument vector * * Test taking a zero-terminated array with length parameter **/ void -annotation_object_parse_args(AnnotationObject *object, - int *argc, - char ***argv) +regress_annotation_object_parse_args(RegressAnnotationObject *object, + int *argc, + char ***argv) { } /** - * annotation_object_string_out: - * @object: a #AnnotationObject + * regress_annotation_object_string_out: + * @object: a #RegressAnnotationObject * @str_out: (out) (transfer full): string return value * * Test returning a string as an out parameter @@ -489,63 +489,63 @@ annotation_object_parse_args(AnnotationObject *object, * Returns: some boolean **/ gboolean -annotation_object_string_out(AnnotationObject *object, - char **str_out) +regress_annotation_object_string_out(RegressAnnotationObject *object, + char **str_out) { return FALSE; } /** - * annotation_object_foreach: - * @object: a #AnnotationObject + * regress_annotation_object_foreach: + * @object: a #RegressAnnotationObject * @func: (scope call): Callback to invoke * @user_data: Callback user data * * Test taking a call-scoped callback **/ void -annotation_object_foreach (AnnotationObject *object, - AnnotationForeachFunc func, - gpointer user_data) +regress_annotation_object_foreach (RegressAnnotationObject *object, + RegressAnnotationForeachFunc func, + gpointer user_data) { - + } /** - * annotation_object_set_data: - * @object: a #AnnotationObject + * regress_annotation_object_set_data: + * @object: a #RegressAnnotationObject * @data: (array length=length): The data * @length: Length of the data * * Test taking a guchar * with a length. **/ void -annotation_object_set_data (AnnotationObject *object, - const guchar *data, - gsize length) +regress_annotation_object_set_data (RegressAnnotationObject *object, + const guchar *data, + gsize length) { - + } /** - * annotation_object_set_data2: - * @object: a #AnnotationObject + * regress_annotation_object_set_data2: + * @object: a #RegressAnnotationObject * @data: (array length=length) (element-type gint8): The data * @length: Length of the data * * Test taking a gchar * with a length. **/ void -annotation_object_set_data2 (AnnotationObject *object, - const gchar *data, - gsize length) +regress_annotation_object_set_data2 (RegressAnnotationObject *object, + const gchar *data, + gsize length) { - + } /** - * annotation_object_set_data3: - * @object: a #AnnotationObject + * regress_annotation_object_set_data3: + * @object: a #RegressAnnotationObject * @data: (array length=length) (element-type guint8): The data * @length: Length of the data * @@ -553,233 +553,233 @@ annotation_object_set_data2 (AnnotationObject *object, * type. **/ void -annotation_object_set_data3 (AnnotationObject *object, - gpointer data, - gsize length) +regress_annotation_object_set_data3 (RegressAnnotationObject *object, + gpointer data, + gsize length) { - + } /** - * annotation_object_allow_none: + * regress_annotation_object_allow_none: * @object: a #GObject * @somearg: (allow-none): * * Returns: (transfer none): %NULL always **/ GObject* -annotation_object_allow_none (AnnotationObject *object, const gchar *somearg) +regress_annotation_object_allow_none (RegressAnnotationObject *object, const gchar *somearg) { return NULL; } /** - * annotation_object_notrans: + * regress_annotation_object_notrans: * @object: a #GObject * * Returns: (transfer none): An object, not referenced **/ GObject* -annotation_object_notrans (AnnotationObject *object) +regress_annotation_object_notrans (RegressAnnotationObject *object) { return NULL; } /** - * annotation_object_do_not_use: + * regress_annotation_object_do_not_use: * @object: a #GObject * * Returns: (transfer none): %NULL always - * Deprecated: 0.12: Use annotation_object_create_object() instead. + * Deprecated: 0.12: Use regress_annotation_object_create_object() instead. **/ GObject* -annotation_object_do_not_use (AnnotationObject *object) +regress_annotation_object_do_not_use (RegressAnnotationObject *object) { return NULL; } /** - * annotation_object_watch: (skip) - * @object: A #AnnotationObject + * regress_annotation_object_watch: (skip) + * @object: A #RegressAnnotationObject * @func: The callback * @user_data: The callback data * * This is here just for the sake of being overriden by its - * annotation_object_watch_full(). + * regress_annotation_object_watch_full(). */ void -annotation_object_watch (AnnotationObject *object, - AnnotationForeachFunc func, - gpointer user_data) +regress_annotation_object_watch (RegressAnnotationObject *object, + RegressAnnotationForeachFunc func, + gpointer user_data) { } /** - * annotation_object_watch_full: - * @object: A #AnnotationObject + * regress_annotation_object_watch_full: + * @object: A #RegressAnnotationObject * @func: The callback * @user_data: The callback data * @destroy: Destroy notification * - * Test overriding via the "Rename To" annotation. + * Test overriding via the "Rename To" regress_annotation. * - * Rename to: annotation_object_watch + * Rename to: regress_annotation_object_watch */ void -annotation_object_watch_full (AnnotationObject *object, - AnnotationForeachFunc func, - gpointer user_data, - GDestroyNotify destroy) +regress_annotation_object_watch_full (RegressAnnotationObject *object, + RegressAnnotationForeachFunc func, + gpointer user_data, + GDestroyNotify destroy) { } /** - * annotation_object_hidden_self: - * @object: (type AnnotationObject): A #AnnotationObject + * regress_annotation_object_hidden_self: + * @object: (type RegressAnnotationObject): A #RegressAnnotationObject **/ void -annotation_object_hidden_self (gpointer object) +regress_annotation_object_hidden_self (gpointer object) { } /** - * annotation_init: - * @argc: (inout): The number of args. + * regress_annotation_init: + * @argc: (inout): The number of args. * @argv: (inout) (array length=argc): The arguments. **/ void -annotation_init (int *argc, char ***argv) +regress_annotation_init (int *argc, char ***argv) { } /** - * annotation_return_array: + * regress_annotation_return_array: * @length: (out): Number of return values * * Return value: (transfer full) (array length=length): The return value **/ char ** -annotation_return_array (int *length) +regress_annotation_return_array (int *length) { return NULL; } /** - * annotation_string_zero_terminated: + * regress_annotation_string_zero_terminated: * * Return value: (transfer full) (array zero-terminated=1): The return value **/ char ** -annotation_string_zero_terminated (void) +regress_annotation_string_zero_terminated (void) { return NULL; } /** - * annotation_string_zero_terminated_out: + * regress_annotation_string_zero_terminated_out: * @out: (array zero-terminated=1) (inout): **/ void -annotation_string_zero_terminated_out (char ***out) +regress_annotation_string_zero_terminated_out (char ***out) { } /** - * annotation_versioned: + * regress_annotation_versioned: * * Since: 0.6 **/ void -annotation_versioned (void) +regress_annotation_versioned (void) { } /** - * annotation_string_array_length: + * regress_annotation_string_array_length: * @n_properties: * @properties: (array length=n_properties) (element-type utf8): */ void -annotation_string_array_length (guint n_properties, const gchar * const properties[]) +regress_annotation_string_array_length (guint n_properties, const gchar * const properties[]) { } /** - * annotation_object_extra_annos: + * regress_annotation_object_extra_annos: * * Attributes: (org.foobar testvalue) */ void -annotation_object_extra_annos (AnnotationObject *object) +regress_annotation_object_extra_annos (RegressAnnotationObject *object) { } /** - * annotation_custom_destroy: + * regress_annotation_custom_destroy: * @callback: (destroy destroy) (closure data): Destroy notification * * Test messing up the heuristic of closure/destroy-notification - * detection, and fixing it via annotations. + * detection, and fixing it via regress_annotations. */ void -annotation_custom_destroy (AnnotationCallback callback, - AnnotationNotifyFunc destroy, - gpointer data) +regress_annotation_custom_destroy (RegressAnnotationCallback callback, + RegressAnnotationNotifyFunc destroy, + gpointer data) { } /** - * annotation_get_source_file: + * regress_annotation_get_source_file: * * Return value: (type filename) (transfer full): Source file */ char * -annotation_get_source_file (void) +regress_annotation_get_source_file (void) { return NULL; } /** - * annotation_set_source_file: + * regress_annotation_set_source_file: * @fname: (type filename): Source file * */ void -annotation_set_source_file (const char *fname) +regress_annotation_set_source_file (const char *fname) { } /** - * annotation_ptr_array: + * regress_annotation_ptr_array: * @array: (element-type GLib.Value): the array */ void -annotation_ptr_array (GPtrArray *array) +regress_annotation_ptr_array (GPtrArray *array) { } /** - * annotation_attribute_func: - * @object: A #AnnotationObject. - * @data: (attribute some.annotation value) (attribute another.annotation blahvalue): Some data. + * regress_annotation_attribute_func: + * @object: A #RegressAnnotationObject. + * @data: (attribute some.regress_annotation value) (attribute another.regress_annotation blahvalue): Some data. * - * Returns: (attribute some.other.annotation value2) (attribute yet.another.annotation another_value): The return value. + * Returns: (attribute some.other.regress_annotation value2) (attribute yet.another.regress_annotation another_value): The return value. */ gint -annotation_attribute_func (AnnotationObject *object, - const gchar *data) +regress_annotation_attribute_func (RegressAnnotationObject *object, + const gchar *data) { return 42; } /** - * annotation_invalid_annotation: + * regress_annotation_invalid_regress_annotation: * @foo: some text (e.g. example) or else */ void -annotation_invalid_annotation (int foo) +regress_annotation_invalid_regress_annotation (int foo) { } @@ -789,47 +789,47 @@ char backslash_parsing_tester_2 = '\\'; /** - * annotation_test_parsing_bug630862: + * regress_annotation_test_parsing_bug630862: * * See https://bugzilla.gnome.org/show_bug.cgi?id=630862 * * Returns: (transfer none): An object, note the colon:in here */ GObject * -annotation_test_parsing_bug630862 (void) +regress_annotation_test_parsing_bug630862 (void) { return NULL; } -/** - * annotation_space_after_comment_bug631690: +/** + * regress_annotation_space_after_comment_bug631690: * * Explicitly test having a space after the ** here. */ void -annotation_space_after_comment_bug631690 (void) +regress_annotation_space_after_comment_bug631690 (void) { } /** - * annotation_return_filename: + * regress_annotation_return_filename: * * Returns: (type filename): An annotated filename */ gchar* -annotation_return_filename (void) +regress_annotation_return_filename (void) { return "a utf-8 filename"; } /** - * annotation_transfer_floating: + * regress_annotation_transfer_floating: * * Returns: (transfer floating): A floating object */ GObject * -annotation_transfer_floating(void) +regress_annotation_transfer_floating(void) { return NULL; } diff --git a/tests/scanner/annotation.h b/tests/scanner/annotation.h index 09d4f4f2..154b0d88 100644 --- a/tests/scanner/annotation.h +++ b/tests/scanner/annotation.h @@ -1,5 +1,5 @@ -#ifndef __ANNOTATION_OBJECT_H__ -#define __ANNOTATION_OBJECT_H__ +#ifndef __REGRESS_ANNOTATION_OBJECT_H__ +#define __REGRESS_ANNOTATION_OBJECT_H__ #include @@ -7,175 +7,175 @@ typedef enum /*< flags,prefix=ANN >*/ { ANN_FLAG_FOO = 1, ANN_FLAG_BAR = 2 -} AnnotationBitfield; +} RegressAnnotationBitfield; /** - * AnnotationCallback: + * RegressAnnotationCallback: * @in: (in) (transfer none): array of ints * * This is a callback. * Return value: (transfer none): array of ints */ -typedef const gint* (*AnnotationCallback) (const gint *in); +typedef const gint* (*RegressAnnotationCallback) (const gint *in); /** - * AnnotationListCallback: + * RegressAnnotationListCallback: * @in: (in) (transfer none) (element-type utf8): list of strings * * This is a callback taking a list. * Return value: (transfer container) (element-type utf8): list of strings */ -typedef GList* (*AnnotationListCallback) (GList *in); +typedef GList* (*RegressAnnotationListCallback) (GList *in); /** - * AnnotationNotifyFunc: + * RegressAnnotationNotifyFunc: * @data: (closure): The user data * * This is a callback with a 'closure' argument that is not named * 'user_data' and hence has to be annotated. */ -typedef void (*AnnotationNotifyFunc) (gpointer data); +typedef void (*RegressAnnotationNotifyFunc) (gpointer data); /** - * AnnotationObject: + * RegressAnnotationObject: * - * This is an object used to test annotations. + * This is an object used to test regress_annotations. * * Attributes: (org.example.Test cows) */ -typedef struct _AnnotationObject AnnotationObject; -typedef struct _AnnotationObjectClass AnnotationObjectClass; +typedef struct _RegressAnnotationObject RegressAnnotationObject; +typedef struct _RegressAnnotationObjectClass RegressAnnotationObjectClass; -typedef void (*AnnotationForeachFunc) (AnnotationObject *object, +typedef void (*RegressAnnotationForeachFunc) (RegressAnnotationObject *object, const char *item, gpointer user_data); -struct _AnnotationObject +struct _RegressAnnotationObject { GObject parent_instance; }; -struct _AnnotationObjectClass +struct _RegressAnnotationObjectClass { GObjectClass parent_class; }; -GType annotation_object_get_type (void); +GType regress_annotation_object_get_type (void); -gint annotation_object_method (AnnotationObject *object); -gint annotation_object_out (AnnotationObject *object, +gint regress_annotation_object_method (RegressAnnotationObject *object); +gint regress_annotation_object_out (RegressAnnotationObject *object, int *outarg); -GObject* annotation_object_create_object(AnnotationObject *object); -GObject* annotation_object_allow_none (AnnotationObject *object, +GObject* regress_annotation_object_create_object(RegressAnnotationObject *object); +GObject* regress_annotation_object_allow_none (RegressAnnotationObject *object, const gchar *somearg); -GObject* annotation_object_notrans (AnnotationObject *object); -gint annotation_object_inout (AnnotationObject *object, +GObject* regress_annotation_object_notrans (RegressAnnotationObject *object); +gint regress_annotation_object_inout (RegressAnnotationObject *object, int *inoutarg); -gint annotation_object_inout2 (AnnotationObject *object, +gint regress_annotation_object_inout2 (RegressAnnotationObject *object, int *inoutarg); -gint annotation_object_inout3 (AnnotationObject *object, +gint regress_annotation_object_inout3 (RegressAnnotationObject *object, int *inoutarg); -gint annotation_object_in (AnnotationObject *object, +gint regress_annotation_object_in (RegressAnnotationObject *object, int *inarg); -gint annotation_object_calleeowns (AnnotationObject *object, +gint regress_annotation_object_calleeowns (RegressAnnotationObject *object, GObject **toown); -gint annotation_object_calleesowns (AnnotationObject *object, +gint regress_annotation_object_calleesowns (RegressAnnotationObject *object, GObject **toown1, GObject **toown2); -GList* annotation_object_get_strings (AnnotationObject *object); -GHashTable*annotation_object_get_hash (AnnotationObject *object); -void annotation_object_with_voidp (AnnotationObject *object, +GList* regress_annotation_object_get_strings (RegressAnnotationObject *object); +GHashTable*regress_annotation_object_get_hash (RegressAnnotationObject *object); +void regress_annotation_object_with_voidp (RegressAnnotationObject *object, void *data); -GSList* annotation_object_get_objects (AnnotationObject *object); +GSList* regress_annotation_object_get_objects (RegressAnnotationObject *object); -void annotation_object_use_buffer (AnnotationObject *object, +void regress_annotation_object_use_buffer (RegressAnnotationObject *object, guchar *bytes); -void annotation_object_compute_sum (AnnotationObject *object, +void regress_annotation_object_compute_sum (RegressAnnotationObject *object, int *nums); -void annotation_object_compute_sum_n(AnnotationObject *object, +void regress_annotation_object_compute_sum_n(RegressAnnotationObject *object, int *nums, int n_nums); -void annotation_object_compute_sum_nz(AnnotationObject *object, +void regress_annotation_object_compute_sum_nz(RegressAnnotationObject *object, int *nums, int n_nums); -void annotation_object_parse_args (AnnotationObject *object, +void regress_annotation_object_parse_args (RegressAnnotationObject *object, int *argc, char ***argv); -gboolean annotation_object_string_out (AnnotationObject *object, +gboolean regress_annotation_object_string_out (RegressAnnotationObject *object, char **str_out); -void annotation_object_foreach (AnnotationObject *object, - AnnotationForeachFunc func, +void regress_annotation_object_foreach (RegressAnnotationObject *object, + RegressAnnotationForeachFunc func, gpointer user_data); -void annotation_object_set_data (AnnotationObject *object, +void regress_annotation_object_set_data (RegressAnnotationObject *object, const guchar *data, gsize length); -void annotation_object_set_data2 (AnnotationObject *object, +void regress_annotation_object_set_data2 (RegressAnnotationObject *object, const gchar *data, gsize length); -void annotation_object_set_data3 (AnnotationObject *object, +void regress_annotation_object_set_data3 (RegressAnnotationObject *object, gpointer data, gsize length); -GObject* annotation_object_do_not_use (AnnotationObject *object); -void annotation_object_watch (AnnotationObject *object, - AnnotationForeachFunc func, +GObject* regress_annotation_object_do_not_use (RegressAnnotationObject *object); +void regress_annotation_object_watch (RegressAnnotationObject *object, + RegressAnnotationForeachFunc func, gpointer user_data); -void annotation_object_watch_full (AnnotationObject *object, - AnnotationForeachFunc func, +void regress_annotation_object_watch_full (RegressAnnotationObject *object, + RegressAnnotationForeachFunc func, gpointer user_data, GDestroyNotify destroy); -void annotation_object_hidden_self (gpointer object); +void regress_annotation_object_hidden_self (gpointer object); -void annotation_init (int *argc, +void regress_annotation_init (int *argc, char ***argv); -char ** annotation_return_array (int *length); -void annotation_versioned (void); -char ** annotation_string_zero_terminated (void); -void annotation_string_zero_terminated_out (char ***out); +char ** regress_annotation_return_array (int *length); +void regress_annotation_versioned (void); +char ** regress_annotation_string_zero_terminated (void); +void regress_annotation_string_zero_terminated_out (char ***out); -void annotation_string_array_length (guint n_properties, const gchar * const properties[]); +void regress_annotation_string_array_length (guint n_properties, const gchar * const properties[]); -void annotation_object_extra_annos (AnnotationObject *object); +void regress_annotation_object_extra_annos (RegressAnnotationObject *object); -void annotation_custom_destroy (AnnotationCallback callback, - AnnotationNotifyFunc destroy, +void regress_annotation_custom_destroy (RegressAnnotationCallback callback, + RegressAnnotationNotifyFunc destroy, gpointer data); -char * annotation_get_source_file (void); -void annotation_set_source_file (const char *fname); +char * regress_annotation_get_source_file (void); +void regress_annotation_set_source_file (const char *fname); -gint annotation_attribute_func (AnnotationObject *object, +gint regress_annotation_attribute_func (RegressAnnotationObject *object, const gchar *data); -void annotation_invalid_annotation (int foo); +void regress_annotation_invalid_regress_annotation (int foo); /** - * AnnotationStruct: + * RegressAnnotationStruct: * * This is a test of an array of object in an field of a struct. */ -struct AnnotationStruct +struct RegressAnnotationStruct { - AnnotationObject *objects[10]; + RegressAnnotationObject *objects[10]; }; -void annotation_ptr_array (GPtrArray *array); +void regress_annotation_ptr_array (GPtrArray *array); -GObject * annotation_test_parsing_bug630862 (void); +GObject * regress_annotation_test_parsing_bug630862 (void); -void annotation_space_after_comment_bug631690 (void); +void regress_annotation_space_after_comment_bug631690 (void); -gchar* annotation_return_filename (void); +gchar* regress_annotation_return_filename (void); -GObject * annotation_transfer_floating(void); +GObject * regress_annotation_transfer_floating(void); /* This one we can handle properly */ -#define ANNOTATION_CALCULATED_DEFINE (10 * 10) +#define REGRESS_ANNOTATION_CALCULATED_DEFINE (10 * 10) /** - * ANNOTATION_CALCULATED_LARGE: + * REGRESS_ANNOTATION_CALCULATED_LARGE: * * Constant to define a calculated large value * @@ -183,16 +183,16 @@ GObject * annotation_transfer_floating(void); * * Since: 1.4 */ -#define ANNOTATION_CALCULATED_LARGE (1000 * G_GINT64_CONSTANT (10000000)) +#define REGRESS_ANNOTATION_CALCULATED_LARGE (1000 * G_GINT64_CONSTANT (10000000)) /** - * ANNOTATION_CALCULATED_LARGE_DIV: + * REGRESS_ANNOTATION_CALCULATED_LARGE_DIV: * * Constant to define a calculated large value * * Value: 1000000UL */ -#define ANNOTATION_CALCULATED_LARGE_DIV (1000 / G_GINT64_CONSTANT (10000000)) +#define REGRESS_ANNOTATION_CALCULATED_LARGE_DIV (1000 / G_GINT64_CONSTANT (10000000)) -#endif /* __ANNOTATION_OBJECT_H__ */ +#endif /* __REGRESS_ANNOTATION_OBJECT_H__ */ -- cgit v1.2.1 From 9fc6eb16e954559d97cdd9a03437c8b1877c2a1d Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sat, 2 Feb 2013 11:53:53 -0500 Subject: tests: Move Foo into Regress https://bugzilla.gnome.org/show_bug.cgi?id=693097 --- .gitignore | 1 - tests/scanner/Makefile.am | 21 +- tests/scanner/Regress-1.0-expected.gir | 1467 +++++++++++++++++++++++++++++++- tests/scanner/foo.c | 498 ++++++----- tests/scanner/foo.h | 438 +++++----- 5 files changed, 1925 insertions(+), 500 deletions(-) diff --git a/.gitignore b/.gitignore index 7051e4f4..fd079f0b 100644 --- a/.gitignore +++ b/.gitignore @@ -70,7 +70,6 @@ tests/repository/gitestrepo tests/repository/gitestthrows tests/repository/gitypelibtest tests/scanner/Bar-1.0.gir -tests/scanner/Foo-1.0.gir tests/scanner/GetType-1.0.gir tests/scanner/GtkFrob-1.0.gir tests/scanner/Headeronly-1.0.gir diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index 91ab9a8f..52009594 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -8,7 +8,6 @@ INTROSPECTION_SCANNER_ARGS += --warn-all check_LTLIBRARIES = \ libsletter.la \ libtestinherit.la \ - libfoo.la \ libutility.la \ libgtkfrob.la \ libgettype.la \ @@ -29,11 +28,13 @@ libsletter_la_CFLAGS = $(AM_CFLAGS) libsletter_la_LDFLAGS = $(AM_LDFLAGS) libtestinherit_la_SOURCES = $(srcdir)/drawable.c $(srcdir)/drawable.h -libfoo_la_SOURCES = $(srcdir)/foo.c $(srcdir)/foo.h -libfoo_la_LIBADD = $(top_builddir)/libgirepository-1.0.la libutility_la_SOURCES = $(srcdir)/utility.c $(srcdir)/utility.h libgtkfrob_la_SOURCES = $(srcdir)/gtkfrob.c $(srcdir)/gtkfrob.h -libregress_la_SOURCES = $(srcdir)/regress.c $(srcdir)/regress.h $(srcdir)/annotation.c $(srcdir)/annotation.h +libregress_la_SOURCES = \ + $(srcdir)/regress.c $(srcdir)/regress.h \ + $(srcdir)/annotation.c $(srcdir)/annotation.h \ + $(srcdir)/foo.c $(srcdir)/foo.h \ + $(NULL) libregress_la_LIBADD = $(GIO_LIBS) if HAVE_CAIRO libregress_la_LIBADD += $(CAIRO_LIBS) @@ -78,9 +79,9 @@ SLetter_1_0_gir_FILES = $(libsletter_la_SOURCES) SLetter_1_0_gir_SCANNERFLAGS = --identifier-prefix=S --c-include="sletter.h" --warn-error GIRS += SLetter-1.0.gir -Regress-1.0.gir: $(top_builddir)/Gio-2.0.gir libregress.la +Regress-1.0.gir: $(top_builddir)/Gio-2.0.gir Utility-1.0.gir libregress.la Regress_1_0_gir_LIBS = libregress.la -Regress_1_0_gir_INCLUDES = Gio-2.0 +Regress_1_0_gir_INCLUDES = Gio-2.0 Utility-1.0 if HAVE_CAIRO Regress_1_0_gir_INCLUDES += cairo-1.0 endif @@ -103,14 +104,6 @@ TestInherit_1_0_gir_FILES = $(libtestinherit_la_SOURCES) TestInherit_1_0_gir_SCANNERFLAGS = --c-include="drawable.h" --warn-error GIRS += TestInherit-1.0.gir -Foo-1.0.gir: Utility-1.0.gir libfoo.la -Foo_1_0_gir_PACKAGES = gobject-2.0 -Foo_1_0_gir_LIBS = libfoo.la -Foo_1_0_gir_INCLUDES = GObject-2.0 Gio-2.0 Utility-1.0 -Foo_1_0_gir_FILES = $(srcdir)/foo.h $(srcdir)/foo.c -Foo_1_0_gir_SCANNERFLAGS = --c-include="foo.h" --warn-error -GIRS += Foo-1.0.gir - Utility-1.0.gir: libutility.la Utility_1_0_gir_PACKAGES = gobject-2.0 Utility_1_0_gir_LIBS = libutility.la diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 61fb07ab..3cb0382e 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -9,6 +9,7 @@ and/or use gtk-doc annotations. --> + Typedef TestBoxed to test caller-allocates correctness + + + + + + Compatibility typedef, like telepathy-glib's TpIntSet @@ -819,28 +826,1138 @@ it says it's pointer but it's actually a string. - + + + + + + + This is a test of an array of object in an field of a struct. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + This function is intended to match clutter_stage_get_default which +uses a C sugar return type. + + The global #RegressFooSubobject + + + + + + + + + + Read some stuff. + + + + + + + + + offset + + + + length + + + + + + + + + + + + + + + + + + + This shouldn't be scanned as a constructor. + + + + + + + + + + + + + + + + + + + + + + + + + %NULL always + + + + + a #RegressFooObject + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Not sure why this test is here... + + + + + + + + + + + + + + Read some stuff. + + + + + + obj + + + + offset + + + + length + + + + + + This is only useful from C. + + + + + + obj + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + offset + + + + length + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + add to this rect + + + + source rectangle + + + + + + This is a C convenience constructor; we have to (skip) +it because it's not a boxed type. + + + + + + + + + + + + + + + + + + + + + Some type that is only interesting from C and should not be +exposed to language bindings. + + a skippable enum value + + + another skippable enum value + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - This is a test of an array of object in an field of a struct. - - - + + + + + + + + + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + @@ -3011,6 +4128,324 @@ detection, and fixing it via regress_annotations. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + This should be scanned as a top-level function, and shouldn't cause +a "Can't find matching type for constructor" warning. + + + + + + This is a C convenience constructor; we have to (skip) +it because it's not a boxed type. + + + + + + + + + + + + + + + + + + + + Does something that's only interesting from C and should not be +exposed to language bindings. + + + + + + a #RegressFooSkippable + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/scanner/foo.c b/tests/scanner/foo.c index f8cc350b..c883ada1 100644 --- a/tests/scanner/foo.c +++ b/tests/scanner/foo.c @@ -1,45 +1,44 @@ #include "foo.h" -#include "girepository.h" /* A hidden type not exposed publicly, similar to GUPNP's XML wrapper object */ -typedef struct _FooHidden FooHidden; - -int foo_init_argv (int argc, char **argv); -int foo_init_argv_address (int *argc, char ***argv); -void foo_private_function (FooObject *foo); -void foo_test_unsigned (unsigned int uint); -void foo_interface_do_foo (FooInterface *self, int x); -void foo_do_foo (FooInterface *self, int x); -int foo_enum_method (FooEnumType foo_enum); -FooHidden * foo_hidden_copy (const FooHidden *boxed); -void foo_hidden_free (FooHidden *boxed); -GType foo_hidden_get_type (void); -FooBoxed *foo_boxed_copy (const FooBoxed *boxed); -void foo_boxed_free (FooBoxed *boxed); -void foo_dbus_data_free (FooDBusData *boxed); -FooDBusData *foo_dbus_data_copy (const FooDBusData *boxed); +typedef struct _RegressFooHidden RegressFooHidden; + +int regress_foo_init_argv (int argc, char **argv); +int regress_foo_init_argv_address (int *argc, char ***argv); +void regress_foo_private_function (RegressFooObject *regress_foo); +void regress_foo_test_unsigned (unsigned int uint); +void regress_foo_interface_do_regress_foo (RegressFooInterface *self, int x); +void regress_foo_do_regress_foo (RegressFooInterface *self, int x); +int regress_foo_enum_method (RegressFooEnumType regress_foo_enum); +RegressFooHidden * regress_foo_hidden_copy (const RegressFooHidden *boxed); +void regress_foo_hidden_free (RegressFooHidden *boxed); +GType regress_foo_hidden_get_type (void); +RegressFooBoxed *regress_foo_boxed_copy (const RegressFooBoxed *boxed); +void regress_foo_boxed_free (RegressFooBoxed *boxed); +void regress_foo_dbus_data_free (RegressFooDBusData *boxed); +RegressFooDBusData *regress_foo_dbus_data_copy (const RegressFooDBusData *boxed); typedef struct { int i; } PrivateStruct; -void foo_private_function (FooObject *foo) +void regress_foo_private_function (RegressFooObject *regress_foo) { } GType -foo_interface_get_type (void) +regress_foo_interface_get_type (void) { static GType object_type = 0; if (!object_type) { object_type = g_type_register_static_simple (G_TYPE_INTERFACE, - "FooInterface", - sizeof (FooInterfaceIface), + "RegressFooInterface", + sizeof (RegressFooInterfaceIface), NULL, 0, NULL, 0); g_type_interface_add_prerequisite (object_type, G_TYPE_OBJECT); @@ -48,12 +47,12 @@ foo_interface_get_type (void) return object_type; } -void foo_interface_do_foo (FooInterface *self, int x) +void regress_foo_interface_do_regress_foo (RegressFooInterface *self, int x) { - FOO_INTERFACE_GET_INTERFACE(self)->do_foo (self, x); + REGRESS_FOO_INTERFACE_GET_INTERFACE(self)->do_regress_foo (self, x); } -void foo_interface_static_method (int x) +void regress_foo_interface_static_method (int x) { } @@ -68,14 +67,14 @@ enum { LAST_SIGNAL }; -static guint foo_object_signals[LAST_SIGNAL] = { 0 }; +static guint regress_foo_object_signals[LAST_SIGNAL] = { 0 }; static void -foo_foo_interface_init (gpointer g_iface, - gpointer iface_data) +regress_foo_regress_foo_interface_init (gpointer g_iface, + gpointer iface_data) { - FooInterfaceIface *iface = (FooInterfaceIface *)g_iface; - iface->do_foo = foo_do_foo; + RegressFooInterfaceIface *iface = (RegressFooInterfaceIface *)g_iface; + iface->do_regress_foo = regress_foo_do_regress_foo; } enum { @@ -84,75 +83,74 @@ enum { }; static void -foo_sub_interface_class_init (gpointer g_class, gpointer class_data); +regress_foo_sub_interface_class_init (gpointer g_class, gpointer class_data); -static guint foo_subiface_signals[SUBIFACE_LAST_SIGNAL] = { 0 }; +static guint regress_foo_subiface_signals[SUBIFACE_LAST_SIGNAL] = { 0 }; GType -foo_sub_interface_get_type (void) +regress_foo_sub_interface_get_type (void) { static GType object_type = 0; if (!object_type) { object_type = g_type_register_static_simple (G_TYPE_INTERFACE, - "FooSubInterface", - sizeof (FooSubInterfaceIface), - foo_sub_interface_class_init, 0, NULL, 0); + "RegressFooSubInterface", + sizeof (RegressFooSubInterfaceIface), + regress_foo_sub_interface_class_init, 0, NULL, 0); - g_type_interface_add_prerequisite (object_type, FOO_TYPE_INTERFACE); + g_type_interface_add_prerequisite (object_type, REGRESS_FOO_TYPE_INTERFACE); } return object_type; } static void -foo_sub_interface_class_init (gpointer g_class, gpointer class_data) +regress_foo_sub_interface_class_init (gpointer g_class, gpointer class_data) { - foo_subiface_signals[SUBIFACE_DESTROY_EVENT] = - g_signal_new ("destroy-event", FOO_TYPE_SUBINTERFACE, + regress_foo_subiface_signals[SUBIFACE_DESTROY_EVENT] = + g_signal_new ("destroy-event", REGRESS_FOO_TYPE_SUBINTERFACE, G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (FooSubInterfaceIface, destroy_event), - NULL, NULL, - gi_cclosure_marshal_generic, + G_STRUCT_OFFSET (RegressFooSubInterfaceIface, destroy_event), + NULL, NULL, NULL, G_TYPE_NONE, 0, G_TYPE_NONE); } void -foo_sub_interface_do_bar (FooSubInterface *self) +regress_foo_sub_interface_do_bar (RegressFooSubInterface *self) { - FOO_SUBINTERFACE_GET_INTERFACE(self)->do_bar (self); + REGRESS_FOO_SUBINTERFACE_GET_INTERFACE(self)->do_bar (self); } void -foo_sub_interface_do_moo (FooSubInterface *self, int x, gpointer y) +regress_foo_sub_interface_do_moo (RegressFooSubInterface *self, int x, gpointer y) { - FOO_SUBINTERFACE_GET_INTERFACE(self)->do_moo (self, x, y); + REGRESS_FOO_SUBINTERFACE_GET_INTERFACE(self)->do_moo (self, x, y); } /** - * foo_sub_interface_do_baz: + * regress_foo_sub_interface_do_baz: * @self: * @callback: (scope call): * @user_data: */ void -foo_sub_interface_do_baz (FooSubInterface *self, GCallback callback, gpointer user_data) +regress_foo_sub_interface_do_baz (RegressFooSubInterface *self, GCallback callback, gpointer user_data) { - FOO_SUBINTERFACE_GET_INTERFACE(self)->do_baz (self, callback, user_data); + REGRESS_FOO_SUBINTERFACE_GET_INTERFACE(self)->do_baz (self, callback, user_data); } -G_DEFINE_TYPE_EXTENDED (FooObject, foo_object, G_TYPE_OBJECT, - 0, G_IMPLEMENT_INTERFACE (FOO_TYPE_INTERFACE, - foo_foo_interface_init)); +G_DEFINE_TYPE_EXTENDED (RegressFooObject, regress_foo_object, G_TYPE_OBJECT, + 0, G_IMPLEMENT_INTERFACE (REGRESS_FOO_TYPE_INTERFACE, + regress_foo_regress_foo_interface_init)); static void -foo_object_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) +regress_foo_object_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) { switch (prop_id) { @@ -167,10 +165,10 @@ foo_object_set_property (GObject *object, } static void -foo_object_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) +regress_foo_object_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) { switch (prop_id) { @@ -185,14 +183,14 @@ foo_object_get_property (GObject *object, } static void -foo_object_class_init (FooObjectClass *klass) +regress_foo_object_class_init (RegressFooObjectClass *klass) { GObjectClass *gobject_class; gobject_class = G_OBJECT_CLASS (klass); - gobject_class->set_property = foo_object_set_property; - gobject_class->get_property = foo_object_get_property; + gobject_class->set_property = regress_foo_object_set_property; + gobject_class->get_property = regress_foo_object_get_property; g_object_class_install_property (gobject_class, PROP_STRING, @@ -206,9 +204,9 @@ foo_object_class_init (FooObjectClass *klass) g_param_spec_boxed ("hidden", "hidden property", "should not be exposed", - foo_hidden_get_type (), + regress_foo_hidden_get_type (), G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY)); - foo_object_signals[SIGNAL] = + regress_foo_object_signals[SIGNAL] = g_signal_new ("signal", G_OBJECT_CLASS_TYPE (gobject_class), G_SIGNAL_RUN_LAST, @@ -220,80 +218,80 @@ foo_object_class_init (FooObjectClass *klass) } static void -foo_object_init (FooObject *object) +regress_foo_object_init (RegressFooObject *object) { } -FooObject * -foo_object_new (void) +RegressFooObject * +regress_foo_object_new (void) { - return g_object_new (FOO_TYPE_OBJECT, NULL); + return g_object_new (REGRESS_FOO_TYPE_OBJECT, NULL); } GObject * -foo_object_new_as_super (void) +regress_foo_object_new_as_super (void) { - return g_object_new (FOO_TYPE_OBJECT, NULL); + return g_object_new (REGRESS_FOO_TYPE_OBJECT, NULL); } /** - * foo_object_external_type: - * @object: a #FooObject + * regress_foo_object_external_type: + * @object: a #RegressFooObject * * Returns: (transfer none): %NULL always */ UtilityObject* -foo_object_external_type (FooObject *object) +regress_foo_object_external_type (RegressFooObject *object) { return NULL; } void -foo_object_take_all (FooObject *object, int x, ...) +regress_foo_object_take_all (RegressFooObject *object, int x, ...) { } void -foo_do_foo (FooInterface *self, int x) +regress_foo_do_regress_foo (RegressFooInterface *self, int x) { } void -foo_object_is_it_time_yet (FooObject *object, time_t time) +regress_foo_object_is_it_time_yet (RegressFooObject *object, time_t time) { } /** - * foo_object_new_cookie: (skip) + * regress_foo_object_new_cookie: (skip) * @object: * @target: * * Not sure why this test is here... */ -FooObjectCookie -foo_object_new_cookie (FooObject *object, const char *target) +RegressFooObjectCookie +regress_foo_object_new_cookie (RegressFooObject *object, const char *target) { return NULL; } const char * -foo_object_get_name (FooObject *object) +regress_foo_object_get_name (RegressFooObject *object) { - return "foo"; + return "regress_foo"; } char * -foo_object_dup_name (FooObject *object) +regress_foo_object_dup_name (RegressFooObject *object) { - return g_strdup ("foo"); + return g_strdup ("regress_foo"); } /** - * foo_object_read: + * regress_foo_object_read: * @object: obj * @offset: offset * @length: length @@ -303,244 +301,244 @@ foo_object_dup_name (FooObject *object) * Virtual: read_fn */ void -foo_object_read (FooObject *object, int offset, int length) +regress_foo_object_read (RegressFooObject *object, int offset, int length) { } /** - * foo_object_skipped_method: (skip) + * regress_foo_object_skipped_method: (skip) * @object: obj * * This is only useful from C. */ void -foo_object_skipped_method (FooObject *object) +regress_foo_object_skipped_method (RegressFooObject *object) { } -G_DEFINE_ABSTRACT_TYPE (FooSubobject, foo_subobject, FOO_TYPE_OBJECT); +G_DEFINE_ABSTRACT_TYPE (RegressFooSubobject, regress_foo_subobject, REGRESS_FOO_TYPE_OBJECT); static void -foo_subobject_class_init (FooSubobjectClass *klass) +regress_foo_subobject_class_init (RegressFooSubobjectClass *klass) { } static void -foo_subobject_init (FooSubobject *object) +regress_foo_subobject_init (RegressFooSubobject *object) { } /** - * foo_object_get_default: + * regress_foo_object_get_default: * * This function is intended to match clutter_stage_get_default which * uses a C sugar return type. * - * Return value: (type FooSubobject) (transfer none): The global #FooSubobject + * Return value: (type RegressFooSubobject) (transfer none): The global #RegressFooSubobject */ -FooObject * -foo_object_get_default () +RegressFooObject * +regress_foo_object_get_default () { return NULL; } -int foo_init (void) +int regress_foo_init (void) { - return FOO_SUCCESS_INT; + return REGRESS_FOO_SUCCESS_INT; } -int foo_init_argv (int argc, char **argv) +int regress_foo_init_argv (int argc, char **argv) { - return FOO_SUCCESS_INT; + return REGRESS_FOO_SUCCESS_INT; } -int foo_init_argv_address (int *argc, char ***argv) +int regress_foo_init_argv_address (int *argc, char ***argv) { - return FOO_SUCCESS_INT; + return REGRESS_FOO_SUCCESS_INT; } GType -foo_enum_type_get_type (void) -{ - static GType etype = 0; - if (G_UNLIKELY(etype == 0)) { - static const GEnumValue values[] = { - { FOO_ENUM_ALPHA, "FOO_ENUM_ALPHA", "alpha" }, - { FOO_ENUM_BETA, "FOO_ENUM_BETA", "beta" }, - { FOO_ENUM_DELTA, "FOO_ENUM_DELTA", "delta" }, - { 0, NULL, NULL } - }; - etype = g_enum_register_static (g_intern_static_string ("FooEnumType"), values); - } - return etype; +regress_foo_enum_type_get_type (void) +{ + static GType etype = 0; + if (G_UNLIKELY(etype == 0)) { + static const GEnumValue values[] = { + { REGRESS_FOO_ENUM_ALPHA, "REGRESS_FOO_ENUM_ALPHA", "alpha" }, + { REGRESS_FOO_ENUM_BETA, "REGRESS_FOO_ENUM_BETA", "beta" }, + { REGRESS_FOO_ENUM_DELTA, "REGRESS_FOO_ENUM_DELTA", "delta" }, + { 0, NULL, NULL } + }; + etype = g_enum_register_static (g_intern_static_string ("RegressFooEnumType"), values); + } + return etype; } -int foo_enum_method (FooEnumType foo_enum) +int regress_foo_enum_method (RegressFooEnumType regress_foo_enum) { return 0; } GType -foo_flags_type_get_type (void) -{ - static GType etype = 0; - if (G_UNLIKELY(etype == 0)) { - static const GFlagsValue values[] = { - { FOO_FLAGS_FIRST, "FOO_FLAGS_FIRST", "first" }, - { FOO_FLAGS_SECOND, "FOO_FLAGS_SECOND", "second" }, - { FOO_FLAGS_THIRD, "FOO_FLAGS_THIRD", "third" }, - { 0, NULL, NULL } - }; - etype = g_flags_register_static (g_intern_static_string ("FooFlagsType"), values); - } - return etype; +regress_foo_flags_type_get_type (void) +{ + static GType etype = 0; + if (G_UNLIKELY(etype == 0)) { + static const GFlagsValue values[] = { + { REGRESS_FOO_FLAGS_FIRST, "REGRESS_FOO_FLAGS_FIRST", "first" }, + { REGRESS_FOO_FLAGS_SECOND, "REGRESS_FOO_FLAGS_SECOND", "second" }, + { REGRESS_FOO_FLAGS_THIRD, "REGRESS_FOO_FLAGS_THIRD", "third" }, + { 0, NULL, NULL } + }; + etype = g_flags_register_static (g_intern_static_string ("RegressFooFlagsType"), values); + } + return etype; } -struct _FooBoxed +struct _RegressFooBoxed { int private; }; -FooBoxed * -foo_boxed_copy (const FooBoxed *boxed) +RegressFooBoxed * +regress_foo_boxed_copy (const RegressFooBoxed *boxed) { - return (FooBoxed *)g_memdup (boxed, sizeof (FooBoxed)); + return (RegressFooBoxed *)g_memdup (boxed, sizeof (RegressFooBoxed)); } void -foo_boxed_free (FooBoxed *boxed) +regress_foo_boxed_free (RegressFooBoxed *boxed) { - g_slice_free (FooBoxed, boxed); + g_slice_free (RegressFooBoxed, boxed); } GType -foo_boxed_get_type (void) +regress_foo_boxed_get_type (void) { static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static ("FooBoxed", - (GBoxedCopyFunc) foo_boxed_copy, - (GBoxedFreeFunc) foo_boxed_free); + our_type = g_boxed_type_register_static ("RegressFooBoxed", + (GBoxedCopyFunc) regress_foo_boxed_copy, + (GBoxedFreeFunc) regress_foo_boxed_free); return our_type; } -FooBoxed * -foo_boxed_new (void) +RegressFooBoxed * +regress_foo_boxed_new (void) { - return g_slice_new0 (FooBoxed); + return g_slice_new0 (RegressFooBoxed); } void -foo_boxed_method (FooBoxed *boxed) +regress_foo_boxed_method (RegressFooBoxed *boxed) { } -/* FooDbus */ -struct _FooDBusData +/* RegressFooDbus */ +struct _RegressFooDBusData { double private; }; -FooDBusData * -foo_dbus_data_copy (const FooDBusData *boxed) +RegressFooDBusData * +regress_foo_dbus_data_copy (const RegressFooDBusData *boxed) { - return (FooDBusData *)g_memdup (boxed, sizeof (FooDBusData)); + return (RegressFooDBusData *)g_memdup (boxed, sizeof (RegressFooDBusData)); } void -foo_dbus_data_free (FooDBusData *boxed) +regress_foo_dbus_data_free (RegressFooDBusData *boxed) { - g_slice_free (FooDBusData, boxed); + g_slice_free (RegressFooDBusData, boxed); } GType -foo_dbus_data_get_type (void) +regress_foo_dbus_data_get_type (void) { static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static ("FooDBusData", - (GBoxedCopyFunc) foo_dbus_data_copy, - (GBoxedFreeFunc) foo_dbus_data_free); + our_type = g_boxed_type_register_static ("RegressFooDBusData", + (GBoxedCopyFunc) regress_foo_dbus_data_copy, + (GBoxedFreeFunc) regress_foo_dbus_data_free); return our_type; } GType -foo_brect_get_type (void) +regress_foo_brect_get_type (void) { static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static ("FooBRect", + our_type = g_boxed_type_register_static ("RegressFooBRect", (GBoxedCopyFunc) g_memdup, /* Won't work */ (GBoxedFreeFunc) g_free); return our_type; } GType -foo_bunion_get_type (void) +regress_foo_bunion_get_type (void) { static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static ("FooBUnion", + our_type = g_boxed_type_register_static ("RegressFooBUnion", (GBoxedCopyFunc) g_memdup, /* Won't work */ (GBoxedFreeFunc) g_free); return our_type; } -void foo_test_unsigned (unsigned int uint) +void regress_foo_test_unsigned (unsigned int uint) { } /** - * foo_test_string_array: + * regress_foo_test_string_array: * @array: (array zero-terminated=1): */ void -foo_test_string_array (char **array) +regress_foo_test_string_array (char **array) { } /** - * foo_test_string_array_with_g: + * regress_foo_test_string_array_with_g: * @array: (array zero-terminated=1): */ void -foo_test_string_array_with_g (gchar **array) +regress_foo_test_string_array_with_g (gchar **array) { } /** - * foo_test_array: + * regress_foo_test_array: * * Returns: (element-type utf8) (transfer container): */ GArray * -foo_test_array (void) +regress_foo_test_array (void) { return NULL; } /** - * foo_rectangle_new: (skip) + * regress_foo_rectangle_new: (skip) * * This is a C convenience constructor; we have to (skip) * it because it's not a boxed type. */ -FooRectangle * -foo_rectangle_new (int x, int y, int width, int height) +RegressFooRectangle * +regress_foo_rectangle_new (int x, int y, int width, int height) { - FooRectangle *r = g_slice_new (FooRectangle); + RegressFooRectangle *r = g_slice_new (RegressFooRectangle); r->x = x; r->y = y; r->width = width; @@ -549,250 +547,250 @@ foo_rectangle_new (int x, int y, int width, int height) } /** - * foo_rectangle_add: + * regress_foo_rectangle_add: * @r1: (inout): add to this rect * @r2: source rectangle */ void -foo_rectangle_add(FooRectangle *r1, const FooRectangle *r2) +regress_foo_rectangle_add(RegressFooRectangle *r1, const RegressFooRectangle *r2) { } -/* FooHidden */ +/* RegressFooHidden */ -struct _FooHidden +struct _RegressFooHidden { char *frob; }; -FooHidden * -foo_hidden_copy (const FooHidden *boxed) +RegressFooHidden * +regress_foo_hidden_copy (const RegressFooHidden *boxed) { - return (FooHidden *)g_memdup (boxed, sizeof (FooHidden)); + return (RegressFooHidden *)g_memdup (boxed, sizeof (RegressFooHidden)); } void -foo_hidden_free (FooHidden *boxed) +regress_foo_hidden_free (RegressFooHidden *boxed) { - g_slice_free (FooHidden, boxed); + g_slice_free (RegressFooHidden, boxed); } GType -foo_hidden_get_type (void) +regress_foo_hidden_get_type (void) { static GType our_type = 0; if (our_type == 0) - our_type = g_boxed_type_register_static ("FooHidden", - (GBoxedCopyFunc) foo_hidden_copy, - (GBoxedFreeFunc) foo_hidden_free); + our_type = g_boxed_type_register_static ("RegressFooHidden", + (GBoxedCopyFunc) regress_foo_hidden_copy, + (GBoxedFreeFunc) regress_foo_hidden_free); return our_type; } GType -foo_error_get_type (void) -{ - static GType etype = 0; - if (G_UNLIKELY(etype == 0)) { - static const GEnumValue values[] = { - { FOO_ERROR_GOOD, "FOO_ERROR_GOOD", "good" }, - { FOO_ERROR_BAD, "FOO_ERROR_BAD", "bad" }, - { FOO_ERROR_UGLY, "FOO_ERROR_UGLY", "ugly" }, - { 0, NULL, NULL } - }; - etype = g_enum_register_static (g_intern_static_string ("FooError"), values); - } - return etype; +regress_foo_error_get_type (void) +{ + static GType etype = 0; + if (G_UNLIKELY(etype == 0)) { + static const GEnumValue values[] = { + { REGRESS_FOO_ERROR_GOOD, "REGRESS_FOO_ERROR_GOOD", "good" }, + { REGRESS_FOO_ERROR_BAD, "REGRESS_FOO_ERROR_BAD", "bad" }, + { REGRESS_FOO_ERROR_UGLY, "REGRESS_FOO_ERROR_UGLY", "ugly" }, + { 0, NULL, NULL } + }; + etype = g_enum_register_static (g_intern_static_string ("RegressFooError"), values); + } + return etype; } GQuark -foo_error_quark (void) +regress_foo_error_quark (void) { - return g_quark_from_static_string ("foo-error-quark"); + return g_quark_from_static_string ("regress_foo-error-quark"); } void -foo_some_variant (guint x, va_list args) +regress_foo_some_variant (guint x, va_list args) { } -GType foo_tile_handler_get_type(void); +GType regress_foo_tile_handler_get_type(void); /* This setup of a totally hidden parent class matches * http://bugzilla.gnome.org/show_bug.cgi?id=561360 */ -#define FOO_TYPE_TILE_HANDLER (foo_tile_handler_get_type ()) -#define FOO_TILE_HANDLER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), FOO_TYPE_TILE_HANDLER, FooTileHandler)) -#define FOO_IS_TILE_HANDLER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), FOO_TYPE_TILE_HANDLER)) +#define REGRESS_FOO_TYPE_TILE_HANDLER (regress_foo_tile_handler_get_type ()) +#define REGRESS_FOO_TILE_HANDLER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), REGRESS_FOO_TYPE_TILE_HANDLER, RegressFooTileHandler)) +#define REGRESS_FOO_IS_TILE_HANDLER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), REGRESS_FOO_TYPE_TILE_HANDLER)) -struct _FooTileHandler +struct _RegressFooTileHandler { - FooObject parent_instance; + RegressFooObject parent_instance; }; -struct _FooTileHandlerClass +struct _RegressFooTileHandlerClass { - FooObjectClass parent_class; + RegressFooObjectClass parent_class; }; -typedef struct _FooTileHandler FooTileHandler; -typedef struct _FooTileHandlerClass FooTileHandlerClass; +typedef struct _RegressFooTileHandler RegressFooTileHandler; +typedef struct _RegressFooTileHandlerClass RegressFooTileHandlerClass; -G_DEFINE_TYPE(FooTileHandler, foo_tile_handler, FOO_TYPE_OBJECT); +G_DEFINE_TYPE(RegressFooTileHandler, regress_foo_tile_handler, REGRESS_FOO_TYPE_OBJECT); static void -foo_tile_handler_class_init (FooTileHandlerClass *klass) +regress_foo_tile_handler_class_init (RegressFooTileHandlerClass *klass) { } static void -foo_tile_handler_init (FooTileHandler *object) +regress_foo_tile_handler_init (RegressFooTileHandler *object) { } -struct _FooBuffer +struct _RegressFooBuffer { - FooTileHandler parent_instance; + RegressFooTileHandler parent_instance; }; -struct _FooBufferClass +struct _RegressFooBufferClass { - FooTileHandlerClass parent_class; + RegressFooTileHandlerClass parent_class; }; -G_DEFINE_TYPE(FooBuffer, foo_buffer, FOO_TYPE_TILE_HANDLER); +G_DEFINE_TYPE(RegressFooBuffer, regress_foo_buffer, REGRESS_FOO_TYPE_TILE_HANDLER); static void -foo_buffer_class_init (FooBufferClass *klass) +regress_foo_buffer_class_init (RegressFooBufferClass *klass) { } static void -foo_buffer_init (FooBuffer *object) +regress_foo_buffer_init (RegressFooBuffer *object) { } void -foo_buffer_some_method (FooBuffer *buffer) +regress_foo_buffer_some_method (RegressFooBuffer *buffer) { } -struct _FooOtherObject +struct _RegressFooOtherObject { GObject parent_instance; }; -struct _FooOtherObjectClass +struct _RegressFooOtherObjectClass { GObjectClass parent_class; }; -G_DEFINE_TYPE(FooOtherObject, foo_other_object, G_TYPE_OBJECT); +G_DEFINE_TYPE(RegressFooOtherObject, regress_foo_other_object, G_TYPE_OBJECT); static void -foo_other_object_class_init (FooOtherObjectClass *klass) +regress_foo_other_object_class_init (RegressFooOtherObjectClass *klass) { } static void -foo_other_object_init (FooOtherObject *object) +regress_foo_other_object_init (RegressFooOtherObject *object) { } -#define FOO_DEFINE_SHOULD_NOT_BE_EXPOSED "should not be exposed" +#define REGRESS_FOO_DEFINE_SHOULD_NOT_BE_EXPOSED "should not be exposed" /** - * foo_skip_me: (skip) - * @fs: a #FooSkippable + * regress_foo_skip_me: (skip) + * @fs: a #RegressFooSkippable * * Does something that's only interesting from C and should not be * exposed to language bindings. */ void -foo_skip_me (FooSkippable fs) +regress_foo_skip_me (RegressFooSkippable fs) { } /** - * FooForeignStruct: (foreign) + * RegressFooForeignStruct: (foreign) * */ -FooForeignStruct* -foo_foreign_struct_new (void) +RegressFooForeignStruct* +regress_foo_foreign_struct_new (void) { - return g_slice_new0 (FooForeignStruct); + return g_slice_new0 (RegressFooForeignStruct); } -FooForeignStruct* -foo_foreign_struct_copy (FooForeignStruct *original) +RegressFooForeignStruct* +regress_foo_foreign_struct_copy (RegressFooForeignStruct *original) { - FooForeignStruct *copy; - copy = foo_foreign_struct_new (); - copy->foo = original->foo; - return copy; + RegressFooForeignStruct *copy; + copy = regress_foo_foreign_struct_new (); + copy->regress_foo = original->regress_foo; + return copy; } /** - * foo_test_varargs_callback: (skip) + * regress_foo_test_varargs_callback: (skip) * */ void -foo_test_varargs_callback (gint i, FooVarargsCallback callback) +regress_foo_test_varargs_callback (gint i, RegressFooVarargsCallback callback) { } /** - * foo_test_varargs_callback2: (skip) + * regress_foo_test_varargs_callback2: (skip) * */ void -foo_test_varargs_callback2 (FooVarargsCallback callback) +regress_foo_test_varargs_callback2 (RegressFooVarargsCallback callback) { } /** - * foo_test_varargs_callback3: (skip) + * regress_foo_test_varargs_callback3: (skip) * */ void -foo_test_varargs_callback3 (FooVarargsCallback callback, - FooVarargsCallback callback2) +regress_foo_test_varargs_callback3 (RegressFooVarargsCallback callback, + RegressFooVarargsCallback callback2) { } /** - * foo_object_append_new_stack_layer: + * regress_foo_object_append_new_stack_layer: * * This shouldn't be scanned as a constructor. * * Returns: (transfer none): */ -FooOtherObject * -foo_object_append_new_stack_layer (FooObject *obj, int x) +RegressFooOtherObject * +regress_foo_object_append_new_stack_layer (RegressFooObject *obj, int x) { return NULL; } /** - * foo_not_a_constructor_new: + * regress_foo_not_a_constructor_new: * * This should be scanned as a top-level function, and shouldn't cause * a "Can't find matching type for constructor" warning. * * Returns: (transfer none): */ -FooObject * -foo_not_a_constructor_new (void) +RegressFooObject * +regress_foo_not_a_constructor_new (void) { return NULL; } diff --git a/tests/scanner/foo.h b/tests/scanner/foo.h index f852083c..20c92eb8 100644 --- a/tests/scanner/foo.h +++ b/tests/scanner/foo.h @@ -1,257 +1,257 @@ -#ifndef __FOO_OBJECT_H__ -#define __FOO_OBJECT_H__ +#ifndef __REGRESS_FOO_OBJECT_H__ +#define __REGRESS_FOO_OBJECT_H__ #include #include /* GAsyncReadyCallback */ #include "utility.h" -#define FOO_SUCCESS_INT 0x1138 +#define REGRESS_FOO_SUCCESS_INT 0x1138 -#define FOO_DEFINE_SHOULD_BE_EXPOSED "should be exposed" +#define REGRESS_FOO_DEFINE_SHOULD_BE_EXPOSED "should be exposed" -#define FOO_PIE_IS_TASTY 3.14159 +#define REGRESS_FOO_PIE_IS_TASTY 3.14159 -#define FOO_TYPE_INTERFACE (foo_interface_get_type ()) -#define FOO_INTERFACE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), FOO_TYPE_INTERFACE, FooInterface)) -#define FOO_IS_INTERFACE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), FOO_TYPE_INTERFACE)) -#define FOO_INTERFACE_GET_INTERFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), FOO_TYPE_INTERFACE, FooInterfaceIface)) +#define REGRESS_FOO_TYPE_INTERFACE (regress_foo_interface_get_type ()) +#define REGRESS_FOO_INTERFACE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), REGRESS_FOO_TYPE_INTERFACE, RegressFooInterface)) +#define REGRESS_FOO_IS_INTERFACE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), REGRESS_FOO_TYPE_INTERFACE)) +#define REGRESS_FOO_INTERFACE_GET_INTERFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), REGRESS_FOO_TYPE_INTERFACE, RegressFooInterfaceIface)) -#define FOO_TYPE_SUBINTERFACE (foo_sub_interface_get_type ()) -#define FOO_SUBINTERFACE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), FOO_TYPE_SUBINTERFACE, FooSubInterface)) -#define FOO_IS_SUBINTERFACE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), FOO_TYPE_SUBINTERFACE)) -#define FOO_SUBINTERFACE_GET_INTERFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), FOO_TYPE_SUBINTERFACE, FooSubInterfaceIface)) +#define REGRESS_FOO_TYPE_SUBINTERFACE (regress_foo_sub_interface_get_type ()) +#define REGRESS_FOO_SUBINTERFACE(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), REGRESS_FOO_TYPE_SUBINTERFACE, RegressFooSubInterface)) +#define REGRESS_FOO_IS_SUBINTERFACE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), REGRESS_FOO_TYPE_SUBINTERFACE)) +#define REGRESS_FOO_SUBINTERFACE_GET_INTERFACE(inst) (G_TYPE_INSTANCE_GET_INTERFACE ((inst), REGRESS_FOO_TYPE_SUBINTERFACE, RegressFooSubInterfaceIface)) -#define FOO_TYPE_OBJECT (foo_object_get_type ()) -#define FOO_OBJECT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), FOO_TYPE_OBJECT, FooObject)) -#define FOO_IS_OBJECT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), FOO_TYPE_OBJECT)) +#define REGRESS_FOO_TYPE_OBJECT (regress_foo_object_get_type ()) +#define REGRESS_FOO_OBJECT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), REGRESS_FOO_TYPE_OBJECT, RegressFooObject)) +#define REGRESS_FOO_IS_OBJECT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), REGRESS_FOO_TYPE_OBJECT)) -#define FOO_TYPE_SUBOBJECT (foo_subobject_get_type ()) -#define FOO_SUBOBJECT(subobject) (G_TYPE_CHECK_INSTANCE_CAST ((subobject), FOO_TYPE_SUBOBJECT, FooSubobject)) -#define FOO_IS_SUBOBJECT(subobject) (G_TYPE_CHECK_INSTANCE_TYPE ((subobject), FOO_TYPE_SUBOBJECT)) +#define REGRESS_FOO_TYPE_SUBOBJECT (regress_foo_subobject_get_type ()) +#define REGRESS_FOO_SUBOBJECT(subobject) (G_TYPE_CHECK_INSTANCE_CAST ((subobject), REGRESS_FOO_TYPE_SUBOBJECT, RegressFooSubobject)) +#define REGRESS_FOO_IS_SUBOBJECT(subobject) (G_TYPE_CHECK_INSTANCE_TYPE ((subobject), REGRESS_FOO_TYPE_SUBOBJECT)) -#define FOO_TYPE_BUFFER (foo_buffer_get_type ()) -#define FOO_BUFFER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), FOO_TYPE_BUFFER, FooBuffer)) -#define FOO_IS_BUFFER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), FOO_TYPE_BUFFER)) +#define REGRESS_FOO_TYPE_BUFFER (regress_foo_buffer_get_type ()) +#define REGRESS_FOO_BUFFER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), REGRESS_FOO_TYPE_BUFFER, RegressFooBuffer)) +#define REGRESS_FOO_IS_BUFFER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), REGRESS_FOO_TYPE_BUFFER)) -#define FOO_TYPE_OTHER_OBJECT (foo_other_object_get_type ()) -#define FOO_OTHER_OBJECT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), FOO_TYPE_OTHER_OBJECT, FooOtherObject)) -#define FOO_IS_OTHER_OBJECT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), FOO_TYPE_OTHER_OBJECT)) +#define REGRESS_FOO_TYPE_OTHER_OBJECT (regress_foo_other_object_get_type ()) +#define REGRESS_FOO_OTHER_OBJECT(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), REGRESS_FOO_TYPE_OTHER_OBJECT, RegressFooOtherObject)) +#define REGRESS_FOO_IS_OTHER_OBJECT(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), REGRESS_FOO_TYPE_OTHER_OBJECT)) -typedef struct _FooInterface FooInterface; -typedef struct _FooInterfaceIface FooInterfaceIface; -typedef struct _FooSubInterface FooSubInterface; -typedef struct _FooSubInterfaceIface FooSubInterfaceIface; -typedef struct _FooObject FooObject; -typedef struct _FooObjectClass FooObjectClass; -typedef struct _FooSubobject FooSubobject; -typedef struct _FooSubobjectClass FooSubobjectClass; -typedef struct _FooBuffer FooBuffer; -typedef struct _FooBufferClass FooBufferClass; -typedef struct _FooOtherObject FooOtherObject; -typedef struct _FooOtherObjectClass FooOtherObjectClass; +typedef struct _RegressFooInterface RegressFooInterface; +typedef struct _RegressFooInterfaceIface RegressFooInterfaceIface; +typedef struct _RegressFooSubInterface RegressFooSubInterface; +typedef struct _RegressFooSubInterfaceIface RegressFooSubInterfaceIface; +typedef struct _RegressFooObject RegressFooObject; +typedef struct _RegressFooObjectClass RegressFooObjectClass; +typedef struct _RegressFooSubobject RegressFooSubobject; +typedef struct _RegressFooSubobjectClass RegressFooSubobjectClass; +typedef struct _RegressFooBuffer RegressFooBuffer; +typedef struct _RegressFooBufferClass RegressFooBufferClass; +typedef struct _RegressFooOtherObject RegressFooOtherObject; +typedef struct _RegressFooOtherObjectClass RegressFooOtherObjectClass; -struct _FooInterfaceIface +struct _RegressFooInterfaceIface { GTypeInterface parent_iface; - void (*do_foo) (FooInterface *self, int x); + void (*do_regress_foo) (RegressFooInterface *self, int x); }; -GType foo_interface_get_type (void) G_GNUC_CONST; +GType regress_foo_interface_get_type (void) G_GNUC_CONST; -void foo_interface_do_foo (FooInterface *iface, int x); +void regress_foo_interface_do_regress_foo (RegressFooInterface *iface, int x); -void foo_interface_static_method (int x); +void regress_foo_interface_static_method (int x); -struct _FooSubInterfaceIface +struct _RegressFooSubInterfaceIface { GTypeInterface parent_iface; /* signals */ - void (*destroy_event) (FooSubInterface *self); + void (*destroy_event) (RegressFooSubInterface *self); /* virtual table */ - void (*do_bar) (FooSubInterface *self); + void (*do_bar) (RegressFooSubInterface *self); /* explicitly test un-named parameters */ - void (*do_moo) (FooSubInterface *self, int, gpointer); + void (*do_moo) (RegressFooSubInterface *self, int, gpointer); - void (*do_baz) (FooSubInterface *self, GCallback callback, gpointer user_data); + void (*do_baz) (RegressFooSubInterface *self, GCallback callback, gpointer user_data); }; -GType foo_sub_interface_get_type (void) G_GNUC_CONST; +GType regress_foo_sub_interface_get_type (void) G_GNUC_CONST; -void foo_sub_interface_do_bar (FooSubInterface *self); -void foo_sub_interface_do_moo (FooSubInterface *self, int, gpointer); -void foo_sub_interface_do_baz (FooSubInterface *self, - GCallback callback, - gpointer user_data); +void regress_foo_sub_interface_do_bar (RegressFooSubInterface *self); +void regress_foo_sub_interface_do_moo (RegressFooSubInterface *self, int, gpointer); +void regress_foo_sub_interface_do_baz (RegressFooSubInterface *self, + GCallback callback, + gpointer user_data); -struct _FooObject +struct _RegressFooObject { GObject parent_instance; int some_int; }; -struct _FooObjectClass +struct _RegressFooObjectClass { GObjectClass parent_class; - gboolean (* virtual_method) (FooObject *object, int first_param); + gboolean (* virtual_method) (RegressFooObject *object, int first_param); /* Intended to match GFile */ - void (*read_fn) (FooObject *object, int offset, int length); + void (*read_fn) (RegressFooObject *object, int offset, int length); /* Test reserved stuff */ GCallback _reserved[4]; }; -gint foo_init (void); +gint regress_foo_init (void); -GType foo_object_get_type (void) G_GNUC_CONST; -FooObject* foo_object_new (void); -UtilityObject* foo_object_external_type (FooObject *object); -GObject* foo_object_new_as_super (void); +GType regress_foo_object_get_type (void) G_GNUC_CONST; +RegressFooObject* regress_foo_object_new (void); +UtilityObject* regress_foo_object_external_type (RegressFooObject *object); +GObject* regress_foo_object_new_as_super (void); -void foo_object_various (FooObject *object, void *data, GType some_type); +void regress_foo_object_various (RegressFooObject *object, void *data, GType some_type); -void foo_object_take_all (FooObject *object, int x, ...); +void regress_foo_object_take_all (RegressFooObject *object, int x, ...); -typedef gpointer FooObjectCookie; +typedef gpointer RegressFooObjectCookie; -FooObjectCookie foo_object_new_cookie (FooObject *object, const char *target); +RegressFooObjectCookie regress_foo_object_new_cookie (RegressFooObject *object, const char *target); -void foo_object_is_it_time_yet (FooObject *object, time_t time); +void regress_foo_object_is_it_time_yet (RegressFooObject *object, time_t time); -const char * foo_object_get_name (FooObject *object); +const char * regress_foo_object_get_name (RegressFooObject *object); -char * foo_object_dup_name (FooObject *object); +char * regress_foo_object_dup_name (RegressFooObject *object); -void foo_object_handle_glyph (FooObject *object, UtilityGlyph glyph); +void regress_foo_object_handle_glyph (RegressFooObject *object, UtilityGlyph glyph); -gboolean foo_object_virtual_method (FooObject *object, int first_param); +gboolean regress_foo_object_virtual_method (RegressFooObject *object, int first_param); -void foo_object_read (FooObject *object, int offset, int length); +void regress_foo_object_read (RegressFooObject *object, int offset, int length); -int foo_object_static_meth (void); +int regress_foo_object_static_meth (void); -void foo_object_skipped_method (FooObject *object); +void regress_foo_object_skipped_method (RegressFooObject *object); -struct _FooSubobject +struct _RegressFooSubobject { - FooObject parent_instance; + RegressFooObject parent_instance; }; -struct _FooSubobjectClass +struct _RegressFooSubobjectClass { - FooObjectClass parent_class; + RegressFooObjectClass parent_class; }; -GType foo_subobject_get_type (void) G_GNUC_CONST; -FooSubobject* foo_subobject_new (void); +GType regress_foo_subobject_get_type (void) G_GNUC_CONST; +RegressFooSubobject* regress_foo_subobject_new (void); -FooObject * foo_object_get_default (void); +RegressFooObject * regress_foo_object_get_default (void); -GType foo_buffer_get_type (void); +GType regress_foo_buffer_get_type (void); -void foo_buffer_some_method (FooBuffer *buffer); +void regress_foo_buffer_some_method (RegressFooBuffer *buffer); -GType foo_other_object_get_type (void) G_GNUC_CONST; +GType regress_foo_other_object_get_type (void) G_GNUC_CONST; -FooObject * foo_not_a_constructor_new (void); +RegressFooObject * regress_foo_not_a_constructor_new (void); typedef enum { - FOO_ENUM_ALPHA, - FOO_ENUM_BETA, - FOO_ENUM_DELTA -} FooEnumType; + REGRESS_FOO_ENUM_ALPHA, + REGRESS_FOO_ENUM_BETA, + REGRESS_FOO_ENUM_DELTA +} RegressFooEnumType; -GType foo_enum_type_get_type (void); +GType regress_foo_enum_type_get_type (void); -int foo_enum_type_method (FooEnumType foo_enum); +int regress_foo_enum_type_method (RegressFooEnumType regress_foo_enum); -FooEnumType foo_enum_type_returnv (int x); +RegressFooEnumType regress_foo_enum_type_returnv (int x); typedef enum { - FOO_FLAGS_FIRST = 1 << 0, - FOO_FLAGS_SECOND = 1 << 1, - FOO_FLAGS_THIRD = 1 << 2 -} FooFlagsType; + REGRESS_FOO_FLAGS_FIRST = 1 << 0, + REGRESS_FOO_FLAGS_SECOND = 1 << 1, + REGRESS_FOO_FLAGS_THIRD = 1 << 2 +} RegressFooFlagsType; -GType foo_flags_type_get_type (void); +GType regress_foo_flags_type_get_type (void); typedef enum { - FOO_ENUM_UN = 1, - FOO_ENUM_DEUX = 2, - FOO_ENUM_TROIS = 3, - FOO_ENUM_NEUF = 9 -} FooEnumNoType; + REGRESS_FOO_ENUM_UN = 1, + REGRESS_FOO_ENUM_DEUX = 2, + REGRESS_FOO_ENUM_TROIS = 3, + REGRESS_FOO_ENUM_NEUF = 9 +} RegressFooEnumNoType; typedef enum { - FOO_FLAGS_ETT = 1 << 0, - FOO_FLAGS_TVA = 1 << 1, - FOO_FLAGS_FYRA = 1 << 2 -} FooFlagsNoType; + REGRESS_FOO_FLAGS_ETT = 1 << 0, + REGRESS_FOO_FLAGS_TVA = 1 << 1, + REGRESS_FOO_FLAGS_FYRA = 1 << 2 +} RegressFooFlagsNoType; typedef enum { - FOO_ENUM_FULLNAME_ONE = 1, - FOO_ENUM_FULLNAME_TWO, - FOO_ENUM_FULLNAME_THREE -} FooEnumFullname; + REGRESS_FOO_ENUM_FULLNAME_ONE = 1, + REGRESS_FOO_ENUM_FULLNAME_TWO, + REGRESS_FOO_ENUM_FULLNAME_THREE +} RegressFooEnumFullname; typedef enum { - FOO_ADDRESS_INVALID, - FOO_ADDRESS_IPV4, - FOO_ADDRESS_IPV6 -} FooAddressType; + REGRESS_FOO_ADDRESS_INVALID, + REGRESS_FOO_ADDRESS_IPV4, + REGRESS_FOO_ADDRESS_IPV6 +} RegressFooAddressType; -typedef struct _FooBoxed FooBoxed; +typedef struct _RegressFooBoxed RegressFooBoxed; -GType foo_boxed_get_type (void) G_GNUC_CONST; -FooBoxed* foo_boxed_new (void); -void foo_boxed_method (FooBoxed* boxed); +GType regress_foo_boxed_get_type (void) G_GNUC_CONST; +RegressFooBoxed* regress_foo_boxed_new (void); +void regress_foo_boxed_method (RegressFooBoxed* boxed); /* This one tests capitalization handling with respect to DBus */ -typedef struct _FooDBusData FooDBusData; -GType foo_dbus_data_get_type (void) G_GNUC_CONST; -void foo_dbus_data_method (FooDBusData* dbusdata); +typedef struct _RegressFooDBusData RegressFooDBusData; +GType regress_foo_dbus_data_get_type (void) G_GNUC_CONST; +void regress_foo_dbus_data_method (RegressFooDBusData* dbusdata); /* FIXME: Scanner does not support this yet -const char *FOO_CONSTANT_STR = "foo-constant-str"; -const int FOO_CONSTANT_INT = 10; -const float FOO_CONSTANT_FLOAT = 10; +const char *REGRESS_FOO_CONSTANT_STR = "regress_foo-constant-str"; +const int REGRESS_FOO_CONSTANT_INT = 10; +const float REGRESS_FOO_CONSTANT_FLOAT = 10; */ /* Callback */ -typedef gboolean (* FooCallback) (FooObject *foo, gboolean b, gpointer data); +typedef gboolean (* RegressFooCallback) (RegressFooObject *regress_foo, gboolean b, gpointer data); /* Invalid comments, should be ignored */ /* @ */ /* @: */ -typedef struct _FooStruct FooStruct; -typedef struct _FooStructPrivate FooStructPrivate; +typedef struct _RegressFooStruct RegressFooStruct; +typedef struct _RegressFooStructPrivate RegressFooStructPrivate; -struct _FooStruct +struct _RegressFooStruct { - FooStructPrivate *priv; + RegressFooStructPrivate *priv; int member; }; -typedef struct _FooRectangle FooRectangle; +typedef struct _RegressFooRectangle RegressFooRectangle; -struct _FooRectangle +struct _RegressFooRectangle { gint x; gint y; @@ -260,81 +260,81 @@ struct _FooRectangle }; void -foo_method_external_references (UtilityObject *object, - UtilityEnumType e, - UtilityFlagType f, - UtilityStruct s); +regress_foo_method_external_references (UtilityObject *object, + UtilityEnumType e, + UtilityFlagType f, + UtilityStruct s); -void foo_rectangle_add(FooRectangle *r1, const FooRectangle *r2); +void regress_foo_rectangle_add(RegressFooRectangle *r1, const RegressFooRectangle *r2); -FooRectangle * foo_rectangle_new (int x, int y, int width, int height); +RegressFooRectangle * regress_foo_rectangle_new (int x, int y, int width, int height); -typedef struct _FooEventAny FooEventAny; -typedef struct _FooEventExpose FooEventExpose; +typedef struct _RegressFooEventAny RegressFooEventAny; +typedef struct _RegressFooEventExpose RegressFooEventExpose; -typedef union _FooEvent FooEvent; +typedef union _RegressFooEvent RegressFooEvent; -struct _FooEventAny +struct _RegressFooEventAny { gint8 send_event; }; -struct _FooEventExpose +struct _RegressFooEventExpose { gint8 send_event; gint count; }; -union _FooEvent +union _RegressFooEvent { int type; - FooEventAny any; - FooEventExpose expose; + RegressFooEventAny any; + RegressFooEventExpose expose; }; -typedef void FooXEvent; +typedef void RegressFooXEvent; /* And now some boxed variants */ -typedef struct _FooBRect FooBRect; +typedef struct _RegressFooBRect RegressFooBRect; -struct _FooBRect +struct _RegressFooBRect { double x; double y; }; -GType foo_brect_get_type (void); +GType regress_foo_brect_get_type (void); -FooBRect *foo_brect_new (double x, double y); +RegressFooBRect *regress_foo_brect_new (double x, double y); -void foo_brect_add (FooBRect *b1, FooBRect *b2); +void regress_foo_brect_add (RegressFooBRect *b1, RegressFooBRect *b2); -typedef union _FooBUnion FooBUnion; +typedef union _RegressFooBUnion RegressFooBUnion; -union _FooBUnion +union _RegressFooBUnion { int type; double v; - FooBRect *rect; + RegressFooBRect *rect; }; -typedef union _FooUnion FooUnion; +typedef union _RegressFooUnion RegressFooUnion; -union _FooUnion +union _RegressFooUnion { - int foo; + int regress_foo; }; -typedef struct _FooUtilityStruct FooUtilityStruct; -struct _FooUtilityStruct +typedef struct _RegressFooUtilityStruct RegressFooUtilityStruct; +struct _RegressFooUtilityStruct { UtilityStruct bar; }; -typedef struct _FooThingWithArray FooThingWithArray; -struct _FooThingWithArray +typedef struct _RegressFooThingWithArray RegressFooThingWithArray; +struct _RegressFooThingWithArray { int x; int y; @@ -342,100 +342,100 @@ struct _FooThingWithArray guchar *data; } ; -FooBUnion *foo_bunion_new (void); +RegressFooBUnion *regress_foo_bunion_new (void); -GType foo_bunion_get_type (void); +GType regress_foo_bunion_get_type (void); -int foo_bunion_get_contained_type (FooBUnion *bunion); +int regress_foo_bunion_get_contained_type (RegressFooBUnion *bunion); -void foo_test_unsigned_qualifier (unsigned int unsigned_param); -void foo_test_unsigned_type (unsigned unsigned_param); +void regress_foo_test_unsigned_qualifier (unsigned int unsigned_param); +void regress_foo_test_unsigned_type (unsigned unsigned_param); -void foo_test_string_array (char **array); +void regress_foo_test_string_array (char **array); -void foo_test_string_array_with_g (gchar **array); +void regress_foo_test_string_array_with_g (gchar **array); -GArray *foo_test_array (void); +GArray *regress_foo_test_array (void); -const char * foo_test_const_char_retval (void); -const FooStruct * foo_test_const_struct_retval (void); -void foo_test_const_char_param (const char * param); -void foo_test_const_struct_param (const FooStruct * param); +const char * regress_foo_test_const_char_retval (void); +const RegressFooStruct * regress_foo_test_const_struct_retval (void); +void regress_foo_test_const_char_param (const char * param); +void regress_foo_test_const_struct_param (const RegressFooStruct * param); -typedef void (*FooVarargsCallback) (const char * param, ...); -void foo_test_varargs_callback (gint i, FooVarargsCallback callback); -void foo_test_varargs_callback2 (FooVarargsCallback callback); -void foo_test_varargs_callback3 (FooVarargsCallback callback, - FooVarargsCallback callback2); +typedef void (*RegressFooVarargsCallback) (const char * param, ...); +void regress_foo_test_varargs_callback (gint i, RegressFooVarargsCallback callback); +void regress_foo_test_varargs_callback2 (RegressFooVarargsCallback callback); +void regress_foo_test_varargs_callback3 (RegressFooVarargsCallback callback, + RegressFooVarargsCallback callback2); /* Make sure callbacks get the right scope by default */ -void foo_async_ready_callback(GCancellable *cancellable, - GAsyncReadyCallback callback, - gpointer user_data); -void foo_destroy_notify_callback(FooCallback callback, - gpointer data, - GDestroyNotify destroy); +void regress_foo_async_ready_callback(GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +void regress_foo_destroy_notify_callback(RegressFooCallback callback, + gpointer data, + GDestroyNotify destroy); typedef enum { - FOO_ERROR_GOOD, - FOO_ERROR_BAD, - FOO_ERROR_UGLY -} FooError; -GType foo_error_get_type (void); + REGRESS_FOO_ERROR_GOOD, + REGRESS_FOO_ERROR_BAD, + REGRESS_FOO_ERROR_UGLY +} RegressFooError; +GType regress_foo_error_get_type (void); -GQuark foo_error_quark (void); +GQuark regress_foo_error_quark (void); typedef enum { - FOO_LAYER_DESKTOP = 0, - FOO_LAYER_BOTTOM = 1, - FOO_LAYER_NORMAL = 2, - FOO_LAYER_TOP = 4, /* Same as DOCK; see EWMH and bug 330717 */ - FOO_LAYER_DOCK = 4, - FOO_LAYER_FULLSCREEN = 5, - FOO_LAYER_FOCUSED_WINDOW = 6, - FOO_LAYER_OVERRIDE_REDIRECT = 7, - FOO_LAYER_LAST = 8 -} FooStackLayer; + REGRESS_FOO_LAYER_DESKTOP = 0, + REGRESS_FOO_LAYER_BOTTOM = 1, + REGRESS_FOO_LAYER_NORMAL = 2, + REGRESS_FOO_LAYER_TOP = 4, /* Same as DOCK; see EWMH and bug 330717 */ + REGRESS_FOO_LAYER_DOCK = 4, + REGRESS_FOO_LAYER_FULLSCREEN = 5, + REGRESS_FOO_LAYER_FOCUSED_WINDOW = 6, + REGRESS_FOO_LAYER_OVERRIDE_REDIRECT = 7, + REGRESS_FOO_LAYER_LAST = 8 +} RegressFooStackLayer; typedef enum { - FOO_SOME_SINGLE_ENUM -} FooASingle; + REGRESS_FOO_SOME_SINGLE_ENUM +} RegressFooASingle; /* Should be skipped */ -void foo_some_variant (guint x, va_list args); -void foo_some_variant_ptr (guint x, va_list *args); +void regress_foo_some_variant (guint x, va_list args); +void regress_foo_some_variant_ptr (guint x, va_list *args); /** - * FooSkippable: (skip) - * @FOO_SKIPPABLE_ONE: a skippable enum value - * @FOO_SKIPPABLE_TWO: another skippable enum value + * RegressFooSkippable: (skip) + * @REGRESS_FOO_SKIPPABLE_ONE: a skippable enum value + * @REGRESS_FOO_SKIPPABLE_TWO: another skippable enum value * * Some type that is only interesting from C and should not be * exposed to language bindings. */ typedef enum { - FOO_SKIPPABLE_ONE, - FOO_SKIPPABLE_TWO -} FooSkippable; -void foo_skip_me (FooSkippable fs); + REGRESS_FOO_SKIPPABLE_ONE, + REGRESS_FOO_SKIPPABLE_TWO +} RegressFooSkippable; +void regress_foo_skip_me (RegressFooSkippable fs); -typedef struct _FooForeignStruct FooForeignStruct; +typedef struct _RegressFooForeignStruct RegressFooForeignStruct; -struct _FooForeignStruct +struct _RegressFooForeignStruct { - int foo; + int regress_foo; }; -FooForeignStruct* foo_foreign_struct_new (void); -FooForeignStruct* foo_foreign_struct_copy (FooForeignStruct *original); +RegressFooForeignStruct* regress_foo_foreign_struct_new (void); +RegressFooForeignStruct* regress_foo_foreign_struct_copy (RegressFooForeignStruct *original); /* This one should be a global, not a method on UtilityObject since * it's a separate namespace. */ -void foo_object_a_global_method (UtilityObject *obj); +void regress_foo_object_a_global_method (UtilityObject *obj); -FooOtherObject * foo_object_append_new_stack_layer (FooObject *obj, int x); +RegressFooOtherObject * regress_foo_object_append_new_stack_layer (RegressFooObject *obj, int x); -#endif /* __FOO_OBJECT_H__ */ +#endif /* __REGRESS_FOO_OBJECT_H__ */ -- cgit v1.2.1 From bb1ac9cf2dc450c5d44b1e39e3162ba06069f4a1 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sat, 2 Feb 2013 12:00:15 -0500 Subject: tests: Move TestInherit into Regress https://bugzilla.gnome.org/show_bug.cgi?id=693097 --- .gitignore | 1 - tests/scanner/Makefile.am | 11 +--- tests/scanner/Regress-1.0-expected.gir | 105 +++++++++++++++++++++++++++++++++ tests/scanner/drawable.c | 22 +++---- tests/scanner/drawable.h | 30 +++++----- 5 files changed, 132 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index fd079f0b..92b3da0e 100644 --- a/.gitignore +++ b/.gitignore @@ -75,7 +75,6 @@ tests/scanner/GtkFrob-1.0.gir tests/scanner/Headeronly-1.0.gir tests/scanner/Regress-1.0.gir tests/scanner/SLetter-1.0.gir -tests/scanner/TestInherit-1.0.gir tests/scanner/Utility-1.0.gir tests/scanner/WarnLib-1.0.gir tests/scanner/barapp diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index 52009594..cf045082 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -7,7 +7,6 @@ INTROSPECTION_SCANNER_ARGS += --warn-all check_LTLIBRARIES = \ libsletter.la \ - libtestinherit.la \ libutility.la \ libgtkfrob.la \ libgettype.la \ @@ -27,13 +26,13 @@ libsletter_la_LIBADD = $(GIO_LIBS) libsletter_la_CFLAGS = $(AM_CFLAGS) libsletter_la_LDFLAGS = $(AM_LDFLAGS) -libtestinherit_la_SOURCES = $(srcdir)/drawable.c $(srcdir)/drawable.h libutility_la_SOURCES = $(srcdir)/utility.c $(srcdir)/utility.h libgtkfrob_la_SOURCES = $(srcdir)/gtkfrob.c $(srcdir)/gtkfrob.h libregress_la_SOURCES = \ $(srcdir)/regress.c $(srcdir)/regress.h \ $(srcdir)/annotation.c $(srcdir)/annotation.h \ $(srcdir)/foo.c $(srcdir)/foo.h \ + $(srcdir)/drawable.c $(srcdir)/drawable.h \ $(NULL) libregress_la_LIBADD = $(GIO_LIBS) if HAVE_CAIRO @@ -96,14 +95,6 @@ WarnLib_1_0_gir_FILES = $(libwarnlib_la_SOURCES) WarnLib_1_0_gir_SCANNERFLAGS = --c-include="warnlib.h" --symbol-prefix=warnlib_ GIRS += WarnLib-1.0.gir -TestInherit-1.0.gir: Utility-1.0.gir libtestinherit.la -TestInherit_1_0_gir_PACKAGES = gobject-2.0 -TestInherit_1_0_gir_LIBS = libtestinherit.la -TestInherit_1_0_gir_INCLUDES = GObject-2.0 Utility-1.0 -TestInherit_1_0_gir_FILES = $(libtestinherit_la_SOURCES) -TestInherit_1_0_gir_SCANNERFLAGS = --c-include="drawable.h" --warn-error -GIRS += TestInherit-1.0.gir - Utility-1.0.gir: libutility.la Utility_1_0_gir_PACKAGES = gobject-2.0 Utility_1_0_gir_LIBS = libutility.la diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 3cb0382e..98ad01b6 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -2612,6 +2612,111 @@ use it should be. c:type="RegressTestFundamentalObjectClass"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -typedef struct _TestInheritDrawable TestInheritDrawable; -typedef struct _TestInheritDrawableClass TestInheritDrawableClass; +typedef struct _RegressTestInheritDrawable RegressTestInheritDrawable; +typedef struct _RegressTestInheritDrawableClass RegressTestInheritDrawableClass; -struct _TestInheritDrawable +struct _RegressTestInheritDrawable { GObject parent_instance; }; -struct _TestInheritDrawableClass +struct _RegressTestInheritDrawableClass { GObjectClass parent_class; }; -GType test_inherit_drawable_get_type (void) G_GNUC_CONST; +GType regress_test_inherit_drawable_get_type (void) G_GNUC_CONST; -void test_inherit_drawable_do_foo (TestInheritDrawable *drawable, int x); -void test_inherit_drawable_get_origin (TestInheritDrawable *drawable, int *x, int *y); -void test_inherit_drawable_get_size (TestInheritDrawable *drawable, guint *width, guint *height); -void test_inherit_drawable_do_foo_maybe_throw (TestInheritDrawable *drawable, int x, GError **error); +void regress_test_inherit_drawable_do_foo (RegressTestInheritDrawable *drawable, int x); +void regress_test_inherit_drawable_get_origin (RegressTestInheritDrawable *drawable, int *x, int *y); +void regress_test_inherit_drawable_get_size (RegressTestInheritDrawable *drawable, guint *width, guint *height); +void regress_test_inherit_drawable_do_foo_maybe_throw (RegressTestInheritDrawable *drawable, int x, GError **error); -typedef struct _TestInheritPixmapObjectClass TestInheritPixmapObjectClass; +typedef struct _RegressTestInheritPixmapObjectClass RegressTestInheritPixmapObjectClass; -struct _TestInheritPixmapObjectClass +struct _RegressTestInheritPixmapObjectClass { - TestInheritDrawableClass parent_class; + RegressTestInheritDrawableClass parent_class; }; -#endif /* __TEST_INHERIT_DRAWABLE_H__ */ +#endif /* __REGRESS_TEST_INHERIT_DRAWABLE_H__ */ -- cgit v1.2.1 From b714353e38cf72b6cb2754d413b3688a47624028 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 3 Feb 2013 10:50:21 -0500 Subject: tests: Move do_moo to warnlib We want to warn on unnamed params in declarations to ensure that all functions are bindable. Thus, we need to move a test containing unnamed params to WarnLib so it can be tested. https://bugzilla.gnome.org/show_bug.cgi?id=693098 --- tests/scanner/Regress-1.0-expected.gir | 50 -------------------------- tests/scanner/WarnLib-1.0-expected.gir | 64 ++++++++++++++++++++++++++++++++++ tests/scanner/foo.c | 6 ---- tests/scanner/foo.h | 4 --- tests/scanner/warnlib.c | 13 +++++++ tests/scanner/warnlib.h | 23 ++++++++++++ 6 files changed, 100 insertions(+), 60 deletions(-) diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 98ad01b6..04b1e397 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -1754,22 +1754,6 @@ exposed to language bindings. - - - - - - - - - - - - - - - - @@ -1799,22 +1783,6 @@ exposed to language bindings. - - - - - - - - - - - - - - - - @@ -1851,24 +1819,6 @@ exposed to language bindings. - - - - - - - - - - - - - - - - - - diff --git a/tests/scanner/WarnLib-1.0-expected.gir b/tests/scanner/WarnLib-1.0-expected.gir index 9f3b348d..3f8be712 100644 --- a/tests/scanner/WarnLib-1.0-expected.gir +++ b/tests/scanner/WarnLib-1.0-expected.gir @@ -15,6 +15,70 @@ and/or use gtk-doc annotations. --> shared-library="" c:identifier-prefixes="WarnLib" c:symbol-prefixes="warnlib_"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/scanner/foo.c b/tests/scanner/foo.c index c883ada1..4d5090b6 100644 --- a/tests/scanner/foo.c +++ b/tests/scanner/foo.c @@ -124,12 +124,6 @@ regress_foo_sub_interface_do_bar (RegressFooSubInterface *self) REGRESS_FOO_SUBINTERFACE_GET_INTERFACE(self)->do_bar (self); } -void -regress_foo_sub_interface_do_moo (RegressFooSubInterface *self, int x, gpointer y) -{ - REGRESS_FOO_SUBINTERFACE_GET_INTERFACE(self)->do_moo (self, x, y); -} - /** * regress_foo_sub_interface_do_baz: * @self: diff --git a/tests/scanner/foo.h b/tests/scanner/foo.h index 20c92eb8..e097560e 100644 --- a/tests/scanner/foo.h +++ b/tests/scanner/foo.h @@ -76,16 +76,12 @@ struct _RegressFooSubInterfaceIface void (*do_bar) (RegressFooSubInterface *self); - /* explicitly test un-named parameters */ - void (*do_moo) (RegressFooSubInterface *self, int, gpointer); - void (*do_baz) (RegressFooSubInterface *self, GCallback callback, gpointer user_data); }; GType regress_foo_sub_interface_get_type (void) G_GNUC_CONST; void regress_foo_sub_interface_do_bar (RegressFooSubInterface *self); -void regress_foo_sub_interface_do_moo (RegressFooSubInterface *self, int, gpointer); void regress_foo_sub_interface_do_baz (RegressFooSubInterface *self, GCallback callback, gpointer user_data); diff --git a/tests/scanner/warnlib.c b/tests/scanner/warnlib.c index 4fc8515d..940d2b6a 100644 --- a/tests/scanner/warnlib.c +++ b/tests/scanner/warnlib.c @@ -18,3 +18,16 @@ warnlib_throw_unpaired (GError **error) return FALSE; } +typedef WarnLibWhateverIface WarnLibWhateverInterface; +G_DEFINE_INTERFACE (WarnLibWhatever, warnlib_whatever, G_TYPE_OBJECT) + +static void +warnlib_whatever_default_init(WarnLibWhateverIface *iface) +{ +} + +void +warnlib_whatever_do_moo (WarnLibWhatever *self, int x, gpointer y) +{ + WARNLIB_WHATEVER_GET_IFACE(self)->do_moo (self, x, y); +} diff --git a/tests/scanner/warnlib.h b/tests/scanner/warnlib.h index 8aca901a..9e448c08 100644 --- a/tests/scanner/warnlib.h +++ b/tests/scanner/warnlib.h @@ -10,4 +10,27 @@ GQuark warnlib_unpaired_error_quark (void); gboolean warnlib_throw_unpaired (GError **error); +/* interface */ +#define WARNLIB_TYPE_WHATEVER (warnlib_whatever_get_type ()) +#define WARNLIB_WHATEVER(object) (G_TYPE_CHECK_INSTANCE_CAST ((object), WARNLIB_TYPE_WHATEVER, WarnLibWhatever)) +#define WARNLIB_IS_WHATEVER(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), WARNLIB_TYPE_WHATEVER)) +#define WARNLIB_WHATEVER_GET_IFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), WARNLIB_TYPE_WHATEVER, WarnLibWhateverIface)) + +typedef struct _WarnLibWhateverIface WarnLibWhateverIface; +typedef struct _WarnLibWhatever WarnLibWhatever; + +struct _WarnLibWhateverIface +{ + GTypeInterface parent_iface; + + /* virtual table */ + + /* explicitly test un-named parameters */ + void (*do_moo) (WarnLibWhatever *self, int, gpointer); +}; + +void warnlib_whatever_do_moo (WarnLibWhatever *self, int, gpointer); + +GType warnlib_whatever_get_type (void) G_GNUC_CONST; + #endif -- cgit v1.2.1 From e9887d2a856a963c93ddbfdf1f8d40910555b78b Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 3 Feb 2013 11:13:53 -0500 Subject: warningtester: Sort the list of warnings This means that we can simply put all warnings at the bottom, unrelated to the order that they're emitted in the code, keeping line numbers more stable. https://bugzilla.gnome.org/show_bug.cgi?id=693098 --- tests/warn/warningtester.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/warn/warningtester.py b/tests/warn/warningtester.py index ee6b3c16..27e0a5e6 100644 --- a/tests/warn/warningtester.py +++ b/tests/warn/warningtester.py @@ -128,6 +128,9 @@ def check(args): expected_warnings = _extract_expected(filename) + expected_warnings.sort() + emitted_warnings.sort() + if len(expected_warnings) != len(emitted_warnings): raise SystemExit('ERROR in %r: %d warnings were emitted, ' 'expected %d:\n%s' %(os.path.basename(filename), -- cgit v1.2.1 From 06f2eb7c305bb717edeec84ebf39b113bf3481a5 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 3 Feb 2013 10:39:36 -0500 Subject: transformer: Warn on unnamed params in declarations These params are unannotatable and undocumentable. They really should not be allowed. https://bugzilla.gnome.org/show_bug.cgi?id=693098 --- giscanner/transformer.py | 14 +++++++++----- tests/warn/unknown-parameter.h | 20 ++++++++++++++++++++ 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/giscanner/transformer.py b/giscanner/transformer.py index ba7afb93..25857b73 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -410,7 +410,7 @@ raise ValueError.""" # Drop functions that start with _ very early on here if symbol.ident.startswith('_'): return None - parameters = list(self._create_parameters(symbol.base_type)) + parameters = list(self._create_parameters(symbol, symbol.base_type)) return_ = self._create_return(symbol.base_type.base_type) try: name = self._strip_symbol(symbol) @@ -478,11 +478,11 @@ raise ValueError.""" return value - def _create_parameters(self, base_type): + def _create_parameters(self, symbol, base_type): # warn if we see annotations for unknown parameters param_names = set(child.ident for child in base_type.child_list) for child in base_type.child_list: - yield self._create_parameter(child) + yield self._create_parameter(symbol, child) def _synthesize_union_type(self, symbol, parent_symbol): # Synthesize a named union so that it can be referenced. @@ -695,11 +695,15 @@ raise ValueError.""" return container return ast.Type(ctype=ctype, is_const=is_const, complete_ctype=complete_ctype) - def _create_parameter(self, symbol): + def _create_parameter(self, parent_symbol, symbol): if symbol.type == CSYMBOL_TYPE_ELLIPSIS: ptype = ast.Varargs() else: ptype = self._create_type_from_base(symbol.base_type, is_parameter=True) + + if symbol.ident is None and symbol.base_type and symbol.base_type.type != CTYPE_VOID: + message.warn_symbol(parent_symbol, "missing parameter name; undocumentable") + return ast.Parameter(symbol.ident, ptype) def _create_return(self, source_type): @@ -835,7 +839,7 @@ raise ValueError.""" return self._create_compound(ast.Union, symbol, anonymous) def _create_callback(self, symbol, member=False): - parameters = list(self._create_parameters(symbol.base_type.base_type)) + parameters = list(self._create_parameters(symbol, symbol.base_type.base_type)) retval = self._create_return(symbol.base_type.base_type.base_type) # Mark the 'user_data' arguments diff --git a/tests/warn/unknown-parameter.h b/tests/warn/unknown-parameter.h index 3d339b32..384704df 100644 --- a/tests/warn/unknown-parameter.h +++ b/tests/warn/unknown-parameter.h @@ -46,3 +46,23 @@ void test_param_missing(void); void test_param_varargs(int i, ...); // Should not warn + +/** + * test_undocumentable_param: + */ +void test_undocumentable_param(int); + +// EXPECT:53: Warning: Test: symbol='test_undocumentable_param': missing parameter name; undocumentable + +void test_undocumentable_param_2(int a, int); + +// EXPECT:57: Warning: Test: symbol='test_undocumentable_param_2': missing parameter name; undocumentable + +void test_undocumentable_param_3(int, int); + +// EXPECT:61: Warning: Test: symbol='test_undocumentable_param_3': missing parameter name; undocumentable +// EXPECT:61: Warning: Test: symbol='test_undocumentable_param_3': missing parameter name; undocumentable + +void test_void(void); + +// Should not warn -- cgit v1.2.1 From d06a453042dfc21a5bfc99f9c770d6cdfaf86939 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 3 Feb 2013 09:29:23 -0500 Subject: annotation: Fix invalid type I'm quite sure this is a typo rather than an intended thing. This will gain a test and a warning soon. https://bugzilla.gnome.org/show_bug.cgi?id=693098 --- tests/scanner/Regress-1.0-expected.gir | 5 ++--- tests/scanner/annotation.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 04b1e397..65628943 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -4056,8 +4056,7 @@ detection, and fixing it via regress_annotations. + c:identifier="regress_annotation_ptr_array"> @@ -4065,7 +4064,7 @@ detection, and fixing it via regress_annotations. the array - + diff --git a/tests/scanner/annotation.c b/tests/scanner/annotation.c index 1181644a..f3cfb424 100644 --- a/tests/scanner/annotation.c +++ b/tests/scanner/annotation.c @@ -753,7 +753,7 @@ regress_annotation_set_source_file (const char *fname) /** * regress_annotation_ptr_array: - * @array: (element-type GLib.Value): the array + * @array: (element-type GObject.Value): the array */ void regress_annotation_ptr_array (GPtrArray *array) -- cgit v1.2.1 From 71bc26058124b2b9f2e283eeb07fae5eb3e52710 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 3 Feb 2013 10:07:23 -0500 Subject: ast: Add a quick __repr__ to Field and Member Nothing too specific, just something to help with debugging. https://bugzilla.gnome.org/show_bug.cgi?id=693098 --- giscanner/ast.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/giscanner/ast.py b/giscanner/ast.py index aae9ee2e..f3639fe6 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -824,6 +824,8 @@ class Member(Annotated): def __cmp__(self, other): return cmp(self.name, other.name) + def __repr__(self): + return '%s(%r)' % (self.__class__.__name__, self.name) class Compound(Node, Registered): @@ -879,6 +881,9 @@ class Field(Annotated): def __cmp__(self, other): return cmp(self.name, other.name) + def __repr__(self): + return '%s(%r)' % (self.__class__.__name__, self.name) + class Record(Compound): -- cgit v1.2.1 From 7bdc0b75872dcff2e154d05121568de54996a947 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 3 Feb 2013 08:54:16 -0500 Subject: transformer: Ensure that types aren't resolved if we can't find them This ensures that things can't try to reference undefined/invalid types without emitting warnings, and that users need to include other GIRs at build time if they want to reference another type. https://bugzilla.gnome.org/show_bug.cgi?id=693098 --- giscanner/maintransformer.py | 2 +- giscanner/transformer.py | 30 ++++++++++++++++++++++++++---- tests/warn/invalid-element-type.h | 9 +++++++++ 3 files changed, 36 insertions(+), 5 deletions(-) diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py index d149f30a..4eaf6401 100644 --- a/giscanner/maintransformer.py +++ b/giscanner/maintransformer.py @@ -306,7 +306,7 @@ usage is void (*_gtk_reserved1)(void);""" else: text = type_str message.warn_node(parent, "%s: Unknown type: %r" % - (text, result.ctype), positions=position) + (text, type_str), positions=position) return result def _resolve_toplevel(self, type_str, type_node=None, node=None, parent=None): diff --git a/giscanner/transformer.py b/giscanner/transformer.py index 25857b73..0858b8d3 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -877,9 +877,12 @@ Note that type resolution may not succeed.""" if '.' in typestr: container = self._create_bare_container_type(typestr) if container: - return container - return self._namespace.type_from_name(typestr) - typeval = self.create_type_from_ctype_string(typestr) + typeval = container + else: + typeval = self._namespace.type_from_name(typestr) + else: + typeval = self.create_type_from_ctype_string(typestr) + self.resolve_type(typeval) if typeval.resolved: # Explicitly clear out the c_type; there isn't one in this case. @@ -924,7 +927,7 @@ Note that type resolution may not succeed.""" return True return False - def resolve_type(self, typeval): + def _resolve_type_internal(self, typeval): if isinstance(typeval, (ast.Array, ast.List)): return self.resolve_type(typeval.element_type) elif isinstance(typeval, ast.Map): @@ -938,6 +941,25 @@ Note that type resolution may not succeed.""" elif typeval.gtype_name: return self._resolve_type_from_gtype_name(typeval) + def resolve_type(self, typeval): + if not self._resolve_type_internal(typeval): + return False + + if typeval.target_fundamental or typeval.target_foreign: + return True + + assert typeval.target_giname is not None + + try: + type_ = self.lookup_giname(typeval.target_giname) + except KeyError: + typeval.target_giname = None + + if type_ is None: + typeval.target_giname = None + + return typeval.resolved + def _typepair_to_str(self, item): nsname, item = item if nsname is None: diff --git a/tests/warn/invalid-element-type.h b/tests/warn/invalid-element-type.h index c9ff3040..bcd9123b 100644 --- a/tests/warn/invalid-element-type.h +++ b/tests/warn/invalid-element-type.h @@ -65,6 +65,14 @@ void test_invalid_ptrarray_element_type(GPtrArray *p1, GPtrArray *p2); GList* test_unresolved_element_type(void); +/** + * test_unresolved_value_element_type: + * + * Returns: (element-type GLib.Value) (transfer full): + */ + +GPtrArray* test_unresolved_value_element_type(void); + // EXPECT:5: Warning: Test: element-type annotation takes at least one option, none given // EXPECT:6: Warning: Test: element-type annotation for a list must have exactly one option, not 2 options @@ -78,6 +86,7 @@ GList* test_unresolved_element_type(void); // EXPECT:51: Warning: Test: element-type annotation takes at least one option, none given // EXPECT:52: Warning: Test: invalid (element-type) for a GPtrArray, must be a pointer // EXPECT:63: Warning: Test: test_unresolved_element_type: Unknown type: 'Unresolved' +// EXPECT:71: Warning: Test: test_unresolved_value_element_type: Unknown type: 'GLib.Value' // EXPECT:4: Warning: Test: test_invalid_list_element_type: argument l1: Missing (element-type) annotation // EXPECT:4: Warning: Test: test_invalid_list_element_type: argument l2: Missing (element-type) annotation // EXPECT:50: Warning: Test: test_invalid_ptrarray_element_type: argument p1: Missing (element-type) annotation -- cgit v1.2.1 From e9939eeb1cd0a2626b968fd72387681366ecb61b Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 7 Feb 2013 15:25:25 -0500 Subject: scanner: Fix use of undeclared variable in previous commit Fixes the NetworkManager build. --- giscanner/transformer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giscanner/transformer.py b/giscanner/transformer.py index 0858b8d3..d6a5f8f9 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -953,7 +953,7 @@ Note that type resolution may not succeed.""" try: type_ = self.lookup_giname(typeval.target_giname) except KeyError: - typeval.target_giname = None + type_ = None if type_ is None: typeval.target_giname = None -- cgit v1.2.1 From 05f400942d2f3ac9a721bbfad5d58b6aa1d93cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20Sch=C3=B6nfeld?= Date: Sun, 2 Oct 2011 17:20:45 +0200 Subject: scanner: remove backcompat copies more safely Instead of modifying the namespace while we are iterating over it, which leads to nodes not being tested, set an 'internal_skipped' property on the function and read it in the GIR writer. https://bugzilla.gnome.org/show_bug.cgi?id=660698 --- giscanner/ast.py | 1 + giscanner/girwriter.py | 2 ++ giscanner/introspectablepass.py | 8 ++++---- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/giscanner/ast.py b/giscanner/ast.py index f3639fe6..1806720e 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -613,6 +613,7 @@ class Function(Callable): self.shadowed_by = None # C symbol string self.shadows = None # C symbol string self.moved_to = None # namespaced function name string + self.internal_skipped = False # if True, this func will not be written to GIR def clone(self): clone = copy.copy(self) diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py index c54a5389..90f7e1ed 100644 --- a/giscanner/girwriter.py +++ b/giscanner/girwriter.py @@ -173,6 +173,8 @@ and/or use gtk-doc annotations. ''') self._write_parameters(callable) def _write_function(self, func, tag_name='function'): + if func.internal_skipped: + return attrs = [] if hasattr(func, 'symbol'): attrs.append(('c:identifier', func.symbol)) diff --git a/giscanner/introspectablepass.py b/giscanner/introspectablepass.py index b87156a8..460c8200 100644 --- a/giscanner/introspectablepass.py +++ b/giscanner/introspectablepass.py @@ -229,8 +229,8 @@ class IntrospectablePass(object): def _remove_non_reachable_backcompat_copies(self, obj, stack): if obj.skip: return False - if (isinstance(obj, ast.Function) - and not obj.introspectable - and obj.moved_to is not None): - self._namespace.remove(obj) + if (isinstance(obj, ast.Function) and obj.moved_to is not None): + # remove functions that are not introspectable + if not obj.introspectable: + obj.internal_skipped = True return True -- cgit v1.2.1 From f2a530f575e4ad8dcff9406d136c6130202b3c4b Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 11 Feb 2013 11:49:31 -0500 Subject: build: Enable g-ir-doctool if mako is found Let's lift it out of the disabled-by-default ghetto. --- configure.ac | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index fc39916b..68fb3f25 100644 --- a/configure.ac +++ b/configure.ac @@ -262,10 +262,16 @@ fi dnl Not enabled by default until 3.6 cycle when we can propose mako as dnl an external dependency -AC_ARG_ENABLE(doctool,[ --enable-doctool enable g-ir-doctool ], enable_doctool=$enableval,enable_doctool=no) -if test x$enable_doctool != xno; then - AM_CHECK_PYMOD(mako,,,[AC_MSG_ERROR(Could not find python module: mako)]) -fi +AC_ARG_ENABLE(doctool,[ --disable-doctool disable g-ir-doctool ],,enable_doctool=auto) +AS_IF([ test x$enable_doctool != xno], [ + AM_CHECK_PYMOD(mako,,have_python_mako=yes,have_python_mako=no) +]) +AS_IF([ test x$enable_doctool = xauto && test x$have_python_mako = xyes ], + [ enable_doctool=yes ], + [ test x$enable_doctool = xauto && test x$have_python_mako = xno ], + [ enable_doctool=no ], + [ test x$enable_doctool = xyes && test x$have_python_mako = xno ], + [ AC_MSG_ERROR([Python mako module not found]) ]) AM_CONDITIONAL(BUILD_DOCTOOL, test x$enable_doctool != xno) # Glib documentation -- cgit v1.2.1 From 3818b98a9785026c8aab2cf07e35855caf32a768 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 3 Feb 2013 07:31:52 -0500 Subject: docmain: Support an include path for GIRs We need this to replace the test infrastructure so it can find Utility-1.0.gir --- giscanner/docmain.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/giscanner/docmain.py b/giscanner/docmain.py index 8919eabb..cd782fef 100644 --- a/giscanner/docmain.py +++ b/giscanner/docmain.py @@ -34,6 +34,9 @@ def doc_main(args): action="store", dest="language", default="Python", help="Output language") + parser.add_option("", "--add-include-path", + action="append", dest="include_paths", default=[], + help="include paths for other GIR files") options, args = parser.parse_args(args) if not options.output: @@ -50,6 +53,7 @@ def doc_main(args): extra_include_dirs = [os.path.join(top_srcdir, 'gir'), top_builddir] else: extra_include_dirs = [] + extra_include_dirs.extend(options.include_paths) transformer = Transformer.parse_from_gir(args[1], extra_include_dirs) writer = DocWriter(transformer, options.language) -- cgit v1.2.1 From ff80c6d88a28b26576508ab891c9b9da0b13ac49 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sat, 2 Feb 2013 11:07:42 -0500 Subject: doctool: Don't use zip(range(L)) Instead, remove it entirely (since we don't need the index) or instead use enumerate(). --- giscanner/doctemplates/C/function.tmpl | 6 +++--- giscanner/doctemplates/Gjs/class.tmpl | 2 +- giscanner/doctemplates/Gjs/enum.tmpl | 2 +- giscanner/doctemplates/Gjs/function.tmpl | 2 +- giscanner/doctemplates/Gjs/vfunc.tmpl | 2 +- giscanner/doctemplates/Python/class.tmpl | 2 +- giscanner/doctemplates/Python/enum.tmpl | 2 +- giscanner/doctemplates/Python/function.tmpl | 4 ++-- giscanner/doctemplates/Python/signal.tmpl | 4 ++-- giscanner/doctemplates/Python/vfunc.tmpl | 4 ++-- 10 files changed, 15 insertions(+), 15 deletions(-) diff --git a/giscanner/doctemplates/C/function.tmpl b/giscanner/doctemplates/C/function.tmpl index 94036986..e76eda31 100644 --- a/giscanner/doctemplates/C/function.tmpl +++ b/giscanner/doctemplates/C/function.tmpl @@ -25,10 +25,10 @@ <%block name="synopsis"> ${node.retval.type.ctype} ${formatter.format_function_name(node)} (\ -% if len(node.all_parameters) == 0: +% if not node.all_parameters: void\ % else: -% for arg, ix in zip(node.all_parameters, range(len(node.all_parameters))): +% for ix, arg in enumerate(node.all_parameters): % if ix != 0: ${' ' * (len(formatter.format_type(node.retval.type)) + len(formatter.format_function_name(node)) + 3)}\ % endif @@ -48,7 +48,7 @@ ${formatter.format_type(arg.type) | x} ${arg.argname}\ <%block name="details"> % if node.all_parameters or node.retval:
-% for arg, ix in zip(node.parameters, range(len(node.parameters))): +% for arg in node.parameters:

${arg.argname} :

${formatter.format(node, arg.doc)}
% endfor diff --git a/giscanner/doctemplates/Gjs/class.tmpl b/giscanner/doctemplates/Gjs/class.tmpl index 3991ff31..435b31a5 100644 --- a/giscanner/doctemplates/Gjs/class.tmpl +++ b/giscanner/doctemplates/Gjs/class.tmpl @@ -4,7 +4,7 @@ from gi.repository import ${namespace.name} ${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}(\ -% for property_, ix in zip(node.properties, range(len(node.properties))): +% for ix, property_ in enumerate(node.properties): % if property_.construct or property_.construct_only or property_.writable: ${property_.name.replace('-', '_')}=value\ % if ix != len(node.properties) - 1: diff --git a/giscanner/doctemplates/Gjs/enum.tmpl b/giscanner/doctemplates/Gjs/enum.tmpl index 840f79f5..2624c425 100644 --- a/giscanner/doctemplates/Gjs/enum.tmpl +++ b/giscanner/doctemplates/Gjs/enum.tmpl @@ -2,7 +2,7 @@ <%block name="details"> % if node.members:
-% for member, ix in zip(node.members, range(len(node.members))): +% for member in node.members:

${node.name}.${member.name.upper()} :

${formatter.format(node, member.doc)}
% endfor diff --git a/giscanner/doctemplates/Gjs/function.tmpl b/giscanner/doctemplates/Gjs/function.tmpl index d0fa096e..2039405d 100644 --- a/giscanner/doctemplates/Gjs/function.tmpl +++ b/giscanner/doctemplates/Gjs/function.tmpl @@ -35,7 +35,7 @@ ${', '.join('%s:%s' % (arg.argname, formatter.format_type(arg.type)) for arg in <%block name="details"> % if node.parameters or node.retval:
-% for arg, ix in zip(node.parameters, range(len(node.parameters))): +% for arg in node.parameters:

${arg.argname} :

${formatter.format(node, arg.doc)}
% endfor diff --git a/giscanner/doctemplates/Gjs/vfunc.tmpl b/giscanner/doctemplates/Gjs/vfunc.tmpl index bba3f38d..2e5d8c94 100644 --- a/giscanner/doctemplates/Gjs/vfunc.tmpl +++ b/giscanner/doctemplates/Gjs/vfunc.tmpl @@ -10,7 +10,7 @@ ${', '.join('%s:%s' % (arg.argname, formatter.format_type(arg.type)) for arg in <%block name="details"> % if node.parameters or node.retval:
-% for arg, ix in zip(node.parameters, range(len(node.parameters))): +% for arg in node.parameters:

${arg.argname} :

${formatter.format(node, arg.doc)}
% endfor diff --git a/giscanner/doctemplates/Python/class.tmpl b/giscanner/doctemplates/Python/class.tmpl index 3991ff31..435b31a5 100644 --- a/giscanner/doctemplates/Python/class.tmpl +++ b/giscanner/doctemplates/Python/class.tmpl @@ -4,7 +4,7 @@ from gi.repository import ${namespace.name} ${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}(\ -% for property_, ix in zip(node.properties, range(len(node.properties))): +% for ix, property_ in enumerate(node.properties): % if property_.construct or property_.construct_only or property_.writable: ${property_.name.replace('-', '_')}=value\ % if ix != len(node.properties) - 1: diff --git a/giscanner/doctemplates/Python/enum.tmpl b/giscanner/doctemplates/Python/enum.tmpl index 840f79f5..2624c425 100644 --- a/giscanner/doctemplates/Python/enum.tmpl +++ b/giscanner/doctemplates/Python/enum.tmpl @@ -2,7 +2,7 @@ <%block name="details"> % if node.members:
-% for member, ix in zip(node.members, range(len(node.members))): +% for member in node.members:

${node.name}.${member.name.upper()} :

${formatter.format(node, member.doc)}
% endfor diff --git a/giscanner/doctemplates/Python/function.tmpl b/giscanner/doctemplates/Python/function.tmpl index fa705bd0..23fde041 100644 --- a/giscanner/doctemplates/Python/function.tmpl +++ b/giscanner/doctemplates/Python/function.tmpl @@ -24,7 +24,7 @@ <%block name="synopsis"> -% if len(node.all_parameters) != 0: +% if node.all_parameters: @accepts(\ ${', '.join((formatter.format_type(arg.type) for arg in node.all_parameters))}\ ) @@ -40,7 +40,7 @@ ${', '.join((formatter.format_parameter_name(node, arg) for arg in node.all_para <%block name="details"> % if node.all_parameters or node.retval:
-% for arg, ix in zip(node.all_parameters, range(len(node.all_parameters))): +% for ix, arg in enumerate(node.all_parameters):

${formatter.format_parameter_name(node, arg)} :

${formatter.format(node, arg.doc)}
% endfor diff --git a/giscanner/doctemplates/Python/signal.tmpl b/giscanner/doctemplates/Python/signal.tmpl index 9b277466..abb3a3ae 100644 --- a/giscanner/doctemplates/Python/signal.tmpl +++ b/giscanner/doctemplates/Python/signal.tmpl @@ -6,7 +6,7 @@ <%block name="synopsis"> def callback(${formatter.to_underscores(node.parent.name).lower()}, \ -% for arg, ix in zip(node.parameters, range(len(node.parameters))): +% for arg in node.parameters: ${arg.argname}, \ % endfor user_param1, ...) @@ -16,7 +16,7 @@ user_param1, ...)

${formatter.to_underscores(node.parent.name).lower()} :

instance of ${namespace.name}.${node.parent.name} that is emitting the signal

-% for arg, ix in zip(node.parameters, range(len(node.parameters))): +% for arg in node.parameters:

${arg.argname} :

${formatter.format(node, arg.doc)}
% endfor diff --git a/giscanner/doctemplates/Python/vfunc.tmpl b/giscanner/doctemplates/Python/vfunc.tmpl index 65f856a5..6f7e6920 100644 --- a/giscanner/doctemplates/Python/vfunc.tmpl +++ b/giscanner/doctemplates/Python/vfunc.tmpl @@ -1,7 +1,7 @@ <%inherit file="/base.tmpl"/> <%block name="synopsis"> -% if len(node.parameters) != 0: +% if node.parameters: @accepts(\ ${', '.join((formatter.format_type(arg.type) for arg in node.parameters))}\ ) @@ -16,7 +16,7 @@ ${', '.join((arg.argname for arg in node.parameters))}\ <%block name="details"> % if node.parameters or node.retval:
-% for arg, ix in zip(node.parameters, range(len(node.parameters))): +% for arg in node.parameters:

${arg.argname} :

${formatter.format(node, arg.doc)}
% endfor -- cgit v1.2.1 From c9450dc3d7e2f87fa980923594736621f0ecd6ae Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sat, 2 Feb 2013 11:24:13 -0500 Subject: docwriter: Define a new formatter method for getting params This will let us gracefully skip over parameters that aren't exposed by specific language bindings. It also fixes a bug in the C/Python documentation where we weren't iterating over the right parameters. --- giscanner/doctemplates/C/function.tmpl | 12 ++++++------ giscanner/doctemplates/Gjs/function.tmpl | 8 ++++---- giscanner/doctemplates/Gjs/signal.tmpl | 4 ++-- giscanner/doctemplates/Gjs/vfunc.tmpl | 6 +++--- giscanner/doctemplates/Python/function.tmpl | 12 ++++++------ giscanner/doctemplates/Python/signal.tmpl | 4 ++-- giscanner/doctemplates/Python/vfunc.tmpl | 12 ++++++------ giscanner/docwriter.py | 12 ++++++++++++ .../DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page | 2 ++ .../DocExamples-1.0-C-expected/DocExamples.Obj.method.page | 2 ++ .../DocExamples.Obj-vfunc.page | 4 +++- 11 files changed, 48 insertions(+), 30 deletions(-) diff --git a/giscanner/doctemplates/C/function.tmpl b/giscanner/doctemplates/C/function.tmpl index e76eda31..c551bc2e 100644 --- a/giscanner/doctemplates/C/function.tmpl +++ b/giscanner/doctemplates/C/function.tmpl @@ -10,7 +10,7 @@ ${formatter.format_type(node.retval.type) | x} ${formatter.format_function_name(node)} -% for arg in node.all_parameters: +% for arg in formatter.get_parameters(node): % if arg.type.ctype == '': % else: @@ -25,10 +25,10 @@ <%block name="synopsis"> ${node.retval.type.ctype} ${formatter.format_function_name(node)} (\ -% if not node.all_parameters: +% if not formatter.get_parameters(node): void\ % else: -% for ix, arg in enumerate(node.all_parameters): +% for ix, arg in enumerate(formatter.get_parameters(node)): % if ix != 0: ${' ' * (len(formatter.format_type(node.retval.type)) + len(formatter.format_function_name(node)) + 3)}\ % endif @@ -37,7 +37,7 @@ ${' ' * (len(formatter.format_type(node.retval.type)) + len(formatter.format_fun % else: ${formatter.format_type(arg.type) | x} ${arg.argname}\ % endif -% if ix != len(node.all_parameters) - 1: +% if ix != len(formatter.get_parameters(node)) - 1: , % endif % endfor @@ -46,9 +46,9 @@ ${formatter.format_type(arg.type) | x} ${arg.argname}\ <%block name="details"> -% if node.all_parameters or node.retval: +% if formatter.get_parameters(node) or node.retval:
-% for arg in node.parameters: +% for arg in formatter.get_parameters(node):

${arg.argname} :

${formatter.format(node, arg.doc)}
% endfor diff --git a/giscanner/doctemplates/Gjs/function.tmpl b/giscanner/doctemplates/Gjs/function.tmpl index 2039405d..db2c8ae3 100644 --- a/giscanner/doctemplates/Gjs/function.tmpl +++ b/giscanner/doctemplates/Gjs/function.tmpl @@ -10,7 +10,7 @@ ${formatter.format_type(node.retval.type) | x} ${node.symbol} -% for arg in node.parameters: +% for arg in formatter.get_parameters(node): % if arg.type.ctype == '': % else: @@ -26,16 +26,16 @@ function \ ${node.name}(\ -${', '.join('%s:%s' % (arg.argname, formatter.format_type(arg.type)) for arg in node.parameters)}\ +${', '.join('%s:%s' % (arg.argname, formatter.format_type(arg.type)) for arg in formatter.get_parameters(node))}\ ):${formatter.format_type(node.retval.type)} { // Gjs wrapper for ${node.symbol}() } <%block name="details"> -% if node.parameters or node.retval: +% if formatter.get_parameters(node) or node.retval:
-% for arg in node.parameters: +% for arg in formatter.get_parameters(node):

${arg.argname} :

${formatter.format(node, arg.doc)}
% endfor diff --git a/giscanner/doctemplates/Gjs/signal.tmpl b/giscanner/doctemplates/Gjs/signal.tmpl index f2eb5868..83264804 100644 --- a/giscanner/doctemplates/Gjs/signal.tmpl +++ b/giscanner/doctemplates/Gjs/signal.tmpl @@ -6,7 +6,7 @@ <%block name="synopsis"> function callback(${formatter.to_underscores(node.parent.name).lower()}, \ -% for arg in node.parameters: +% for arg in formatter.get_parameters(node): ${arg.argname}:${formatter.format_type(arg.type)}, \ % endfor user_param1, ...):${formatter.format_type(node.retval.type)}; @@ -16,7 +16,7 @@ user_param1, ...):${formatter.format_type(node.retval.type)};

${formatter.to_underscores(node.parent.name).lower()} :

instance of ${namespace.name}.${node.parent.name} that is emitting the signal

-% for arg in node.parameters: +% for arg in formatter.get_parameters(node):

${arg.argname} :

${formatter.format(node, arg.doc)}
% endfor diff --git a/giscanner/doctemplates/Gjs/vfunc.tmpl b/giscanner/doctemplates/Gjs/vfunc.tmpl index 2e5d8c94..1d132c78 100644 --- a/giscanner/doctemplates/Gjs/vfunc.tmpl +++ b/giscanner/doctemplates/Gjs/vfunc.tmpl @@ -2,15 +2,15 @@ <%block name="synopsis"> function vfunc_${node.name}(\ -${', '.join('%s:%s' % (arg.argname, formatter.format_type(arg.type)) for arg in node.parameters)}\ +${', '.join('%s:%s' % (arg.argname, formatter.format_type(arg.type)) for arg in formatter.get_parameters(node))}\ ):${formatter.format_type(node.retval.type)} { } <%block name="details"> -% if node.parameters or node.retval: +% if formatter.get_parameters(node) or node.retval:
-% for arg in node.parameters: +% for arg in formatter.get_parameters(node):

${arg.argname} :

${formatter.format(node, arg.doc)}
% endfor diff --git a/giscanner/doctemplates/Python/function.tmpl b/giscanner/doctemplates/Python/function.tmpl index 23fde041..356619c3 100644 --- a/giscanner/doctemplates/Python/function.tmpl +++ b/giscanner/doctemplates/Python/function.tmpl @@ -10,7 +10,7 @@ ${formatter.format_type(node.retval.type) | x} ${node.symbol} -% for arg in node.all_parameters: +% for arg in formatter.get_parameters(node): % if arg.type.ctype == '': % else: @@ -24,23 +24,23 @@ <%block name="synopsis"> -% if node.all_parameters: +% if formatter.get_parameters(node): @accepts(\ -${', '.join((formatter.format_type(arg.type) for arg in node.all_parameters))}\ +${', '.join((formatter.format_type(arg.type) for arg in formatter.get_parameters(node)))}\ ) % endif @returns(${formatter.format_type(node.retval.type) | x}) def \ ${node.name}(\ -${', '.join((formatter.format_parameter_name(node, arg) for arg in node.all_parameters))}\ +${', '.join((formatter.format_parameter_name(node, arg) for arg in formatter.get_parameters(node)))}\ ): # Python wrapper for ${node.symbol}() <%block name="details"> -% if node.all_parameters or node.retval: +% if formatter.get_parameters(node) or node.retval:
-% for ix, arg in enumerate(node.all_parameters): +% for ix, arg in enumerate(formatter.get_parameters(node)):

${formatter.format_parameter_name(node, arg)} :

${formatter.format(node, arg.doc)}
% endfor diff --git a/giscanner/doctemplates/Python/signal.tmpl b/giscanner/doctemplates/Python/signal.tmpl index abb3a3ae..0df13f64 100644 --- a/giscanner/doctemplates/Python/signal.tmpl +++ b/giscanner/doctemplates/Python/signal.tmpl @@ -6,7 +6,7 @@ <%block name="synopsis"> def callback(${formatter.to_underscores(node.parent.name).lower()}, \ -% for arg in node.parameters: +% for arg in formatter.get_parameters(node): ${arg.argname}, \ % endfor user_param1, ...) @@ -16,7 +16,7 @@ user_param1, ...)

${formatter.to_underscores(node.parent.name).lower()} :

instance of ${namespace.name}.${node.parent.name} that is emitting the signal

-% for arg in node.parameters: +% for arg in formatter.get_parameters(node):

${arg.argname} :

${formatter.format(node, arg.doc)}
% endfor diff --git a/giscanner/doctemplates/Python/vfunc.tmpl b/giscanner/doctemplates/Python/vfunc.tmpl index 6f7e6920..c4716a5e 100644 --- a/giscanner/doctemplates/Python/vfunc.tmpl +++ b/giscanner/doctemplates/Python/vfunc.tmpl @@ -1,22 +1,22 @@ <%inherit file="/base.tmpl"/> <%block name="synopsis"> -% if node.parameters: +% if formatter.get_parameters(node): @accepts(\ -${', '.join((formatter.format_type(arg.type) for arg in node.parameters))}\ +${', '.join((formatter.format_type(arg.type) for arg in formatter.get_parameters(node)))}\ ) % endif @returns(${formatter.format_type(node.retval.type) | x}) def \ -do_${node.name}(self, \ -${', '.join((arg.argname for arg in node.parameters))}\ +do_${node.name}(\ +${', '.join((arg.argname for arg in formatter.get_parameters(node)))}\ ): <%block name="details"> -% if node.parameters or node.retval: +% if formatter.get_parameters(node) or node.retval:
-% for arg in node.parameters: +% for arg in formatter.get_parameters(node):

${arg.argname} :

${formatter.format(node, arg.doc)}
% endfor diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py index 2b9cb0fc..be4d74ff 100644 --- a/giscanner/docwriter.py +++ b/giscanner/docwriter.py @@ -289,6 +289,9 @@ class DocFormatter(object): return dispatch[kind](node, match, props) + def get_parameters(self, node): + raise NotImplementedError + def format_inline(self, node, para): tokens = self._scanner.scan(para) words = [self._process_token(node, tok) for tok in tokens] @@ -374,6 +377,9 @@ class DocFormatterC(DocFormatter): else: return func.name + def get_parameters(self, node): + return node.all_parameters + class DocFormatterPython(DocFormatter): language = "Python" mime_type = "text/python" @@ -450,6 +456,9 @@ class DocFormatterPython(DocFormatter): else: return func.name + def get_parameters(self, node): + return node.all_parameters + class DocFormatterGjs(DocFormatter): language = "Gjs" mime_type = "text/x-gjs" @@ -520,6 +529,9 @@ class DocFormatterGjs(DocFormatter): else: return func.name + def get_parameters(self, node): + return node.parameters + LANGUAGES = { "c": DocFormatterC, "python": DocFormatterPython, diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page index 6a71a87c..7ff7e568 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page @@ -25,6 +25,8 @@ void vfunc (DocExamplesObj* self,
+

self :

+

first_arg :

first argument

Returns :

diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page index 8dbe8a73..b154b8de 100644 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page +++ b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page @@ -61,6 +61,8 @@ in as obj.

This should be a %FALSEALARM.

+

obj :

+

A .

first_arg :

first argument

second_arg :

diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page index a4864631..94fe8f67 100644 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page +++ b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page @@ -13,7 +13,7 @@ DocExamples.Obj::vfunc -@accepts(int) +@accepts(DocExamples.Obj, int) @returns(none) def do_vfunc(self, first_arg): @@ -26,6 +26,8 @@ def do_vfunc(self, first_arg):
+

self :

+

first_arg :

first argument

-- cgit v1.2.1 From 4dee82c91f91076e96c1c8d309621a9fb1141ac8 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sat, 2 Feb 2013 11:40:51 -0500 Subject: docwriter: Skip lots of special kinds of parameters Gjs ignores all of these when constructing function signatures. --- giscanner/docwriter.py | 17 ++++++++++++++++- .../DocExamples.callback_function.page | 14 +------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py index be4d74ff..cd721778 100644 --- a/giscanner/docwriter.py +++ b/giscanner/docwriter.py @@ -530,7 +530,22 @@ class DocFormatterGjs(DocFormatter): return func.name def get_parameters(self, node): - return node.parameters + skip = [] + for param in node.parameters: + if param.direction == ast.PARAM_DIRECTION_OUT: + skip.append(param) + if param.closure_name is not None: + skip.append(node.get_parameter(param.closure_name)) + if param.destroy_name is not None: + skip.append(node.get_parameter(param.destroy_name)) + if isinstance(param.type, ast.Array) and param.type.length_param_name is not None: + skip.append(node.get_parameter(param.type.length_param_name)) + + params = [] + for param in node.parameters: + if param not in skip: + params.append(param) + return params LANGUAGES = { "c": DocFormatterC, diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.callback_function.page index 4e3de123..cb449c74 100644 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.callback_function.page +++ b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.callback_function.page @@ -17,21 +17,13 @@ DocExamples.Callback callback - - gpointer - user_data - - - GLib.DestroyNotify - destroy_notify - callback_function -function callback_function(callback:DocExamples.Callback, user_data:gpointer, destroy_notify:GLib.DestroyNotify):DocExamples.Enum { +function callback_function(callback:DocExamples.Callback):DocExamples.Enum { // Gjs wrapper for doc_examples_callback_function() } @@ -47,10 +39,6 @@ will expose this in different ways (e.g. Python keeps the

callback :

Just Call Me Maybe

-

user_data :

-

your stuff

-

destroy_notify :

-

how to get rid of user_data

Returns :

.foo sometimes, .bar other times.

-- cgit v1.2.1 From a10a32a191aa2f0a124ab79ba5906f8f57b69cdd Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 3 Feb 2013 10:19:42 -0500 Subject: docwriter: Support varargs in parameter names --- giscanner/docwriter.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py index cd721778..ddd0e6ea 100644 --- a/giscanner/docwriter.py +++ b/giscanner/docwriter.py @@ -298,7 +298,10 @@ class DocFormatter(object): return ''.join(words) def format_parameter_name(self, node, parameter): - return parameter.argname + if isinstance(parameter.type, ast.Varargs): + return "..." + else: + return parameter.argname def format_function_name(self, func): raise NotImplementedError @@ -412,6 +415,8 @@ class DocFormatterPython(DocFormatter): # Force "self" for the first parameter of a method if self.is_method(node) and parameter is node.instance_parameter: return "self" + elif isinstance(parameter.type, ast.Varargs): + return "..." else: return parameter.argname -- cgit v1.2.1 From 841a6cfefbb1954ce94c89009be736895b91699c Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 3 Feb 2013 08:15:28 -0500 Subject: docwriter: Support formatting of types without c:types This can happen for properties/signals. --- giscanner/docwriter.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py index ddd0e6ea..8a03aefe 100644 --- a/giscanner/docwriter.py +++ b/giscanner/docwriter.py @@ -371,8 +371,11 @@ class DocFormatterC(DocFormatter): return self.format_type(type_.element_type) + '*' elif type_.ctype is not None: return type_.ctype - else: + elif type_.target_fundamental: return type_.target_fundamental + else: + node = self._transformer.lookup_typenode(type_) + return getattr(node, 'ctype') def format_function_name(self, func): if isinstance(func, (ast.Function)): -- cgit v1.2.1 From 86f7acf0f139a917e460db26872b5a4306fca8d2 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 3 Feb 2013 06:58:53 -0500 Subject: tests: Use Regress GIR for doctool This makes us test a lot more functionality in the doc tool, and removes the need to have a lot of different test libraries, and different test infrastructure. --- .gitignore | 2 +- common.mk | 6 + configure.ac | 1 - tests/Makefile.am | 6 - .../DocExamples.Callback.page | 25 --- .../DocExamples.Enum.page | 25 --- .../DocExamples.Obj-property-example.page | 27 --- .../DocExamples.Obj-signal-example.page | 42 ----- .../DocExamples.Obj-vfunc.page | 38 ---- .../DocExamples.Obj.method.page | 82 --------- .../DocExamples.Obj.new.page | 38 ---- .../DocExamples.Obj.page | 59 ------ .../DocExamples.Obj.static_method.page | 45 ----- .../DocExamples.ObjClass.page | 25 --- .../DocExamples.array_function.page | 45 ----- .../DocExamples.callback_function.page | 60 ------ .../doctool/DocExamples-1.0-C-expected/index.page | 33 ---- .../DocExamples.Callback.page | 25 --- .../DocExamples.Enum.page | 31 ---- .../DocExamples.Obj-property-example.page | 30 --- .../DocExamples.Obj-signal-example.page | 44 ----- .../DocExamples.Obj-vfunc.page | 34 ---- .../DocExamples.Obj.method.page | 73 -------- .../DocExamples.Obj.new.page | 40 ---- .../DocExamples.Obj.page | 63 ------- .../DocExamples.Obj.static_method.page | 47 ----- .../DocExamples.array_function.page | 47 ----- .../DocExamples.callback_function.page | 48 ----- .../DocExamples-1.0-Gjs-expected/index.page | 33 ---- .../DocExamples.Callback.page | 25 --- .../DocExamples.Enum.page | 31 ---- .../DocExamples.Obj-property-example.page | 30 --- .../DocExamples.Obj-signal-example.page | 44 ----- .../DocExamples.Obj-vfunc.page | 37 ---- .../DocExamples.Obj.method.page | 80 -------- .../DocExamples.Obj.page | 63 ------- .../DocExamples.Obj.static_method.page | 48 ----- .../DocExamples.array_function.page | 48 ----- .../DocExamples.callback_function.page | 61 ------- .../DocExamples-1.0-Python-expected/index.page | 33 ---- tests/doctool/Makefile.am | 60 ------ tests/doctool/doc-examples-obj.c | 203 --------------------- tests/doctool/doc-examples-obj.h | 93 ---------- tests/scanner/Makefile.am | 38 +++- .../Regress.ANNOTATION_CALCULATED_DEFINE.page | 25 +++ .../Regress.ANNOTATION_CALCULATED_LARGE.page | 26 +++ .../Regress.ANNOTATION_CALCULATED_LARGE_DIV.page | 25 +++ .../Regress-1.0-C-expected/Regress.ATestError.page | 25 +++ .../Regress.AliasedTestBoxed.page | 25 +++ .../Regress.AnnotationBitfield.page | 25 +++ .../Regress.AnnotationCallback.page | 25 +++ .../Regress.AnnotationForeachFunc.page | 25 +++ .../Regress.AnnotationListCallback.page | 25 +++ .../Regress.AnnotationNotifyFunc.page | 26 +++ .../Regress.AnnotationObject-attribute-signal.page | 38 ++++ ...ess.AnnotationObject-doc-empty-arg-parsing.page | 35 ++++ ...Regress.AnnotationObject-function-property.page | 26 +++ .../Regress.AnnotationObject-list-signal.page | 36 ++++ .../Regress.AnnotationObject-string-property.page | 27 +++ .../Regress.AnnotationObject-string-signal.page | 37 ++++ .../Regress.AnnotationObject-tab-property.page | 28 +++ .../Regress.AnnotationObject.allow_none.page | 51 ++++++ .../Regress.AnnotationObject.calleeowns.page | 51 ++++++ .../Regress.AnnotationObject.calleesowns.page | 58 ++++++ .../Regress.AnnotationObject.compute_sum.page | 51 ++++++ .../Regress.AnnotationObject.compute_sum_n.page | 58 ++++++ .../Regress.AnnotationObject.compute_sum_nz.page | 58 ++++++ .../Regress.AnnotationObject.create_object.page | 44 +++++ .../Regress.AnnotationObject.do_not_use.page | 44 +++++ .../Regress.AnnotationObject.extra_annos.page | 44 +++++ .../Regress.AnnotationObject.foreach.page | 58 ++++++ .../Regress.AnnotationObject.get_hash.page | 45 +++++ .../Regress.AnnotationObject.get_objects.page | 46 +++++ .../Regress.AnnotationObject.get_strings.page | 45 +++++ .../Regress.AnnotationObject.hidden_self.page | 44 +++++ .../Regress.AnnotationObject.in.page | 51 ++++++ .../Regress.AnnotationObject.inout.page | 51 ++++++ .../Regress.AnnotationObject.inout2.page | 51 ++++++ .../Regress.AnnotationObject.inout3.page | 51 ++++++ .../Regress.AnnotationObject.method.page | 44 +++++ .../Regress.AnnotationObject.notrans.page | 44 +++++ .../Regress.AnnotationObject.out.page | 51 ++++++ .../Regress.AnnotationObject.page | 58 ++++++ .../Regress.AnnotationObject.parse_args.page | 58 ++++++ .../Regress.AnnotationObject.set_data.page | 58 ++++++ .../Regress.AnnotationObject.set_data2.page | 58 ++++++ .../Regress.AnnotationObject.set_data3.page | 59 ++++++ .../Regress.AnnotationObject.string_out.page | 51 ++++++ .../Regress.AnnotationObject.use_buffer.page | 51 ++++++ .../Regress.AnnotationObject.watch.page | 59 ++++++ .../Regress.AnnotationObject.watch_full.page | 65 +++++++ .../Regress.AnnotationObject.with_voidp.page | 51 ++++++ .../Regress.AnnotationObjectClass.page | 25 +++ .../Regress.AnnotationStruct.page | 25 +++ .../Regress.DOUBLE_CONSTANT.page | 25 +++ .../Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page | 25 +++ .../Regress.FOO_PIE_IS_TASTY.page | 25 +++ .../Regress.FOO_SUCCESS_INT.page | 25 +++ .../Regress-1.0-C-expected/Regress.FooASingle.page | 25 +++ .../Regress.FooAddressType.page | 25 +++ .../Regress.FooBRect.add.page | 51 ++++++ .../Regress.FooBRect.new.page | 51 ++++++ .../Regress-1.0-C-expected/Regress.FooBRect.page | 25 +++ .../Regress-1.0-C-expected/Regress.FooBUnion.page | 25 +++ .../Regress.FooBoxed.method.page | 44 +++++ .../Regress.FooBoxed.new.page | 38 ++++ .../Regress-1.0-C-expected/Regress.FooBoxed.page | 25 +++ .../Regress-1.0-C-expected/Regress.FooBuffer.page | 61 +++++++ .../Regress.FooBuffer.some_method.page | 44 +++++ .../Regress.FooCallback.page | 25 +++ .../Regress.FooDBusData.method.page | 44 +++++ .../Regress.FooDBusData.page | 25 +++ .../Regress.FooEnumFullname.page | 25 +++ .../Regress.FooEnumNoType.page | 25 +++ .../Regress.FooEnumType.page | 25 +++ .../Regress-1.0-C-expected/Regress.FooError.page | 25 +++ .../Regress-1.0-C-expected/Regress.FooEvent.page | 25 +++ .../Regress.FooEventAny.page | 25 +++ .../Regress.FooEventExpose.page | 25 +++ .../Regress.FooFlagsNoType.page | 25 +++ .../Regress.FooFlagsType.page | 25 +++ .../Regress.FooForeignStruct.copy.page | 44 +++++ .../Regress.FooForeignStruct.new.page | 38 ++++ .../Regress.FooForeignStruct.page | 25 +++ .../Regress.FooInterface-do_regress_foo.page | 37 ++++ .../Regress.FooInterface.do_regress_foo.page | 51 ++++++ .../Regress.FooInterface.page | 55 ++++++ .../Regress.FooInterface.static_method.page | 44 +++++ .../Regress.FooInterfaceIface.page | 25 +++ .../Regress.FooObject-hidden.page | 26 +++ .../Regress.FooObject-read_fn.page | 40 ++++ .../Regress.FooObject-signal.page | 38 ++++ .../Regress.FooObject-string.page | 26 +++ .../Regress.FooObject-virtual_method.page | 37 ++++ .../Regress.FooObject.a_global_method.page | 44 +++++ .../Regress.FooObject.append_new_stack_layer.page | 51 ++++++ .../Regress.FooObject.dup_name.page | 44 +++++ .../Regress.FooObject.external_type.page | 44 +++++ .../Regress.FooObject.get_default.page | 39 ++++ .../Regress.FooObject.get_name.page | 44 +++++ .../Regress.FooObject.handle_glyph.page | 51 ++++++ .../Regress.FooObject.is_it_time_yet.page | 51 ++++++ .../Regress.FooObject.new.page | 38 ++++ .../Regress.FooObject.new_as_super.page | 38 ++++ .../Regress.FooObject.new_cookie.page | 51 ++++++ .../Regress-1.0-C-expected/Regress.FooObject.page | 58 ++++++ .../Regress.FooObject.read.page | 58 ++++++ .../Regress.FooObject.skipped_method.page | 44 +++++ .../Regress.FooObject.static_meth.page | 38 ++++ .../Regress.FooObject.take_all.page | 55 ++++++ .../Regress.FooObject.various.page | 58 ++++++ .../Regress.FooObject.virtual_method.page | 51 ++++++ .../Regress.FooObjectClass.page | 25 +++ .../Regress.FooObjectCookie.page | 25 +++ .../Regress.FooOtherObject.page | 58 ++++++ .../Regress.FooRectangle.add.page | 51 ++++++ .../Regress.FooRectangle.new.page | 66 +++++++ .../Regress.FooRectangle.page | 25 +++ .../Regress.FooSkippable.page | 26 +++ .../Regress.FooStackLayer.page | 25 +++ .../Regress-1.0-C-expected/Regress.FooStruct.page | 25 +++ .../Regress.FooSubInterface-destroy-event.page | 33 ++++ .../Regress.FooSubInterface-destroy_event.page | 34 ++++ .../Regress.FooSubInterface-do_bar.page | 34 ++++ .../Regress.FooSubInterface-do_baz.page | 40 ++++ .../Regress.FooSubInterface.do_bar.page | 44 +++++ .../Regress.FooSubInterface.do_baz.page | 58 ++++++ .../Regress.FooSubInterface.page | 55 ++++++ .../Regress.FooSubInterfaceIface.page | 25 +++ .../Regress.FooSubobject.new.page | 38 ++++ .../Regress.FooSubobject.page | 61 +++++++ .../Regress.FooSubobjectClass.page | 25 +++ .../Regress.FooThingWithArray.page | 25 +++ .../Regress-1.0-C-expected/Regress.FooUnion.page | 25 +++ .../Regress.FooUtilityStruct.page | 25 +++ .../Regress.FooVarargsCallback.page | 25 +++ .../Regress-1.0-C-expected/Regress.FooXEvent.page | 25 +++ .../Regress.GUINT64_CONSTANT.page | 25 +++ .../Regress.GUINT64_CONSTANTA.page | 25 +++ .../Regress.G_GINT64_CONSTANT.page | 25 +++ .../Regress.INT_CONSTANT.page | 25 +++ .../Regress-1.0-C-expected/Regress.IntSet.page | 25 +++ .../Regress.LONG_STRING_CONSTANT.page | 25 +++ .../Regress.LikeGnomeKeyringPasswordSchema.page | 25 +++ .../Regress-1.0-C-expected/Regress.MAXUINT64.page | 25 +++ .../Regress-1.0-C-expected/Regress.MININT64.page | 25 +++ .../Regress.Mixed_Case_Constant.page | 25 +++ .../Regress.NEGATIVE_INT_CONSTANT.page | 25 +++ .../Regress.PtrArrayAlias.page | 25 +++ .../Regress.STRING_CONSTANT.page | 25 +++ .../Regress.SkippedStructure.page | 26 +++ .../Regress.TestABCError.page | 25 +++ .../Regress.TestBoxed.copy.page | 44 +++++ .../Regress.TestBoxed.equals.page | 51 ++++++ .../Regress.TestBoxed.new.page | 38 ++++ ...ess.TestBoxed.new_alternative_constructor1.page | 44 +++++ ...ess.TestBoxed.new_alternative_constructor2.page | 51 ++++++ ...ess.TestBoxed.new_alternative_constructor3.page | 44 +++++ .../Regress-1.0-C-expected/Regress.TestBoxed.page | 25 +++ .../Regress.TestBoxedB.copy.page | 44 +++++ .../Regress.TestBoxedB.new.page | 51 ++++++ .../Regress-1.0-C-expected/Regress.TestBoxedB.page | 25 +++ .../Regress.TestBoxedC.new.page | 38 ++++ .../Regress-1.0-C-expected/Regress.TestBoxedC.page | 25 +++ .../Regress.TestBoxedD.copy.page | 44 +++++ .../Regress.TestBoxedD.free.page | 44 +++++ .../Regress.TestBoxedD.get_magic.page | 44 +++++ .../Regress.TestBoxedD.new.page | 51 ++++++ .../Regress-1.0-C-expected/Regress.TestBoxedD.page | 25 +++ .../Regress.TestCallback.page | 25 +++ .../Regress.TestCallbackArray.page | 25 +++ .../Regress.TestCallbackFull.page | 25 +++ .../Regress.TestCallbackGError.page | 25 +++ .../Regress.TestCallbackHashtable.page | 25 +++ .../Regress.TestCallbackOwnedGError.page | 25 +++ .../Regress.TestCallbackUserData.page | 25 +++ .../Regress.TestDEFError.page | 25 +++ .../Regress-1.0-C-expected/Regress.TestEnum.page | 25 +++ .../Regress.TestEnumNoGEnum.page | 25 +++ .../Regress.TestEnumUnsigned.page | 25 +++ .../Regress-1.0-C-expected/Regress.TestError.page | 25 +++ .../Regress-1.0-C-expected/Regress.TestFlags.page | 25 +++ .../Regress.TestFloating.new.page | 38 ++++ .../Regress.TestFloating.page | 61 +++++++ .../Regress.TestFloatingClass.page | 25 +++ .../Regress.TestFundamentalObject.page | 55 ++++++ .../Regress.TestFundamentalObject.ref.page | 44 +++++ .../Regress.TestFundamentalObject.unref.page | 44 +++++ .../Regress.TestFundamentalObjectClass.page | 25 +++ .../Regress.TestFundamentalObjectCopyFunction.page | 25 +++ ...ress.TestFundamentalObjectFinalizeFunction.page | 25 +++ .../Regress.TestFundamentalSubObject.new.page | 44 +++++ .../Regress.TestFundamentalSubObject.page | 58 ++++++ .../Regress.TestFundamentalSubObjectClass.page | 25 +++ .../Regress.TestInheritDrawable.do_foo.page | 51 ++++++ ...ess.TestInheritDrawable.do_foo_maybe_throw.page | 51 ++++++ .../Regress.TestInheritDrawable.get_origin.page | 58 ++++++ .../Regress.TestInheritDrawable.get_size.page | 58 ++++++ .../Regress.TestInheritDrawable.page | 58 ++++++ .../Regress.TestInheritDrawableClass.page | 25 +++ .../Regress.TestInheritPixmapObjectClass.page | 25 +++ .../Regress.TestInterface.page | 55 ++++++ .../Regress.TestInterfaceIface.page | 25 +++ .../Regress.TestObj-all.page | 33 ++++ .../Regress.TestObj-allow_none_vfunc.page | 37 ++++ .../Regress.TestObj-bare.page | 26 +++ .../Regress.TestObj-boxed.page | 26 +++ .../Regress.TestObj-cleanup.page | 33 ++++ .../Regress.TestObj-double.page | 26 +++ .../Regress.TestObj-first.page | 33 ++++ .../Regress.TestObj-float.page | 26 +++ .../Regress.TestObj-gtype.page | 26 +++ .../Regress.TestObj-hash-table-old.page | 26 +++ .../Regress.TestObj-hash-table.page | 26 +++ .../Regress.TestObj-int.page | 26 +++ .../Regress.TestObj-list-old.page | 26 +++ .../Regress.TestObj-list.page | 26 +++ .../Regress.TestObj-matrix.page | 39 ++++ .../Regress.TestObj-sig-with-array-prop.page | 36 ++++ .../Regress.TestObj-sig-with-foreign-struct.page | 35 ++++ .../Regress.TestObj-sig-with-hash-prop.page | 36 ++++ .../Regress.TestObj-sig-with-int64-prop.page | 36 ++++ .../Regress.TestObj-sig-with-intarray-ret.page | 35 ++++ .../Regress.TestObj-sig-with-obj.page | 36 ++++ .../Regress.TestObj-sig-with-strv.page | 35 ++++ .../Regress.TestObj-sig-with-uint64-prop.page | 36 ++++ .../Regress.TestObj-string.page | 26 +++ ...Regress.TestObj-test-with-static-scope-arg.page | 35 ++++ .../Regress.TestObj-test.page | 33 ++++ .../Regress.TestObj.constructor.page | 38 ++++ .../Regress.TestObj.do_matrix.page | 53 ++++++ ...gress.TestObj.emit_sig_with_foreign_struct.page | 44 +++++ .../Regress.TestObj.emit_sig_with_int64.page | 44 +++++ .../Regress.TestObj.emit_sig_with_obj.page | 44 +++++ .../Regress.TestObj.emit_sig_with_uint64.page | 44 +++++ .../Regress.TestObj.forced_method.page | 44 +++++ .../Regress.TestObj.instance_method.page | 44 +++++ .../Regress.TestObj.instance_method_callback.page | 51 ++++++ .../Regress.TestObj.new.page | 44 +++++ .../Regress.TestObj.new_callback.page | 58 ++++++ .../Regress.TestObj.new_from_file.page | 44 +++++ .../Regress.TestObj.null_out.page | 44 +++++ .../Regress-1.0-C-expected/Regress.TestObj.page | 58 ++++++ .../Regress.TestObj.set_bare.page | 51 ++++++ .../Regress.TestObj.skip_inout_param.page | 93 ++++++++++ .../Regress.TestObj.skip_out_param.page | 93 ++++++++++ .../Regress.TestObj.skip_param.page | 93 ++++++++++ .../Regress.TestObj.skip_return_val.page | 93 ++++++++++ .../Regress.TestObj.skip_return_val_no_out.page | 52 ++++++ .../Regress.TestObj.static_method.page | 44 +++++ .../Regress.TestObj.static_method_callback.page | 44 +++++ .../Regress.TestObj.torture_signature_0.page | 86 +++++++++ .../Regress.TestObj.torture_signature_1.page | 86 +++++++++ .../Regress.TestObjClass.page | 25 +++ .../Regress.TestOtherError.page | 25 +++ .../Regress.TestPrivateEnum.page | 25 +++ .../Regress.TestPrivateStruct.page | 25 +++ .../Regress.TestSimpleBoxedA.const_return.page | 38 ++++ .../Regress.TestSimpleBoxedA.copy.page | 44 +++++ .../Regress.TestSimpleBoxedA.equals.page | 51 ++++++ .../Regress.TestSimpleBoxedA.page | 25 +++ .../Regress.TestSimpleBoxedB.copy.page | 44 +++++ .../Regress.TestSimpleBoxedB.page | 25 +++ .../Regress.TestSimpleCallback.page | 25 +++ .../Regress.TestStructA.clone.page | 51 ++++++ .../Regress.TestStructA.page | 25 +++ .../Regress.TestStructA.parse.page | 51 ++++++ .../Regress.TestStructB.clone.page | 51 ++++++ .../Regress.TestStructB.page | 25 +++ .../Regress.TestStructC.page | 25 +++ .../Regress.TestStructD.page | 25 +++ .../Regress.TestStructE.page | 25 +++ .../Regress.TestStructE__some_union__union.page | 25 +++ .../Regress.TestStructF.page | 25 +++ .../Regress.TestStructFixedArray.frob.page | 44 +++++ .../Regress.TestStructFixedArray.page | 25 +++ .../Regress.TestSubObj.instance_method.page | 44 +++++ .../Regress.TestSubObj.new.page | 38 ++++ .../Regress-1.0-C-expected/Regress.TestSubObj.page | 61 +++++++ .../Regress.TestSubObj.unset_bare.page | 44 +++++ .../Regress.TestSubObjClass.page | 25 +++ .../Regress.TestTypeGUInt64.page | 25 +++ .../Regress.TestWi8021x-testbool.page | 26 +++ .../Regress.TestWi8021x.get_testbool.page | 44 +++++ .../Regress.TestWi8021x.new.page | 38 ++++ .../Regress.TestWi8021x.page | 58 ++++++ .../Regress.TestWi8021x.set_testbool.page | 51 ++++++ .../Regress.TestWi8021x.static_method.page | 44 +++++ .../Regress.TestWi8021xClass.page | 25 +++ .../Regress.UTF8_CONSTANT.page | 25 +++ .../Regress.VaListAlias.page | 25 +++ .../Regress.aliased_caller_alloc.page | 44 +++++ .../Regress.annotation_attribute_func.page | 51 ++++++ .../Regress.annotation_custom_destroy.page | 59 ++++++ .../Regress.annotation_get_source_file.page | 38 ++++ .../Regress.annotation_init.page | 51 ++++++ ...ress.annotation_invalid_regress_annotation.page | 44 +++++ .../Regress.annotation_ptr_array.page | 44 +++++ .../Regress.annotation_return_array.page | 44 +++++ .../Regress.annotation_return_filename.page | 38 ++++ .../Regress.annotation_set_source_file.page | 44 +++++ ...s.annotation_space_after_comment_bug631690.page | 38 ++++ .../Regress.annotation_string_array_length.page | 51 ++++++ .../Regress.annotation_string_zero_terminated.page | 38 ++++ ...ress.annotation_string_zero_terminated_out.page | 44 +++++ .../Regress.annotation_test_parsing_bug630862.page | 38 ++++ .../Regress.annotation_transfer_floating.page | 38 ++++ .../Regress.annotation_versioned.page | 39 ++++ .../Regress.atest_error_quark.page | 38 ++++ .../Regress.foo_async_ready_callback.page | 58 ++++++ .../Regress.foo_destroy_notify_callback.page | 58 ++++++ .../Regress-1.0-C-expected/Regress.foo_init.page | 38 ++++ .../Regress.foo_method_external_references.page | 65 +++++++ .../Regress.foo_not_a_constructor_new.page | 39 ++++ .../Regress.foo_skip_me.page | 45 +++++ .../Regress.foo_some_variant.page | 51 ++++++ .../Regress.foo_some_variant_ptr.page | 51 ++++++ .../Regress.foo_test_array.page | 38 ++++ .../Regress.foo_test_const_char_param.page | 44 +++++ .../Regress.foo_test_const_char_retval.page | 38 ++++ .../Regress.foo_test_const_struct_param.page | 44 +++++ .../Regress.foo_test_const_struct_retval.page | 38 ++++ .../Regress.foo_test_string_array.page | 44 +++++ .../Regress.foo_test_string_array_with_g.page | 44 +++++ .../Regress.foo_test_unsigned_qualifier.page | 44 +++++ .../Regress.foo_test_unsigned_type.page | 44 +++++ .../Regress.foo_test_varargs_callback.page | 51 ++++++ .../Regress.foo_test_varargs_callback2.page | 44 +++++ .../Regress.foo_test_varargs_callback3.page | 51 ++++++ .../Regress.func_obj_null_in.page | 44 +++++ .../Regress.global_get_flags_out.page | 44 +++++ .../Regress.has_parameter_named_attrs.page | 52 ++++++ .../Regress.introspectable_via_alias.page | 44 +++++ .../Regress.not_introspectable_via_alias.page | 44 +++++ ...ess.random_function_with_skipped_structure.page | 58 ++++++ .../Regress.set_abort_on_error.page | 44 +++++ .../Regress.test_array_callback.page | 44 +++++ .../Regress.test_array_fixed_out_objects.page | 44 +++++ .../Regress.test_array_fixed_size_int_in.page | 44 +++++ .../Regress.test_array_fixed_size_int_out.page | 44 +++++ .../Regress.test_array_fixed_size_int_return.page | 38 ++++ .../Regress.test_array_gint16_in.page | 51 ++++++ .../Regress.test_array_gint32_in.page | 51 ++++++ .../Regress.test_array_gint64_in.page | 51 ++++++ .../Regress.test_array_gint8_in.page | 51 ++++++ .../Regress.test_array_gtype_in.page | 51 ++++++ .../Regress.test_array_int_full_out.page | 44 +++++ .../Regress.test_array_int_in.page | 51 ++++++ .../Regress.test_array_int_inout.page | 51 ++++++ .../Regress.test_array_int_none_out.page | 44 +++++ .../Regress.test_array_int_null_in.page | 51 ++++++ .../Regress.test_array_int_null_out.page | 51 ++++++ .../Regress.test_array_int_out.page | 51 ++++++ .../Regress.test_async_ready_callback.page | 44 +++++ .../Regress.test_boolean.page | 44 +++++ .../Regress.test_boolean_false.page | 44 +++++ .../Regress.test_boolean_true.page | 44 +++++ .../Regress.test_cairo_context_full_return.page | 38 ++++ .../Regress.test_cairo_context_none_in.page | 44 +++++ .../Regress.test_cairo_surface_full_out.page | 44 +++++ .../Regress.test_cairo_surface_full_return.page | 38 ++++ .../Regress.test_cairo_surface_none_in.page | 44 +++++ .../Regress.test_cairo_surface_none_return.page | 38 ++++ .../Regress.test_callback.page | 44 +++++ .../Regress.test_callback_async.page | 51 ++++++ .../Regress.test_callback_destroy_notify.page | 59 ++++++ ....test_callback_destroy_notify_no_user_data.page | 52 ++++++ .../Regress.test_callback_thaw_async.page | 38 ++++ .../Regress.test_callback_thaw_notifications.page | 40 ++++ .../Regress.test_callback_user_data.page | 52 ++++++ .../Regress.test_closure.page | 44 +++++ .../Regress.test_closure_one_arg.page | 51 ++++++ .../Regress.test_closure_variant.page | 51 ++++++ .../Regress.test_date_in_gvalue.page | 38 ++++ .../Regress.test_def_error_quark.page | 38 ++++ .../Regress.test_double.page | 44 +++++ .../Regress.test_filename_return.page | 38 ++++ .../Regress-1.0-C-expected/Regress.test_float.page | 44 +++++ .../Regress.test_garray_container_return.page | 38 ++++ .../Regress.test_garray_full_return.page | 38 ++++ .../Regress.test_gerror_callback.page | 44 +++++ .../Regress.test_ghash_container_return.page | 38 ++++ .../Regress.test_ghash_everything_return.page | 38 ++++ .../Regress.test_ghash_gvalue_in.page | 44 +++++ .../Regress.test_ghash_gvalue_return.page | 38 ++++ ...egress.test_ghash_nested_everything_return.page | 38 ++++ ...gress.test_ghash_nested_everything_return2.page | 39 ++++ .../Regress.test_ghash_nothing_in.page | 44 +++++ .../Regress.test_ghash_nothing_in2.page | 44 +++++ .../Regress.test_ghash_nothing_return.page | 38 ++++ .../Regress.test_ghash_nothing_return2.page | 38 ++++ .../Regress.test_ghash_null_in.page | 44 +++++ .../Regress.test_ghash_null_out.page | 44 +++++ .../Regress.test_ghash_null_return.page | 38 ++++ .../Regress.test_glist_container_return.page | 38 ++++ .../Regress.test_glist_everything_return.page | 38 ++++ .../Regress.test_glist_nothing_in.page | 44 +++++ .../Regress.test_glist_nothing_in2.page | 44 +++++ .../Regress.test_glist_nothing_return.page | 38 ++++ .../Regress.test_glist_nothing_return2.page | 38 ++++ .../Regress.test_glist_null_in.page | 44 +++++ .../Regress.test_glist_null_out.page | 44 +++++ .../Regress.test_gslist_container_return.page | 38 ++++ .../Regress.test_gslist_everything_return.page | 38 ++++ .../Regress.test_gslist_nothing_in.page | 44 +++++ .../Regress.test_gslist_nothing_in2.page | 44 +++++ .../Regress.test_gslist_nothing_return.page | 38 ++++ .../Regress.test_gslist_nothing_return2.page | 38 ++++ .../Regress.test_gslist_null_in.page | 44 +++++ .../Regress.test_gslist_null_out.page | 44 +++++ .../Regress-1.0-C-expected/Regress.test_gtype.page | 44 +++++ .../Regress.test_gvariant_as.page | 38 ++++ .../Regress.test_gvariant_asv.page | 38 ++++ .../Regress.test_gvariant_i.page | 38 ++++ .../Regress.test_gvariant_s.page | 38 ++++ .../Regress.test_gvariant_v.page | 38 ++++ .../Regress.test_hash_table_callback.page | 51 ++++++ .../Regress-1.0-C-expected/Regress.test_int.page | 44 +++++ .../Regress-1.0-C-expected/Regress.test_int16.page | 44 +++++ .../Regress-1.0-C-expected/Regress.test_int32.page | 44 +++++ .../Regress-1.0-C-expected/Regress.test_int64.page | 44 +++++ .../Regress-1.0-C-expected/Regress.test_int8.page | 44 +++++ .../Regress.test_int_out_utf8.page | 51 ++++++ .../Regress.test_int_value_arg.page | 44 +++++ .../Regress-1.0-C-expected/Regress.test_long.page | 44 +++++ .../Regress.test_multi_callback.page | 44 +++++ .../Regress.test_multi_double_args.page | 58 ++++++ .../Regress.test_multiline_doc_comments.page | 38 ++++ .../Regress.test_nested_parameter.page | 69 +++++++ .../Regress.test_null_gerror_callback.page | 44 +++++ .../Regress.test_owned_gerror_callback.page | 44 +++++ .../Regress-1.0-C-expected/Regress.test_short.page | 44 +++++ .../Regress.test_simple_callback.page | 44 +++++ .../Regress-1.0-C-expected/Regress.test_size.page | 44 +++++ .../Regress.test_skip_unannotated_callback.page | 45 +++++ .../Regress-1.0-C-expected/Regress.test_ssize.page | 44 +++++ .../Regress.test_strv_in.page | 44 +++++ .../Regress.test_strv_in_gvalue.page | 38 ++++ .../Regress.test_strv_out.page | 38 ++++ .../Regress.test_strv_out_c.page | 38 ++++ .../Regress.test_strv_out_container.page | 38 ++++ .../Regress.test_strv_outarg.page | 44 +++++ .../Regress-1.0-C-expected/Regress.test_timet.page | 44 +++++ .../Regress.test_torture_signature_0.page | 79 ++++++++ .../Regress.test_torture_signature_1.page | 79 ++++++++ .../Regress.test_torture_signature_2.page | 100 ++++++++++ .../Regress-1.0-C-expected/Regress.test_uint.page | 44 +++++ .../Regress.test_uint16.page | 44 +++++ .../Regress.test_uint32.page | 44 +++++ .../Regress.test_uint64.page | 44 +++++ .../Regress-1.0-C-expected/Regress.test_uint8.page | 44 +++++ .../Regress-1.0-C-expected/Regress.test_ulong.page | 44 +++++ .../Regress.test_unichar.page | 44 +++++ .../Regress.test_unsigned_enum_param.page | 44 +++++ .../Regress.test_ushort.page | 44 +++++ .../Regress.test_utf8_const_in.page | 44 +++++ .../Regress.test_utf8_const_return.page | 38 ++++ .../Regress.test_utf8_inout.page | 44 +++++ .../Regress.test_utf8_nonconst_return.page | 38 ++++ .../Regress.test_utf8_null_in.page | 44 +++++ .../Regress.test_utf8_null_out.page | 44 +++++ .../Regress.test_utf8_out.page | 44 +++++ .../Regress.test_utf8_out_nonconst_return.page | 44 +++++ .../Regress.test_utf8_out_out.page | 51 ++++++ .../Regress.test_value_get_fundamental_object.page | 44 +++++ .../Regress.test_value_return.page | 44 +++++ .../Regress.test_value_set_fundamental_object.page | 51 ++++++ .../Regress.test_versioning.page | 39 ++++ tests/scanner/Regress-1.0-C-expected/index.page | 33 ++++ .../Regress.ANNOTATION_CALCULATED_DEFINE.page | 25 +++ .../Regress.ANNOTATION_CALCULATED_LARGE.page | 26 +++ .../Regress.ANNOTATION_CALCULATED_LARGE_DIV.page | 25 +++ .../Regress.ATestError.page | 33 ++++ .../Regress.AliasedTestBoxed.page | 25 +++ .../Regress.AnnotationBitfield.page | 25 +++ .../Regress.AnnotationCallback.page | 25 +++ .../Regress.AnnotationForeachFunc.page | 25 +++ .../Regress.AnnotationListCallback.page | 25 +++ .../Regress.AnnotationNotifyFunc.page | 26 +++ .../Regress.AnnotationObject-attribute-signal.page | 43 +++++ ...ess.AnnotationObject-doc-empty-arg-parsing.page | 39 ++++ ...Regress.AnnotationObject-function-property.page | 29 +++ .../Regress.AnnotationObject-list-signal.page | 40 ++++ .../Regress.AnnotationObject-string-property.page | 30 +++ .../Regress.AnnotationObject-string-signal.page | 41 +++++ .../Regress.AnnotationObject-tab-property.page | 31 ++++ .../Regress.AnnotationObject.allow_none.page | 46 +++++ .../Regress.AnnotationObject.calleeowns.page | 40 ++++ .../Regress.AnnotationObject.calleesowns.page | 40 ++++ .../Regress.AnnotationObject.compute_sum.page | 44 +++++ .../Regress.AnnotationObject.compute_sum_n.page | 44 +++++ .../Regress.AnnotationObject.compute_sum_nz.page | 44 +++++ .../Regress.AnnotationObject.create_object.page | 40 ++++ .../Regress.AnnotationObject.do_not_use.page | 40 ++++ .../Regress.AnnotationObject.extra_annos.page | 38 ++++ .../Regress.AnnotationObject.foreach.page | 44 +++++ .../Regress.AnnotationObject.get_hash.page | 41 +++++ .../Regress.AnnotationObject.get_objects.page | 42 +++++ .../Regress.AnnotationObject.get_strings.page | 41 +++++ .../Regress.AnnotationObject.hidden_self.page | 38 ++++ .../Regress.AnnotationObject.in.page | 46 +++++ .../Regress.AnnotationObject.inout.page | 46 +++++ .../Regress.AnnotationObject.inout2.page | 46 +++++ .../Regress.AnnotationObject.inout3.page | 46 +++++ .../Regress.AnnotationObject.method.page | 40 ++++ .../Regress.AnnotationObject.notrans.page | 40 ++++ .../Regress.AnnotationObject.out.page | 40 ++++ .../Regress.AnnotationObject.page | 62 +++++++ .../Regress.AnnotationObject.parse_args.page | 44 +++++ .../Regress.AnnotationObject.set_data.page | 44 +++++ .../Regress.AnnotationObject.set_data2.page | 44 +++++ .../Regress.AnnotationObject.set_data3.page | 45 +++++ .../Regress.AnnotationObject.string_out.page | 40 ++++ .../Regress.AnnotationObject.use_buffer.page | 44 +++++ .../Regress.AnnotationObject.watch.page | 45 +++++ .../Regress.AnnotationObject.watch_full.page | 44 +++++ .../Regress.AnnotationObject.with_voidp.page | 44 +++++ .../Regress.AnnotationStruct.page | 25 +++ .../Regress.DOUBLE_CONSTANT.page | 25 +++ .../Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page | 25 +++ .../Regress.FOO_PIE_IS_TASTY.page | 25 +++ .../Regress.FOO_SUCCESS_INT.page | 25 +++ .../Regress.FooASingle.page | 29 +++ .../Regress.FooAddressType.page | 33 ++++ .../Regress.FooBRect.add.page | 44 +++++ .../Regress.FooBRect.new.page | 52 ++++++ .../Regress-1.0-Gjs-expected/Regress.FooBRect.page | 25 +++ .../Regress.FooBUnion.page | 25 +++ .../Regress.FooBoxed.method.page | 38 ++++ .../Regress.FooBoxed.new.page | 40 ++++ .../Regress-1.0-Gjs-expected/Regress.FooBoxed.page | 25 +++ .../Regress.FooBuffer.page | 65 +++++++ .../Regress.FooBuffer.some_method.page | 38 ++++ .../Regress.FooCallback.page | 25 +++ .../Regress.FooDBusData.method.page | 38 ++++ .../Regress.FooDBusData.page | 25 +++ .../Regress.FooEnumFullname.page | 33 ++++ .../Regress.FooEnumNoType.page | 35 ++++ .../Regress.FooEnumType.page | 33 ++++ .../Regress-1.0-Gjs-expected/Regress.FooError.page | 33 ++++ .../Regress-1.0-Gjs-expected/Regress.FooEvent.page | 25 +++ .../Regress.FooEventAny.page | 25 +++ .../Regress.FooEventExpose.page | 25 +++ .../Regress.FooFlagsNoType.page | 25 +++ .../Regress.FooFlagsType.page | 25 +++ .../Regress.FooForeignStruct.copy.page | 40 ++++ .../Regress.FooForeignStruct.new.page | 40 ++++ .../Regress.FooForeignStruct.page | 25 +++ .../Regress.FooInterface-do_regress_foo.page | 33 ++++ .../Regress.FooInterface.do_regress_foo.page | 44 +++++ .../Regress.FooInterface.page | 59 ++++++ .../Regress.FooInterface.static_method.page | 44 +++++ .../Regress.FooObject-hidden.page | 29 +++ .../Regress.FooObject-read_fn.page | 35 ++++ .../Regress.FooObject-signal.page | 43 +++++ .../Regress.FooObject-string.page | 29 +++ .../Regress.FooObject-virtual_method.page | 35 ++++ .../Regress.FooObject.a_global_method.page | 44 +++++ .../Regress.FooObject.append_new_stack_layer.page | 46 +++++ .../Regress.FooObject.dup_name.page | 40 ++++ .../Regress.FooObject.external_type.page | 40 ++++ .../Regress.FooObject.get_default.page | 41 +++++ .../Regress.FooObject.get_name.page | 40 ++++ .../Regress.FooObject.handle_glyph.page | 44 +++++ .../Regress.FooObject.is_it_time_yet.page | 44 +++++ .../Regress.FooObject.new.page | 40 ++++ .../Regress.FooObject.new_as_super.page | 40 ++++ .../Regress.FooObject.new_cookie.page | 46 +++++ .../Regress.FooObject.page | 62 +++++++ .../Regress.FooObject.read.page | 50 +++++ .../Regress.FooObject.skipped_method.page | 38 ++++ .../Regress.FooObject.static_meth.page | 40 ++++ .../Regress.FooObject.take_all.page | 47 +++++ .../Regress.FooObject.various.page | 50 +++++ .../Regress.FooObject.virtual_method.page | 46 +++++ .../Regress.FooObjectCookie.page | 25 +++ .../Regress.FooOtherObject.page | 62 +++++++ .../Regress.FooRectangle.add.page | 44 +++++ .../Regress.FooRectangle.new.page | 65 +++++++ .../Regress.FooRectangle.page | 25 +++ .../Regress.FooSkippable.page | 32 ++++ .../Regress.FooStackLayer.page | 45 +++++ .../Regress.FooStruct.page | 25 +++ .../Regress.FooSubInterface-destroy-event.page | 37 ++++ .../Regress.FooSubInterface-destroy_event.page | 31 ++++ .../Regress.FooSubInterface-do_bar.page | 31 ++++ .../Regress.FooSubInterface-do_baz.page | 33 ++++ .../Regress.FooSubInterface.do_bar.page | 38 ++++ .../Regress.FooSubInterface.do_baz.page | 44 +++++ .../Regress.FooSubInterface.page | 59 ++++++ .../Regress.FooSubobject.new.page | 40 ++++ .../Regress.FooSubobject.page | 65 +++++++ .../Regress.FooThingWithArray.page | 25 +++ .../Regress-1.0-Gjs-expected/Regress.FooUnion.page | 25 +++ .../Regress.FooUtilityStruct.page | 25 +++ .../Regress.FooVarargsCallback.page | 25 +++ .../Regress.FooXEvent.page | 25 +++ .../Regress.GUINT64_CONSTANT.page | 25 +++ .../Regress.GUINT64_CONSTANTA.page | 25 +++ .../Regress.G_GINT64_CONSTANT.page | 25 +++ .../Regress.INT_CONSTANT.page | 25 +++ .../Regress-1.0-Gjs-expected/Regress.IntSet.page | 25 +++ .../Regress.LONG_STRING_CONSTANT.page | 25 +++ .../Regress.LikeGnomeKeyringPasswordSchema.page | 25 +++ .../Regress.MAXUINT64.page | 25 +++ .../Regress-1.0-Gjs-expected/Regress.MININT64.page | 25 +++ .../Regress.Mixed_Case_Constant.page | 25 +++ .../Regress.NEGATIVE_INT_CONSTANT.page | 25 +++ .../Regress.PtrArrayAlias.page | 25 +++ .../Regress.STRING_CONSTANT.page | 25 +++ .../Regress.SkippedStructure.page | 26 +++ .../Regress.TestABCError.page | 33 ++++ .../Regress.TestBoxed.copy.page | 40 ++++ .../Regress.TestBoxed.equals.page | 46 +++++ .../Regress.TestBoxed.new.page | 40 ++++ ...ess.TestBoxed.new_alternative_constructor1.page | 46 +++++ ...ess.TestBoxed.new_alternative_constructor2.page | 52 ++++++ ...ess.TestBoxed.new_alternative_constructor3.page | 46 +++++ .../Regress.TestBoxed.page | 25 +++ .../Regress.TestBoxedB.copy.page | 40 ++++ .../Regress.TestBoxedB.new.page | 52 ++++++ .../Regress.TestBoxedB.page | 25 +++ .../Regress.TestBoxedC.new.page | 40 ++++ .../Regress.TestBoxedC.page | 25 +++ .../Regress.TestBoxedD.copy.page | 40 ++++ .../Regress.TestBoxedD.free.page | 38 ++++ .../Regress.TestBoxedD.get_magic.page | 40 ++++ .../Regress.TestBoxedD.new.page | 52 ++++++ .../Regress.TestBoxedD.page | 25 +++ .../Regress.TestCallback.page | 25 +++ .../Regress.TestCallbackArray.page | 25 +++ .../Regress.TestCallbackFull.page | 25 +++ .../Regress.TestCallbackGError.page | 25 +++ .../Regress.TestCallbackHashtable.page | 25 +++ .../Regress.TestCallbackOwnedGError.page | 25 +++ .../Regress.TestCallbackUserData.page | 25 +++ .../Regress.TestDEFError.page | 33 ++++ .../Regress-1.0-Gjs-expected/Regress.TestEnum.page | 35 ++++ .../Regress.TestEnumNoGEnum.page | 33 ++++ .../Regress.TestEnumUnsigned.page | 31 ++++ .../Regress.TestError.page | 33 ++++ .../Regress.TestFlags.page | 25 +++ .../Regress.TestFloating.new.page | 40 ++++ .../Regress.TestFloating.page | 65 +++++++ .../Regress.TestFundamentalObject.page | 59 ++++++ .../Regress.TestFundamentalObject.ref.page | 40 ++++ .../Regress.TestFundamentalObject.unref.page | 38 ++++ .../Regress.TestFundamentalObjectCopyFunction.page | 25 +++ ...ress.TestFundamentalObjectFinalizeFunction.page | 25 +++ .../Regress.TestFundamentalSubObject.new.page | 46 +++++ .../Regress.TestFundamentalSubObject.page | 62 +++++++ .../Regress.TestInheritDrawable.do_foo.page | 44 +++++ ...ess.TestInheritDrawable.do_foo_maybe_throw.page | 44 +++++ .../Regress.TestInheritDrawable.get_origin.page | 38 ++++ .../Regress.TestInheritDrawable.get_size.page | 38 ++++ .../Regress.TestInheritDrawable.page | 62 +++++++ .../Regress.TestInheritPixmapObjectClass.page | 25 +++ .../Regress.TestInterface.page | 59 ++++++ .../Regress.TestObj-all.page | 37 ++++ .../Regress.TestObj-allow_none_vfunc.page | 33 ++++ .../Regress.TestObj-bare.page | 29 +++ .../Regress.TestObj-boxed.page | 29 +++ .../Regress.TestObj-cleanup.page | 37 ++++ .../Regress.TestObj-double.page | 29 +++ .../Regress.TestObj-first.page | 37 ++++ .../Regress.TestObj-float.page | 29 +++ .../Regress.TestObj-gtype.page | 29 +++ .../Regress.TestObj-hash-table-old.page | 29 +++ .../Regress.TestObj-hash-table.page | 29 +++ .../Regress.TestObj-int.page | 29 +++ .../Regress.TestObj-list-old.page | 29 +++ .../Regress.TestObj-list.page | 29 +++ .../Regress.TestObj-matrix.page | 37 ++++ .../Regress.TestObj-sig-with-array-prop.page | 40 ++++ .../Regress.TestObj-sig-with-foreign-struct.page | 39 ++++ .../Regress.TestObj-sig-with-hash-prop.page | 40 ++++ .../Regress.TestObj-sig-with-int64-prop.page | 42 +++++ .../Regress.TestObj-sig-with-intarray-ret.page | 39 ++++ .../Regress.TestObj-sig-with-obj.page | 40 ++++ .../Regress.TestObj-sig-with-strv.page | 39 ++++ .../Regress.TestObj-sig-with-uint64-prop.page | 42 +++++ .../Regress.TestObj-string.page | 29 +++ ...Regress.TestObj-test-with-static-scope-arg.page | 39 ++++ .../Regress.TestObj-test.page | 37 ++++ .../Regress.TestObj.constructor.page | 40 ++++ .../Regress.TestObj.do_matrix.page | 48 +++++ ...gress.TestObj.emit_sig_with_foreign_struct.page | 38 ++++ .../Regress.TestObj.emit_sig_with_int64.page | 38 ++++ .../Regress.TestObj.emit_sig_with_obj.page | 38 ++++ .../Regress.TestObj.emit_sig_with_uint64.page | 38 ++++ .../Regress.TestObj.forced_method.page | 38 ++++ .../Regress.TestObj.instance_method.page | 40 ++++ .../Regress.TestObj.instance_method_callback.page | 44 +++++ .../Regress.TestObj.new.page | 46 +++++ .../Regress.TestObj.new_callback.page | 46 +++++ .../Regress.TestObj.new_from_file.page | 46 +++++ .../Regress.TestObj.null_out.page | 38 ++++ .../Regress-1.0-Gjs-expected/Regress.TestObj.page | 62 +++++++ .../Regress.TestObj.set_bare.page | 44 +++++ .../Regress.TestObj.skip_inout_param.page | 70 +++++++ .../Regress.TestObj.skip_out_param.page | 70 +++++++ .../Regress.TestObj.skip_param.page | 70 +++++++ .../Regress.TestObj.skip_return_val.page | 70 +++++++ .../Regress.TestObj.skip_return_val_no_out.page | 47 +++++ .../Regress.TestObj.static_method.page | 46 +++++ .../Regress.TestObj.static_method_callback.page | 44 +++++ .../Regress.TestObj.torture_signature_0.page | 56 ++++++ .../Regress.TestObj.torture_signature_1.page | 58 ++++++ .../Regress.TestOtherError.page | 33 ++++ .../Regress.TestPrivateEnum.page | 25 +++ .../Regress.TestPrivateStruct.page | 25 +++ .../Regress.TestSimpleBoxedA.const_return.page | 40 ++++ .../Regress.TestSimpleBoxedA.copy.page | 40 ++++ .../Regress.TestSimpleBoxedA.equals.page | 46 +++++ .../Regress.TestSimpleBoxedA.page | 25 +++ .../Regress.TestSimpleBoxedB.copy.page | 40 ++++ .../Regress.TestSimpleBoxedB.page | 25 +++ .../Regress.TestSimpleCallback.page | 25 +++ .../Regress.TestStructA.clone.page | 38 ++++ .../Regress.TestStructA.page | 25 +++ .../Regress.TestStructA.parse.page | 44 +++++ .../Regress.TestStructB.clone.page | 38 ++++ .../Regress.TestStructB.page | 25 +++ .../Regress.TestStructC.page | 25 +++ .../Regress.TestStructD.page | 25 +++ .../Regress.TestStructE.page | 25 +++ .../Regress.TestStructE__some_union__union.page | 25 +++ .../Regress.TestStructF.page | 25 +++ .../Regress.TestStructFixedArray.frob.page | 38 ++++ .../Regress.TestStructFixedArray.page | 25 +++ .../Regress.TestSubObj.instance_method.page | 40 ++++ .../Regress.TestSubObj.new.page | 40 ++++ .../Regress.TestSubObj.page | 65 +++++++ .../Regress.TestSubObj.unset_bare.page | 38 ++++ .../Regress.TestTypeGUInt64.page | 25 +++ .../Regress.TestWi8021x-testbool.page | 29 +++ .../Regress.TestWi8021x.get_testbool.page | 40 ++++ .../Regress.TestWi8021x.new.page | 40 ++++ .../Regress.TestWi8021x.page | 62 +++++++ .../Regress.TestWi8021x.set_testbool.page | 44 +++++ .../Regress.TestWi8021x.static_method.page | 46 +++++ .../Regress.UTF8_CONSTANT.page | 25 +++ .../Regress.VaListAlias.page | 25 +++ .../Regress.aliased_caller_alloc.page | 38 ++++ .../Regress.annotation_attribute_func.page | 52 ++++++ .../Regress.annotation_custom_destroy.page | 45 +++++ .../Regress.annotation_get_source_file.page | 40 ++++ .../Regress.annotation_init.page | 44 +++++ ...ress.annotation_invalid_regress_annotation.page | 44 +++++ .../Regress.annotation_ptr_array.page | 44 +++++ .../Regress.annotation_return_array.page | 40 ++++ .../Regress.annotation_return_filename.page | 40 ++++ .../Regress.annotation_set_source_file.page | 44 +++++ ...s.annotation_space_after_comment_bug631690.page | 38 ++++ .../Regress.annotation_string_array_length.page | 44 +++++ .../Regress.annotation_string_zero_terminated.page | 40 ++++ ...ress.annotation_string_zero_terminated_out.page | 44 +++++ .../Regress.annotation_test_parsing_bug630862.page | 40 ++++ .../Regress.annotation_transfer_floating.page | 40 ++++ .../Regress.annotation_versioned.page | 39 ++++ .../Regress.atest_error_quark.page | 40 ++++ .../Regress.foo_async_ready_callback.page | 50 +++++ .../Regress.foo_destroy_notify_callback.page | 44 +++++ .../Regress-1.0-Gjs-expected/Regress.foo_init.page | 40 ++++ .../Regress.foo_method_external_references.page | 62 +++++++ .../Regress.foo_not_a_constructor_new.page | 41 +++++ .../Regress.foo_skip_me.page | 45 +++++ .../Regress.foo_some_variant.page | 50 +++++ .../Regress.foo_some_variant_ptr.page | 50 +++++ .../Regress.foo_test_array.page | 40 ++++ .../Regress.foo_test_const_char_param.page | 44 +++++ .../Regress.foo_test_const_char_retval.page | 40 ++++ .../Regress.foo_test_const_struct_param.page | 44 +++++ .../Regress.foo_test_const_struct_retval.page | 40 ++++ .../Regress.foo_test_string_array.page | 44 +++++ .../Regress.foo_test_string_array_with_g.page | 44 +++++ .../Regress.foo_test_unsigned_qualifier.page | 44 +++++ .../Regress.foo_test_unsigned_type.page | 44 +++++ .../Regress.foo_test_varargs_callback.page | 50 +++++ .../Regress.foo_test_varargs_callback2.page | 44 +++++ .../Regress.foo_test_varargs_callback3.page | 50 +++++ .../Regress.func_obj_null_in.page | 44 +++++ .../Regress.global_get_flags_out.page | 38 ++++ .../Regress.has_parameter_named_attrs.page | 51 ++++++ .../Regress.introspectable_via_alias.page | 44 +++++ .../Regress.not_introspectable_via_alias.page | 44 +++++ ...ess.random_function_with_skipped_structure.page | 56 ++++++ .../Regress.set_abort_on_error.page | 44 +++++ .../Regress.test_array_callback.page | 46 +++++ .../Regress.test_array_fixed_out_objects.page | 38 ++++ .../Regress.test_array_fixed_size_int_in.page | 46 +++++ .../Regress.test_array_fixed_size_int_out.page | 38 ++++ .../Regress.test_array_fixed_size_int_return.page | 40 ++++ .../Regress.test_array_gint16_in.page | 46 +++++ .../Regress.test_array_gint32_in.page | 46 +++++ .../Regress.test_array_gint64_in.page | 46 +++++ .../Regress.test_array_gint8_in.page | 46 +++++ .../Regress.test_array_gtype_in.page | 46 +++++ .../Regress.test_array_int_full_out.page | 40 ++++ .../Regress.test_array_int_in.page | 46 +++++ .../Regress.test_array_int_inout.page | 44 +++++ .../Regress.test_array_int_none_out.page | 40 ++++ .../Regress.test_array_int_null_in.page | 44 +++++ .../Regress.test_array_int_null_out.page | 38 ++++ .../Regress.test_array_int_out.page | 38 ++++ .../Regress.test_async_ready_callback.page | 44 +++++ .../Regress.test_boolean.page | 46 +++++ .../Regress.test_boolean_false.page | 46 +++++ .../Regress.test_boolean_true.page | 46 +++++ .../Regress.test_cairo_context_full_return.page | 40 ++++ .../Regress.test_cairo_context_none_in.page | 44 +++++ .../Regress.test_cairo_surface_full_out.page | 38 ++++ .../Regress.test_cairo_surface_full_return.page | 40 ++++ .../Regress.test_cairo_surface_none_in.page | 44 +++++ .../Regress.test_cairo_surface_none_return.page | 40 ++++ .../Regress.test_callback.page | 46 +++++ .../Regress.test_callback_async.page | 44 +++++ .../Regress.test_callback_destroy_notify.page | 47 +++++ ....test_callback_destroy_notify_no_user_data.page | 47 +++++ .../Regress.test_callback_thaw_async.page | 40 ++++ .../Regress.test_callback_thaw_notifications.page | 42 +++++ .../Regress.test_callback_user_data.page | 47 +++++ .../Regress.test_closure.page | 46 +++++ .../Regress.test_closure_one_arg.page | 52 ++++++ .../Regress.test_closure_variant.page | 52 ++++++ .../Regress.test_date_in_gvalue.page | 40 ++++ .../Regress.test_def_error_quark.page | 40 ++++ .../Regress.test_double.page | 46 +++++ .../Regress.test_filename_return.page | 40 ++++ .../Regress.test_float.page | 46 +++++ .../Regress.test_garray_container_return.page | 40 ++++ .../Regress.test_garray_full_return.page | 40 ++++ .../Regress.test_gerror_callback.page | 44 +++++ .../Regress.test_ghash_container_return.page | 40 ++++ .../Regress.test_ghash_everything_return.page | 40 ++++ .../Regress.test_ghash_gvalue_in.page | 44 +++++ .../Regress.test_ghash_gvalue_return.page | 40 ++++ ...egress.test_ghash_nested_everything_return.page | 40 ++++ ...gress.test_ghash_nested_everything_return2.page | 41 +++++ .../Regress.test_ghash_nothing_in.page | 44 +++++ .../Regress.test_ghash_nothing_in2.page | 44 +++++ .../Regress.test_ghash_nothing_return.page | 40 ++++ .../Regress.test_ghash_nothing_return2.page | 40 ++++ .../Regress.test_ghash_null_in.page | 44 +++++ .../Regress.test_ghash_null_out.page | 38 ++++ .../Regress.test_ghash_null_return.page | 40 ++++ .../Regress.test_glist_container_return.page | 40 ++++ .../Regress.test_glist_everything_return.page | 40 ++++ .../Regress.test_glist_nothing_in.page | 44 +++++ .../Regress.test_glist_nothing_in2.page | 44 +++++ .../Regress.test_glist_nothing_return.page | 40 ++++ .../Regress.test_glist_nothing_return2.page | 40 ++++ .../Regress.test_glist_null_in.page | 44 +++++ .../Regress.test_glist_null_out.page | 38 ++++ .../Regress.test_gslist_container_return.page | 40 ++++ .../Regress.test_gslist_everything_return.page | 40 ++++ .../Regress.test_gslist_nothing_in.page | 44 +++++ .../Regress.test_gslist_nothing_in2.page | 44 +++++ .../Regress.test_gslist_nothing_return.page | 40 ++++ .../Regress.test_gslist_nothing_return2.page | 40 ++++ .../Regress.test_gslist_null_in.page | 44 +++++ .../Regress.test_gslist_null_out.page | 38 ++++ .../Regress.test_gtype.page | 46 +++++ .../Regress.test_gvariant_as.page | 40 ++++ .../Regress.test_gvariant_asv.page | 40 ++++ .../Regress.test_gvariant_i.page | 40 ++++ .../Regress.test_gvariant_s.page | 40 ++++ .../Regress.test_gvariant_v.page | 40 ++++ .../Regress.test_hash_table_callback.page | 50 +++++ .../Regress-1.0-Gjs-expected/Regress.test_int.page | 46 +++++ .../Regress.test_int16.page | 46 +++++ .../Regress.test_int32.page | 46 +++++ .../Regress.test_int64.page | 46 +++++ .../Regress.test_int8.page | 46 +++++ .../Regress.test_int_out_utf8.page | 44 +++++ .../Regress.test_int_value_arg.page | 46 +++++ .../Regress.test_long.page | 46 +++++ .../Regress.test_multi_callback.page | 46 +++++ .../Regress.test_multi_double_args.page | 44 +++++ .../Regress.test_multiline_doc_comments.page | 38 ++++ .../Regress.test_nested_parameter.page | 69 +++++++ .../Regress.test_null_gerror_callback.page | 44 +++++ .../Regress.test_owned_gerror_callback.page | 44 +++++ .../Regress.test_short.page | 46 +++++ .../Regress.test_simple_callback.page | 44 +++++ .../Regress.test_size.page | 46 +++++ .../Regress.test_skip_unannotated_callback.page | 45 +++++ .../Regress.test_ssize.page | 46 +++++ .../Regress.test_strv_in.page | 46 +++++ .../Regress.test_strv_in_gvalue.page | 40 ++++ .../Regress.test_strv_out.page | 40 ++++ .../Regress.test_strv_out_c.page | 40 ++++ .../Regress.test_strv_out_container.page | 40 ++++ .../Regress.test_strv_outarg.page | 38 ++++ .../Regress.test_timet.page | 46 +++++ .../Regress.test_torture_signature_0.page | 56 ++++++ .../Regress.test_torture_signature_1.page | 58 ++++++ .../Regress.test_torture_signature_2.page | 62 +++++++ .../Regress.test_uint.page | 46 +++++ .../Regress.test_uint16.page | 46 +++++ .../Regress.test_uint32.page | 46 +++++ .../Regress.test_uint64.page | 46 +++++ .../Regress.test_uint8.page | 46 +++++ .../Regress.test_ulong.page | 46 +++++ .../Regress.test_unichar.page | 46 +++++ .../Regress.test_unsigned_enum_param.page | 46 +++++ .../Regress.test_ushort.page | 46 +++++ .../Regress.test_utf8_const_in.page | 44 +++++ .../Regress.test_utf8_const_return.page | 40 ++++ .../Regress.test_utf8_inout.page | 44 +++++ .../Regress.test_utf8_nonconst_return.page | 40 ++++ .../Regress.test_utf8_null_in.page | 44 +++++ .../Regress.test_utf8_null_out.page | 38 ++++ .../Regress.test_utf8_out.page | 38 ++++ .../Regress.test_utf8_out_nonconst_return.page | 40 ++++ .../Regress.test_utf8_out_out.page | 38 ++++ .../Regress.test_value_get_fundamental_object.page | 46 +++++ .../Regress.test_value_return.page | 46 +++++ .../Regress.test_value_set_fundamental_object.page | 50 +++++ .../Regress.test_versioning.page | 39 ++++ tests/scanner/Regress-1.0-Gjs-expected/index.page | 33 ++++ .../Regress.ANNOTATION_CALCULATED_DEFINE.page | 25 +++ .../Regress.ANNOTATION_CALCULATED_LARGE.page | 26 +++ .../Regress.ANNOTATION_CALCULATED_LARGE_DIV.page | 25 +++ .../Regress.ATestError.page | 33 ++++ .../Regress.AliasedTestBoxed.page | 25 +++ .../Regress.AnnotationBitfield.page | 25 +++ .../Regress.AnnotationCallback.page | 25 +++ .../Regress.AnnotationForeachFunc.page | 25 +++ .../Regress.AnnotationListCallback.page | 25 +++ .../Regress.AnnotationNotifyFunc.page | 26 +++ .../Regress.AnnotationObject-attribute-signal.page | 43 +++++ ...ess.AnnotationObject-doc-empty-arg-parsing.page | 39 ++++ ...Regress.AnnotationObject-function-property.page | 29 +++ .../Regress.AnnotationObject-list-signal.page | 40 ++++ .../Regress.AnnotationObject-string-property.page | 30 +++ .../Regress.AnnotationObject-string-signal.page | 41 +++++ .../Regress.AnnotationObject-tab-property.page | 31 ++++ .../Regress.AnnotationObject.allow_none.page | 53 ++++++ .../Regress.AnnotationObject.calleeowns.page | 53 ++++++ .../Regress.AnnotationObject.calleesowns.page | 59 ++++++ .../Regress.AnnotationObject.compute_sum.page | 51 ++++++ .../Regress.AnnotationObject.compute_sum_n.page | 57 ++++++ .../Regress.AnnotationObject.compute_sum_nz.page | 57 ++++++ .../Regress.AnnotationObject.create_object.page | 47 +++++ .../Regress.AnnotationObject.do_not_use.page | 47 +++++ .../Regress.AnnotationObject.extra_annos.page | 45 +++++ .../Regress.AnnotationObject.foreach.page | 57 ++++++ .../Regress.AnnotationObject.get_hash.page | 48 +++++ .../Regress.AnnotationObject.get_objects.page | 49 +++++ .../Regress.AnnotationObject.get_strings.page | 48 +++++ .../Regress.AnnotationObject.hidden_self.page | 45 +++++ .../Regress.AnnotationObject.in.page | 53 ++++++ .../Regress.AnnotationObject.inout.page | 53 ++++++ .../Regress.AnnotationObject.inout2.page | 53 ++++++ .../Regress.AnnotationObject.inout3.page | 53 ++++++ .../Regress.AnnotationObject.method.page | 47 +++++ .../Regress.AnnotationObject.notrans.page | 47 +++++ .../Regress.AnnotationObject.out.page | 53 ++++++ .../Regress.AnnotationObject.page | 62 +++++++ .../Regress.AnnotationObject.parse_args.page | 57 ++++++ .../Regress.AnnotationObject.set_data.page | 57 ++++++ .../Regress.AnnotationObject.set_data2.page | 57 ++++++ .../Regress.AnnotationObject.set_data3.page | 58 ++++++ .../Regress.AnnotationObject.string_out.page | 53 ++++++ .../Regress.AnnotationObject.use_buffer.page | 51 ++++++ .../Regress.AnnotationObject.watch.page | 58 ++++++ .../Regress.AnnotationObject.watch_full.page | 63 +++++++ .../Regress.AnnotationObject.with_voidp.page | 51 ++++++ .../Regress.AnnotationStruct.page | 25 +++ .../Regress.DOUBLE_CONSTANT.page | 25 +++ .../Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page | 25 +++ .../Regress.FOO_PIE_IS_TASTY.page | 25 +++ .../Regress.FOO_SUCCESS_INT.page | 25 +++ .../Regress.FooASingle.page | 29 +++ .../Regress.FooAddressType.page | 33 ++++ .../Regress.FooBRect.add.page | 51 ++++++ .../Regress.FooBRect.page | 25 +++ .../Regress.FooBUnion.page | 25 +++ .../Regress.FooBoxed.method.page | 45 +++++ .../Regress.FooBoxed.page | 25 +++ .../Regress.FooBuffer.page | 65 +++++++ .../Regress.FooBuffer.some_method.page | 45 +++++ .../Regress.FooCallback.page | 25 +++ .../Regress.FooDBusData.method.page | 45 +++++ .../Regress.FooDBusData.page | 25 +++ .../Regress.FooEnumFullname.page | 33 ++++ .../Regress.FooEnumNoType.page | 35 ++++ .../Regress.FooEnumType.page | 33 ++++ .../Regress.FooError.page | 33 ++++ .../Regress.FooEvent.page | 25 +++ .../Regress.FooEventAny.page | 25 +++ .../Regress.FooEventExpose.page | 25 +++ .../Regress.FooFlagsNoType.page | 25 +++ .../Regress.FooFlagsType.page | 25 +++ .../Regress.FooForeignStruct.copy.page | 47 +++++ .../Regress.FooForeignStruct.page | 25 +++ .../Regress.FooInterface-do_regress_foo.page | 36 ++++ .../Regress.FooInterface.do_regress_foo.page | 51 ++++++ .../Regress.FooInterface.page | 59 ++++++ .../Regress.FooInterface.static_method.page | 45 +++++ .../Regress.FooObject-hidden.page | 29 +++ .../Regress.FooObject-read_fn.page | 38 ++++ .../Regress.FooObject-signal.page | 43 +++++ .../Regress.FooObject-string.page | 29 +++ .../Regress.FooObject-virtual_method.page | 38 ++++ .../Regress.FooObject.a_global_method.page | 45 +++++ .../Regress.FooObject.append_new_stack_layer.page | 53 ++++++ .../Regress.FooObject.dup_name.page | 47 +++++ .../Regress.FooObject.external_type.page | 47 +++++ .../Regress.FooObject.get_default.page | 41 +++++ .../Regress.FooObject.get_name.page | 47 +++++ .../Regress.FooObject.handle_glyph.page | 51 ++++++ .../Regress.FooObject.is_it_time_yet.page | 51 ++++++ .../Regress.FooObject.new_cookie.page | 53 ++++++ .../Regress.FooObject.page | 62 +++++++ .../Regress.FooObject.read.page | 57 ++++++ .../Regress.FooObject.skipped_method.page | 45 +++++ .../Regress.FooObject.static_meth.page | 40 ++++ .../Regress.FooObject.take_all.page | 54 ++++++ .../Regress.FooObject.various.page | 57 ++++++ .../Regress.FooObject.virtual_method.page | 53 ++++++ .../Regress.FooObjectCookie.page | 25 +++ .../Regress.FooOtherObject.page | 62 +++++++ .../Regress.FooRectangle.add.page | 51 ++++++ .../Regress.FooRectangle.new.page | 66 +++++++ .../Regress.FooRectangle.page | 25 +++ .../Regress.FooSkippable.page | 32 ++++ .../Regress.FooStackLayer.page | 45 +++++ .../Regress.FooStruct.page | 25 +++ .../Regress.FooSubInterface-destroy-event.page | 37 ++++ .../Regress.FooSubInterface-destroy_event.page | 34 ++++ .../Regress.FooSubInterface-do_bar.page | 34 ++++ .../Regress.FooSubInterface-do_baz.page | 38 ++++ .../Regress.FooSubInterface.do_bar.page | 45 +++++ .../Regress.FooSubInterface.do_baz.page | 57 ++++++ .../Regress.FooSubInterface.page | 59 ++++++ .../Regress.FooSubobject.page | 65 +++++++ .../Regress.FooThingWithArray.page | 25 +++ .../Regress.FooUnion.page | 25 +++ .../Regress.FooUtilityStruct.page | 25 +++ .../Regress.FooVarargsCallback.page | 25 +++ .../Regress.FooXEvent.page | 25 +++ .../Regress.GUINT64_CONSTANT.page | 25 +++ .../Regress.GUINT64_CONSTANTA.page | 25 +++ .../Regress.G_GINT64_CONSTANT.page | 25 +++ .../Regress.INT_CONSTANT.page | 25 +++ .../Regress.IntSet.page | 25 +++ .../Regress.LONG_STRING_CONSTANT.page | 25 +++ .../Regress.LikeGnomeKeyringPasswordSchema.page | 25 +++ .../Regress.MAXUINT64.page | 25 +++ .../Regress.MININT64.page | 25 +++ .../Regress.Mixed_Case_Constant.page | 25 +++ .../Regress.NEGATIVE_INT_CONSTANT.page | 25 +++ .../Regress.PtrArrayAlias.page | 25 +++ .../Regress.STRING_CONSTANT.page | 25 +++ .../Regress.SkippedStructure.page | 26 +++ .../Regress.TestABCError.page | 33 ++++ .../Regress.TestBoxed.copy.page | 47 +++++ .../Regress.TestBoxed.equals.page | 53 ++++++ .../Regress.TestBoxed.page | 25 +++ .../Regress.TestBoxedB.copy.page | 47 +++++ .../Regress.TestBoxedB.page | 25 +++ .../Regress.TestBoxedC.page | 25 +++ .../Regress.TestBoxedD.copy.page | 47 +++++ .../Regress.TestBoxedD.free.page | 45 +++++ .../Regress.TestBoxedD.get_magic.page | 47 +++++ .../Regress.TestBoxedD.page | 25 +++ .../Regress.TestCallback.page | 25 +++ .../Regress.TestCallbackArray.page | 25 +++ .../Regress.TestCallbackFull.page | 25 +++ .../Regress.TestCallbackGError.page | 25 +++ .../Regress.TestCallbackHashtable.page | 25 +++ .../Regress.TestCallbackOwnedGError.page | 25 +++ .../Regress.TestCallbackUserData.page | 25 +++ .../Regress.TestDEFError.page | 33 ++++ .../Regress.TestEnum.page | 35 ++++ .../Regress.TestEnumNoGEnum.page | 33 ++++ .../Regress.TestEnumUnsigned.page | 31 ++++ .../Regress.TestError.page | 33 ++++ .../Regress.TestFlags.page | 25 +++ .../Regress.TestFloating.page | 65 +++++++ .../Regress.TestFundamentalObject.page | 59 ++++++ .../Regress.TestFundamentalObject.ref.page | 47 +++++ .../Regress.TestFundamentalObject.unref.page | 45 +++++ .../Regress.TestFundamentalObjectCopyFunction.page | 25 +++ ...ress.TestFundamentalObjectFinalizeFunction.page | 25 +++ .../Regress.TestFundamentalSubObject.page | 62 +++++++ .../Regress.TestInheritDrawable.do_foo.page | 51 ++++++ ...ess.TestInheritDrawable.do_foo_maybe_throw.page | 51 ++++++ .../Regress.TestInheritDrawable.get_origin.page | 57 ++++++ .../Regress.TestInheritDrawable.get_size.page | 57 ++++++ .../Regress.TestInheritDrawable.page | 62 +++++++ .../Regress.TestInheritPixmapObjectClass.page | 25 +++ .../Regress.TestInterface.page | 59 ++++++ .../Regress.TestObj-all.page | 37 ++++ .../Regress.TestObj-allow_none_vfunc.page | 36 ++++ .../Regress.TestObj-bare.page | 29 +++ .../Regress.TestObj-boxed.page | 29 +++ .../Regress.TestObj-cleanup.page | 37 ++++ .../Regress.TestObj-double.page | 29 +++ .../Regress.TestObj-first.page | 37 ++++ .../Regress.TestObj-float.page | 29 +++ .../Regress.TestObj-gtype.page | 29 +++ .../Regress.TestObj-hash-table-old.page | 29 +++ .../Regress.TestObj-hash-table.page | 29 +++ .../Regress.TestObj-int.page | 29 +++ .../Regress.TestObj-list-old.page | 29 +++ .../Regress.TestObj-list.page | 29 +++ .../Regress.TestObj-matrix.page | 40 ++++ .../Regress.TestObj-sig-with-array-prop.page | 40 ++++ .../Regress.TestObj-sig-with-foreign-struct.page | 39 ++++ .../Regress.TestObj-sig-with-hash-prop.page | 40 ++++ .../Regress.TestObj-sig-with-int64-prop.page | 42 +++++ .../Regress.TestObj-sig-with-intarray-ret.page | 39 ++++ .../Regress.TestObj-sig-with-obj.page | 40 ++++ .../Regress.TestObj-sig-with-strv.page | 39 ++++ .../Regress.TestObj-sig-with-uint64-prop.page | 42 +++++ .../Regress.TestObj-string.page | 29 +++ ...Regress.TestObj-test-with-static-scope-arg.page | 39 ++++ .../Regress.TestObj-test.page | 37 ++++ .../Regress.TestObj.do_matrix.page | 55 ++++++ ...gress.TestObj.emit_sig_with_foreign_struct.page | 45 +++++ .../Regress.TestObj.emit_sig_with_int64.page | 45 +++++ .../Regress.TestObj.emit_sig_with_obj.page | 45 +++++ .../Regress.TestObj.emit_sig_with_uint64.page | 45 +++++ .../Regress.TestObj.forced_method.page | 45 +++++ .../Regress.TestObj.instance_method.page | 47 +++++ .../Regress.TestObj.instance_method_callback.page | 51 ++++++ .../Regress.TestObj.null_out.page | 45 +++++ .../Regress.TestObj.page | 62 +++++++ .../Regress.TestObj.set_bare.page | 51 ++++++ .../Regress.TestObj.skip_inout_param.page | 89 +++++++++ .../Regress.TestObj.skip_out_param.page | 89 +++++++++ .../Regress.TestObj.skip_param.page | 89 +++++++++ .../Regress.TestObj.skip_return_val.page | 89 +++++++++ .../Regress.TestObj.skip_return_val_no_out.page | 54 ++++++ .../Regress.TestObj.static_method.page | 47 +++++ .../Regress.TestObj.static_method_callback.page | 45 +++++ .../Regress.TestObj.torture_signature_0.page | 81 ++++++++ .../Regress.TestObj.torture_signature_1.page | 83 +++++++++ .../Regress.TestOtherError.page | 33 ++++ .../Regress.TestPrivateEnum.page | 25 +++ .../Regress.TestPrivateStruct.page | 25 +++ .../Regress.TestSimpleBoxedA.const_return.page | 40 ++++ .../Regress.TestSimpleBoxedA.copy.page | 47 +++++ .../Regress.TestSimpleBoxedA.equals.page | 53 ++++++ .../Regress.TestSimpleBoxedA.page | 25 +++ .../Regress.TestSimpleBoxedB.copy.page | 47 +++++ .../Regress.TestSimpleBoxedB.page | 25 +++ .../Regress.TestSimpleCallback.page | 25 +++ .../Regress.TestStructA.clone.page | 51 ++++++ .../Regress.TestStructA.page | 25 +++ .../Regress.TestStructA.parse.page | 51 ++++++ .../Regress.TestStructB.clone.page | 51 ++++++ .../Regress.TestStructB.page | 25 +++ .../Regress.TestStructC.page | 25 +++ .../Regress.TestStructD.page | 25 +++ .../Regress.TestStructE.page | 25 +++ .../Regress.TestStructE__some_union__union.page | 25 +++ .../Regress.TestStructF.page | 25 +++ .../Regress.TestStructFixedArray.frob.page | 45 +++++ .../Regress.TestStructFixedArray.page | 25 +++ .../Regress.TestSubObj.instance_method.page | 47 +++++ .../Regress.TestSubObj.page | 65 +++++++ .../Regress.TestSubObj.unset_bare.page | 45 +++++ .../Regress.TestTypeGUInt64.page | 25 +++ .../Regress.TestWi8021x-testbool.page | 29 +++ .../Regress.TestWi8021x.get_testbool.page | 47 +++++ .../Regress.TestWi8021x.page | 62 +++++++ .../Regress.TestWi8021x.set_testbool.page | 51 ++++++ .../Regress.TestWi8021x.static_method.page | 47 +++++ .../Regress.UTF8_CONSTANT.page | 25 +++ .../Regress.VaListAlias.page | 25 +++ .../Regress.aliased_caller_alloc.page | 45 +++++ .../Regress.annotation_attribute_func.page | 53 ++++++ .../Regress.annotation_custom_destroy.page | 58 ++++++ .../Regress.annotation_get_source_file.page | 40 ++++ .../Regress.annotation_init.page | 51 ++++++ ...ress.annotation_invalid_regress_annotation.page | 45 +++++ .../Regress.annotation_ptr_array.page | 45 +++++ .../Regress.annotation_return_array.page | 47 +++++ .../Regress.annotation_return_filename.page | 40 ++++ .../Regress.annotation_set_source_file.page | 45 +++++ ...s.annotation_space_after_comment_bug631690.page | 38 ++++ .../Regress.annotation_string_array_length.page | 51 ++++++ .../Regress.annotation_string_zero_terminated.page | 40 ++++ ...ress.annotation_string_zero_terminated_out.page | 45 +++++ .../Regress.annotation_test_parsing_bug630862.page | 40 ++++ .../Regress.annotation_transfer_floating.page | 40 ++++ .../Regress.annotation_versioned.page | 39 ++++ .../Regress.atest_error_quark.page | 40 ++++ .../Regress.foo_async_ready_callback.page | 57 ++++++ .../Regress.foo_destroy_notify_callback.page | 57 ++++++ .../Regress.foo_init.page | 40 ++++ .../Regress.foo_method_external_references.page | 63 +++++++ .../Regress.foo_not_a_constructor_new.page | 41 +++++ .../Regress.foo_skip_me.page | 46 +++++ .../Regress.foo_some_variant.page | 51 ++++++ .../Regress.foo_some_variant_ptr.page | 51 ++++++ .../Regress.foo_test_array.page | 40 ++++ .../Regress.foo_test_const_char_param.page | 45 +++++ .../Regress.foo_test_const_char_retval.page | 40 ++++ .../Regress.foo_test_const_struct_param.page | 45 +++++ .../Regress.foo_test_const_struct_retval.page | 40 ++++ .../Regress.foo_test_string_array.page | 45 +++++ .../Regress.foo_test_string_array_with_g.page | 45 +++++ .../Regress.foo_test_unsigned_qualifier.page | 45 +++++ .../Regress.foo_test_unsigned_type.page | 45 +++++ .../Regress.foo_test_varargs_callback.page | 51 ++++++ .../Regress.foo_test_varargs_callback2.page | 45 +++++ .../Regress.foo_test_varargs_callback3.page | 51 ++++++ .../Regress.func_obj_null_in.page | 45 +++++ .../Regress.global_get_flags_out.page | 45 +++++ .../Regress.has_parameter_named_attrs.page | 52 ++++++ .../Regress.introspectable_via_alias.page | 45 +++++ .../Regress.not_introspectable_via_alias.page | 45 +++++ ...ess.random_function_with_skipped_structure.page | 57 ++++++ .../Regress.set_abort_on_error.page | 45 +++++ .../Regress.test_array_callback.page | 47 +++++ .../Regress.test_array_fixed_out_objects.page | 45 +++++ .../Regress.test_array_fixed_size_int_in.page | 47 +++++ .../Regress.test_array_fixed_size_int_out.page | 45 +++++ .../Regress.test_array_fixed_size_int_return.page | 40 ++++ .../Regress.test_array_gint16_in.page | 53 ++++++ .../Regress.test_array_gint32_in.page | 53 ++++++ .../Regress.test_array_gint64_in.page | 53 ++++++ .../Regress.test_array_gint8_in.page | 53 ++++++ .../Regress.test_array_gtype_in.page | 53 ++++++ .../Regress.test_array_int_full_out.page | 47 +++++ .../Regress.test_array_int_in.page | 53 ++++++ .../Regress.test_array_int_inout.page | 51 ++++++ .../Regress.test_array_int_none_out.page | 47 +++++ .../Regress.test_array_int_null_in.page | 51 ++++++ .../Regress.test_array_int_null_out.page | 51 ++++++ .../Regress.test_array_int_out.page | 51 ++++++ .../Regress.test_async_ready_callback.page | 45 +++++ .../Regress.test_boolean.page | 47 +++++ .../Regress.test_boolean_false.page | 47 +++++ .../Regress.test_boolean_true.page | 47 +++++ .../Regress.test_cairo_context_full_return.page | 40 ++++ .../Regress.test_cairo_context_none_in.page | 45 +++++ .../Regress.test_cairo_surface_full_out.page | 45 +++++ .../Regress.test_cairo_surface_full_return.page | 40 ++++ .../Regress.test_cairo_surface_none_in.page | 45 +++++ .../Regress.test_cairo_surface_none_return.page | 40 ++++ .../Regress.test_callback.page | 47 +++++ .../Regress.test_callback_async.page | 51 ++++++ .../Regress.test_callback_destroy_notify.page | 60 ++++++ ....test_callback_destroy_notify_no_user_data.page | 54 ++++++ .../Regress.test_callback_thaw_async.page | 40 ++++ .../Regress.test_callback_thaw_notifications.page | 42 +++++ .../Regress.test_callback_user_data.page | 54 ++++++ .../Regress.test_closure.page | 47 +++++ .../Regress.test_closure_one_arg.page | 53 ++++++ .../Regress.test_closure_variant.page | 53 ++++++ .../Regress.test_date_in_gvalue.page | 40 ++++ .../Regress.test_def_error_quark.page | 40 ++++ .../Regress.test_double.page | 47 +++++ .../Regress.test_filename_return.page | 40 ++++ .../Regress.test_float.page | 47 +++++ .../Regress.test_garray_container_return.page | 40 ++++ .../Regress.test_garray_full_return.page | 40 ++++ .../Regress.test_gerror_callback.page | 45 +++++ .../Regress.test_ghash_container_return.page | 40 ++++ .../Regress.test_ghash_everything_return.page | 40 ++++ .../Regress.test_ghash_gvalue_in.page | 45 +++++ .../Regress.test_ghash_gvalue_return.page | 40 ++++ ...egress.test_ghash_nested_everything_return.page | 40 ++++ ...gress.test_ghash_nested_everything_return2.page | 41 +++++ .../Regress.test_ghash_nothing_in.page | 45 +++++ .../Regress.test_ghash_nothing_in2.page | 45 +++++ .../Regress.test_ghash_nothing_return.page | 40 ++++ .../Regress.test_ghash_nothing_return2.page | 40 ++++ .../Regress.test_ghash_null_in.page | 45 +++++ .../Regress.test_ghash_null_out.page | 45 +++++ .../Regress.test_ghash_null_return.page | 40 ++++ .../Regress.test_glist_container_return.page | 40 ++++ .../Regress.test_glist_everything_return.page | 40 ++++ .../Regress.test_glist_nothing_in.page | 45 +++++ .../Regress.test_glist_nothing_in2.page | 45 +++++ .../Regress.test_glist_nothing_return.page | 40 ++++ .../Regress.test_glist_nothing_return2.page | 40 ++++ .../Regress.test_glist_null_in.page | 45 +++++ .../Regress.test_glist_null_out.page | 45 +++++ .../Regress.test_gslist_container_return.page | 40 ++++ .../Regress.test_gslist_everything_return.page | 40 ++++ .../Regress.test_gslist_nothing_in.page | 45 +++++ .../Regress.test_gslist_nothing_in2.page | 45 +++++ .../Regress.test_gslist_nothing_return.page | 40 ++++ .../Regress.test_gslist_nothing_return2.page | 40 ++++ .../Regress.test_gslist_null_in.page | 45 +++++ .../Regress.test_gslist_null_out.page | 45 +++++ .../Regress.test_gtype.page | 47 +++++ .../Regress.test_gvariant_as.page | 40 ++++ .../Regress.test_gvariant_asv.page | 40 ++++ .../Regress.test_gvariant_i.page | 40 ++++ .../Regress.test_gvariant_s.page | 40 ++++ .../Regress.test_gvariant_v.page | 40 ++++ .../Regress.test_hash_table_callback.page | 51 ++++++ .../Regress.test_int.page | 47 +++++ .../Regress.test_int16.page | 47 +++++ .../Regress.test_int32.page | 47 +++++ .../Regress.test_int64.page | 47 +++++ .../Regress.test_int8.page | 47 +++++ .../Regress.test_int_out_utf8.page | 51 ++++++ .../Regress.test_int_value_arg.page | 47 +++++ .../Regress.test_long.page | 47 +++++ .../Regress.test_multi_callback.page | 47 +++++ .../Regress.test_multi_double_args.page | 57 ++++++ .../Regress.test_multiline_doc_comments.page | 38 ++++ .../Regress.test_nested_parameter.page | 70 +++++++ .../Regress.test_null_gerror_callback.page | 45 +++++ .../Regress.test_owned_gerror_callback.page | 45 +++++ .../Regress.test_short.page | 47 +++++ .../Regress.test_simple_callback.page | 45 +++++ .../Regress.test_size.page | 47 +++++ .../Regress.test_skip_unannotated_callback.page | 46 +++++ .../Regress.test_ssize.page | 47 +++++ .../Regress.test_strv_in.page | 47 +++++ .../Regress.test_strv_in_gvalue.page | 40 ++++ .../Regress.test_strv_out.page | 40 ++++ .../Regress.test_strv_out_c.page | 40 ++++ .../Regress.test_strv_out_container.page | 40 ++++ .../Regress.test_strv_outarg.page | 45 +++++ .../Regress.test_timet.page | 47 +++++ .../Regress.test_torture_signature_0.page | 75 ++++++++ .../Regress.test_torture_signature_1.page | 77 ++++++++ .../Regress.test_torture_signature_2.page | 93 ++++++++++ .../Regress.test_uint.page | 47 +++++ .../Regress.test_uint16.page | 47 +++++ .../Regress.test_uint32.page | 47 +++++ .../Regress.test_uint64.page | 47 +++++ .../Regress.test_uint8.page | 47 +++++ .../Regress.test_ulong.page | 47 +++++ .../Regress.test_unichar.page | 47 +++++ .../Regress.test_unsigned_enum_param.page | 47 +++++ .../Regress.test_ushort.page | 47 +++++ .../Regress.test_utf8_const_in.page | 45 +++++ .../Regress.test_utf8_const_return.page | 40 ++++ .../Regress.test_utf8_inout.page | 45 +++++ .../Regress.test_utf8_nonconst_return.page | 40 ++++ .../Regress.test_utf8_null_in.page | 45 +++++ .../Regress.test_utf8_null_out.page | 45 +++++ .../Regress.test_utf8_out.page | 45 +++++ .../Regress.test_utf8_out_nonconst_return.page | 47 +++++ .../Regress.test_utf8_out_out.page | 51 ++++++ .../Regress.test_value_get_fundamental_object.page | 47 +++++ .../Regress.test_value_return.page | 47 +++++ .../Regress.test_value_set_fundamental_object.page | 51 ++++++ .../Regress.test_versioning.page | 39 ++++ .../scanner/Regress-1.0-Python-expected/index.page | 33 ++++ 1392 files changed, 55412 insertions(+), 1924 deletions(-) delete mode 100644 tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page delete mode 100644 tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page delete mode 100644 tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page delete mode 100644 tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page delete mode 100644 tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page delete mode 100644 tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page delete mode 100644 tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page delete mode 100644 tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page delete mode 100644 tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page delete mode 100644 tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page delete mode 100644 tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page delete mode 100644 tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page delete mode 100644 tests/doctool/DocExamples-1.0-C-expected/index.page delete mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Callback.page delete mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Enum.page delete mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-property-example.page delete mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-signal-example.page delete mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-vfunc.page delete mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page delete mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.new.page delete mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.page delete mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.static_method.page delete mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.array_function.page delete mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.callback_function.page delete mode 100644 tests/doctool/DocExamples-1.0-Gjs-expected/index.page delete mode 100644 tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page delete mode 100644 tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page delete mode 100644 tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-property-example.page delete mode 100644 tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page delete mode 100644 tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page delete mode 100644 tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page delete mode 100644 tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page delete mode 100644 tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page delete mode 100644 tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page delete mode 100644 tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page delete mode 100644 tests/doctool/DocExamples-1.0-Python-expected/index.page delete mode 100644 tests/doctool/Makefile.am delete mode 100644 tests/doctool/doc-examples-obj.c delete mode 100644 tests/doctool/doc-examples-obj.h create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.ATestError.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AliasedTestBoxed.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationCallback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationForeachFunc.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationListCallback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationNotifyFunc.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-function-property.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-property.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.DOUBLE_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FOO_PIE_IS_TASTY.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FOO_SUCCESS_INT.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooASingle.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooAddressType.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooCallback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooEnumFullname.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooEnumNoType.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooError.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooEvent.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject-hidden.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject-string.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObjectCookie.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObject.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSkippable.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooStackLayer.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooStruct.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooUnion.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooVarargsCallback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooXEvent.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANTA.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.G_GINT64_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.INT_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.LONG_STRING_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.MAXUINT64.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.MININT64.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.Mixed_Case_Constant.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.NEGATIVE_INT_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.PtrArrayAlias.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.STRING_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestCallback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackArray.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackFull.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackGError.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackHashtable.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackOwnedGError.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackUserData.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestDEFError.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestEnumNoGEnum.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestEnumUnsigned.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestError.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectCopyFunction.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectFinalizeFunction.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-bare.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-boxed.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-double.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-float.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-gtype.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table-old.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-int.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list-old.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-string.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleCallback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructC.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructD.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructE.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructF.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestTypeGUInt64.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-testbool.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.UTF8_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.VaListAlias.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_double.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_float.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_int.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_long.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_short.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_size.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page create mode 100644 tests/scanner/Regress-1.0-C-expected/index.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AliasedTestBoxed.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationForeachFunc.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationNotifyFunc.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-function-property.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-property.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.DOUBLE_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_PIE_IS_TASTY.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_SUCCESS_INT.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-hidden.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-string.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_cookie.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.skipped_method.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.take_all.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObjectCookie.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.new.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSkippable.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUnion.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooVarargsCallback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooXEvent.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANTA.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.G_GINT64_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.INT_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.IntSet.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.LONG_STRING_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.MAXUINT64.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.MININT64.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.Mixed_Case_Constant.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.NEGATIVE_INT_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.PtrArrayAlias.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.STRING_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.SkippedStructure.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackArray.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackFull.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackHashtable.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackUserData.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectCopyFunction.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectFinalizeFunction.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-boxed.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-double.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-float.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-gtype.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table-old.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-int.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-string.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleCallback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestTypeGUInt64.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x-testbool.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.UTF8_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.VaListAlias.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_skip_me.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant_ptr.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback2.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback3.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.not_introspectable_via_alias.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.random_function_with_skipped_structure.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_skip_unannotated_callback.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_get_fundamental_object.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_set_fundamental_object.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/index.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.DOUBLE_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FOO_PIE_IS_TASTY.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FOO_SUCCESS_INT.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooCallback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-hidden.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-string.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.new_cookie.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.skipped_method.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.take_all.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.new.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooSkippable.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooVarargsCallback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANTA.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.G_GINT64_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.INT_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.IntSet.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.LONG_STRING_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.MAXUINT64.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.MININT64.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.Mixed_Case_Constant.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.NEGATIVE_INT_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.STRING_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.SkippedStructure.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackFull.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.UTF8_CONSTANT.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.VaListAlias.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_skip_me.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant_ptr.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback2.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback3.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.not_introspectable_via_alias.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.random_function_with_skipped_structure.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_skip_unannotated_callback.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_value_get_fundamental_object.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_value_set_fundamental_object.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/index.page diff --git a/.gitignore b/.gitignore index 92b3da0e..1e0a0262 100644 --- a/.gitignore +++ b/.gitignore @@ -106,4 +106,4 @@ docs/reference/version.xml #g-ir-doc-tool tests *.page -!tests/doctool/*-expected/*.page +!tests/scanner/*-expected/*.page diff --git a/common.mk b/common.mk index 87ceaee2..28b73c7e 100644 --- a/common.mk +++ b/common.mk @@ -40,3 +40,9 @@ INTROSPECTION_DOCTOOL = \ UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) \ UNINSTALLED_INTROSPECTION_BUILDDIR=$(top_builddir) \ $(top_builddir)/g-ir-doc-tool + +INTROSPECTION_DOCTOOL_ARGS = \ + --add-include-path=$(srcdir) \ + --add-include-path=$(top_srcdir)/gir \ + --add-include-path=$(builddir) \ + --add-include-path=$(top_builddir) diff --git a/configure.ac b/configure.ac index 68fb3f25..c8e01731 100644 --- a/configure.ac +++ b/configure.ac @@ -318,7 +318,6 @@ tests/offsets/Makefile tests/scanner/Makefile tests/repository/Makefile tests/warn/Makefile -tests/doctool/Makefile docs/Makefile docs/reference/Makefile gobject-introspection-1.0.pc diff --git a/tests/Makefile.am b/tests/Makefile.am index 676d485f..b4985b90 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,12 +1,6 @@ include $(top_srcdir)/common.mk SUBDIRS = . scanner repository offsets warn -DIST_SUBDIRS = $(SUBDIRS) -if BUILD_DOCTOOL -SUBDIRS += doctool -else -DIST_SUBDIRS += doctool -endif EXTRA_DIST= BUILT_SOURCES= diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page deleted file mode 100644 index 621485cf..00000000 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Callback.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - DocExamples.Callback - - - - - - - - - - - - diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page deleted file mode 100644 index 6957f4b7..00000000 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Enum.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - DocExamples.Enum - - - -

This is an example to document an enumeration.

- - - - - - - - diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page deleted file mode 100644 index 90982bf2..00000000 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-property-example.page +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - property-example - - - DocExamples.Obj:property-example - - - -

This is an example of how to document a property.

- - -

Since 0.99

- - - - - - diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page deleted file mode 100644 index 8502865c..00000000 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-signal-example.page +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - signal-example - - - DocExamples.Obj::signal-example - - -void signal-example (guint int_param, - guint float_param, - gpointer pointer_param); - - - -

This is an example of how to document a signal.

- - -

Since 0.99

- - -
-

int_param :

-

a parameter of type int

-

float_param :

-

a parameter of type float

-

pointer_param :

-

A pointer to @obj's thingy -- pass int_param if you really want to.

-

Returns :

-
-
- - - - diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page deleted file mode 100644 index 7ff7e568..00000000 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj-vfunc.page +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - DocExamples.Obj::vfunc - - -void vfunc (DocExamplesObj* self, - gint first_arg); - - - -

This is an example of how to document a vfunc.

- - -

Since 0.99

- - -
-

self :

-
-

first_arg :

-

first argument

-

Returns :

-
-
- - - - diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page deleted file mode 100644 index b154b8de..00000000 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.method.page +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - gboolean - - doc_examples_obj_method - - DocExamplesObj* - obj - - - gint - first_arg - - - gfloat - second_arg - - - gboolean - boolean_arg - - - gpointer - pointer_arg - - - gchar* - string - - - - - doc_examples_obj_method - - -gboolean doc_examples_obj_method (DocExamplesObj* obj, - gint first_arg, - gfloat second_arg, - gboolean boolean_arg, - gpointer pointer_arg, - gchar* string); - - - -

This is an example of how to document a method.

You should call this on a that was -created with , by passing it -in as obj.

This should be a %FALSEALARM.

- - -

Since 0.99

- - -
-

obj :

-

A .

-

first_arg :

-

first argument

-

second_arg :

-

second argument

-

boolean_arg :

-

You should always pass TRUE.

-

pointer_arg :

-

If not NULL, do a thing. Pass first_arg if you want to sometimes. You can also pass second_arg, or even boolean_arg.

-

string :

-

A NUL-terminated string.

-

Returns :

-

Either FALSE or something FALSE-y.

-
- - - - diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page deleted file mode 100644 index ceef763d..00000000 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.new.page +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - DocExamplesObj* - - doc_examples_obj_new - - - - doc_examples_obj_new - - -DocExamplesObj* doc_examples_obj_new (void); - - - - - - - - -
-

Returns :

-
-
- - - - diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page deleted file mode 100644 index 9448bbb6..00000000 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.page +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - DocExamples.Obj - - - -

This is an example of how to document a class

This class has a signal: .

And also has a property: .

- - -

Since 0.99

- - - - Hierarchy - - - GObject.Object - - DocExamples.Obj - - - - - - - - Methods - - - Functions - - - Properties - - - Signals - - - Virtual functions - - - Other - - - diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page deleted file mode 100644 index 99345e0e..00000000 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.Obj.static_method.page +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - gboolean - - doc_examples_obj_static_method - - gint* - out_arg - - - - - doc_examples_obj_static_method - - -gboolean doc_examples_obj_static_method (gint* out_arg); - - - -

This is an example of a function with an out argument -and a return value.

- - - - -
-

out_arg :

-

a pointer to int, or NULL to ignore

-

Returns :

-

TRUE if out_arg is valid, FALSE otherwise

-
- - - - diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page deleted file mode 100644 index fe95df74..00000000 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.ObjClass.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - DocExamples.ObjClass - - - - - - - - - - - - diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page deleted file mode 100644 index c3dfc238..00000000 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.array_function.page +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - gint* - - doc_examples_array_function - - gint* - out_len - - - - - doc_examples_array_function - - -gint* doc_examples_array_function (gint* out_len); - - - -

This function returns an array with an explicit length, -and the length should be invisible in most introspected bindings.

- - - - -
-

out_len :

-

the length of the returned array

-

Returns :

-

an array of numbers.

-
- - - - diff --git a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page deleted file mode 100644 index 0688cbb9..00000000 --- a/tests/doctool/DocExamples-1.0-C-expected/DocExamples.callback_function.page +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - DocExamplesEnum - - doc_examples_callback_function - - DocExamplesCallback - callback - - - gpointer - user_data - - - GDestroyNotify - destroy_notify - - - - - doc_examples_callback_function - - -DocExamplesEnum doc_examples_callback_function (DocExamplesCallback callback, - gpointer user_data, - GDestroyNotify destroy_notify); - - - -

This is a function that takes a callback. Different languages -will expose this in different ways (e.g. Python keeps the -user_data parameter, while JS doesn't)

- - - - -
-

callback :

-

Just Call Me Maybe

-

user_data :

-

your stuff

-

destroy_notify :

-

how to get rid of user_data

-

Returns :

-

.foo sometimes, .bar other times.

-
- - - - diff --git a/tests/doctool/DocExamples-1.0-C-expected/index.page b/tests/doctool/DocExamples-1.0-C-expected/index.page deleted file mode 100644 index 1d89dedd..00000000 --- a/tests/doctool/DocExamples-1.0-C-expected/index.page +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - Index - - - - - - - - - - - Classes - - - Functions - - - Other - - - diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Callback.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Callback.page deleted file mode 100644 index 621485cf..00000000 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Callback.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - DocExamples.Callback - - - - - - - - - - - - diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Enum.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Enum.page deleted file mode 100644 index a3e64bc5..00000000 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Enum.page +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - DocExamples.Enum - - - -

This is an example to document an enumeration.

- - - - -
-

Enum.FOO :

-

a foo

-

Enum.BAR :

-

a bar

-
- - - - diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-property-example.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-property-example.page deleted file mode 100644 index 59d90f4d..00000000 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-property-example.page +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - property-example - - - DocExamples.Obj:property-example - - -"property-example" {String: gint8} : Read / Write - - - -

This is an example of how to document a property.

- - -

Since 0.99

- - - - - - diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-signal-example.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-signal-example.page deleted file mode 100644 index 074ccd2b..00000000 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-signal-example.page +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - signal-example - - - DocExamples.Obj::signal-example - - -function callback(obj, int_param:Number, float_param:Number, pointer_param:gpointer, user_param1, ...):void; - - - -

This is an example of how to document a signal.

- - -

Since 0.99

- - -
-

obj :

-

instance of DocExamples.Obj that is emitting the signal

-

int_param :

-

a parameter of type int

-

float_param :

-

a parameter of type float

-

pointer_param :

-

A pointer to @obj's thingy -- pass int_param if you really want to.

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
- - - - diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-vfunc.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-vfunc.page deleted file mode 100644 index 87c38e63..00000000 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj-vfunc.page +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - DocExamples.Obj::vfunc - - -function vfunc_vfunc(first_arg:Number):void { -} - - - -

This is an example of how to document a vfunc.

- - -

Since 0.99

- - -
-

first_arg :

-

first argument

-
- - - - diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page deleted file mode 100644 index abe38df2..00000000 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.method.page +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - Boolean - - doc_examples_obj_method - - Number - first_arg - - - Number - second_arg - - - Boolean - boolean_arg - - - gpointer - pointer_arg - - - String - string - - - - - Obj.prototype.method - - -function method(first_arg:Number, second_arg:Number, boolean_arg:Boolean, pointer_arg:gpointer, string:String):Boolean { - // Gjs wrapper for doc_examples_obj_method() -} - - - -

This is an example of how to document a method.

You should call this on a that was -created with , by passing it -in as obj.

This should be a %FALSEALARM.

- - -

Since 0.99

- - -
-

first_arg :

-

first argument

-

second_arg :

-

second argument

-

boolean_arg :

-

You should always pass true.

-

pointer_arg :

-

If not null, do a thing. Pass first_arg if you want to sometimes. You can also pass second_arg, or even boolean_arg.

-

string :

-

A NUL-terminated string.

-

Returns :

-

Either false or something false-y.

-
- - - - diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.new.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.new.page deleted file mode 100644 index 2dab7439..00000000 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.new.page +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - DocExamples.Obj - - doc_examples_obj_new - - - - Obj.new - - -function new():DocExamples.Obj { - // Gjs wrapper for doc_examples_obj_new() -} - - - - - - - - -
-

Returns :

-
-
- - - - diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.page deleted file mode 100644 index 378f27d1..00000000 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.page +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - DocExamples.Obj - - -from gi.repository import DocExamples - -obj = DocExamples.Obj(property_example=value) - - -

This is an example of how to document a class

This class has a signal: .

And also has a property: .

- - -

Since 0.99

- - - - Hierarchy - - - GObject.Object - - DocExamples.Obj - - - - - - - - Methods - - - Functions - - - Properties - - - Signals - - - Virtual functions - - - Other - - - diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.static_method.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.static_method.page deleted file mode 100644 index fd9e1007..00000000 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.Obj.static_method.page +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - Boolean - - doc_examples_obj_static_method - - Number - out_arg - - - - - static_method - - -function static_method(out_arg:Number):Boolean { - // Gjs wrapper for doc_examples_obj_static_method() -} - - - -

This is an example of a function with an out argument -and a return value.

- - - - -
-

out_arg :

-

a pointer to int, or null to ignore

-

Returns :

-

true if out_arg is valid, false otherwise

-
- - - - diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.array_function.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.array_function.page deleted file mode 100644 index 05583a26..00000000 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.array_function.page +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - [Number] - - doc_examples_array_function - - Number - out_len - - - - - array_function - - -function array_function(out_len:Number):[Number] { - // Gjs wrapper for doc_examples_array_function() -} - - - -

This function returns an array with an explicit length, -and the length should be invisible in most introspected bindings.

- - - - -
-

out_len :

-

the length of the returned array

-

Returns :

-

an array of numbers.

-
- - - - diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.callback_function.page deleted file mode 100644 index cb449c74..00000000 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/DocExamples.callback_function.page +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - DocExamples.Enum - - doc_examples_callback_function - - DocExamples.Callback - callback - - - - - callback_function - - -function callback_function(callback:DocExamples.Callback):DocExamples.Enum { - // Gjs wrapper for doc_examples_callback_function() -} - - - -

This is a function that takes a callback. Different languages -will expose this in different ways (e.g. Python keeps the -user_data parameter, while JS doesn't)

- - - - -
-

callback :

-

Just Call Me Maybe

-

Returns :

-

.foo sometimes, .bar other times.

-
- - - - diff --git a/tests/doctool/DocExamples-1.0-Gjs-expected/index.page b/tests/doctool/DocExamples-1.0-Gjs-expected/index.page deleted file mode 100644 index 1d89dedd..00000000 --- a/tests/doctool/DocExamples-1.0-Gjs-expected/index.page +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - Index - - - - - - - - - - - Classes - - - Functions - - - Other - - - diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page deleted file mode 100644 index 621485cf..00000000 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Callback.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - DocExamples.Callback - - - - - - - - - - - - diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page deleted file mode 100644 index a3e64bc5..00000000 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Enum.page +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - DocExamples.Enum - - - -

This is an example to document an enumeration.

- - - - -
-

Enum.FOO :

-

a foo

-

Enum.BAR :

-

a bar

-
- - - - diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-property-example.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-property-example.page deleted file mode 100644 index 98cafdf5..00000000 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-property-example.page +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - property-example - - - DocExamples.Obj:property-example - - -"property-example" {unicode: gint8} : Read / Write - - - -

This is an example of how to document a property.

- - -

Since 0.99

- - - - - - diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page deleted file mode 100644 index 1dc5d60d..00000000 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-signal-example.page +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - signal-example - - - DocExamples.Obj::signal-example - - -def callback(obj, int_param, float_param, pointer_param, user_param1, ...) - - - -

This is an example of how to document a signal.

- - -

Since 0.99

- - -
-

obj :

-

instance of DocExamples.Obj that is emitting the signal

-

int_param :

-

a parameter of type int

-

float_param :

-

a parameter of type float

-

pointer_param :

-

A pointer to @obj's thingy -- pass int_param if you really want to.

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
- - - - diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page deleted file mode 100644 index 94fe8f67..00000000 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj-vfunc.page +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - DocExamples.Obj::vfunc - - -@accepts(DocExamples.Obj, int) -@returns(none) -def do_vfunc(self, first_arg): - - - -

This is an example of how to document a vfunc.

- - -

Since 0.99

- - -
-

self :

-
-

first_arg :

-

first argument

-
- - - - diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page deleted file mode 100644 index 7b7c8fa0..00000000 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.method.page +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - bool - - doc_examples_obj_method - - DocExamples.Obj - self - - - int - first_arg - - - float - second_arg - - - bool - boolean_arg - - - gpointer - pointer_arg - - - unicode - string - - - - - Obj.method - - -@accepts(DocExamples.Obj, int, float, bool, gpointer, unicode) -@returns(bool) -def method(self, first_arg, second_arg, boolean_arg, pointer_arg, string): - # Python wrapper for doc_examples_obj_method() - - - -

This is an example of how to document a method.

You should call this on a that was -created with , by passing it -in as self.

This should be a %FALSEALARM.

- - -

Since 0.99

- - -
-

self :

-

A .

-

first_arg :

-

first argument

-

second_arg :

-

second argument

-

boolean_arg :

-

You should always pass True.

-

pointer_arg :

-

If not None, do a thing. Pass first_arg if you want to sometimes. You can also pass second_arg, or even boolean_arg.

-

string :

-

A NUL-terminated string.

-

Returns :

-

Either False or something False-y.

-
- - - - diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page deleted file mode 100644 index 12cfad8c..00000000 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.page +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - DocExamples.Obj - - -from gi.repository import DocExamples - -obj = DocExamples.Obj(property_example=value) - - -

This is an example of how to document a class

This class has a signal: .

And also has a property: .

- - -

Since 0.99

- - - - Hierarchy - - - GObject.Object - - DocExamples.Obj - - - - - - - - Methods - - - Functions - - - Properties - - - Signals - - - Virtual functions - - - Other - - - diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page deleted file mode 100644 index 6088a5e2..00000000 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.Obj.static_method.page +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - bool - - doc_examples_obj_static_method - - int - out_arg - - - - - Obj.static_method - - -@accepts(int) -@returns(bool) -def static_method(out_arg): - # Python wrapper for doc_examples_obj_static_method() - - - -

This is an example of a function with an out argument -and a return value.

- - - - -
-

out_arg :

-

a pointer to int, or None to ignore

-

Returns :

-

True if out_arg is valid, False otherwise

-
- - - - diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page deleted file mode 100644 index 506e40f3..00000000 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.array_function.page +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - [int] - - doc_examples_array_function - - int - out_len - - - - - array_function - - -@accepts(int) -@returns([int]) -def array_function(out_len): - # Python wrapper for doc_examples_array_function() - - - -

This function returns an array with an explicit length, -and the length should be invisible in most introspected bindings.

- - - - -
-

out_len :

-

the length of the returned array

-

Returns :

-

an array of numbers.

-
- - - - diff --git a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page b/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page deleted file mode 100644 index 53f5861d..00000000 --- a/tests/doctool/DocExamples-1.0-Python-expected/DocExamples.callback_function.page +++ /dev/null @@ -1,61 +0,0 @@ - - - - - - - - DocExamples.Enum - - doc_examples_callback_function - - DocExamples.Callback - callback - - - gpointer - user_data - - - GLib.DestroyNotify - destroy_notify - - - - - callback_function - - -@accepts(DocExamples.Callback, gpointer, GLib.DestroyNotify) -@returns(DocExamples.Enum) -def callback_function(callback, user_data, destroy_notify): - # Python wrapper for doc_examples_callback_function() - - - -

This is a function that takes a callback. Different languages -will expose this in different ways (e.g. Python keeps the -user_data parameter, while JS doesn't)

- - - - -
-

callback :

-

Just Call Me Maybe

-

user_data :

-

your stuff

-

destroy_notify :

-

how to get rid of user_data

-

Returns :

-

.foo sometimes, .bar other times.

-
- - - - diff --git a/tests/doctool/DocExamples-1.0-Python-expected/index.page b/tests/doctool/DocExamples-1.0-Python-expected/index.page deleted file mode 100644 index 1d89dedd..00000000 --- a/tests/doctool/DocExamples-1.0-Python-expected/index.page +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - Index - - - - - - - - - - - Classes - - - Functions - - - Other - - - diff --git a/tests/doctool/Makefile.am b/tests/doctool/Makefile.am deleted file mode 100644 index 4d2b9d7f..00000000 --- a/tests/doctool/Makefile.am +++ /dev/null @@ -1,60 +0,0 @@ -include $(top_srcdir)/common.mk -include $(top_srcdir)/Makefile.introspection - -INTROSPECTION_SCANNER_ARGS += --warn-all --warn-error -I. - -check_LTLIBRARIES = \ - libdocexamples.la - -AM_CFLAGS = $(GOBJECT_CFLAGS) -LIBS = $(GOBJECT_LIBS) - -libdocexamples_la_SOURCES = $(srcdir)/doc-examples-obj.c $(srcdir)/doc-examples-obj.h - -GIRS = -TYPELIBS = $(GIRS:.gir=.typelib) -INTROSPECTION_GIRS = $(GIRS) -CHECK_TARGETS = $(GIRS:.gir=-C.page.check) $(GIRS:.gir=-Python.page.check) $(GIRS:.gir=-Gjs.page.check) -MALLARD_DIRS = $(GIRS:.gir=-C) $(GIRS:.gir=-Python) $(GIRS:.gir=-Gjs) -EXPECTED_MALLARD_DIRS = $(MALLARD_DIRS:=-expected) -CLEANFILES = $(TYPELIBS) $(GIRS) -BUILT_SOURCES = $(MALLARD_DIRS) -EXTRA_DIST = $(EXPECTED_MALLARD_DIRS) - -DocExamples-1.0.gir: $(top_builddir)/Gio-2.0.gir libdocexamples.la -DocExamples_1_0_gir_LIBS = libdocexamples.la -DocExamples_1_0_gir_INCLUDES = cairo-1.0 Gio-2.0 -DocExamples_1_0_gir_FILES = $(libdocexamples_la_SOURCES) -#DocExamples_1_0_gir_SCANNERFLAGS = --c-include="regress.h" -GIRS += DocExamples-1.0.gir - -%-C: %.gir - $(AM_V_GEN) - $(AM_V_at)$(MKDIR_P) $*-C - $(AM_V_at)rm -f $*-C/*.page - $(AM_V_at)$(INTROSPECTION_DOCTOOL) --language C $*.gir -o $*-C/ - -%-Python: %.gir - $(AM_V_GEN) - $(AM_V_at)$(MKDIR_P) $*-Python - $(AM_V_at)rm -f $*-Python/*.page - $(AM_V_at)$(INTROSPECTION_DOCTOOL) --language Python $*.gir -o $*-Python/ - -%-Gjs: %.gir - $(AM_V_GEN) - $(AM_V_at)$(MKDIR_P) $*-Gjs - $(AM_V_at)rm -f $*-Gjs/*.page - $(AM_V_at)$(INTROSPECTION_DOCTOOL) --language Gjs $*.gir -o $*-Gjs/ - -%-C.page.check: %-C - @diff -u -w -B -U 10 $(srcdir)/$*-C-expected $*-C && echo " TEST $*-C" - -%-Python.page.check: %-Python - @diff -u -w -B -U 10 $(srcdir)/$*-Python-expected $*-Python && echo " TEST $*-Python" - -%-Gjs.page.check: %-Gjs - @diff -u -w -B -U 10 $(srcdir)/$*-Gjs-expected $*-Gjs && echo " TEST $*-Gjs" - -check-local: $(CHECK_TARGETS) $(TYPELIBS) -clean-local: - @rm -rf $(MALLARD_DIRS) diff --git a/tests/doctool/doc-examples-obj.c b/tests/doctool/doc-examples-obj.c deleted file mode 100644 index fff1aaa5..00000000 --- a/tests/doctool/doc-examples-obj.c +++ /dev/null @@ -1,203 +0,0 @@ -/* doc-examples-obj.c */ - -#include "doc-examples-obj.h" - -/** - * DocExamplesObj: - * - * This is an example of how to document a class - * - * This class has a signal: #DocExamplesObj::signal-example. - * - * And also has a property: #DocExamplesObj:property-example. - * - * Since: 0.99 - */ - -G_DEFINE_TYPE (DocExamplesObj, doc_examples_obj, G_TYPE_OBJECT) - -static void -doc_examples_obj_get_property (GObject *object, - guint property_id, - GValue *value, - GParamSpec *pspec) -{ - switch (property_id) - { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - } -} - -static void -doc_examples_obj_set_property (GObject *object, - guint property_id, - const GValue *value, - GParamSpec *pspec) -{ - switch (property_id) - { - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - } -} - -static void -doc_examples_obj_class_init (DocExamplesObjClass *klass) -{ - GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - GParamSpec *pspec; - - gobject_class->get_property = doc_examples_obj_get_property; - gobject_class->set_property = doc_examples_obj_set_property; - - /** - * DocExamplesObj::signal-example: - * @obj: - * @int_param: a parameter of type int - * @float_param: a parameter of type float - * @pointer_param: A pointer to @obj's thingy -- - * pass @int_param if you really want to. - * - * This is an example of how to document a signal. - * - * Since: 0.99 - */ - g_signal_new ("signal-example", - G_TYPE_FROM_CLASS (gobject_class), - G_SIGNAL_RUN_LAST, - 0, NULL, NULL, - NULL, - G_TYPE_NONE, 3, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_POINTER); - - /** - * DocExamplesObj:property-example: - * - * This is an example of how to document a property. - * - * Type: GLib.HashTable(utf8,gint8) - * Transfer: container - * - * Since: 0.99 - */ - pspec = g_param_spec_boxed ("property-example", - "Example property", - "A contained GHashTable", - G_TYPE_HASH_TABLE, - G_PARAM_READWRITE); - g_object_class_install_property (gobject_class, - 1, - pspec); -} - -static void -doc_examples_obj_init (DocExamplesObj *self) -{ - -} - -DocExamplesObj * -doc_examples_obj_new (void) -{ - return g_object_new (DOC_EXAMPLES_TYPE_OBJ, NULL); -} - -/** - * doc_examples_obj_method: - * @obj: A #DocExamplesObj. - * @first_arg: first argument - * @second_arg: second argument - * @boolean_arg: You should always pass %TRUE. - * @pointer_arg: (allow-none): If not %NULL, do a thing. - * Pass @first_arg if you want to sometimes. You can - * also pass @second_arg, or even @boolean_arg. - * @string: A NUL-terminated string. - * - * This is an example of how to document a method. - * - * You should call this on a #DocExamplesObj that was - * created with doc_examples_obj_new(), by passing it - * in as @obj. - * - * This should be a %FALSEALARM. - * - * Since: 0.99 - * - * Returns: Either %FALSE or something %FALSE-y. - */ -gboolean -doc_examples_obj_method (DocExamplesObj *obj, gint first_arg, gfloat second_arg, - gboolean boolean_arg, gpointer pointer_arg, gchar *string) -{ - return FALSE; -} - -/** - * doc_examples_obj_static_method: - * @out_arg: (out) (allow-none): a pointer to int, or %NULL to ignore - * - * This is an example of a function with an out argument - * and a return value. - * - * Returns: %TRUE if @out_arg is valid, %FALSE otherwise - */ -gboolean -doc_examples_obj_static_method (gint *out_arg) -{ - if (out_arg) - *out_arg = 42; - - return TRUE; -} - -/** - * doc_examples_array_function: - * @out_len: (out): the length of the returned array - * - * This function returns an array with an explicit length, - * and the length should be invisible in most introspected bindings. - * - * Returns: (array length=out_len) (transfer full): an array of numbers. - */ -gint * -doc_examples_array_function (gint *out_len) -{ - gint *array; - int i, n = 3; - - array = g_new(int, n); - for (i = 0; i < n; i++) - array[i] = i; - - *out_len = n; - return array; -} - -/** - * doc_examples_callback_function: - * @callback: Just Call Me Maybe - * @user_data: your stuff - * @destroy_notify: how to get rid of @user_data - * - * This is a function that takes a callback. Different languages - * will expose this in different ways (e.g. Python keeps the - * @user_data parameter, while JS doesn't) - * - * Returns: %DOC_EXAMPLES_FOO sometimes, %DOC_EXAMPLES_BAR - * other times. - */ -DocExamplesEnum -doc_examples_callback_function (DocExamplesCallback callback, - gpointer user_data, - GDestroyNotify destroy_notify) -{ - gchar *result; - - result = callback (42, 17); - g_free (result); - - if (user_data && destroy_notify) - destroy_notify (user_data); - - return DOC_EXAMPLES_FOO; -} diff --git a/tests/doctool/doc-examples-obj.h b/tests/doctool/doc-examples-obj.h deleted file mode 100644 index 543a8c29..00000000 --- a/tests/doctool/doc-examples-obj.h +++ /dev/null @@ -1,93 +0,0 @@ -/* doc-examples-obj.h */ - -#ifndef _DOC_EXAMPLES_OBJ_H -#define _DOC_EXAMPLES_OBJ_H - -#include - -G_BEGIN_DECLS - -#define DOC_EXAMPLES_TYPE_OBJ doc_examples_obj_get_type() - -#define DOC_EXAMPLES_OBJ(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - DOC_EXAMPLES_TYPE_OBJ, DocExamplesObj)) - -#define DOC_EXAMPLES_OBJ_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), \ - DOC_EXAMPLES_TYPE_OBJ, DocExamplesObjClass)) - -#define DOC_EXAMPLES_IS_OBJ(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - DOC_EXAMPLES_TYPE_OBJ)) - -#define DOC_EXAMPLES_IS_OBJ_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - DOC_EXAMPLES_TYPE_OBJ)) - -#define DOC_EXAMPLES_OBJ_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - DOC_EXAMPLES_TYPE_OBJ, DocExamplesObjClass)) - -typedef struct _DocExamplesObj DocExamplesObj; -typedef struct _DocExamplesObjClass DocExamplesObjClass; - -struct _DocExamplesObj -{ - GObject parent; -}; - -struct _DocExamplesObjClass -{ - GObjectClass parent_class; - - /** - * DocExamplesObjClass::vfunc: - * @self: - * @first_arg: first argument - * - * This is an example of how to document a vfunc. - * - * Since: 0.99 - */ - void (*vfunc) (DocExamplesObj *self, gint first_arg); -}; - -GType doc_examples_obj_get_type (void) G_GNUC_CONST; - -DocExamplesObj *doc_examples_obj_new (void); -gboolean doc_examples_obj_method (DocExamplesObj *obj, gint first_arg, gfloat second_arg, - gboolean boolean_arg, gpointer pointer_arg, gchar *string); - -gboolean doc_examples_obj_static_method (gint *out_arg); - -gint *doc_examples_array_function (gint *out_len); - -/** - * DocExamplesEnum: - * @DOC_EXAMPLES_FOO: a foo - * @DOC_EXAMPLES_BAR: a bar - * - * This is an example to document an enumeration. - */ -typedef enum { - DOC_EXAMPLES_FOO, - DOC_EXAMPLES_BAR -} DocExamplesEnum; - -/** - * DocExamplesCallback: - * @one: first parameter - * @two: second parameter - * - * Returns: something - */ -typedef gchar * (*DocExamplesCallback) (int one, int two); - -DocExamplesEnum doc_examples_callback_function (DocExamplesCallback callback, - gpointer user_data, - GDestroyNotify destroy_notify); - -G_END_DECLS - -#endif /* _DOC_EXAMPLES_OBJ_H */ diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index cf045082..e07bdd3e 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -146,7 +146,43 @@ Headeronly-1.0.gir: headeronly.h %.gir.check: %.gir @diff -u -U 10 $(srcdir)/$*-expected.gir $*.gir && echo " TEST $*.gir" -check-local: Headeronly-1.0.gir $(CHECKGIRS) $(TYPELIBS) +if BUILD_DOCTOOL +DOCGIRS = Regress-1.0.gir +CHECKDOCS = $(DOCGIRS:.gir=-C.page.check) $(DOCGIRS:.gir=-Python.page.check) $(DOCGIRS:.gir=-Gjs.page.check) +MALLARD_DIRS = $(DOCGIRS:.gir=-C) $(DOCGIRS:.gir=-Python) $(DOCGIRS:.gir=-Gjs) +EXPECTED_MALLARD_DIRS = $(MALLARD_DIRS:=-expected) + +%-C: %.gir + $(AM_V_GEN) + $(AM_V_at)$(MKDIR_P) $*-C + $(AM_V_at)rm -f $*-C/*.page + $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language C $*.gir -o $*-C/ + +%-Python: %.gir + $(AM_V_GEN) + $(AM_V_at)$(MKDIR_P) $*-Python + $(AM_V_at)rm -f $*-Python/*.page + $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language Python $*.gir -o $*-Python/ + +%-Gjs: %.gir + $(AM_V_GEN) + $(AM_V_at)$(MKDIR_P) $*-Gjs + $(AM_V_at)rm -f $*-Gjs/*.page + $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language Gjs $*.gir -o $*-Gjs/ + +%-C.page.check: %-C + @diff -u -w -B -U 10 $(srcdir)/$*-C-expected $*-C && echo " TEST $*-C" + +%-Python.page.check: %-Python + @diff -u -w -B -U 10 $(srcdir)/$*-Python-expected $*-Python && echo " TEST $*-Python" + +%-Gjs.page.check: %-Gjs + @diff -u -w -B -U 10 $(srcdir)/$*-Gjs-expected $*-Gjs && echo " TEST $*-Gjs" +else +CHECKDOCS = +endif + +check-local: Headeronly-1.0.gir $(CHECKGIRS) $(CHECKDOCS) $(TYPELIBS) EXTRA_DIST += \ annotationparser/README \ diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page new file mode 100644 index 00000000..ebe71b0d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.ANNOTATION_CALCULATED_DEFINE + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE.page b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE.page new file mode 100644 index 00000000..4b38cc01 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE.page @@ -0,0 +1,26 @@ + + + + + + + + Regress.ANNOTATION_CALCULATED_LARGE + + + +

Constant to define a calculated large value

+ + +

Since 1.4

+ + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page new file mode 100644 index 00000000..d6c8e76a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.ANNOTATION_CALCULATED_LARGE_DIV + + + +

Constant to define a calculated large value

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.ATestError.page b/tests/scanner/Regress-1.0-C-expected/Regress.ATestError.page new file mode 100644 index 00000000..a2ab2ef9 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.ATestError.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.ATestError + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AliasedTestBoxed.page b/tests/scanner/Regress-1.0-C-expected/Regress.AliasedTestBoxed.page new file mode 100644 index 00000000..2229245a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AliasedTestBoxed.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.AliasedTestBoxed + + + +

Typedef TestBoxed to test caller-allocates correctness

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page new file mode 100644 index 00000000..8cbc8326 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.AnnotationBitfield + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationCallback.page new file mode 100644 index 00000000..30f950c2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationCallback.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.AnnotationCallback + + + +

This is a callback.

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationForeachFunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationForeachFunc.page new file mode 100644 index 00000000..506ceffd --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationForeachFunc.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.AnnotationForeachFunc + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationListCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationListCallback.page new file mode 100644 index 00000000..3f9409ed --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationListCallback.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.AnnotationListCallback + + + +

This is a callback taking a list.

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationNotifyFunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationNotifyFunc.page new file mode 100644 index 00000000..b2dc717c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationNotifyFunc.page @@ -0,0 +1,26 @@ + + + + + + + + Regress.AnnotationNotifyFunc + + + +

This is a callback with a 'closure' argument that is not named +'user_data' and hence has to be annotated.

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page new file mode 100644 index 00000000..2e30a44e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page @@ -0,0 +1,38 @@ + + + + + + attribute-signal + + + Regress.AnnotationObject::attribute-signal + + +gchar* attribute-signal (gchar* arg1, + gchar* arg2); + + + +

This signal tests a signal with attributes.

+ + + + +
+

arg1 :

+

a value

+

arg2 :

+

another value

+

Returns :

+

the return value

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page new file mode 100644 index 00000000..8f7a9de4 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page @@ -0,0 +1,35 @@ + + + + + + doc-empty-arg-parsing + + + Regress.AnnotationObject::doc-empty-arg-parsing + + +void doc-empty-arg-parsing (gpointer arg1); + + + +

This signal tests an empty document argument (arg1)

+ + + + +
+

arg1 :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-function-property.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-function-property.page new file mode 100644 index 00000000..88dae758 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-function-property.page @@ -0,0 +1,26 @@ + + + + + + function-property + + + Regress.AnnotationObject:function-property + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page new file mode 100644 index 00000000..f4e8868f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page @@ -0,0 +1,36 @@ + + + + + + list-signal + + + Regress.AnnotationObject::list-signal + + +void list-signal (gpointer list); + + + +

This is a signal which takes a list of strings, but it's not +known by GObject as it's only marked as G_TYPE_POINTER

+ + + + +
+

list :

+

a list of strings

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-property.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-property.page new file mode 100644 index 00000000..bedc1445 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-property.page @@ -0,0 +1,27 @@ + + + + + + string-property + + + Regress.AnnotationObject:string-property + + + +

This is a property which is a string

+ + +

Since 1.0

+ + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page new file mode 100644 index 00000000..71dbe0c4 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page @@ -0,0 +1,37 @@ + + + + + + string-signal + + + Regress.AnnotationObject::string-signal + + +void string-signal (gpointer string); + + + +

This is a signal which has a broken signal handler, +it says it's pointer but it's actually a string.

+ + +

Since 1.0

+ + +
+

string :

+

a string

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page new file mode 100644 index 00000000..1363f9ed --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page @@ -0,0 +1,28 @@ + + + + + + tab-property + + + Regress.AnnotationObject:tab-property + + + +

This is a property regress_annotation intentionally indented with a mix +of tabs and strings to test the tab handling capabilities of the scanner.

+ + +

Since 1.2

+ + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page new file mode 100644 index 00000000..ea33c695 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page @@ -0,0 +1,51 @@ + + + + + + + + GObject* + + regress_annotation_object_allow_none + + RegressAnnotationObject* + object + + + const gchar* + somearg + + + + + regress_annotation_object_allow_none + + +GObject* regress_annotation_object_allow_none (RegressAnnotationObject* object, + const gchar* somearg); + + + + + + + + +
+

object :

+

a

+

somearg :

+
+

Returns :

+

NULL always

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page new file mode 100644 index 00000000..27b6b8ac --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page @@ -0,0 +1,51 @@ + + + + + + + + gint + + regress_annotation_object_calleeowns + + RegressAnnotationObject* + object + + + GObject** + toown + + + + + regress_annotation_object_calleeowns + + +gint regress_annotation_object_calleeowns (RegressAnnotationObject* object, + GObject** toown); + + + +

This is a test for out arguments; GObject defaults to transfer

+ + + + +
+

object :

+

a

+

toown :

+

a

+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page new file mode 100644 index 00000000..72e2e62b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page @@ -0,0 +1,58 @@ + + + + + + + + gint + + regress_annotation_object_calleesowns + + RegressAnnotationObject* + object + + + GObject** + toown1 + + + GObject** + toown2 + + + + + regress_annotation_object_calleesowns + + +gint regress_annotation_object_calleesowns (RegressAnnotationObject* object, + GObject** toown1, + GObject** toown2); + + + +

This is a test for out arguments, one transferred, other not

+ + + + +
+

object :

+

a

+

toown1 :

+

a

+

toown2 :

+

a

+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page new file mode 100644 index 00000000..825b4493 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_annotation_object_compute_sum + + RegressAnnotationObject* + object + + + int* + nums + + + + + regress_annotation_object_compute_sum + + +void regress_annotation_object_compute_sum (RegressAnnotationObject* object, + int* nums); + + + +

Test taking a zero-terminated array

+ + + + +
+

object :

+

a

+

nums :

+

Sequence of numbers

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page new file mode 100644 index 00000000..11333b5f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page @@ -0,0 +1,58 @@ + + + + + + + + void + + regress_annotation_object_compute_sum_n + + RegressAnnotationObject* + object + + + int* + nums + + + int + n_nums + + + + + regress_annotation_object_compute_sum_n + + +void regress_annotation_object_compute_sum_n (RegressAnnotationObject* object, + int* nums, + int n_nums); + + + +

Test taking an array with length parameter

+ + + + +
+

object :

+

a

+

nums :

+

Sequence of numbers that are zero-terminated

+

n_nums :

+

Length of number array

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page new file mode 100644 index 00000000..7017be8e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page @@ -0,0 +1,58 @@ + + + + + + + + void + + regress_annotation_object_compute_sum_nz + + RegressAnnotationObject* + object + + + int* + nums + + + int + n_nums + + + + + regress_annotation_object_compute_sum_nz + + +void regress_annotation_object_compute_sum_nz (RegressAnnotationObject* object, + int* nums, + int n_nums); + + + +

Test taking a zero-terminated array with length parameter

+ + + + +
+

object :

+

a

+

nums :

+

Sequence of numbers that are zero-terminated

+

n_nums :

+

Length of number array

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page new file mode 100644 index 00000000..cde56f8e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page @@ -0,0 +1,44 @@ + + + + + + + + GObject* + + regress_annotation_object_create_object + + RegressAnnotationObject* + object + + + + + regress_annotation_object_create_object + + +GObject* regress_annotation_object_create_object (RegressAnnotationObject* object); + + + +

Test returning a caller-owned object

+ + + + +
+

object :

+

a

+

Returns :

+

The object

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page new file mode 100644 index 00000000..2c5eaad9 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page @@ -0,0 +1,44 @@ + + + + + + + + GObject* + + regress_annotation_object_do_not_use + + RegressAnnotationObject* + object + + + + + regress_annotation_object_do_not_use + + +GObject* regress_annotation_object_do_not_use (RegressAnnotationObject* object); + + + + + + + + +
+

object :

+

a

+

Returns :

+

NULL always

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page new file mode 100644 index 00000000..b1aa7aaa --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_object_extra_annos + + RegressAnnotationObject* + object + + + + + regress_annotation_object_extra_annos + + +void regress_annotation_object_extra_annos (RegressAnnotationObject* object); + + + + + + + + +
+

object :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page new file mode 100644 index 00000000..ba91139a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page @@ -0,0 +1,58 @@ + + + + + + + + void + + regress_annotation_object_foreach + + RegressAnnotationObject* + object + + + RegressAnnotationForeachFunc + func + + + gpointer + user_data + + + + + regress_annotation_object_foreach + + +void regress_annotation_object_foreach (RegressAnnotationObject* object, + RegressAnnotationForeachFunc func, + gpointer user_data); + + + +

Test taking a call-scoped callback

+ + + + +
+

object :

+

a

+

func :

+

Callback to invoke

+

user_data :

+

Callback user data

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page new file mode 100644 index 00000000..5a06e842 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page @@ -0,0 +1,45 @@ + + + + + + + + GHashTable* + + regress_annotation_object_get_hash + + RegressAnnotationObject* + object + + + + + regress_annotation_object_get_hash + + +GHashTable* regress_annotation_object_get_hash (RegressAnnotationObject* object); + + + +

This is a test for returning a hash table mapping strings to +objects.

+ + + + +
+

object :

+

a

+

Returns :

+

hash table

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page new file mode 100644 index 00000000..2e36a384 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page @@ -0,0 +1,46 @@ + + + + + + + + GSList* + + regress_annotation_object_get_objects + + RegressAnnotationObject* + object + + + + + regress_annotation_object_get_objects + + +GSList* regress_annotation_object_get_objects (RegressAnnotationObject* object); + + + +

This is a test for returning a list of objects. +The list itself should be freed, but not the internal objects, +intentionally similar example to gtk_container_get_children

+ + + + +
+

object :

+

a

+

Returns :

+

list of objects

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page new file mode 100644 index 00000000..be29a584 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page @@ -0,0 +1,45 @@ + + + + + + + + GList* + + regress_annotation_object_get_strings + + RegressAnnotationObject* + object + + + + + regress_annotation_object_get_strings + + +GList* regress_annotation_object_get_strings (RegressAnnotationObject* object); + + + +

This is a test for returning a list of strings, where +each string needs to be freed.

+ + + + +
+

object :

+

a

+

Returns :

+

list of strings

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page new file mode 100644 index 00000000..8218f23d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_object_hidden_self + + gpointer + object + + + + + regress_annotation_object_hidden_self + + +void regress_annotation_object_hidden_self (gpointer object); + + + + + + + + +
+

object :

+

A

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page new file mode 100644 index 00000000..2795957d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page @@ -0,0 +1,51 @@ + + + + + + + + gint + + regress_annotation_object_in + + RegressAnnotationObject* + object + + + int* + inarg + + + + + regress_annotation_object_in + + +gint regress_annotation_object_in (RegressAnnotationObject* object, + int* inarg); + + + +

This is a test for in arguments

+ + + + +
+

object :

+

a

+

inarg :

+

This is an argument test

+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page new file mode 100644 index 00000000..09bc20da --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page @@ -0,0 +1,51 @@ + + + + + + + + gint + + regress_annotation_object_inout + + RegressAnnotationObject* + object + + + int* + inoutarg + + + + + regress_annotation_object_inout + + +gint regress_annotation_object_inout (RegressAnnotationObject* object, + int* inoutarg); + + + +

This is a test for out arguments

+ + + + +
+

object :

+

a

+

inoutarg :

+

This is an argument test

+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page new file mode 100644 index 00000000..4a95ff09 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page @@ -0,0 +1,51 @@ + + + + + + + + gint + + regress_annotation_object_inout2 + + RegressAnnotationObject* + object + + + int* + inoutarg + + + + + regress_annotation_object_inout2 + + +gint regress_annotation_object_inout2 (RegressAnnotationObject* object, + int* inoutarg); + + + +

This is a second test for out arguments

+ + + + +
+

object :

+

a

+

inoutarg :

+

This is an argument test

+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page new file mode 100644 index 00000000..1af81705 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page @@ -0,0 +1,51 @@ + + + + + + + + gint + + regress_annotation_object_inout3 + + RegressAnnotationObject* + object + + + int* + inoutarg + + + + + regress_annotation_object_inout3 + + +gint regress_annotation_object_inout3 (RegressAnnotationObject* object, + int* inoutarg); + + + +

This is a 3th test for out arguments

+ + + + +
+

object :

+

a

+

inoutarg :

+

This is an argument test

+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page new file mode 100644 index 00000000..793cf370 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page @@ -0,0 +1,44 @@ + + + + + + + + gint + + regress_annotation_object_method + + RegressAnnotationObject* + object + + + + + regress_annotation_object_method + + +gint regress_annotation_object_method (RegressAnnotationObject* object); + + + + + + + + +
+

object :

+

a

+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page new file mode 100644 index 00000000..c8ba72cd --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page @@ -0,0 +1,44 @@ + + + + + + + + GObject* + + regress_annotation_object_notrans + + RegressAnnotationObject* + object + + + + + regress_annotation_object_notrans + + +GObject* regress_annotation_object_notrans (RegressAnnotationObject* object); + + + + + + + + +
+

object :

+

a

+

Returns :

+

An object, not referenced

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page new file mode 100644 index 00000000..ec90d82b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page @@ -0,0 +1,51 @@ + + + + + + + + gint + + regress_annotation_object_out + + RegressAnnotationObject* + object + + + int* + outarg + + + + + regress_annotation_object_out + + +gint regress_annotation_object_out (RegressAnnotationObject* object, + int* outarg); + + + +

This is a test for out arguments

+ + + + +
+

object :

+

a

+

outarg :

+

This is an argument test

+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page new file mode 100644 index 00000000..145996ec --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page @@ -0,0 +1,58 @@ + + + + + + + + Regress.AnnotationObject + + + +

This is an object used to test regress_annotations.

+ + + + + + Hierarchy + + + GObject.Object + + Regress.AnnotationObject + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page new file mode 100644 index 00000000..5282ab5d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page @@ -0,0 +1,58 @@ + + + + + + + + void + + regress_annotation_object_parse_args + + RegressAnnotationObject* + object + + + int* + argc + + + char*** + argv + + + + + regress_annotation_object_parse_args + + +void regress_annotation_object_parse_args (RegressAnnotationObject* object, + int* argc, + char*** argv); + + + +

Test taking a zero-terminated array with length parameter

+ + + + +
+

object :

+

a

+

argc :

+

Length of the argument vector

+

argv :

+

Argument vector

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page new file mode 100644 index 00000000..a52f0cc3 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page @@ -0,0 +1,58 @@ + + + + + + + + void + + regress_annotation_object_set_data + + RegressAnnotationObject* + object + + + guchar* + data + + + gsize + length + + + + + regress_annotation_object_set_data + + +void regress_annotation_object_set_data (RegressAnnotationObject* object, + guchar* data, + gsize length); + + + +

Test taking a guchar * with a length.

+ + + + +
+

object :

+

a

+

data :

+

The data

+

length :

+

Length of the data

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page new file mode 100644 index 00000000..8c2be283 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page @@ -0,0 +1,58 @@ + + + + + + + + void + + regress_annotation_object_set_data2 + + RegressAnnotationObject* + object + + + gint8* + data + + + gsize + length + + + + + regress_annotation_object_set_data2 + + +void regress_annotation_object_set_data2 (RegressAnnotationObject* object, + gint8* data, + gsize length); + + + +

Test taking a gchar * with a length.

+ + + + +
+

object :

+

a

+

data :

+

The data

+

length :

+

Length of the data

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page new file mode 100644 index 00000000..989bb1da --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page @@ -0,0 +1,59 @@ + + + + + + + + void + + regress_annotation_object_set_data3 + + RegressAnnotationObject* + object + + + guint8* + data + + + gsize + length + + + + + regress_annotation_object_set_data3 + + +void regress_annotation_object_set_data3 (RegressAnnotationObject* object, + guint8* data, + gsize length); + + + +

Test taking a gchar * with a length, overriding the array element +type.

+ + + + +
+

object :

+

a

+

data :

+

The data

+

length :

+

Length of the data

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page new file mode 100644 index 00000000..8195d4aa --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page @@ -0,0 +1,51 @@ + + + + + + + + gboolean + + regress_annotation_object_string_out + + RegressAnnotationObject* + object + + + char** + str_out + + + + + regress_annotation_object_string_out + + +gboolean regress_annotation_object_string_out (RegressAnnotationObject* object, + char** str_out); + + + +

Test returning a string as an out parameter

+ + + + +
+

object :

+

a

+

str_out :

+

string return value

+

Returns :

+

some boolean

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page new file mode 100644 index 00000000..8a8094ba --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_annotation_object_use_buffer + + RegressAnnotationObject* + object + + + guchar* + bytes + + + + + regress_annotation_object_use_buffer + + +void regress_annotation_object_use_buffer (RegressAnnotationObject* object, + guchar* bytes); + + + + + + + + +
+

object :

+

a

+

bytes :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page new file mode 100644 index 00000000..c669d91a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page @@ -0,0 +1,59 @@ + + + + + + + + void + + regress_annotation_object_watch + + RegressAnnotationObject* + object + + + RegressAnnotationForeachFunc + func + + + gpointer + user_data + + + + + regress_annotation_object_watch + + +void regress_annotation_object_watch (RegressAnnotationObject* object, + RegressAnnotationForeachFunc func, + gpointer user_data); + + + +

This is here just for the sake of being overriden by its +.

+ + + + +
+

object :

+

A

+

func :

+

The callback

+

user_data :

+

The callback data

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page new file mode 100644 index 00000000..90500ccb --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page @@ -0,0 +1,65 @@ + + + + + + + + void + + regress_annotation_object_watch_full + + RegressAnnotationObject* + object + + + RegressAnnotationForeachFunc + func + + + gpointer + user_data + + + GDestroyNotify + destroy + + + + + regress_annotation_object_watch_full + + +void regress_annotation_object_watch_full (RegressAnnotationObject* object, + RegressAnnotationForeachFunc func, + gpointer user_data, + GDestroyNotify destroy); + + + +

Test overriding via the "Rename To" regress_annotation.

+ + + + +
+

object :

+

A

+

func :

+

The callback

+

user_data :

+

The callback data

+

destroy :

+

Destroy notification

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page new file mode 100644 index 00000000..287a0d22 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_annotation_object_with_voidp + + RegressAnnotationObject* + object + + + void* + data + + + + + regress_annotation_object_with_voidp + + +void regress_annotation_object_with_voidp (RegressAnnotationObject* object, + void* data); + + + + + + + + +
+

object :

+
+

data :

+

Opaque pointer handle

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass.page new file mode 100644 index 00000000..16e82e3a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.AnnotationObjectClass + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct.page new file mode 100644 index 00000000..67f83e95 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.AnnotationStruct + + + +

This is a test of an array of object in an field of a struct.

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.DOUBLE_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.DOUBLE_CONSTANT.page new file mode 100644 index 00000000..b1aa32d8 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.DOUBLE_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.DOUBLE_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page new file mode 100644 index 00000000..357665de --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FOO_DEFINE_SHOULD_BE_EXPOSED + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FOO_PIE_IS_TASTY.page b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_PIE_IS_TASTY.page new file mode 100644 index 00000000..7dc308a1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_PIE_IS_TASTY.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FOO_PIE_IS_TASTY + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FOO_SUCCESS_INT.page b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_SUCCESS_INT.page new file mode 100644 index 00000000..f20f426f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_SUCCESS_INT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FOO_SUCCESS_INT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooASingle.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooASingle.page new file mode 100644 index 00000000..d4646251 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooASingle.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooASingle + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooAddressType.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooAddressType.page new file mode 100644 index 00000000..b98ce57c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooAddressType.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooAddressType + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page new file mode 100644 index 00000000..b518be03 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_foo_brect_add + + RegressFooBRect* + b1 + + + RegressFooBRect* + b2 + + + + + regress_foo_brect_add + + +void regress_foo_brect_add (RegressFooBRect* b1, + RegressFooBRect* b2); + + + + + + + + +
+

b1 :

+
+

b2 :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page new file mode 100644 index 00000000..6b1b2834 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page @@ -0,0 +1,51 @@ + + + + + + + + RegressFooBRect* + + regress_foo_brect_new + + double + x + + + double + y + + + + + regress_foo_brect_new + + +RegressFooBRect* regress_foo_brect_new (double x, + double y); + + + + + + + + +
+

x :

+
+

y :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.page new file mode 100644 index 00000000..29268bee --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooBRect + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.page new file mode 100644 index 00000000..63831e74 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooBUnion + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page new file mode 100644 index 00000000..565e9669 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_boxed_method + + RegressFooBoxed* + boxed + + + + + regress_foo_boxed_method + + +void regress_foo_boxed_method (RegressFooBoxed* boxed); + + + + + + + + +
+

boxed :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page new file mode 100644 index 00000000..bfaaeb81 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page @@ -0,0 +1,38 @@ + + + + + + + + RegressFooBoxed* + + regress_foo_boxed_new + + + + regress_foo_boxed_new + + +RegressFooBoxed* regress_foo_boxed_new (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.page new file mode 100644 index 00000000..11fe2818 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooBoxed + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.page new file mode 100644 index 00000000..1291cbfd --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.page @@ -0,0 +1,61 @@ + + + + + + + + Regress.FooBuffer + + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.FooObject + + Regress.FooBuffer + + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page new file mode 100644 index 00000000..937b6795 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_buffer_some_method + + RegressFooBuffer* + buffer + + + + + regress_foo_buffer_some_method + + +void regress_foo_buffer_some_method (RegressFooBuffer* buffer); + + + + + + + + +
+

buffer :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooCallback.page new file mode 100644 index 00000000..241296e1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooCallback.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooCallback + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page new file mode 100644 index 00000000..1324acb0 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_dbus_data_method + + RegressFooDBusData* + dbusdata + + + + + regress_foo_dbus_data_method + + +void regress_foo_dbus_data_method (RegressFooDBusData* dbusdata); + + + + + + + + +
+

dbusdata :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.page new file mode 100644 index 00000000..34bb11ea --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooDBusData + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumFullname.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumFullname.page new file mode 100644 index 00000000..6e9c360d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumFullname.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooEnumFullname + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumNoType.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumNoType.page new file mode 100644 index 00000000..bf48cb96 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumNoType.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooEnumNoType + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.page new file mode 100644 index 00000000..9512104e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooEnumType + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooError.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooError.page new file mode 100644 index 00000000..09ae5007 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooError.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooError + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent.page new file mode 100644 index 00000000..0b77bcbb --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooEvent + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny.page new file mode 100644 index 00000000..347c6514 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooEventAny + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose.page new file mode 100644 index 00000000..a99a5d19 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooEventExpose + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page new file mode 100644 index 00000000..d4db757a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooFlagsNoType + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page new file mode 100644 index 00000000..e4f3edef --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooFlagsType + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page new file mode 100644 index 00000000..836cfe85 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page @@ -0,0 +1,44 @@ + + + + + + + + RegressFooForeignStruct* + + regress_foo_foreign_struct_copy + + RegressFooForeignStruct* + original + + + + + regress_foo_foreign_struct_copy + + +RegressFooForeignStruct* regress_foo_foreign_struct_copy (RegressFooForeignStruct* original); + + + + + + + + +
+

original :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page new file mode 100644 index 00000000..710c5ef0 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page @@ -0,0 +1,38 @@ + + + + + + + + RegressFooForeignStruct* + + regress_foo_foreign_struct_new + + + + regress_foo_foreign_struct_new + + +RegressFooForeignStruct* regress_foo_foreign_struct_new (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.page new file mode 100644 index 00000000..24082f81 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooForeignStruct + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page new file mode 100644 index 00000000..3a16ebc1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page @@ -0,0 +1,37 @@ + + + + + + + + Regress.FooInterface::do_regress_foo + + +void do_regress_foo (RegressFooInterface* self, + int x); + + + + + + + + +
+

self :

+
+

x :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page new file mode 100644 index 00000000..f655d167 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_foo_interface_do_regress_foo + + RegressFooInterface* + iface + + + int + x + + + + + regress_foo_interface_do_regress_foo + + +void regress_foo_interface_do_regress_foo (RegressFooInterface* iface, + int x); + + + + + + + + +
+

iface :

+
+

x :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.page new file mode 100644 index 00000000..4682fdd2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.page @@ -0,0 +1,55 @@ + + + + + + + + Regress.FooInterface + + + + + + + + + + Hierarchy + + + Regress.FooInterface + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page new file mode 100644 index 00000000..009383fa --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_interface_static_method + + int + x + + + + + regress_foo_interface_static_method + + +void regress_foo_interface_static_method (int x); + + + + + + + + +
+

x :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.page new file mode 100644 index 00000000..5a02e944 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooInterfaceIface + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-hidden.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-hidden.page new file mode 100644 index 00000000..a0266cd1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-hidden.page @@ -0,0 +1,26 @@ + + + + + + hidden + + + Regress.FooObject:hidden + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page new file mode 100644 index 00000000..8efc5f1c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.FooObject::read_fn + + +void read_fn (RegressFooObject* object, + int offset, + int length); + + + +

Read some stuff.

+ + + + +
+

object :

+
+

offset :

+

offset

+

length :

+

length

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page new file mode 100644 index 00000000..d7453603 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page @@ -0,0 +1,38 @@ + + + + + + signal + + + Regress.FooObject::signal + + +gchar* signal (GObject object, + gpointer p0); + + + + + + + + +
+

object :

+
+

p0 :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-string.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-string.page new file mode 100644 index 00000000..4de4c9e8 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-string.page @@ -0,0 +1,26 @@ + + + + + + string + + + Regress.FooObject:string + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page new file mode 100644 index 00000000..8dc89fd5 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page @@ -0,0 +1,37 @@ + + + + + + + + Regress.FooObject::virtual_method + + +gboolean virtual_method (RegressFooObject* object, + int first_param); + + + + + + + + +
+

object :

+
+

first_param :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page new file mode 100644 index 00000000..2f4e1b5b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_object_a_global_method + + UtilityObject* + obj + + + + + regress_foo_object_a_global_method + + +void regress_foo_object_a_global_method (UtilityObject* obj); + + + + + + + + +
+

obj :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page new file mode 100644 index 00000000..fb0c6582 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page @@ -0,0 +1,51 @@ + + + + + + + + RegressFooOtherObject* + + regress_foo_object_append_new_stack_layer + + RegressFooObject* + obj + + + int + x + + + + + regress_foo_object_append_new_stack_layer + + +RegressFooOtherObject* regress_foo_object_append_new_stack_layer (RegressFooObject* obj, + int x); + + + +

This shouldn't be scanned as a constructor.

+ + + + +
+

obj :

+
+

x :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page new file mode 100644 index 00000000..3e0a8aaf --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page @@ -0,0 +1,44 @@ + + + + + + + + char* + + regress_foo_object_dup_name + + RegressFooObject* + object + + + + + regress_foo_object_dup_name + + +char* regress_foo_object_dup_name (RegressFooObject* object); + + + + + + + + +
+

object :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page new file mode 100644 index 00000000..3d9138ee --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page @@ -0,0 +1,44 @@ + + + + + + + + UtilityObject* + + regress_foo_object_external_type + + RegressFooObject* + object + + + + + regress_foo_object_external_type + + +UtilityObject* regress_foo_object_external_type (RegressFooObject* object); + + + + + + + + +
+

object :

+

a

+

Returns :

+

NULL always

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page new file mode 100644 index 00000000..201db735 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page @@ -0,0 +1,39 @@ + + + + + + + + RegressFooObject* + + regress_foo_object_get_default + + + + regress_foo_object_get_default + + +RegressFooObject* regress_foo_object_get_default (void); + + + +

This function is intended to match clutter_stage_get_default which +uses a C sugar return type.

+ + + + +
+

Returns :

+

The global

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page new file mode 100644 index 00000000..d48725b3 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page @@ -0,0 +1,44 @@ + + + + + + + + const char* + + regress_foo_object_get_name + + RegressFooObject* + object + + + + + regress_foo_object_get_name + + +const char* regress_foo_object_get_name (RegressFooObject* object); + + + + + + + + +
+

object :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page new file mode 100644 index 00000000..19f19fa1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_foo_object_handle_glyph + + RegressFooObject* + object + + + UtilityGlyph + glyph + + + + + regress_foo_object_handle_glyph + + +void regress_foo_object_handle_glyph (RegressFooObject* object, + UtilityGlyph glyph); + + + + + + + + +
+

object :

+
+

glyph :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page new file mode 100644 index 00000000..6aa3e829 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_foo_object_is_it_time_yet + + RegressFooObject* + object + + + time_t + time + + + + + regress_foo_object_is_it_time_yet + + +void regress_foo_object_is_it_time_yet (RegressFooObject* object, + time_t time); + + + + + + + + +
+

object :

+
+

time :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page new file mode 100644 index 00000000..b1d8ccba --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page @@ -0,0 +1,38 @@ + + + + + + + + RegressFooObject* + + regress_foo_object_new + + + + regress_foo_object_new + + +RegressFooObject* regress_foo_object_new (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page new file mode 100644 index 00000000..7ab6a246 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page @@ -0,0 +1,38 @@ + + + + + + + + GObject* + + regress_foo_object_new_as_super + + + + regress_foo_object_new_as_super + + +GObject* regress_foo_object_new_as_super (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page new file mode 100644 index 00000000..5d4766a9 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page @@ -0,0 +1,51 @@ + + + + + + + + RegressFooObjectCookie + + regress_foo_object_new_cookie + + RegressFooObject* + object + + + const char* + target + + + + + regress_foo_object_new_cookie + + +RegressFooObjectCookie regress_foo_object_new_cookie (RegressFooObject* object, + const char* target); + + + +

Not sure why this test is here...

+ + + + +
+

object :

+
+

target :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.page new file mode 100644 index 00000000..c79e0b71 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.page @@ -0,0 +1,58 @@ + + + + + + + + Regress.FooObject + + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.FooObject + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page new file mode 100644 index 00000000..cff77113 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page @@ -0,0 +1,58 @@ + + + + + + + + void + + regress_foo_object_read + + RegressFooObject* + object + + + int + offset + + + int + length + + + + + regress_foo_object_read + + +void regress_foo_object_read (RegressFooObject* object, + int offset, + int length); + + + +

Read some stuff.

+ + + + +
+

object :

+

obj

+

offset :

+

offset

+

length :

+

length

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page new file mode 100644 index 00000000..f82a16b0 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_object_skipped_method + + RegressFooObject* + object + + + + + regress_foo_object_skipped_method + + +void regress_foo_object_skipped_method (RegressFooObject* object); + + + +

This is only useful from C.

+ + + + +
+

object :

+

obj

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page new file mode 100644 index 00000000..13e2427d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page @@ -0,0 +1,38 @@ + + + + + + + + int + + regress_foo_object_static_meth + + + + regress_foo_object_static_meth + + +int regress_foo_object_static_meth (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page new file mode 100644 index 00000000..3d842cf6 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page @@ -0,0 +1,55 @@ + + + + + + + + void + + regress_foo_object_take_all + + RegressFooObject* + object + + + int + x + + + + + + regress_foo_object_take_all + + +void regress_foo_object_take_all (RegressFooObject* object, + int x, + ...); + + + + + + + + +
+

object :

+
+

x :

+
+

None :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page new file mode 100644 index 00000000..82d3c189 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page @@ -0,0 +1,58 @@ + + + + + + + + void + + regress_foo_object_various + + RegressFooObject* + object + + + void* + data + + + GType + some_type + + + + + regress_foo_object_various + + +void regress_foo_object_various (RegressFooObject* object, + void* data, + GType some_type); + + + + + + + + +
+

object :

+
+

data :

+
+

some_type :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page new file mode 100644 index 00000000..29a2c8cc --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page @@ -0,0 +1,51 @@ + + + + + + + + gboolean + + regress_foo_object_virtual_method + + RegressFooObject* + object + + + int + first_param + + + + + regress_foo_object_virtual_method + + +gboolean regress_foo_object_virtual_method (RegressFooObject* object, + int first_param); + + + + + + + + +
+

object :

+
+

first_param :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.page new file mode 100644 index 00000000..c35a3bc1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooObjectClass + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectCookie.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectCookie.page new file mode 100644 index 00000000..4d9cabc6 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectCookie.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooObjectCookie + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObject.page new file mode 100644 index 00000000..0d080df3 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObject.page @@ -0,0 +1,58 @@ + + + + + + + + Regress.FooOtherObject + + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.FooOtherObject + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page new file mode 100644 index 00000000..483e04f4 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_foo_rectangle_add + + RegressFooRectangle* + r1 + + + const RegressFooRectangle* + r2 + + + + + regress_foo_rectangle_add + + +void regress_foo_rectangle_add (RegressFooRectangle* r1, + const RegressFooRectangle* r2); + + + + + + + + +
+

r1 :

+

add to this rect

+

r2 :

+

source rectangle

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page new file mode 100644 index 00000000..43d831e2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page @@ -0,0 +1,66 @@ + + + + + + + + RegressFooRectangle* + + regress_foo_rectangle_new + + int + x + + + int + y + + + int + width + + + int + height + + + + + regress_foo_rectangle_new + + +RegressFooRectangle* regress_foo_rectangle_new (int x, + int y, + int width, + int height); + + + +

This is a C convenience constructor; we have to (skip) +it because it's not a boxed type.

+ + + + +
+

x :

+
+

y :

+
+

width :

+
+

height :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.page new file mode 100644 index 00000000..3ea38d1e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooRectangle + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSkippable.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSkippable.page new file mode 100644 index 00000000..3746d326 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSkippable.page @@ -0,0 +1,26 @@ + + + + + + + + Regress.FooSkippable + + + +

Some type that is only interesting from C and should not be +exposed to language bindings.

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooStackLayer.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooStackLayer.page new file mode 100644 index 00000000..049d3760 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooStackLayer.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooStackLayer + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct.page new file mode 100644 index 00000000..291133a8 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooStruct + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page new file mode 100644 index 00000000..131747d7 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page @@ -0,0 +1,33 @@ + + + + + + destroy-event + + + Regress.FooSubInterface::destroy-event + + +void destroy-event (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page new file mode 100644 index 00000000..2995ee80 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page @@ -0,0 +1,34 @@ + + + + + + + + Regress.FooSubInterface::destroy_event + + +void destroy_event (RegressFooSubInterface* self); + + + + + + + + +
+

self :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page new file mode 100644 index 00000000..aa72dd19 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page @@ -0,0 +1,34 @@ + + + + + + + + Regress.FooSubInterface::do_bar + + +void do_bar (RegressFooSubInterface* self); + + + + + + + + +
+

self :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page new file mode 100644 index 00000000..777e47b1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.FooSubInterface::do_baz + + +void do_baz (RegressFooSubInterface* self, + GCallback callback, + gpointer user_data); + + + + + + + + +
+

self :

+
+

callback :

+
+

user_data :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page new file mode 100644 index 00000000..f5d7541d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_sub_interface_do_bar + + RegressFooSubInterface* + self + + + + + regress_foo_sub_interface_do_bar + + +void regress_foo_sub_interface_do_bar (RegressFooSubInterface* self); + + + + + + + + +
+

self :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page new file mode 100644 index 00000000..d3fbac44 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page @@ -0,0 +1,58 @@ + + + + + + + + void + + regress_foo_sub_interface_do_baz + + RegressFooSubInterface* + self + + + GCallback + callback + + + gpointer + user_data + + + + + regress_foo_sub_interface_do_baz + + +void regress_foo_sub_interface_do_baz (RegressFooSubInterface* self, + GCallback callback, + gpointer user_data); + + + + + + + + +
+

self :

+
+

callback :

+
+

user_data :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.page new file mode 100644 index 00000000..4147580e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.page @@ -0,0 +1,55 @@ + + + + + + + + Regress.FooSubInterface + + + + + + + + + + Hierarchy + + + Regress.FooSubInterface + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.page new file mode 100644 index 00000000..fc18c914 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooSubInterfaceIface + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page new file mode 100644 index 00000000..86364052 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page @@ -0,0 +1,38 @@ + + + + + + + + RegressFooSubobject* + + regress_foo_subobject_new + + + + regress_foo_subobject_new + + +RegressFooSubobject* regress_foo_subobject_new (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.page new file mode 100644 index 00000000..933b39a9 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.page @@ -0,0 +1,61 @@ + + + + + + + + Regress.FooSubobject + + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.FooObject + + Regress.FooSubobject + + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass.page new file mode 100644 index 00000000..d0e3e886 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooSubobjectClass + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray.page new file mode 100644 index 00000000..facdc1c0 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooThingWithArray + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion.page new file mode 100644 index 00000000..06d2e800 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooUnion + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct.page new file mode 100644 index 00000000..e6943a07 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooUtilityStruct + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooVarargsCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooVarargsCallback.page new file mode 100644 index 00000000..d477638a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooVarargsCallback.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooVarargsCallback + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooXEvent.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooXEvent.page new file mode 100644 index 00000000..18122490 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooXEvent.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooXEvent + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANT.page new file mode 100644 index 00000000..9a0cd162 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.GUINT64_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANTA.page b/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANTA.page new file mode 100644 index 00000000..4faf765f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANTA.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.GUINT64_CONSTANTA + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.G_GINT64_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.G_GINT64_CONSTANT.page new file mode 100644 index 00000000..b4a66f69 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.G_GINT64_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.G_GINT64_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.INT_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.INT_CONSTANT.page new file mode 100644 index 00000000..e4df9a1e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.INT_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.INT_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page b/tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page new file mode 100644 index 00000000..e285bc28 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.IntSet + + + +

Compatibility typedef, like telepathy-glib's TpIntSet

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LONG_STRING_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.LONG_STRING_CONSTANT.page new file mode 100644 index 00000000..3c0409a7 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LONG_STRING_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.LONG_STRING_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema.page new file mode 100644 index 00000000..f2e64f04 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.LikeGnomeKeyringPasswordSchema + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.MAXUINT64.page b/tests/scanner/Regress-1.0-C-expected/Regress.MAXUINT64.page new file mode 100644 index 00000000..be1afd19 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.MAXUINT64.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.MAXUINT64 + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.MININT64.page b/tests/scanner/Regress-1.0-C-expected/Regress.MININT64.page new file mode 100644 index 00000000..35c3e584 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.MININT64.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.MININT64 + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.Mixed_Case_Constant.page b/tests/scanner/Regress-1.0-C-expected/Regress.Mixed_Case_Constant.page new file mode 100644 index 00000000..5ea8d9b0 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.Mixed_Case_Constant.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.Mixed_Case_Constant + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.NEGATIVE_INT_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.NEGATIVE_INT_CONSTANT.page new file mode 100644 index 00000000..576c690f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.NEGATIVE_INT_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.NEGATIVE_INT_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.PtrArrayAlias.page b/tests/scanner/Regress-1.0-C-expected/Regress.PtrArrayAlias.page new file mode 100644 index 00000000..9af00b51 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.PtrArrayAlias.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.PtrArrayAlias + + + +

Typedef'd GPtrArray for some reason

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.STRING_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.STRING_CONSTANT.page new file mode 100644 index 00000000..945ba986 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.STRING_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.STRING_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure.page b/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure.page new file mode 100644 index 00000000..2c6993d0 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure.page @@ -0,0 +1,26 @@ + + + + + + + + Regress.SkippedStructure + + + +

This should be skipped, and moreover, all function which +use it should be.

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.page new file mode 100644 index 00000000..2848aa31 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestABCError + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page new file mode 100644 index 00000000..5bd06bb3 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page @@ -0,0 +1,44 @@ + + + + + + + + RegressTestBoxed* + + regress_test_boxed_copy + + RegressTestBoxed* + boxed + + + + + regress_test_boxed_copy + + +RegressTestBoxed* regress_test_boxed_copy (RegressTestBoxed* boxed); + + + + + + + + +
+

boxed :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page new file mode 100644 index 00000000..073b44ba --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page @@ -0,0 +1,51 @@ + + + + + + + + gboolean + + regress_test_boxed_equals + + RegressTestBoxed* + boxed + + + RegressTestBoxed* + other + + + + + regress_test_boxed_equals + + +gboolean regress_test_boxed_equals (RegressTestBoxed* boxed, + RegressTestBoxed* other); + + + + + + + + +
+

boxed :

+
+

other :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page new file mode 100644 index 00000000..ce4f17bc --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page @@ -0,0 +1,38 @@ + + + + + + + + RegressTestBoxed* + + regress_test_boxed_new + + + + regress_test_boxed_new + + +RegressTestBoxed* regress_test_boxed_new (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page new file mode 100644 index 00000000..7d4292aa --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page @@ -0,0 +1,44 @@ + + + + + + + + RegressTestBoxed* + + regress_test_boxed_new_alternative_constructor1 + + int + i + + + + + regress_test_boxed_new_alternative_constructor1 + + +RegressTestBoxed* regress_test_boxed_new_alternative_constructor1 (int i); + + + + + + + + +
+

i :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page new file mode 100644 index 00000000..5ec33ccd --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page @@ -0,0 +1,51 @@ + + + + + + + + RegressTestBoxed* + + regress_test_boxed_new_alternative_constructor2 + + int + i + + + int + j + + + + + regress_test_boxed_new_alternative_constructor2 + + +RegressTestBoxed* regress_test_boxed_new_alternative_constructor2 (int i, + int j); + + + + + + + + +
+

i :

+
+

j :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page new file mode 100644 index 00000000..56b516ea --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page @@ -0,0 +1,44 @@ + + + + + + + + RegressTestBoxed* + + regress_test_boxed_new_alternative_constructor3 + + char* + s + + + + + regress_test_boxed_new_alternative_constructor3 + + +RegressTestBoxed* regress_test_boxed_new_alternative_constructor3 (char* s); + + + + + + + + +
+

s :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.page new file mode 100644 index 00000000..090ce47c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestBoxed + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page new file mode 100644 index 00000000..99651128 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page @@ -0,0 +1,44 @@ + + + + + + + + RegressTestBoxedB* + + regress_test_boxed_b_copy + + RegressTestBoxedB* + boxed + + + + + regress_test_boxed_b_copy + + +RegressTestBoxedB* regress_test_boxed_b_copy (RegressTestBoxedB* boxed); + + + + + + + + +
+

boxed :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page new file mode 100644 index 00000000..5266692c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page @@ -0,0 +1,51 @@ + + + + + + + + RegressTestBoxedB* + + regress_test_boxed_b_new + + gint8 + some_int8 + + + glong + some_long + + + + + regress_test_boxed_b_new + + +RegressTestBoxedB* regress_test_boxed_b_new (gint8 some_int8, + glong some_long); + + + + + + + + +
+

some_int8 :

+
+

some_long :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.page new file mode 100644 index 00000000..99160c62 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestBoxedB + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page new file mode 100644 index 00000000..52ed3482 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page @@ -0,0 +1,38 @@ + + + + + + + + RegressTestBoxedC* + + regress_test_boxed_c_new + + + + regress_test_boxed_c_new + + +RegressTestBoxedC* regress_test_boxed_c_new (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.page new file mode 100644 index 00000000..9a86486e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestBoxedC + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page new file mode 100644 index 00000000..fd21b483 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page @@ -0,0 +1,44 @@ + + + + + + + + RegressTestBoxedD* + + regress_test_boxed_d_copy + + RegressTestBoxedD* + boxed + + + + + regress_test_boxed_d_copy + + +RegressTestBoxedD* regress_test_boxed_d_copy (RegressTestBoxedD* boxed); + + + + + + + + +
+

boxed :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page new file mode 100644 index 00000000..c98b5f7a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_boxed_d_free + + RegressTestBoxedD* + boxed + + + + + regress_test_boxed_d_free + + +void regress_test_boxed_d_free (RegressTestBoxedD* boxed); + + + + + + + + +
+

boxed :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page new file mode 100644 index 00000000..240ad4fc --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page @@ -0,0 +1,44 @@ + + + + + + + + int + + regress_test_boxed_d_get_magic + + RegressTestBoxedD* + boxed + + + + + regress_test_boxed_d_get_magic + + +int regress_test_boxed_d_get_magic (RegressTestBoxedD* boxed); + + + + + + + + +
+

boxed :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page new file mode 100644 index 00000000..26ec2bbc --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page @@ -0,0 +1,51 @@ + + + + + + + + RegressTestBoxedD* + + regress_test_boxed_d_new + + const char* + a_string + + + int + a_int + + + + + regress_test_boxed_d_new + + +RegressTestBoxedD* regress_test_boxed_d_new (const char* a_string, + int a_int); + + + + + + + + +
+

a_string :

+
+

a_int :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.page new file mode 100644 index 00000000..84781659 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestBoxedD + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallback.page new file mode 100644 index 00000000..9a219e9e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallback.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallback + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackArray.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackArray.page new file mode 100644 index 00000000..7ceb2e07 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackArray.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallbackArray + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackFull.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackFull.page new file mode 100644 index 00000000..3de1fbe8 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackFull.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallbackFull + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackGError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackGError.page new file mode 100644 index 00000000..1f6f2bdb --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackGError.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallbackGError + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackHashtable.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackHashtable.page new file mode 100644 index 00000000..906947c1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackHashtable.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallbackHashtable + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackOwnedGError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackOwnedGError.page new file mode 100644 index 00000000..e7397a1b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackOwnedGError.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallbackOwnedGError + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackUserData.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackUserData.page new file mode 100644 index 00000000..f3047cfd --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackUserData.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallbackUserData + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestDEFError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestDEFError.page new file mode 100644 index 00000000..aa59b415 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestDEFError.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestDEFError + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.page new file mode 100644 index 00000000..b48602f7 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestEnum + + + +

By purpose, not all members have documentation

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumNoGEnum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumNoGEnum.page new file mode 100644 index 00000000..575270db --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumNoGEnum.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestEnumNoGEnum + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumUnsigned.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumUnsigned.page new file mode 100644 index 00000000..20296695 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumUnsigned.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestEnumUnsigned + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestError.page new file mode 100644 index 00000000..6be3dac2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestError.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestError + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page new file mode 100644 index 00000000..d5451972 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestFlags + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page new file mode 100644 index 00000000..14316be4 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page @@ -0,0 +1,38 @@ + + + + + + + + RegressTestFloating* + + regress_test_floating_new + + + + regress_test_floating_new + + +RegressTestFloating* regress_test_floating_new (void); + + + + + + + + +
+

Returns :

+

A new floating

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.page new file mode 100644 index 00000000..f1d98e71 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.page @@ -0,0 +1,61 @@ + + + + + + + + Regress.TestFloating + + + + + + + + + + Hierarchy + + + GObject.Object + + GObject.InitiallyUnowned + + Regress.TestFloating + + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass.page new file mode 100644 index 00000000..143325f2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestFloatingClass + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.page new file mode 100644 index 00000000..964f6914 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.page @@ -0,0 +1,55 @@ + + + + + + + + Regress.TestFundamentalObject + + + + + + + + + + Hierarchy + + + Regress.TestFundamentalObject + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page new file mode 100644 index 00000000..c4b6afa9 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page @@ -0,0 +1,44 @@ + + + + + + + + RegressTestFundamentalObject* + + regress_test_fundamental_object_ref + + RegressTestFundamentalObject* + fundamental_object + + + + + regress_test_fundamental_object_ref + + +RegressTestFundamentalObject* regress_test_fundamental_object_ref (RegressTestFundamentalObject* fundamental_object); + + + + + + + + +
+

fundamental_object :

+
+

Returns :

+

A new

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page new file mode 100644 index 00000000..776c6f65 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_fundamental_object_unref + + RegressTestFundamentalObject* + fundamental_object + + + + + regress_test_fundamental_object_unref + + +void regress_test_fundamental_object_unref (RegressTestFundamentalObject* fundamental_object); + + + + + + + + +
+

fundamental_object :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass.page new file mode 100644 index 00000000..daedb670 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestFundamentalObjectClass + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectCopyFunction.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectCopyFunction.page new file mode 100644 index 00000000..dfd65cef --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectCopyFunction.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestFundamentalObjectCopyFunction + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectFinalizeFunction.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectFinalizeFunction.page new file mode 100644 index 00000000..2b9d965c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectFinalizeFunction.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestFundamentalObjectFinalizeFunction + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page new file mode 100644 index 00000000..26af86a6 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page @@ -0,0 +1,44 @@ + + + + + + + + RegressTestFundamentalSubObject* + + regress_test_fundamental_sub_object_new + + const char* + data + + + + + regress_test_fundamental_sub_object_new + + +RegressTestFundamentalSubObject* regress_test_fundamental_sub_object_new (const char* data); + + + + + + + + +
+

data :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.page new file mode 100644 index 00000000..c8c1f039 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.page @@ -0,0 +1,58 @@ + + + + + + + + Regress.TestFundamentalSubObject + + + + + + + + + + Hierarchy + + + Regress.TestFundamentalObject + + Regress.TestFundamentalSubObject + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass.page new file mode 100644 index 00000000..77dd6bcc --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestFundamentalSubObjectClass + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page new file mode 100644 index 00000000..35caeed4 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_test_inherit_drawable_do_foo + + RegressTestInheritDrawable* + drawable + + + int + x + + + + + regress_test_inherit_drawable_do_foo + + +void regress_test_inherit_drawable_do_foo (RegressTestInheritDrawable* drawable, + int x); + + + + + + + + +
+

drawable :

+
+

x :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page new file mode 100644 index 00000000..cdd27325 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_test_inherit_drawable_do_foo_maybe_throw + + RegressTestInheritDrawable* + drawable + + + int + x + + + + + regress_test_inherit_drawable_do_foo_maybe_throw + + +void regress_test_inherit_drawable_do_foo_maybe_throw (RegressTestInheritDrawable* drawable, + int x); + + + + + + + + +
+

drawable :

+
+

x :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page new file mode 100644 index 00000000..11f36004 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page @@ -0,0 +1,58 @@ + + + + + + + + void + + regress_test_inherit_drawable_get_origin + + RegressTestInheritDrawable* + drawable + + + int* + x + + + int* + y + + + + + regress_test_inherit_drawable_get_origin + + +void regress_test_inherit_drawable_get_origin (RegressTestInheritDrawable* drawable, + int* x, + int* y); + + + + + + + + +
+

drawable :

+
+

x :

+
+

y :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page new file mode 100644 index 00000000..c3061a97 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page @@ -0,0 +1,58 @@ + + + + + + + + void + + regress_test_inherit_drawable_get_size + + RegressTestInheritDrawable* + drawable + + + guint* + width + + + guint* + height + + + + + regress_test_inherit_drawable_get_size + + +void regress_test_inherit_drawable_get_size (RegressTestInheritDrawable* drawable, + guint* width, + guint* height); + + + + + + + + +
+

drawable :

+
+

width :

+
+

height :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.page new file mode 100644 index 00000000..9d50d65c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.page @@ -0,0 +1,58 @@ + + + + + + + + Regress.TestInheritDrawable + + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.TestInheritDrawable + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass.page new file mode 100644 index 00000000..059c991c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestInheritDrawableClass + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass.page new file mode 100644 index 00000000..06e5eed4 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestInheritPixmapObjectClass + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.page new file mode 100644 index 00000000..1f823a24 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.page @@ -0,0 +1,55 @@ + + + + + + + + Regress.TestInterface + + + + + + + + + + Hierarchy + + + Regress.TestInterface + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface.page new file mode 100644 index 00000000..536f0498 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestInterfaceIface + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page new file mode 100644 index 00000000..01b45609 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page @@ -0,0 +1,33 @@ + + + + + + all + + + Regress.TestObj::all + + +void all (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page new file mode 100644 index 00000000..ad9d6c82 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page @@ -0,0 +1,37 @@ + + + + + + + + Regress.TestObj::allow_none_vfunc + + +void allow_none_vfunc (RegressTestObj* obj, + RegressTestObj* two); + + + + + + + + +
+

obj :

+
+

two :

+

Another object

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-bare.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-bare.page new file mode 100644 index 00000000..103b5bcb --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-bare.page @@ -0,0 +1,26 @@ + + + + + + bare + + + Regress.TestObj:bare + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-boxed.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-boxed.page new file mode 100644 index 00000000..c632b210 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-boxed.page @@ -0,0 +1,26 @@ + + + + + + boxed + + + Regress.TestObj:boxed + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page new file mode 100644 index 00000000..ecb33c42 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page @@ -0,0 +1,33 @@ + + + + + + cleanup + + + Regress.TestObj::cleanup + + +void cleanup (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-double.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-double.page new file mode 100644 index 00000000..a80b8041 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-double.page @@ -0,0 +1,26 @@ + + + + + + double + + + Regress.TestObj:double + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page new file mode 100644 index 00000000..ccdfb640 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page @@ -0,0 +1,33 @@ + + + + + + first + + + Regress.TestObj::first + + +void first (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-float.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-float.page new file mode 100644 index 00000000..569b3e87 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-float.page @@ -0,0 +1,26 @@ + + + + + + float + + + Regress.TestObj:float + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-gtype.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-gtype.page new file mode 100644 index 00000000..3956ea6e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-gtype.page @@ -0,0 +1,26 @@ + + + + + + gtype + + + Regress.TestObj:gtype + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table-old.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table-old.page new file mode 100644 index 00000000..7012f4eb --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table-old.page @@ -0,0 +1,26 @@ + + + + + + hash-table-old + + + Regress.TestObj:hash-table-old + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table.page new file mode 100644 index 00000000..4a3be638 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table.page @@ -0,0 +1,26 @@ + + + + + + hash-table + + + Regress.TestObj:hash-table + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-int.page new file mode 100644 index 00000000..fdca28fd --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-int.page @@ -0,0 +1,26 @@ + + + + + + int + + + Regress.TestObj:int + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list-old.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list-old.page new file mode 100644 index 00000000..38b1f7e1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list-old.page @@ -0,0 +1,26 @@ + + + + + + list-old + + + Regress.TestObj:list-old + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list.page new file mode 100644 index 00000000..17aa89b8 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list.page @@ -0,0 +1,26 @@ + + + + + + list + + + Regress.TestObj:list + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page new file mode 100644 index 00000000..b17c04dd --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page @@ -0,0 +1,39 @@ + + + + + + + + Regress.TestObj::matrix + + +int matrix (RegressTestObj* obj, + const char* somestr); + + + +

This method is virtual. Notably its name differs from the virtual +slot name, which makes it useful for testing bindings handle this +case.

+ + + + +
+

obj :

+
+

somestr :

+

Meaningless string

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page new file mode 100644 index 00000000..a9356cb3 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page @@ -0,0 +1,36 @@ + + + + + + sig-with-array-prop + + + Regress.TestObj::sig-with-array-prop + + +void sig-with-array-prop (guint* arr); + + + +

This test signal is like TelepathyGlib's + TpChannel:: group-members-changed-detailed:

+ + + + +
+

arr :

+

numbers

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page new file mode 100644 index 00000000..afe8466c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page @@ -0,0 +1,35 @@ + + + + + + sig-with-foreign-struct + + + Regress.TestObj::sig-with-foreign-struct + + +void sig-with-foreign-struct (cairo_t cr); + + + + + + + + +
+

cr :

+

A cairo context.

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page new file mode 100644 index 00000000..2c7e3f90 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page @@ -0,0 +1,36 @@ + + + + + + sig-with-hash-prop + + + Regress.TestObj::sig-with-hash-prop + + +void sig-with-hash-prop (<map> hash); + + + +

This test signal is like TelepathyGlib's + TpAccount::status-changed

+ + + + +
+

hash :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page new file mode 100644 index 00000000..6a771a14 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page @@ -0,0 +1,36 @@ + + + + + + sig-with-int64-prop + + + Regress.TestObj::sig-with-int64-prop + + +gint64 sig-with-int64-prop (gint64 i); + + + +

You can use this with regress_test_obj_emit_sig_with_int64, or raise from +the introspection client langage.

+ + + + +
+

i :

+

an integer

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page new file mode 100644 index 00000000..135d052d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page @@ -0,0 +1,35 @@ + + + + + + sig-with-intarray-ret + + + Regress.TestObj::sig-with-intarray-ret + + +None sig-with-intarray-ret (gint i); + + + + + + + + +
+

i :

+

an integer

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page new file mode 100644 index 00000000..5aee822f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page @@ -0,0 +1,36 @@ + + + + + + sig-with-obj + + + Regress.TestObj::sig-with-obj + + +void sig-with-obj (GObject obj); + + + +

Test transfer none GObject as a param (tests refcounting). +Use with regress_test_obj_emit_sig_with_obj

+ + + + +
+

obj :

+

A newly created RegressTestObj

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page new file mode 100644 index 00000000..c5fd2dd7 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page @@ -0,0 +1,35 @@ + + + + + + sig-with-strv + + + Regress.TestObj::sig-with-strv + + +void sig-with-strv (utf8* strs); + + + +

Test GStrv as a param.

+ + + + +
+

strs :

+

strings

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page new file mode 100644 index 00000000..25d6d5e7 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -0,0 +1,36 @@ + + + + + + sig-with-uint64-prop + + + Regress.TestObj::sig-with-uint64-prop + + +guint64 sig-with-uint64-prop (guint64 i); + + + +

You can use this with regress_test_obj_emit_sig_with_uint64, or raise from +the introspection client langage.

+ + + + +
+

i :

+

an integer

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-string.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-string.page new file mode 100644 index 00000000..561f2da4 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-string.page @@ -0,0 +1,26 @@ + + + + + + string + + + Regress.TestObj:string + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page new file mode 100644 index 00000000..f0df5f3c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page @@ -0,0 +1,35 @@ + + + + + + test-with-static-scope-arg + + + Regress.TestObj::test-with-static-scope-arg + + +void test-with-static-scope-arg (RegressTestSimpleBoxedA object); + + + + + + + + +
+

object :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page new file mode 100644 index 00000000..29321412 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page @@ -0,0 +1,33 @@ + + + + + + test + + + Regress.TestObj::test + + +void test (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page new file mode 100644 index 00000000..5cdc38db --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page @@ -0,0 +1,38 @@ + + + + + + + + RegressTestObj* + + regress_constructor + + + + regress_constructor + + +RegressTestObj* regress_constructor (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page new file mode 100644 index 00000000..b54d35ad --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page @@ -0,0 +1,53 @@ + + + + + + + + int + + regress_test_obj_do_matrix + + RegressTestObj* + obj + + + const char* + somestr + + + + + regress_test_obj_do_matrix + + +int regress_test_obj_do_matrix (RegressTestObj* obj, + const char* somestr); + + + +

This method is virtual. Notably its name differs from the virtual +slot name, which makes it useful for testing bindings handle this +case.

+ + + + +
+

obj :

+

A

+

somestr :

+

Meaningless string

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page new file mode 100644 index 00000000..677f1fc1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_obj_emit_sig_with_foreign_struct + + RegressTestObj* + obj + + + + + regress_test_obj_emit_sig_with_foreign_struct + + +void regress_test_obj_emit_sig_with_foreign_struct (RegressTestObj* obj); + + + + + + + + +
+

obj :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page new file mode 100644 index 00000000..2dc8a1b7 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_obj_emit_sig_with_int64 + + RegressTestObj* + obj + + + + + regress_test_obj_emit_sig_with_int64 + + +void regress_test_obj_emit_sig_with_int64 (RegressTestObj* obj); + + + + + + + + +
+

obj :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page new file mode 100644 index 00000000..9d598f9c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_obj_emit_sig_with_obj + + RegressTestObj* + obj + + + + + regress_test_obj_emit_sig_with_obj + + +void regress_test_obj_emit_sig_with_obj (RegressTestObj* obj); + + + + + + + + +
+

obj :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page new file mode 100644 index 00000000..a3a89c18 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_obj_emit_sig_with_uint64 + + RegressTestObj* + obj + + + + + regress_test_obj_emit_sig_with_uint64 + + +void regress_test_obj_emit_sig_with_uint64 (RegressTestObj* obj); + + + + + + + + +
+

obj :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page new file mode 100644 index 00000000..28fc6916 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_forced_method + + RegressTestObj* + obj + + + + + regress_forced_method + + +void regress_forced_method (RegressTestObj* obj); + + + + + + + + +
+

obj :

+

A

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page new file mode 100644 index 00000000..2121ada1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page @@ -0,0 +1,44 @@ + + + + + + + + int + + regress_test_obj_instance_method + + RegressTestObj* + obj + + + + + regress_test_obj_instance_method + + +int regress_test_obj_instance_method (RegressTestObj* obj); + + + + + + + + +
+

obj :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page new file mode 100644 index 00000000..7ea17662 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_test_obj_instance_method_callback + + RegressTestObj* + obj + + + RegressTestCallback + callback + + + + + regress_test_obj_instance_method_callback + + +void regress_test_obj_instance_method_callback (RegressTestObj* obj, + RegressTestCallback callback); + + + + + + + + +
+

obj :

+
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page new file mode 100644 index 00000000..1f5ca6d8 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page @@ -0,0 +1,44 @@ + + + + + + + + RegressTestObj* + + regress_test_obj_new + + RegressTestObj* + obj + + + + + regress_test_obj_new + + +RegressTestObj* regress_test_obj_new (RegressTestObj* obj); + + + + + + + + +
+

obj :

+

A

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page new file mode 100644 index 00000000..44f469db --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page @@ -0,0 +1,58 @@ + + + + + + + + RegressTestObj* + + regress_test_obj_new_callback + + RegressTestCallbackUserData + callback + + + gpointer + user_data + + + GDestroyNotify + notify + + + + + regress_test_obj_new_callback + + +RegressTestObj* regress_test_obj_new_callback (RegressTestCallbackUserData callback, + gpointer user_data, + GDestroyNotify notify); + + + + + + + + +
+

callback :

+
+

user_data :

+
+

notify :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page new file mode 100644 index 00000000..49f9c1f0 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page @@ -0,0 +1,44 @@ + + + + + + + + RegressTestObj* + + regress_test_obj_new_from_file + + const char* + x + + + + + regress_test_obj_new_from_file + + +RegressTestObj* regress_test_obj_new_from_file (const char* x); + + + + + + + + +
+

x :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page new file mode 100644 index 00000000..bd78434c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_obj_null_out + + RegressTestObj** + obj + + + + + regress_test_obj_null_out + + +void regress_test_obj_null_out (RegressTestObj** obj); + + + + + + + + +
+

obj :

+

A

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.page new file mode 100644 index 00000000..fc54d988 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.page @@ -0,0 +1,58 @@ + + + + + + + + Regress.TestObj + + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.TestObj + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page new file mode 100644 index 00000000..f1e9a131 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_test_obj_set_bare + + RegressTestObj* + obj + + + GObject* + bare + + + + + regress_test_obj_set_bare + + +void regress_test_obj_set_bare (RegressTestObj* obj, + GObject* bare); + + + + + + + + +
+

obj :

+
+

bare :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page new file mode 100644 index 00000000..f46ec162 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page @@ -0,0 +1,93 @@ + + + + + + + + gboolean + + regress_test_obj_skip_inout_param + + RegressTestObj* + obj + + + gint + a + + + gint* + out_b + + + gdouble + c + + + gint* + inout_d + + + gint* + out_sum + + + gint + num1 + + + gint + num2 + + + + + regress_test_obj_skip_inout_param + + +gboolean regress_test_obj_skip_inout_param (RegressTestObj* obj, + gint a, + gint* out_b, + gdouble c, + gint* inout_d, + gint* out_sum, + gint num1, + gint num2); + + + +

Check that the out value is skipped

+ + + + +
+

obj :

+

A .

+

a :

+

Parameter.

+

out_b :

+

Return value.

+

c :

+

Other parameter.

+

inout_d :

+

Will be incremented.

+

out_sum :

+

Return value.

+

num1 :

+

Number.

+

num2 :

+

Number.

+

Returns :

+

TRUE if the call succeeds, FALSE if @error is set.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page new file mode 100644 index 00000000..77e1de3b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page @@ -0,0 +1,93 @@ + + + + + + + + gboolean + + regress_test_obj_skip_out_param + + RegressTestObj* + obj + + + gint + a + + + gint* + out_b + + + gdouble + c + + + gint* + inout_d + + + gint* + out_sum + + + gint + num1 + + + gint + num2 + + + + + regress_test_obj_skip_out_param + + +gboolean regress_test_obj_skip_out_param (RegressTestObj* obj, + gint a, + gint* out_b, + gdouble c, + gint* inout_d, + gint* out_sum, + gint num1, + gint num2); + + + +

Check that the out value is skipped

+ + + + +
+

obj :

+

A .

+

a :

+

Parameter.

+

out_b :

+

Return value.

+

c :

+

Other parameter.

+

inout_d :

+

Will be incremented.

+

out_sum :

+

Return value.

+

num1 :

+

Number.

+

num2 :

+

Number.

+

Returns :

+

TRUE if the call succeeds, FALSE if @error is set.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page new file mode 100644 index 00000000..ef5893c3 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page @@ -0,0 +1,93 @@ + + + + + + + + gboolean + + regress_test_obj_skip_param + + RegressTestObj* + obj + + + gint + a + + + gint* + out_b + + + gdouble + c + + + gint* + inout_d + + + gint* + out_sum + + + gint + num1 + + + gint + num2 + + + + + regress_test_obj_skip_param + + +gboolean regress_test_obj_skip_param (RegressTestObj* obj, + gint a, + gint* out_b, + gdouble c, + gint* inout_d, + gint* out_sum, + gint num1, + gint num2); + + + +

Check that a parameter is skipped

+ + + + +
+

obj :

+

A .

+

a :

+

Parameter.

+

out_b :

+

Return value.

+

c :

+

Other parameter.

+

inout_d :

+

Will be incremented.

+

out_sum :

+

Return value.

+

num1 :

+

Number.

+

num2 :

+

Number.

+

Returns :

+

TRUE if the call succeeds, FALSE if @error is set.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page new file mode 100644 index 00000000..a463fe77 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page @@ -0,0 +1,93 @@ + + + + + + + + gboolean + + regress_test_obj_skip_return_val + + RegressTestObj* + obj + + + gint + a + + + gint* + out_b + + + gdouble + c + + + gint* + inout_d + + + gint* + out_sum + + + gint + num1 + + + gint + num2 + + + + + regress_test_obj_skip_return_val + + +gboolean regress_test_obj_skip_return_val (RegressTestObj* obj, + gint a, + gint* out_b, + gdouble c, + gint* inout_d, + gint* out_sum, + gint num1, + gint num2); + + + +

Check that the return value is skipped

+ + + + +
+

obj :

+

a

+

a :

+

Parameter.

+

out_b :

+

A return value.

+

c :

+

Other parameter.

+

inout_d :

+

Will be incremented.

+

out_sum :

+

Return value.

+

num1 :

+

Number.

+

num2 :

+

Number.

+

Returns :

+

TRUE if the call succeeds, FALSE if @error is set.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page new file mode 100644 index 00000000..5ebe0f1a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page @@ -0,0 +1,52 @@ + + + + + + + + gboolean + + regress_test_obj_skip_return_val_no_out + + RegressTestObj* + obj + + + gint + a + + + + + regress_test_obj_skip_return_val_no_out + + +gboolean regress_test_obj_skip_return_val_no_out (RegressTestObj* obj, + gint a); + + + +

Check that the return value is skipped. Succeed if a is nonzero, otherwise +raise an error.

+ + + + +
+

obj :

+

a

+

a :

+

Parameter.

+

Returns :

+

TRUE if the call succeeds, FALSE if @error is set.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page new file mode 100644 index 00000000..c27d88bf --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page @@ -0,0 +1,44 @@ + + + + + + + + double + + regress_test_obj_static_method + + int + x + + + + + regress_test_obj_static_method + + +double regress_test_obj_static_method (int x); + + + + + + + + +
+

x :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page new file mode 100644 index 00000000..74583ad6 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_obj_static_method_callback + + RegressTestCallback + callback + + + + + regress_test_obj_static_method_callback + + +void regress_test_obj_static_method_callback (RegressTestCallback callback); + + + + + + + + +
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page new file mode 100644 index 00000000..2ace5e18 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page @@ -0,0 +1,86 @@ + + + + + + + + void + + regress_test_obj_torture_signature_0 + + RegressTestObj* + obj + + + int + x + + + double* + y + + + int* + z + + + const char* + foo + + + int* + q + + + guint + m + + + + + regress_test_obj_torture_signature_0 + + +void regress_test_obj_torture_signature_0 (RegressTestObj* obj, + int x, + double* y, + int* z, + const char* foo, + int* q, + guint m); + + + + + + + + +
+

obj :

+

A

+

x :

+
+

y :

+
+

z :

+
+

foo :

+
+

q :

+
+

m :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page new file mode 100644 index 00000000..aa31fb34 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page @@ -0,0 +1,86 @@ + + + + + + + + gboolean + + regress_test_obj_torture_signature_1 + + RegressTestObj* + obj + + + int + x + + + double* + y + + + int* + z + + + const char* + foo + + + int* + q + + + guint + m + + + + + regress_test_obj_torture_signature_1 + + +gboolean regress_test_obj_torture_signature_1 (RegressTestObj* obj, + int x, + double* y, + int* z, + const char* foo, + int* q, + guint m); + + + +

This function throws an error if m is odd.

+ + + + +
+

obj :

+

A

+

x :

+
+

y :

+
+

z :

+
+

foo :

+
+

q :

+
+

m :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.page new file mode 100644 index 00000000..93e56e8b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestObjClass + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.page new file mode 100644 index 00000000..1180b98a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestOtherError + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page new file mode 100644 index 00000000..788441ac --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestPrivateEnum + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct.page new file mode 100644 index 00000000..8ce8712a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestPrivateStruct + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page new file mode 100644 index 00000000..39a3877b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page @@ -0,0 +1,38 @@ + + + + + + + + const RegressTestSimpleBoxedA* + + regress_test_simple_boxed_a_const_return + + + + regress_test_simple_boxed_a_const_return + + +const RegressTestSimpleBoxedA* regress_test_simple_boxed_a_const_return (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page new file mode 100644 index 00000000..827e39ff --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page @@ -0,0 +1,44 @@ + + + + + + + + RegressTestSimpleBoxedA* + + regress_test_simple_boxed_a_copy + + RegressTestSimpleBoxedA* + a + + + + + regress_test_simple_boxed_a_copy + + +RegressTestSimpleBoxedA* regress_test_simple_boxed_a_copy (RegressTestSimpleBoxedA* a); + + + + + + + + +
+

a :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page new file mode 100644 index 00000000..4108bf91 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page @@ -0,0 +1,51 @@ + + + + + + + + gboolean + + regress_test_simple_boxed_a_equals + + RegressTestSimpleBoxedA* + a + + + RegressTestSimpleBoxedA* + other_a + + + + + regress_test_simple_boxed_a_equals + + +gboolean regress_test_simple_boxed_a_equals (RegressTestSimpleBoxedA* a, + RegressTestSimpleBoxedA* other_a); + + + + + + + + +
+

a :

+
+

other_a :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.page new file mode 100644 index 00000000..36459d33 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestSimpleBoxedA + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page new file mode 100644 index 00000000..0846cbe7 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page @@ -0,0 +1,44 @@ + + + + + + + + RegressTestSimpleBoxedB* + + regress_test_simple_boxed_b_copy + + RegressTestSimpleBoxedB* + b + + + + + regress_test_simple_boxed_b_copy + + +RegressTestSimpleBoxedB* regress_test_simple_boxed_b_copy (RegressTestSimpleBoxedB* b); + + + + + + + + +
+

b :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.page new file mode 100644 index 00000000..e3c9fcbf --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestSimpleBoxedB + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleCallback.page new file mode 100644 index 00000000..61bafb5f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleCallback.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestSimpleCallback + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page new file mode 100644 index 00000000..61f94308 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_test_struct_a_clone + + RegressTestStructA* + a + + + RegressTestStructA* + a_out + + + + + regress_test_struct_a_clone + + +void regress_test_struct_a_clone (RegressTestStructA* a, + RegressTestStructA* a_out); + + + +

Make a copy of a RegressTestStructA

+ + + + +
+

a :

+

the structure

+

a_out :

+

the cloned structure

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.page new file mode 100644 index 00000000..0093ac8e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructA + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page new file mode 100644 index 00000000..ef54d110 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_test_struct_a_parse + + RegressTestStructA* + a_out + + + const gchar* + string + + + + + regress_test_struct_a_parse + + +void regress_test_struct_a_parse (RegressTestStructA* a_out, + const gchar* string); + + + + + + + + +
+

a_out :

+

the structure that is to be filled

+

string :

+

ignored

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page new file mode 100644 index 00000000..4adde2a0 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_test_struct_b_clone + + RegressTestStructB* + b + + + RegressTestStructB* + b_out + + + + + regress_test_struct_b_clone + + +void regress_test_struct_b_clone (RegressTestStructB* b, + RegressTestStructB* b_out); + + + +

Make a copy of a RegressTestStructB

+ + + + +
+

b :

+

the structure

+

b_out :

+

the cloned structure

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.page new file mode 100644 index 00000000..55d74f58 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructB + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC.page new file mode 100644 index 00000000..08e850eb --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructC + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD.page new file mode 100644 index 00000000..37c7b2a4 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructD + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE.page new file mode 100644 index 00000000..b3688e06 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructE + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union.page new file mode 100644 index 00000000..6f77035b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructE__some_union__union + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF.page new file mode 100644 index 00000000..d75ea66b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructF + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page new file mode 100644 index 00000000..e3fb7736 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_struct_fixed_array_frob + + RegressTestStructFixedArray* + str + + + + + regress_test_struct_fixed_array_frob + + +void regress_test_struct_fixed_array_frob (RegressTestStructFixedArray* str); + + + + + + + + +
+

str :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.page new file mode 100644 index 00000000..a18443c4 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructFixedArray + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page new file mode 100644 index 00000000..d32c0de2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page @@ -0,0 +1,44 @@ + + + + + + + + int + + regress_test_sub_obj_instance_method + + RegressTestSubObj* + obj + + + + + regress_test_sub_obj_instance_method + + +int regress_test_sub_obj_instance_method (RegressTestSubObj* obj); + + + + + + + + +
+

obj :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page new file mode 100644 index 00000000..f8ca0d46 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page @@ -0,0 +1,38 @@ + + + + + + + + RegressTestObj* + + regress_test_sub_obj_new + + + + regress_test_sub_obj_new + + +RegressTestObj* regress_test_sub_obj_new (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.page new file mode 100644 index 00000000..f6488d83 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.page @@ -0,0 +1,61 @@ + + + + + + + + Regress.TestSubObj + + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.TestObj + + Regress.TestSubObj + + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page new file mode 100644 index 00000000..a34a25c3 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_sub_obj_unset_bare + + RegressTestSubObj* + obj + + + + + regress_test_sub_obj_unset_bare + + +void regress_test_sub_obj_unset_bare (RegressTestSubObj* obj); + + + + + + + + +
+

obj :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass.page new file mode 100644 index 00000000..6bbd999a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestSubObjClass + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestTypeGUInt64.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestTypeGUInt64.page new file mode 100644 index 00000000..d815a3fe --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestTypeGUInt64.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestTypeGUInt64 + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-testbool.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-testbool.page new file mode 100644 index 00000000..d7333b88 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-testbool.page @@ -0,0 +1,26 @@ + + + + + + testbool + + + Regress.TestWi8021x:testbool + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page new file mode 100644 index 00000000..d54ed689 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page @@ -0,0 +1,44 @@ + + + + + + + + gboolean + + regress_test_wi_802_1x_get_testbool + + RegressTestWi8021x* + obj + + + + + regress_test_wi_802_1x_get_testbool + + +gboolean regress_test_wi_802_1x_get_testbool (RegressTestWi8021x* obj); + + + + + + + + +
+

obj :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page new file mode 100644 index 00000000..2c47b288 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page @@ -0,0 +1,38 @@ + + + + + + + + RegressTestWi8021x* + + regress_test_wi_802_1x_new + + + + regress_test_wi_802_1x_new + + +RegressTestWi8021x* regress_test_wi_802_1x_new (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.page new file mode 100644 index 00000000..9b053187 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.page @@ -0,0 +1,58 @@ + + + + + + + + Regress.TestWi8021x + + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.TestWi8021x + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page new file mode 100644 index 00000000..a32a70ab --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_test_wi_802_1x_set_testbool + + RegressTestWi8021x* + obj + + + gboolean + v + + + + + regress_test_wi_802_1x_set_testbool + + +void regress_test_wi_802_1x_set_testbool (RegressTestWi8021x* obj, + gboolean v); + + + + + + + + +
+

obj :

+
+

v :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page new file mode 100644 index 00000000..cabdd48a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page @@ -0,0 +1,44 @@ + + + + + + + + int + + regress_test_wi_802_1x_static_method + + int + x + + + + + regress_test_wi_802_1x_static_method + + +int regress_test_wi_802_1x_static_method (int x); + + + + + + + + +
+

x :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass.page new file mode 100644 index 00000000..071d9a6f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestWi8021xClass + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.UTF8_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.UTF8_CONSTANT.page new file mode 100644 index 00000000..8f3f5324 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.UTF8_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.UTF8_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.VaListAlias.page b/tests/scanner/Regress-1.0-C-expected/Regress.VaListAlias.page new file mode 100644 index 00000000..bfd52d28 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.VaListAlias.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.VaListAlias + + + +

Typedef'd va_list for additional reasons

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page b/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page new file mode 100644 index 00000000..5f8b1ff3 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_aliased_caller_alloc + + RegressAliasedTestBoxed* + boxed + + + + + regress_aliased_caller_alloc + + +void regress_aliased_caller_alloc (RegressAliasedTestBoxed* boxed); + + + + + + + + +
+

boxed :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page new file mode 100644 index 00000000..05102820 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page @@ -0,0 +1,51 @@ + + + + + + + + gint + + regress_annotation_attribute_func + + RegressAnnotationObject* + object + + + const gchar* + data + + + + + regress_annotation_attribute_func + + +gint regress_annotation_attribute_func (RegressAnnotationObject* object, + const gchar* data); + + + + + + + + +
+

object :

+

A .

+

data :

+

Some data.

+

Returns :

+

The return value.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page new file mode 100644 index 00000000..337b2073 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page @@ -0,0 +1,59 @@ + + + + + + + + void + + regress_annotation_custom_destroy + + RegressAnnotationCallback + callback + + + RegressAnnotationNotifyFunc + destroy + + + gpointer + data + + + + + regress_annotation_custom_destroy + + +void regress_annotation_custom_destroy (RegressAnnotationCallback callback, + RegressAnnotationNotifyFunc destroy, + gpointer data); + + + +

Test messing up the heuristic of closure/destroy-notification +detection, and fixing it via regress_annotations.

+ + + + +
+

callback :

+

Destroy notification

+

destroy :

+
+

data :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page new file mode 100644 index 00000000..6a1c7234 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page @@ -0,0 +1,38 @@ + + + + + + + + char* + + regress_annotation_get_source_file + + + + regress_annotation_get_source_file + + +char* regress_annotation_get_source_file (void); + + + + + + + + +
+

Returns :

+

Source file

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page new file mode 100644 index 00000000..4b471607 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_annotation_init + + int* + argc + + + char*** + argv + + + + + regress_annotation_init + + +void regress_annotation_init (int* argc, + char*** argv); + + + + + + + + +
+

argc :

+

The number of args.

+

argv :

+

The arguments.

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page new file mode 100644 index 00000000..4c485eac --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_invalid_regress_annotation + + int + foo + + + + + regress_annotation_invalid_regress_annotation + + +void regress_annotation_invalid_regress_annotation (int foo); + + + + + + + + +
+

foo :

+

some text (e.g. example) or else

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page new file mode 100644 index 00000000..496fcc5a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_ptr_array + + GValue* + array + + + + + regress_annotation_ptr_array + + +void regress_annotation_ptr_array (GValue* array); + + + + + + + + +
+

array :

+

the array

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page new file mode 100644 index 00000000..1a345a50 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page @@ -0,0 +1,44 @@ + + + + + + + + utf8* + + regress_annotation_return_array + + int* + length + + + + + regress_annotation_return_array + + +char** regress_annotation_return_array (int* length); + + + + + + + + +
+

length :

+

Number of return values

+

Returns :

+

The return value

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page new file mode 100644 index 00000000..968cfe17 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page @@ -0,0 +1,38 @@ + + + + + + + + gchar* + + regress_annotation_return_filename + + + + regress_annotation_return_filename + + +gchar* regress_annotation_return_filename (void); + + + + + + + + +
+

Returns :

+

An annotated filename

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page new file mode 100644 index 00000000..663fd9db --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_set_source_file + + char* + fname + + + + + regress_annotation_set_source_file + + +void regress_annotation_set_source_file (char* fname); + + + + + + + + +
+

fname :

+

Source file

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page new file mode 100644 index 00000000..a4d11d2e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_annotation_space_after_comment_bug631690 + + + + regress_annotation_space_after_comment_bug631690 + + +void regress_annotation_space_after_comment_bug631690 (void); + + + +

Explicitly test having a space after the ** here.

+ + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page new file mode 100644 index 00000000..520b473a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_annotation_string_array_length + + guint + n_properties + + + utf8* + properties + + + + + regress_annotation_string_array_length + + +void regress_annotation_string_array_length (guint n_properties, + utf8* properties); + + + + + + + + +
+

n_properties :

+
+

properties :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page new file mode 100644 index 00000000..e90fa512 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page @@ -0,0 +1,38 @@ + + + + + + + + utf8* + + regress_annotation_string_zero_terminated + + + + regress_annotation_string_zero_terminated + + +char** regress_annotation_string_zero_terminated (void); + + + + + + + + +
+

Returns :

+

The return value

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page new file mode 100644 index 00000000..34293f00 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_string_zero_terminated_out + + char*** + out + + + + + regress_annotation_string_zero_terminated_out + + +void regress_annotation_string_zero_terminated_out (char*** out); + + + + + + + + +
+

out :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page new file mode 100644 index 00000000..71013718 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page @@ -0,0 +1,38 @@ + + + + + + + + GObject* + + regress_annotation_test_parsing_bug630862 + + + + regress_annotation_test_parsing_bug630862 + + +GObject* regress_annotation_test_parsing_bug630862 (void); + + + +

See https://bugzilla.gnome.org/show_bug.cgi?id=630862

+ + + + +
+

Returns :

+

An object, note the colon:in here

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page new file mode 100644 index 00000000..1607c630 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page @@ -0,0 +1,38 @@ + + + + + + + + GObject* + + regress_annotation_transfer_floating + + + + regress_annotation_transfer_floating + + +GObject* regress_annotation_transfer_floating (void); + + + + + + + + +
+

Returns :

+

A floating object

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page new file mode 100644 index 00000000..a3a0fb71 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page @@ -0,0 +1,39 @@ + + + + + + + + void + + regress_annotation_versioned + + + + regress_annotation_versioned + + +void regress_annotation_versioned (void); + + + + + + +

Since 0.6

+ + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page new file mode 100644 index 00000000..c5b4cb6e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page @@ -0,0 +1,38 @@ + + + + + + + + GQuark + + regress_atest_error_quark + + + + regress_atest_error_quark + + +GQuark regress_atest_error_quark (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page new file mode 100644 index 00000000..f5ce6975 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page @@ -0,0 +1,58 @@ + + + + + + + + void + + regress_foo_async_ready_callback + + GCancellable* + cancellable + + + GAsyncReadyCallback + callback + + + gpointer + user_data + + + + + regress_foo_async_ready_callback + + +void regress_foo_async_ready_callback (GCancellable* cancellable, + GAsyncReadyCallback callback, + gpointer user_data); + + + + + + + + +
+

cancellable :

+
+

callback :

+
+

user_data :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page new file mode 100644 index 00000000..6158bf25 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page @@ -0,0 +1,58 @@ + + + + + + + + void + + regress_foo_destroy_notify_callback + + RegressFooCallback + callback + + + gpointer + data + + + GDestroyNotify + destroy + + + + + regress_foo_destroy_notify_callback + + +void regress_foo_destroy_notify_callback (RegressFooCallback callback, + gpointer data, + GDestroyNotify destroy); + + + + + + + + +
+

callback :

+
+

data :

+
+

destroy :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page new file mode 100644 index 00000000..c3ed369c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page @@ -0,0 +1,38 @@ + + + + + + + + gint + + regress_foo_init + + + + regress_foo_init + + +gint regress_foo_init (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page new file mode 100644 index 00000000..07c9c6d1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page @@ -0,0 +1,65 @@ + + + + + + + + void + + regress_foo_method_external_references + + UtilityObject* + object + + + UtilityEnumType + e + + + UtilityFlagType + f + + + UtilityStruct + s + + + + + regress_foo_method_external_references + + +void regress_foo_method_external_references (UtilityObject* object, + UtilityEnumType e, + UtilityFlagType f, + UtilityStruct s); + + + + + + + + +
+

object :

+
+

e :

+
+

f :

+
+

s :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page new file mode 100644 index 00000000..d65bfa1a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page @@ -0,0 +1,39 @@ + + + + + + + + RegressFooObject* + + regress_foo_not_a_constructor_new + + + + regress_foo_not_a_constructor_new + + +RegressFooObject* regress_foo_not_a_constructor_new (void); + + + +

This should be scanned as a top-level function, and shouldn't cause +a "Can't find matching type for constructor" warning.

+ + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page new file mode 100644 index 00000000..8fb9d102 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page @@ -0,0 +1,45 @@ + + + + + + + + void + + regress_foo_skip_me + + RegressFooSkippable + fs + + + + + regress_foo_skip_me + + +void regress_foo_skip_me (RegressFooSkippable fs); + + + +

Does something that's only interesting from C and should not be +exposed to language bindings.

+ + + + +
+

fs :

+

a

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page new file mode 100644 index 00000000..0ed4e2f4 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_foo_some_variant + + guint + x + + + va_list + args + + + + + regress_foo_some_variant + + +void regress_foo_some_variant (guint x, + va_list args); + + + + + + + + +
+

x :

+
+

args :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page new file mode 100644 index 00000000..3755024d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_foo_some_variant_ptr + + guint + x + + + va_list* + args + + + + + regress_foo_some_variant_ptr + + +void regress_foo_some_variant_ptr (guint x, + va_list* args); + + + + + + + + +
+

x :

+
+

args :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page new file mode 100644 index 00000000..cf127cb0 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page @@ -0,0 +1,38 @@ + + + + + + + + utf8* + + regress_foo_test_array + + + + regress_foo_test_array + + +GArray* regress_foo_test_array (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page new file mode 100644 index 00000000..79c50cf2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_test_const_char_param + + const char* + param + + + + + regress_foo_test_const_char_param + + +void regress_foo_test_const_char_param (const char* param); + + + + + + + + +
+

param :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page new file mode 100644 index 00000000..cb286e62 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page @@ -0,0 +1,38 @@ + + + + + + + + const char* + + regress_foo_test_const_char_retval + + + + regress_foo_test_const_char_retval + + +const char* regress_foo_test_const_char_retval (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page new file mode 100644 index 00000000..be33c5ad --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_test_const_struct_param + + const RegressFooStruct* + param + + + + + regress_foo_test_const_struct_param + + +void regress_foo_test_const_struct_param (const RegressFooStruct* param); + + + + + + + + +
+

param :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page new file mode 100644 index 00000000..783b248a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page @@ -0,0 +1,38 @@ + + + + + + + + const RegressFooStruct* + + regress_foo_test_const_struct_retval + + + + regress_foo_test_const_struct_retval + + +const RegressFooStruct* regress_foo_test_const_struct_retval (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page new file mode 100644 index 00000000..83881f67 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_test_string_array + + char** + array + + + + + regress_foo_test_string_array + + +void regress_foo_test_string_array (char** array); + + + + + + + + +
+

array :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page new file mode 100644 index 00000000..c3c45b12 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_test_string_array_with_g + + gchar** + array + + + + + regress_foo_test_string_array_with_g + + +void regress_foo_test_string_array_with_g (gchar** array); + + + + + + + + +
+

array :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page new file mode 100644 index 00000000..b3ded918 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_test_unsigned_qualifier + + unsigned int + unsigned_param + + + + + regress_foo_test_unsigned_qualifier + + +void regress_foo_test_unsigned_qualifier (unsigned int unsigned_param); + + + + + + + + +
+

unsigned_param :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page new file mode 100644 index 00000000..06100021 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_test_unsigned_type + + unsigned + unsigned_param + + + + + regress_foo_test_unsigned_type + + +void regress_foo_test_unsigned_type (unsigned unsigned_param); + + + + + + + + +
+

unsigned_param :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page new file mode 100644 index 00000000..9024a14d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_foo_test_varargs_callback + + gint + i + + + RegressFooVarargsCallback + callback + + + + + regress_foo_test_varargs_callback + + +void regress_foo_test_varargs_callback (gint i, + RegressFooVarargsCallback callback); + + + + + + + + +
+

i :

+
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page new file mode 100644 index 00000000..f89f5474 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_test_varargs_callback2 + + RegressFooVarargsCallback + callback + + + + + regress_foo_test_varargs_callback2 + + +void regress_foo_test_varargs_callback2 (RegressFooVarargsCallback callback); + + + + + + + + +
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page new file mode 100644 index 00000000..e34cfc75 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_foo_test_varargs_callback3 + + RegressFooVarargsCallback + callback + + + RegressFooVarargsCallback + callback2 + + + + + regress_foo_test_varargs_callback3 + + +void regress_foo_test_varargs_callback3 (RegressFooVarargsCallback callback, + RegressFooVarargsCallback callback2); + + + + + + + + +
+

callback :

+
+

callback2 :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page new file mode 100644 index 00000000..ebc6a7f1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_func_obj_null_in + + RegressTestObj* + obj + + + + + regress_func_obj_null_in + + +void regress_func_obj_null_in (RegressTestObj* obj); + + + + + + + + +
+

obj :

+

A

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page new file mode 100644 index 00000000..407cb269 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_global_get_flags_out + + RegressTestFlags* + v + + + + + regress_global_get_flags_out + + +void regress_global_get_flags_out (RegressTestFlags* v); + + + + + + + + +
+

v :

+

A flags value

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page b/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page new file mode 100644 index 00000000..802f00f9 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page @@ -0,0 +1,52 @@ + + + + + + + + void + + regress_has_parameter_named_attrs + + int + foo + + + gpointer* + attributes + + + + + regress_has_parameter_named_attrs + + +void regress_has_parameter_named_attrs (int foo, + gpointer* attributes); + + + +

This test case mirrors GnomeKeyringPasswordSchema from +libgnome-keyring.

+ + + + +
+

foo :

+

some int

+

attributes :

+

list of attributes

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page b/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page new file mode 100644 index 00000000..d769d5bc --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_introspectable_via_alias + + RegressPtrArrayAlias* + data + + + + + regress_introspectable_via_alias + + +void regress_introspectable_via_alias (RegressPtrArrayAlias* data); + + + + + + + + +
+

data :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page b/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page new file mode 100644 index 00000000..263f7c8b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_not_introspectable_via_alias + + RegressVaListAlias + ok + + + + + regress_not_introspectable_via_alias + + +void regress_not_introspectable_via_alias (RegressVaListAlias ok); + + + + + + + + +
+

ok :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page b/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page new file mode 100644 index 00000000..78ba1bcb --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page @@ -0,0 +1,58 @@ + + + + + + + + void + + regress_random_function_with_skipped_structure + + int + x + + + RegressSkippedStructure* + foo + + + double + v + + + + + regress_random_function_with_skipped_structure + + +void regress_random_function_with_skipped_structure (int x, + RegressSkippedStructure* foo, + double v); + + + + + + + + +
+

x :

+
+

foo :

+
+

v :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page b/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page new file mode 100644 index 00000000..7ced7958 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_set_abort_on_error + + gboolean + abort_on_error + + + + + regress_set_abort_on_error + + +void regress_set_abort_on_error (gboolean abort_on_error); + + + + + + + + +
+

abort_on_error :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page new file mode 100644 index 00000000..c7a2b4a7 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page @@ -0,0 +1,44 @@ + + + + + + + + int + + regress_test_array_callback + + RegressTestCallbackArray + callback + + + + + regress_test_array_callback + + +int regress_test_array_callback (RegressTestCallbackArray callback); + + + + + + + + +
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page new file mode 100644 index 00000000..016a967b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_array_fixed_out_objects + + RegressTestObj*** + objs + + + + + regress_test_array_fixed_out_objects + + +void regress_test_array_fixed_out_objects (RegressTestObj*** objs); + + + + + + + + +
+

objs :

+

An array of

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page new file mode 100644 index 00000000..7b756725 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page @@ -0,0 +1,44 @@ + + + + + + + + int + + regress_test_array_fixed_size_int_in + + int* + ints + + + + + regress_test_array_fixed_size_int_in + + +int regress_test_array_fixed_size_int_in (int* ints); + + + + + + + + +
+

ints :

+

a list of 5 integers

+

Returns :

+

the sum of the items in ints

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page new file mode 100644 index 00000000..8d8dda52 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_array_fixed_size_int_out + + int** + ints + + + + + regress_test_array_fixed_size_int_out + + +void regress_test_array_fixed_size_int_out (int** ints); + + + + + + + + +
+

ints :

+

a list of 5 integers ranging from 0 to 4

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page new file mode 100644 index 00000000..6a67355e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page @@ -0,0 +1,38 @@ + + + + + + + + int* + + regress_test_array_fixed_size_int_return + + + + regress_test_array_fixed_size_int_return + + +int* regress_test_array_fixed_size_int_return (void); + + + + + + + + +
+

Returns :

+

a list of 5 integers ranging from 0 to 4

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page new file mode 100644 index 00000000..087ea636 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page @@ -0,0 +1,51 @@ + + + + + + + + int + + regress_test_array_gint16_in + + int + n_ints + + + gint16* + ints + + + + + regress_test_array_gint16_in + + +int regress_test_array_gint16_in (int n_ints, + gint16* ints); + + + + + + + + +
+

n_ints :

+
+

ints :

+

List of ints

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page new file mode 100644 index 00000000..88ef582f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page @@ -0,0 +1,51 @@ + + + + + + + + gint32 + + regress_test_array_gint32_in + + int + n_ints + + + gint32* + ints + + + + + regress_test_array_gint32_in + + +gint32 regress_test_array_gint32_in (int n_ints, + gint32* ints); + + + + + + + + +
+

n_ints :

+
+

ints :

+

List of ints

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page new file mode 100644 index 00000000..0dd47fcc --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page @@ -0,0 +1,51 @@ + + + + + + + + gint64 + + regress_test_array_gint64_in + + int + n_ints + + + gint64* + ints + + + + + regress_test_array_gint64_in + + +gint64 regress_test_array_gint64_in (int n_ints, + gint64* ints); + + + + + + + + +
+

n_ints :

+
+

ints :

+

List of ints

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page new file mode 100644 index 00000000..32a5cb76 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page @@ -0,0 +1,51 @@ + + + + + + + + int + + regress_test_array_gint8_in + + int + n_ints + + + gint8* + ints + + + + + regress_test_array_gint8_in + + +int regress_test_array_gint8_in (int n_ints, + gint8* ints); + + + + + + + + +
+

n_ints :

+
+

ints :

+

List of ints

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page new file mode 100644 index 00000000..178ccda4 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page @@ -0,0 +1,51 @@ + + + + + + + + char* + + regress_test_array_gtype_in + + int + n_types + + + GType* + types + + + + + regress_test_array_gtype_in + + +char* regress_test_array_gtype_in (int n_types, + GType* types); + + + + + + + + +
+

n_types :

+
+

types :

+

List of types

+

Returns :

+

string representation of provided types

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page new file mode 100644 index 00000000..37413f21 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page @@ -0,0 +1,44 @@ + + + + + + + + int* + + regress_test_array_int_full_out + + int* + len + + + + + regress_test_array_int_full_out + + +int* regress_test_array_int_full_out (int* len); + + + + + + + + +
+

len :

+

length of the returned array.

+

Returns :

+

a new array of integers.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page new file mode 100644 index 00000000..f9ba58cf --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page @@ -0,0 +1,51 @@ + + + + + + + + int + + regress_test_array_int_in + + int + n_ints + + + int* + ints + + + + + regress_test_array_int_in + + +int regress_test_array_int_in (int n_ints, + int* ints); + + + + + + + + +
+

n_ints :

+
+

ints :

+

List of ints

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page new file mode 100644 index 00000000..b970df76 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_test_array_int_inout + + int* + n_ints + + + int** + ints + + + + + regress_test_array_int_inout + + +void regress_test_array_int_inout (int* n_ints, + int** ints); + + + + + + + + +
+

n_ints :

+

the length of ints

+

ints :

+

a list of integers whose items will be increased by 1, except the first that will be dropped

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page new file mode 100644 index 00000000..e341b8cc --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page @@ -0,0 +1,44 @@ + + + + + + + + int* + + regress_test_array_int_none_out + + int* + len + + + + + regress_test_array_int_none_out + + +int* regress_test_array_int_none_out (int* len); + + + + + + + + +
+

len :

+

length of the returned array.

+

Returns :

+

a static array of integers.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page new file mode 100644 index 00000000..9afb1ff1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_test_array_int_null_in + + int* + arr + + + int + len + + + + + regress_test_array_int_null_in + + +void regress_test_array_int_null_in (int* arr, + int len); + + + + + + + + +
+

arr :

+
+

len :

+

length

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page new file mode 100644 index 00000000..45ef84f1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_test_array_int_null_out + + int** + arr + + + int* + len + + + + + regress_test_array_int_null_out + + +void regress_test_array_int_null_out (int** arr, + int* len); + + + + + + + + +
+

arr :

+
+

len :

+

length

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page new file mode 100644 index 00000000..be18643d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_test_array_int_out + + int* + n_ints + + + int** + ints + + + + + regress_test_array_int_out + + +void regress_test_array_int_out (int* n_ints, + int** ints); + + + + + + + + +
+

n_ints :

+

the length of ints

+

ints :

+

a list of 5 integers, from 0 to 4 in consecutive order

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page new file mode 100644 index 00000000..6e3421ac --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_async_ready_callback + + GAsyncReadyCallback + callback + + + + + regress_test_async_ready_callback + + +void regress_test_async_ready_callback (GAsyncReadyCallback callback); + + + + + + + + +
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page new file mode 100644 index 00000000..aada509b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page @@ -0,0 +1,44 @@ + + + + + + + + gboolean + + regress_test_boolean + + gboolean + in + + + + + regress_test_boolean + + +gboolean regress_test_boolean (gboolean in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page new file mode 100644 index 00000000..2c84d1c8 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page @@ -0,0 +1,44 @@ + + + + + + + + gboolean + + regress_test_boolean_false + + gboolean + in + + + + + regress_test_boolean_false + + +gboolean regress_test_boolean_false (gboolean in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page new file mode 100644 index 00000000..7d1a9490 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page @@ -0,0 +1,44 @@ + + + + + + + + gboolean + + regress_test_boolean_true + + gboolean + in + + + + + regress_test_boolean_true + + +gboolean regress_test_boolean_true (gboolean in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page new file mode 100644 index 00000000..dfbc29a1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page @@ -0,0 +1,38 @@ + + + + + + + + cairo_t* + + regress_test_cairo_context_full_return + + + + regress_test_cairo_context_full_return + + +cairo_t* regress_test_cairo_context_full_return (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page new file mode 100644 index 00000000..63105798 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_cairo_context_none_in + + cairo_t* + context + + + + + regress_test_cairo_context_none_in + + +void regress_test_cairo_context_none_in (cairo_t* context); + + + + + + + + +
+

context :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page new file mode 100644 index 00000000..4ea5516d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_cairo_surface_full_out + + cairo_surface_t** + surface + + + + + regress_test_cairo_surface_full_out + + +void regress_test_cairo_surface_full_out (cairo_surface_t** surface); + + + + + + + + +
+

surface :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page new file mode 100644 index 00000000..0b15ce02 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page @@ -0,0 +1,38 @@ + + + + + + + + cairo_surface_t* + + regress_test_cairo_surface_full_return + + + + regress_test_cairo_surface_full_return + + +cairo_surface_t* regress_test_cairo_surface_full_return (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page new file mode 100644 index 00000000..a1903ce2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_cairo_surface_none_in + + cairo_surface_t* + surface + + + + + regress_test_cairo_surface_none_in + + +void regress_test_cairo_surface_none_in (cairo_surface_t* surface); + + + + + + + + +
+

surface :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page new file mode 100644 index 00000000..e99ecb4b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page @@ -0,0 +1,38 @@ + + + + + + + + cairo_surface_t* + + regress_test_cairo_surface_none_return + + + + regress_test_cairo_surface_none_return + + +cairo_surface_t* regress_test_cairo_surface_none_return (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page new file mode 100644 index 00000000..99a668ef --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page @@ -0,0 +1,44 @@ + + + + + + + + int + + regress_test_callback + + RegressTestCallback + callback + + + + + regress_test_callback + + +int regress_test_callback (RegressTestCallback callback); + + + + + + + + +
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page new file mode 100644 index 00000000..f2891eda --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_test_callback_async + + RegressTestCallbackUserData + callback + + + gpointer + user_data + + + + + regress_test_callback_async + + +void regress_test_callback_async (RegressTestCallbackUserData callback, + gpointer user_data); + + + + + + + + +
+

callback :

+
+

user_data :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page new file mode 100644 index 00000000..6a365139 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page @@ -0,0 +1,59 @@ + + + + + + + + int + + regress_test_callback_destroy_notify + + RegressTestCallbackUserData + callback + + + gpointer + user_data + + + GDestroyNotify + notify + + + + + regress_test_callback_destroy_notify + + +int regress_test_callback_destroy_notify (RegressTestCallbackUserData callback, + gpointer user_data, + GDestroyNotify notify); + + + +

Notified - callback persists until a DestroyNotify delegate +is invoked.

+ + + + +
+

callback :

+
+

user_data :

+
+

notify :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page new file mode 100644 index 00000000..148fc315 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page @@ -0,0 +1,52 @@ + + + + + + + + int + + regress_test_callback_destroy_notify_no_user_data + + RegressTestCallbackUserData + callback + + + GDestroyNotify + notify + + + + + regress_test_callback_destroy_notify_no_user_data + + +int regress_test_callback_destroy_notify_no_user_data (RegressTestCallbackUserData callback, + GDestroyNotify notify); + + + +

Adds a scope notified callback with no user data. This can invoke an error +condition in bindings which needs to be tested.

+ + + + +
+

callback :

+
+

notify :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page new file mode 100644 index 00000000..a666a332 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page @@ -0,0 +1,38 @@ + + + + + + + + int + + regress_test_callback_thaw_async + + + + regress_test_callback_thaw_async + + +int regress_test_callback_thaw_async (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page new file mode 100644 index 00000000..0a4ce3d0 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page @@ -0,0 +1,40 @@ + + + + + + + + int + + regress_test_callback_thaw_notifications + + + + regress_test_callback_thaw_notifications + + +int regress_test_callback_thaw_notifications (void); + + + +

Invokes all callbacks installed by #test_callback_destroy_notify(), +adding up their return values, and removes them, invoking the +corresponding destroy notfications.

+ + + + +
+

Returns :

+

Sum of the return values of the invoked callbacks.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page new file mode 100644 index 00000000..f577a5eb --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page @@ -0,0 +1,52 @@ + + + + + + + + int + + regress_test_callback_user_data + + RegressTestCallbackUserData + callback + + + gpointer + user_data + + + + + regress_test_callback_user_data + + +int regress_test_callback_user_data (RegressTestCallbackUserData callback, + gpointer user_data); + + + +

Call - callback parameter persists for the duration of the method +call and can be released on return.

+ + + + +
+

callback :

+
+

user_data :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page new file mode 100644 index 00000000..41b5d509 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page @@ -0,0 +1,44 @@ + + + + + + + + int + + regress_test_closure + + GClosure* + closure + + + + + regress_test_closure + + +int regress_test_closure (GClosure* closure); + + + + + + + + +
+

closure :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page new file mode 100644 index 00000000..971f21e2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page @@ -0,0 +1,51 @@ + + + + + + + + int + + regress_test_closure_one_arg + + GClosure* + closure + + + int + arg + + + + + regress_test_closure_one_arg + + +int regress_test_closure_one_arg (GClosure* closure, + int arg); + + + + + + + + +
+

closure :

+
+

arg :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page new file mode 100644 index 00000000..1f5a56a6 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page @@ -0,0 +1,51 @@ + + + + + + + + GVariant* + + regress_test_closure_variant + + GClosure* + closure + + + GVariant* + arg + + + + + regress_test_closure_variant + + +GVariant* regress_test_closure_variant (GClosure* closure, + GVariant* arg); + + + + + + + + +
+

closure :

+

GClosure which takes one GVariant and returns a GVariant

+

arg :

+

a GVariant passed as argument to closure

+

Returns :

+

the return value of closure

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page new file mode 100644 index 00000000..e606febe --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page @@ -0,0 +1,38 @@ + + + + + + + + GValue* + + regress_test_date_in_gvalue + + + + regress_test_date_in_gvalue + + +GValue* regress_test_date_in_gvalue (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page new file mode 100644 index 00000000..1fb55bed --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page @@ -0,0 +1,38 @@ + + + + + + + + GQuark + + regress_test_def_error_quark + + + + regress_test_def_error_quark + + +GQuark regress_test_def_error_quark (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page new file mode 100644 index 00000000..7384ecd6 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page @@ -0,0 +1,44 @@ + + + + + + + + gdouble + + regress_test_double + + gdouble + in + + + + + regress_test_double + + +gdouble regress_test_double (gdouble in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page new file mode 100644 index 00000000..e490ac3e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page @@ -0,0 +1,38 @@ + + + + + + + + GSList* + + regress_test_filename_return + + + + regress_test_filename_return + + +GSList* regress_test_filename_return (void); + + + + + + + + +
+

Returns :

+

list of strings

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page new file mode 100644 index 00000000..f50930da --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page @@ -0,0 +1,44 @@ + + + + + + + + gfloat + + regress_test_float + + gfloat + in + + + + + regress_test_float + + +gfloat regress_test_float (gfloat in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page new file mode 100644 index 00000000..23639759 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page @@ -0,0 +1,38 @@ + + + + + + + + utf8* + + regress_test_garray_container_return + + + + regress_test_garray_container_return + + +GPtrArray* regress_test_garray_container_return (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page new file mode 100644 index 00000000..a433bfaa --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page @@ -0,0 +1,38 @@ + + + + + + + + utf8* + + regress_test_garray_full_return + + + + regress_test_garray_full_return + + +GPtrArray* regress_test_garray_full_return (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page new file mode 100644 index 00000000..4aa5615e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_gerror_callback + + RegressTestCallbackGError + callback + + + + + regress_test_gerror_callback + + +void regress_test_gerror_callback (RegressTestCallbackGError callback); + + + + + + + + +
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page new file mode 100644 index 00000000..fd291224 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page @@ -0,0 +1,38 @@ + + + + + + + + GHashTable* + + regress_test_ghash_container_return + + + + regress_test_ghash_container_return + + +GHashTable* regress_test_ghash_container_return (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page new file mode 100644 index 00000000..4ad5cb53 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page @@ -0,0 +1,38 @@ + + + + + + + + GHashTable* + + regress_test_ghash_everything_return + + + + regress_test_ghash_everything_return + + +GHashTable* regress_test_ghash_everything_return (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page new file mode 100644 index 00000000..8708d8d1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_ghash_gvalue_in + + GHashTable* + hash + + + + + regress_test_ghash_gvalue_in + + +void regress_test_ghash_gvalue_in (GHashTable* hash); + + + + + + + + +
+

hash :

+

the hash table returned by .

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page new file mode 100644 index 00000000..98682591 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page @@ -0,0 +1,38 @@ + + + + + + + + GHashTable* + + regress_test_ghash_gvalue_return + + + + regress_test_ghash_gvalue_return + + +GHashTable* regress_test_ghash_gvalue_return (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page new file mode 100644 index 00000000..8af4cbd7 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page @@ -0,0 +1,38 @@ + + + + + + + + GHashTable* + + regress_test_ghash_nested_everything_return + + + + regress_test_ghash_nested_everything_return + + +GHashTable* regress_test_ghash_nested_everything_return (void); + + + +

Specify nested parameterized types directly with the (type ) annotation.

+ + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page new file mode 100644 index 00000000..8612e665 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page @@ -0,0 +1,39 @@ + + + + + + + + GHashTable* + + regress_test_ghash_nested_everything_return2 + + + + regress_test_ghash_nested_everything_return2 + + +GHashTable* regress_test_ghash_nested_everything_return2 (void); + + + +

Another way of specifying nested parameterized types: using the +element-type annotation.

+ + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page new file mode 100644 index 00000000..8a21bbf2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_ghash_nothing_in + + const GHashTable* + in + + + + + regress_test_ghash_nothing_in + + +void regress_test_ghash_nothing_in (const GHashTable* in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page new file mode 100644 index 00000000..83f5c6e1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_ghash_nothing_in2 + + GHashTable* + in + + + + + regress_test_ghash_nothing_in2 + + +void regress_test_ghash_nothing_in2 (GHashTable* in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page new file mode 100644 index 00000000..a0af756d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page @@ -0,0 +1,38 @@ + + + + + + + + const GHashTable* + + regress_test_ghash_nothing_return + + + + regress_test_ghash_nothing_return + + +const GHashTable* regress_test_ghash_nothing_return (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page new file mode 100644 index 00000000..8a5c7b35 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page @@ -0,0 +1,38 @@ + + + + + + + + GHashTable* + + regress_test_ghash_nothing_return2 + + + + regress_test_ghash_nothing_return2 + + +GHashTable* regress_test_ghash_nothing_return2 (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page new file mode 100644 index 00000000..fa7c04e9 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_ghash_null_in + + const GHashTable* + in + + + + + regress_test_ghash_null_in + + +void regress_test_ghash_null_in (const GHashTable* in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page new file mode 100644 index 00000000..666fdf0c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_ghash_null_out + + const GHashTable** + out + + + + + regress_test_ghash_null_out + + +void regress_test_ghash_null_out (const GHashTable** out); + + + + + + + + +
+

out :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page new file mode 100644 index 00000000..d5c91540 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page @@ -0,0 +1,38 @@ + + + + + + + + const GHashTable* + + regress_test_ghash_null_return + + + + regress_test_ghash_null_return + + +const GHashTable* regress_test_ghash_null_return (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page new file mode 100644 index 00000000..053fbd81 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page @@ -0,0 +1,38 @@ + + + + + + + + GList* + + regress_test_glist_container_return + + + + regress_test_glist_container_return + + +GList* regress_test_glist_container_return (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page new file mode 100644 index 00000000..05efc259 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page @@ -0,0 +1,38 @@ + + + + + + + + GList* + + regress_test_glist_everything_return + + + + regress_test_glist_everything_return + + +GList* regress_test_glist_everything_return (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page new file mode 100644 index 00000000..cab2d96f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_glist_nothing_in + + const GList* + in + + + + + regress_test_glist_nothing_in + + +void regress_test_glist_nothing_in (const GList* in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page new file mode 100644 index 00000000..ec306580 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_glist_nothing_in2 + + GList* + in + + + + + regress_test_glist_nothing_in2 + + +void regress_test_glist_nothing_in2 (GList* in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page new file mode 100644 index 00000000..a5d436fe --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page @@ -0,0 +1,38 @@ + + + + + + + + const GList* + + regress_test_glist_nothing_return + + + + regress_test_glist_nothing_return + + +const GList* regress_test_glist_nothing_return (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page new file mode 100644 index 00000000..1af8f86f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page @@ -0,0 +1,38 @@ + + + + + + + + GList* + + regress_test_glist_nothing_return2 + + + + regress_test_glist_nothing_return2 + + +GList* regress_test_glist_nothing_return2 (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page new file mode 100644 index 00000000..c691426c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_glist_null_in + + GSList* + in + + + + + regress_test_glist_null_in + + +void regress_test_glist_null_in (GSList* in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page new file mode 100644 index 00000000..11ae56f7 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_glist_null_out + + GSList** + out_list + + + + + regress_test_glist_null_out + + +void regress_test_glist_null_out (GSList** out_list); + + + + + + + + +
+

out_list :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page new file mode 100644 index 00000000..3f238141 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page @@ -0,0 +1,38 @@ + + + + + + + + GSList* + + regress_test_gslist_container_return + + + + regress_test_gslist_container_return + + +GSList* regress_test_gslist_container_return (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page new file mode 100644 index 00000000..8f9319ce --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page @@ -0,0 +1,38 @@ + + + + + + + + GSList* + + regress_test_gslist_everything_return + + + + regress_test_gslist_everything_return + + +GSList* regress_test_gslist_everything_return (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page new file mode 100644 index 00000000..22b3230b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_gslist_nothing_in + + const GSList* + in + + + + + regress_test_gslist_nothing_in + + +void regress_test_gslist_nothing_in (const GSList* in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page new file mode 100644 index 00000000..f4f3bfc2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_gslist_nothing_in2 + + GSList* + in + + + + + regress_test_gslist_nothing_in2 + + +void regress_test_gslist_nothing_in2 (GSList* in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page new file mode 100644 index 00000000..8c68039a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page @@ -0,0 +1,38 @@ + + + + + + + + const GSList* + + regress_test_gslist_nothing_return + + + + regress_test_gslist_nothing_return + + +const GSList* regress_test_gslist_nothing_return (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page new file mode 100644 index 00000000..38abfcf0 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page @@ -0,0 +1,38 @@ + + + + + + + + GSList* + + regress_test_gslist_nothing_return2 + + + + regress_test_gslist_nothing_return2 + + +GSList* regress_test_gslist_nothing_return2 (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page new file mode 100644 index 00000000..00bd6702 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_gslist_null_in + + GSList* + in + + + + + regress_test_gslist_null_in + + +void regress_test_gslist_null_in (GSList* in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page new file mode 100644 index 00000000..efa4df62 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_gslist_null_out + + GSList** + out_list + + + + + regress_test_gslist_null_out + + +void regress_test_gslist_null_out (GSList** out_list); + + + + + + + + +
+

out_list :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page new file mode 100644 index 00000000..c99a531a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page @@ -0,0 +1,44 @@ + + + + + + + + GType + + regress_test_gtype + + GType + in + + + + + regress_test_gtype + + +GType regress_test_gtype (GType in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page new file mode 100644 index 00000000..f884014f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page @@ -0,0 +1,38 @@ + + + + + + + + GVariant* + + regress_test_gvariant_as + + + + regress_test_gvariant_as + + +GVariant* regress_test_gvariant_as (void); + + + + + + + + +
+

Returns :

+

New variant

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page new file mode 100644 index 00000000..c39a003c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page @@ -0,0 +1,38 @@ + + + + + + + + GVariant* + + regress_test_gvariant_asv + + + + regress_test_gvariant_asv + + +GVariant* regress_test_gvariant_asv (void); + + + + + + + + +
+

Returns :

+

New variant

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page new file mode 100644 index 00000000..58f1b970 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page @@ -0,0 +1,38 @@ + + + + + + + + GVariant* + + regress_test_gvariant_i + + + + regress_test_gvariant_i + + +GVariant* regress_test_gvariant_i (void); + + + + + + + + +
+

Returns :

+

New variant

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page new file mode 100644 index 00000000..051a307c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page @@ -0,0 +1,38 @@ + + + + + + + + GVariant* + + regress_test_gvariant_s + + + + regress_test_gvariant_s + + +GVariant* regress_test_gvariant_s (void); + + + + + + + + +
+

Returns :

+

New variant

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page new file mode 100644 index 00000000..f1e8f7bd --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page @@ -0,0 +1,38 @@ + + + + + + + + GVariant* + + regress_test_gvariant_v + + + + regress_test_gvariant_v + + +GVariant* regress_test_gvariant_v (void); + + + + + + + + +
+

Returns :

+

New variant

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page new file mode 100644 index 00000000..abbdbbb8 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_test_hash_table_callback + + GHashTable* + data + + + RegressTestCallbackHashtable + callback + + + + + regress_test_hash_table_callback + + +void regress_test_hash_table_callback (GHashTable* data, + RegressTestCallbackHashtable callback); + + + + + + + + +
+

data :

+

GHashTable that gets passed to callback

+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page new file mode 100644 index 00000000..2e271a52 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page @@ -0,0 +1,44 @@ + + + + + + + + gint + + regress_test_int + + gint + in + + + + + regress_test_int + + +gint regress_test_int (gint in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page new file mode 100644 index 00000000..6ee0059c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page @@ -0,0 +1,44 @@ + + + + + + + + gint16 + + regress_test_int16 + + gint16 + in + + + + + regress_test_int16 + + +gint16 regress_test_int16 (gint16 in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page new file mode 100644 index 00000000..58ef340f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page @@ -0,0 +1,44 @@ + + + + + + + + gint32 + + regress_test_int32 + + gint32 + in + + + + + regress_test_int32 + + +gint32 regress_test_int32 (gint32 in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page new file mode 100644 index 00000000..bfe12d60 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page @@ -0,0 +1,44 @@ + + + + + + + + gint64 + + regress_test_int64 + + gint64 + in + + + + + regress_test_int64 + + +gint64 regress_test_int64 (gint64 in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page new file mode 100644 index 00000000..0b4b43ab --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page @@ -0,0 +1,44 @@ + + + + + + + + gint8 + + regress_test_int8 + + gint8 + in + + + + + regress_test_int8 + + +gint8 regress_test_int8 (gint8 in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page new file mode 100644 index 00000000..ae8ecfcd --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_test_int_out_utf8 + + int* + length + + + const char* + in + + + + + regress_test_int_out_utf8 + + +void regress_test_int_out_utf8 (int* length, + const char* in); + + + + + + + + +
+

length :

+
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page new file mode 100644 index 00000000..4fb211e0 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page @@ -0,0 +1,44 @@ + + + + + + + + int + + regress_test_int_value_arg + + const GValue* + v + + + + + regress_test_int_value_arg + + +int regress_test_int_value_arg (const GValue* v); + + + + + + + + +
+

v :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page new file mode 100644 index 00000000..638f066f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page @@ -0,0 +1,44 @@ + + + + + + + + glong + + regress_test_long + + glong + in + + + + + regress_test_long + + +glong regress_test_long (glong in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page new file mode 100644 index 00000000..b0b16c5e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page @@ -0,0 +1,44 @@ + + + + + + + + int + + regress_test_multi_callback + + RegressTestCallback + callback + + + + + regress_test_multi_callback + + +int regress_test_multi_callback (RegressTestCallback callback); + + + + + + + + +
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page new file mode 100644 index 00000000..5dc68cb0 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page @@ -0,0 +1,58 @@ + + + + + + + + void + + regress_test_multi_double_args + + gdouble + in + + + gdouble* + one + + + gdouble* + two + + + + + regress_test_multi_double_args + + +void regress_test_multi_double_args (gdouble in, + gdouble* one, + gdouble* two); + + + + + + + + +
+

in :

+
+

one :

+
+

two :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page new file mode 100644 index 00000000..439f66a7 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_multiline_doc_comments + + + + regress_test_multiline_doc_comments + + +void regress_test_multiline_doc_comments (void); + + + +

This is a function.

It has multiple lines in the documentation.

The sky is blue.

You will give me your credit card number.

+ + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page new file mode 100644 index 00000000..30d6e07a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page @@ -0,0 +1,69 @@ + + + + + + + + void + + regress_test_nested_parameter + + int + a + + + + + regress_test_nested_parameter + + +void regress_test_nested_parameter (int a); + + + +

<informaltable> + <tgroup cols="3"> + <thead> + <row> + <entry>Syntax</entry> + <entry>Explanation</entry> + <entry>Examples</entry> + </row> + </thead> + <tbody> + <row> + <entry>rgb(@r, @g, @b)</entry> + <entry>An opaque color; @r, @g, @b can be either integers between + 0 and 255 or percentages</entry> + <entry><literallayout>rgb(128, 10, 54) +rgb(20%, 30%, 0%)</literallayout></entry> + </row> + <row> + <entry>rgba(@r, @g, @b, a)</entry> + <entry>A translucent color; @r, @g, @b are as in the previous row, + a is a floating point number between 0 and 1</entry> + <entry><literallayout>rgba(255, 255, 0, 0.5)</literallayout></entry> + </row> + </tbody> + </tgroup> +</informaltable>

What we're testing here is that the scanner ignores the a nested inside XML.

+ + + + +
+

a :

+

An integer

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page new file mode 100644 index 00000000..995b82b5 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_null_gerror_callback + + RegressTestCallbackGError + callback + + + + + regress_test_null_gerror_callback + + +void regress_test_null_gerror_callback (RegressTestCallbackGError callback); + + + + + + + + +
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page new file mode 100644 index 00000000..0bb38c93 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_owned_gerror_callback + + RegressTestCallbackOwnedGError + callback + + + + + regress_test_owned_gerror_callback + + +void regress_test_owned_gerror_callback (RegressTestCallbackOwnedGError callback); + + + + + + + + +
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page new file mode 100644 index 00000000..135cd706 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page @@ -0,0 +1,44 @@ + + + + + + + + gshort + + regress_test_short + + gshort + in + + + + + regress_test_short + + +gshort regress_test_short (gshort in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page new file mode 100644 index 00000000..8e844050 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_simple_callback + + RegressTestSimpleCallback + callback + + + + + regress_test_simple_callback + + +void regress_test_simple_callback (RegressTestSimpleCallback callback); + + + + + + + + +
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page new file mode 100644 index 00000000..cf24fbe9 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page @@ -0,0 +1,44 @@ + + + + + + + + gsize + + regress_test_size + + gsize + in + + + + + regress_test_size + + +gsize regress_test_size (gsize in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page new file mode 100644 index 00000000..9764aa94 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page @@ -0,0 +1,45 @@ + + + + + + + + void + + regress_test_skip_unannotated_callback + + RegressTestCallback + callback + + + + + regress_test_skip_unannotated_callback + + +void regress_test_skip_unannotated_callback (RegressTestCallback callback); + + + +

Should not emit a warning: +https://bugzilla.gnome.org/show_bug.cgi?id=685399

+ + + + +
+

callback :

+

No annotation here

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page new file mode 100644 index 00000000..232f21dd --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page @@ -0,0 +1,44 @@ + + + + + + + + gssize + + regress_test_ssize + + gssize + in + + + + + regress_test_ssize + + +gssize regress_test_ssize (gssize in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page new file mode 100644 index 00000000..c1d6ce40 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page @@ -0,0 +1,44 @@ + + + + + + + + gboolean + + regress_test_strv_in + + char** + arr + + + + + regress_test_strv_in + + +gboolean regress_test_strv_in (char** arr); + + + + + + + + +
+

arr :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page new file mode 100644 index 00000000..0609b669 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page @@ -0,0 +1,38 @@ + + + + + + + + GValue* + + regress_test_strv_in_gvalue + + + + regress_test_strv_in_gvalue + + +GValue* regress_test_strv_in_gvalue (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page new file mode 100644 index 00000000..dba053f4 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page @@ -0,0 +1,38 @@ + + + + + + + + utf8* + + regress_test_strv_out + + + + regress_test_strv_out + + +char** regress_test_strv_out (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page new file mode 100644 index 00000000..01e1c371 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page @@ -0,0 +1,38 @@ + + + + + + + + utf8* + + regress_test_strv_out_c + + + + regress_test_strv_out_c + + +const char* const* regress_test_strv_out_c (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page new file mode 100644 index 00000000..71b89c37 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page @@ -0,0 +1,38 @@ + + + + + + + + utf8* + + regress_test_strv_out_container + + + + regress_test_strv_out_container + + +char** regress_test_strv_out_container (void); + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page new file mode 100644 index 00000000..aea2dace --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_strv_outarg + + char*** + retp + + + + + regress_test_strv_outarg + + +void regress_test_strv_outarg (char*** retp); + + + + + + + + +
+

retp :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page new file mode 100644 index 00000000..2c31dccc --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page @@ -0,0 +1,44 @@ + + + + + + + + time_t + + regress_test_timet + + time_t + in + + + + + regress_test_timet + + +time_t regress_test_timet (time_t in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page new file mode 100644 index 00000000..bcdbd35b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page @@ -0,0 +1,79 @@ + + + + + + + + void + + regress_test_torture_signature_0 + + int + x + + + double* + y + + + int* + z + + + const char* + foo + + + int* + q + + + guint + m + + + + + regress_test_torture_signature_0 + + +void regress_test_torture_signature_0 (int x, + double* y, + int* z, + const char* foo, + int* q, + guint m); + + + + + + + + +
+

x :

+
+

y :

+
+

z :

+
+

foo :

+
+

q :

+
+

m :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page new file mode 100644 index 00000000..af54f3f6 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page @@ -0,0 +1,79 @@ + + + + + + + + gboolean + + regress_test_torture_signature_1 + + int + x + + + double* + y + + + int* + z + + + const char* + foo + + + int* + q + + + guint + m + + + + + regress_test_torture_signature_1 + + +gboolean regress_test_torture_signature_1 (int x, + double* y, + int* z, + const char* foo, + int* q, + guint m); + + + +

This function throws an error if m is odd.

+ + + + +
+

x :

+
+

y :

+
+

z :

+
+

foo :

+
+

q :

+
+

m :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page new file mode 100644 index 00000000..145c44f3 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page @@ -0,0 +1,100 @@ + + + + + + + + void + + regress_test_torture_signature_2 + + int + x + + + RegressTestCallbackUserData + callback + + + gpointer + user_data + + + GDestroyNotify + notify + + + double* + y + + + int* + z + + + const char* + foo + + + int* + q + + + guint + m + + + + + regress_test_torture_signature_2 + + +void regress_test_torture_signature_2 (int x, + RegressTestCallbackUserData callback, + gpointer user_data, + GDestroyNotify notify, + double* y, + int* z, + const char* foo, + int* q, + guint m); + + + + + + + + +
+

x :

+
+

callback :

+
+

user_data :

+
+

notify :

+
+

y :

+
+

z :

+
+

foo :

+
+

q :

+
+

m :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page new file mode 100644 index 00000000..aeed54f2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page @@ -0,0 +1,44 @@ + + + + + + + + guint + + regress_test_uint + + guint + in + + + + + regress_test_uint + + +guint regress_test_uint (guint in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page new file mode 100644 index 00000000..280a15f5 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page @@ -0,0 +1,44 @@ + + + + + + + + guint16 + + regress_test_uint16 + + guint16 + in + + + + + regress_test_uint16 + + +guint16 regress_test_uint16 (guint16 in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page new file mode 100644 index 00000000..dd0ef86f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page @@ -0,0 +1,44 @@ + + + + + + + + guint32 + + regress_test_uint32 + + guint32 + in + + + + + regress_test_uint32 + + +guint32 regress_test_uint32 (guint32 in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page new file mode 100644 index 00000000..b4a8d643 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page @@ -0,0 +1,44 @@ + + + + + + + + guint64 + + regress_test_uint64 + + guint64 + in + + + + + regress_test_uint64 + + +guint64 regress_test_uint64 (guint64 in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page new file mode 100644 index 00000000..f482eb7f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page @@ -0,0 +1,44 @@ + + + + + + + + guint8 + + regress_test_uint8 + + guint8 + in + + + + + regress_test_uint8 + + +guint8 regress_test_uint8 (guint8 in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page new file mode 100644 index 00000000..479ebe0b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page @@ -0,0 +1,44 @@ + + + + + + + + gulong + + regress_test_ulong + + gulong + in + + + + + regress_test_ulong + + +gulong regress_test_ulong (gulong in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page new file mode 100644 index 00000000..ecafbe69 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page @@ -0,0 +1,44 @@ + + + + + + + + gunichar + + regress_test_unichar + + gunichar + in + + + + + regress_test_unichar + + +gunichar regress_test_unichar (gunichar in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page new file mode 100644 index 00000000..e5d5cb2a --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page @@ -0,0 +1,44 @@ + + + + + + + + const gchar* + + regress_test_unsigned_enum_param + + RegressTestEnumUnsigned + e + + + + + regress_test_unsigned_enum_param + + +const gchar* regress_test_unsigned_enum_param (RegressTestEnumUnsigned e); + + + + + + + + +
+

e :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page new file mode 100644 index 00000000..0e04b87d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page @@ -0,0 +1,44 @@ + + + + + + + + gushort + + regress_test_ushort + + gushort + in + + + + + regress_test_ushort + + +gushort regress_test_ushort (gushort in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page new file mode 100644 index 00000000..b4c5090c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_utf8_const_in + + const char* + in + + + + + regress_test_utf8_const_in + + +void regress_test_utf8_const_in (const char* in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page new file mode 100644 index 00000000..77ef0826 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page @@ -0,0 +1,38 @@ + + + + + + + + const char* + + regress_test_utf8_const_return + + + + regress_test_utf8_const_return + + +const char* regress_test_utf8_const_return (void); + + + + + + + + +
+

Returns :

+

UTF-8 string

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page new file mode 100644 index 00000000..259e2323 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_utf8_inout + + char** + inout + + + + + regress_test_utf8_inout + + +void regress_test_utf8_inout (char** inout); + + + + + + + + +
+

inout :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page new file mode 100644 index 00000000..3b1ae5d1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page @@ -0,0 +1,38 @@ + + + + + + + + char* + + regress_test_utf8_nonconst_return + + + + regress_test_utf8_nonconst_return + + +char* regress_test_utf8_nonconst_return (void); + + + + + + + + +
+

Returns :

+

UTF-8 string

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page new file mode 100644 index 00000000..a864ae1d --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_utf8_null_in + + char* + in + + + + + regress_test_utf8_null_in + + +void regress_test_utf8_null_in (char* in); + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page new file mode 100644 index 00000000..ffd3147c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_utf8_null_out + + char** + char_out + + + + + regress_test_utf8_null_out + + +void regress_test_utf8_null_out (char** char_out); + + + + + + + + +
+

char_out :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page new file mode 100644 index 00000000..d2743eaf --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_utf8_out + + char** + out + + + + + regress_test_utf8_out + + +void regress_test_utf8_out (char** out); + + + + + + + + +
+

out :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page new file mode 100644 index 00000000..f8356aff --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page @@ -0,0 +1,44 @@ + + + + + + + + char* + + regress_test_utf8_out_nonconst_return + + char** + out + + + + + regress_test_utf8_out_nonconst_return + + +char* regress_test_utf8_out_nonconst_return (char** out); + + + + + + + + +
+

out :

+

a copy of "second"

+

Returns :

+

a copy of "first"

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page new file mode 100644 index 00000000..87ce92f8 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_test_utf8_out_out + + char** + out0 + + + char** + out1 + + + + + regress_test_utf8_out_out + + +void regress_test_utf8_out_out (char** out0, + char** out1); + + + + + + + + +
+

out0 :

+

a copy of "first"

+

out1 :

+

a copy of "second"

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page new file mode 100644 index 00000000..ec758d86 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page @@ -0,0 +1,44 @@ + + + + + + + + RegressTestFundamentalObject* + + regress_test_value_get_fundamental_object + + const GValue* + value + + + + + regress_test_value_get_fundamental_object + + +RegressTestFundamentalObject* regress_test_value_get_fundamental_object (const GValue* value); + + + + + + + + +
+

value :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page new file mode 100644 index 00000000..bcdbed57 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page @@ -0,0 +1,44 @@ + + + + + + + + const GValue* + + regress_test_value_return + + int + i + + + + + regress_test_value_return + + +const GValue* regress_test_value_return (int i); + + + + + + + + +
+

i :

+

an int

+

Returns :

+

the int wrapped in a GValue.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page new file mode 100644 index 00000000..101443ed --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_test_value_set_fundamental_object + + GValue* + value + + + RegressTestFundamentalObject* + fundamental_object + + + + + regress_test_value_set_fundamental_object + + +void regress_test_value_set_fundamental_object (GValue* value, + RegressTestFundamentalObject* fundamental_object); + + + + + + + + +
+

value :

+
+

fundamental_object :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page new file mode 100644 index 00000000..d426f0a4 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page @@ -0,0 +1,39 @@ + + + + + + + + void + + regress_test_versioning + + + + regress_test_versioning + + +void regress_test_versioning (void); + + + + + + +

Since 1.32.1

+ + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-C-expected/index.page b/tests/scanner/Regress-1.0-C-expected/index.page new file mode 100644 index 00000000..1d89dedd --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/index.page @@ -0,0 +1,33 @@ + + + + + + + + Index + + + + + + + + + + + Classes + + + Functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page new file mode 100644 index 00000000..ebe71b0d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.ANNOTATION_CALCULATED_DEFINE + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE.page new file mode 100644 index 00000000..4b38cc01 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE.page @@ -0,0 +1,26 @@ + + + + + + + + Regress.ANNOTATION_CALCULATED_LARGE + + + +

Constant to define a calculated large value

+ + +

Since 1.4

+ + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page new file mode 100644 index 00000000..d6c8e76a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.ANNOTATION_CALCULATED_LARGE_DIV + + + +

Constant to define a calculated large value

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page new file mode 100644 index 00000000..dff139fd --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.ATestError + + + + + + + + +
+

ATestError.CODE0 :

+
+

ATestError.CODE1 :

+
+

ATestError.CODE2 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AliasedTestBoxed.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AliasedTestBoxed.page new file mode 100644 index 00000000..2229245a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AliasedTestBoxed.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.AliasedTestBoxed + + + +

Typedef TestBoxed to test caller-allocates correctness

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page new file mode 100644 index 00000000..8cbc8326 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.AnnotationBitfield + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page new file mode 100644 index 00000000..30f950c2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.AnnotationCallback + + + +

This is a callback.

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationForeachFunc.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationForeachFunc.page new file mode 100644 index 00000000..506ceffd --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationForeachFunc.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.AnnotationForeachFunc + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page new file mode 100644 index 00000000..3f9409ed --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.AnnotationListCallback + + + +

This is a callback taking a list.

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationNotifyFunc.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationNotifyFunc.page new file mode 100644 index 00000000..b2dc717c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationNotifyFunc.page @@ -0,0 +1,26 @@ + + + + + + + + Regress.AnnotationNotifyFunc + + + +

This is a callback with a 'closure' argument that is not named +'user_data' and hence has to be annotated.

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page new file mode 100644 index 00000000..73f9cde8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page @@ -0,0 +1,43 @@ + + + + + + attribute-signal + + + Regress.AnnotationObject::attribute-signal + + +function callback(annotation_object, arg1:String, arg2:String, user_param1, ...):String; + + + +

This signal tests a signal with attributes.

+ + + + +
+

annotation_object :

+

instance of Regress.AnnotationObject that is emitting the signal

+

arg1 :

+

a value

+

arg2 :

+

another value

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+

Returns :

+
gchar*

the return value

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page new file mode 100644 index 00000000..178ce23c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page @@ -0,0 +1,39 @@ + + + + + + doc-empty-arg-parsing + + + Regress.AnnotationObject::doc-empty-arg-parsing + + +function callback(annotation_object, arg1:gpointer, user_param1, ...):void; + + + +

This signal tests an empty document argument (arg1)

+ + + + +
+

annotation_object :

+

instance of Regress.AnnotationObject that is emitting the signal

+

arg1 :

+
+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-function-property.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-function-property.page new file mode 100644 index 00000000..f526ea9b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-function-property.page @@ -0,0 +1,29 @@ + + + + + + function-property + + + Regress.AnnotationObject:function-property + + +"function-property" Regress.AnnotationCallback : Read / Write / Construct + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page new file mode 100644 index 00000000..35d0edd1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page @@ -0,0 +1,40 @@ + + + + + + list-signal + + + Regress.AnnotationObject::list-signal + + +function callback(annotation_object, list:, user_param1, ...):void; + + + +

This is a signal which takes a list of strings, but it's not +known by GObject as it's only marked as G_TYPE_POINTER

+ + + + +
+

annotation_object :

+

instance of Regress.AnnotationObject that is emitting the signal

+

list :

+

a list of strings

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-property.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-property.page new file mode 100644 index 00000000..b570a59c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-property.page @@ -0,0 +1,30 @@ + + + + + + string-property + + + Regress.AnnotationObject:string-property + + +"string-property" String : Read / Write / Construct + + + +

This is a property which is a string

+ + +

Since 1.0

+ + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page new file mode 100644 index 00000000..d8e9f6a8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page @@ -0,0 +1,41 @@ + + + + + + string-signal + + + Regress.AnnotationObject::string-signal + + +function callback(annotation_object, string:String, user_param1, ...):void; + + + +

This is a signal which has a broken signal handler, +it says it's pointer but it's actually a string.

+ + +

Since 1.0

+ + +
+

annotation_object :

+

instance of Regress.AnnotationObject that is emitting the signal

+

string :

+

a string

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page new file mode 100644 index 00000000..e52a728f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page @@ -0,0 +1,31 @@ + + + + + + tab-property + + + Regress.AnnotationObject:tab-property + + +"tab-property" String : Read / Write / Construct + + + +

This is a property regress_annotation intentionally indented with a mix +of tabs and strings to test the tab handling capabilities of the scanner.

+ + +

Since 1.2

+ + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page new file mode 100644 index 00000000..c54f0c3e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page @@ -0,0 +1,46 @@ + + + + + + + + GObject.Object + + regress_annotation_object_allow_none + + String + somearg + + + + + AnnotationObject.prototype.allow_none + + +function allow_none(somearg:String):GObject.Object { + // Gjs wrapper for regress_annotation_object_allow_none() +} + + + + + + + + +
+

somearg :

+
+

Returns :

+

null always

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page new file mode 100644 index 00000000..a11fd19c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page @@ -0,0 +1,40 @@ + + + + + + + + Number + + regress_annotation_object_calleeowns + + + + AnnotationObject.prototype.calleeowns + + +function calleeowns():Number { + // Gjs wrapper for regress_annotation_object_calleeowns() +} + + + +

This is a test for out arguments; GObject defaults to transfer

+ + + + +
+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page new file mode 100644 index 00000000..df95d103 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page @@ -0,0 +1,40 @@ + + + + + + + + Number + + regress_annotation_object_calleesowns + + + + AnnotationObject.prototype.calleesowns + + +function calleesowns():Number { + // Gjs wrapper for regress_annotation_object_calleesowns() +} + + + +

This is a test for out arguments, one transferred, other not

+ + + + +
+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page new file mode 100644 index 00000000..5f930137 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_object_compute_sum + + [Number] + nums + + + + + AnnotationObject.prototype.compute_sum + + +function compute_sum(nums:[Number]):void { + // Gjs wrapper for regress_annotation_object_compute_sum() +} + + + +

Test taking a zero-terminated array

+ + + + +
+

nums :

+

Sequence of numbers

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page new file mode 100644 index 00000000..24e2a802 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_object_compute_sum_n + + [Number] + nums + + + + + AnnotationObject.prototype.compute_sum_n + + +function compute_sum_n(nums:[Number]):void { + // Gjs wrapper for regress_annotation_object_compute_sum_n() +} + + + +

Test taking an array with length parameter

+ + + + +
+

nums :

+

Sequence of numbers that are zero-terminated

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page new file mode 100644 index 00000000..02c501d9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_object_compute_sum_nz + + [Number] + nums + + + + + AnnotationObject.prototype.compute_sum_nz + + +function compute_sum_nz(nums:[Number]):void { + // Gjs wrapper for regress_annotation_object_compute_sum_nz() +} + + + +

Test taking a zero-terminated array with length parameter

+ + + + +
+

nums :

+

Sequence of numbers that are zero-terminated

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page new file mode 100644 index 00000000..4b2d104f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page @@ -0,0 +1,40 @@ + + + + + + + + GObject.Object + + regress_annotation_object_create_object + + + + AnnotationObject.prototype.create_object + + +function create_object():GObject.Object { + // Gjs wrapper for regress_annotation_object_create_object() +} + + + +

Test returning a caller-owned object

+ + + + +
+

Returns :

+

The object

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page new file mode 100644 index 00000000..87249cf9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page @@ -0,0 +1,40 @@ + + + + + + + + GObject.Object + + regress_annotation_object_do_not_use + + + + AnnotationObject.prototype.do_not_use + + +function do_not_use():GObject.Object { + // Gjs wrapper for regress_annotation_object_do_not_use() +} + + + + + + + + +
+

Returns :

+

null always

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page new file mode 100644 index 00000000..ba06aea4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_annotation_object_extra_annos + + + + AnnotationObject.prototype.extra_annos + + +function extra_annos():void { + // Gjs wrapper for regress_annotation_object_extra_annos() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page new file mode 100644 index 00000000..965297e8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_object_foreach + + Regress.AnnotationForeachFunc + func + + + + + AnnotationObject.prototype.foreach + + +function foreach(func:Regress.AnnotationForeachFunc):void { + // Gjs wrapper for regress_annotation_object_foreach() +} + + + +

Test taking a call-scoped callback

+ + + + +
+

func :

+

Callback to invoke

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page new file mode 100644 index 00000000..dbff0ad3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page @@ -0,0 +1,41 @@ + + + + + + + + {String: GObject.Object} + + regress_annotation_object_get_hash + + + + AnnotationObject.prototype.get_hash + + +function get_hash():{String: GObject.Object} { + // Gjs wrapper for regress_annotation_object_get_hash() +} + + + +

This is a test for returning a hash table mapping strings to +objects.

+ + + + +
+

Returns :

+

hash table

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page new file mode 100644 index 00000000..4db2b5f1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page @@ -0,0 +1,42 @@ + + + + + + + + <list> + + regress_annotation_object_get_objects + + + + AnnotationObject.prototype.get_objects + + +function get_objects(): { + // Gjs wrapper for regress_annotation_object_get_objects() +} + + + +

This is a test for returning a list of objects. +The list itself should be freed, but not the internal objects, +intentionally similar example to gtk_container_get_children

+ + + + +
+

Returns :

+

list of objects

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page new file mode 100644 index 00000000..f12734f1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page @@ -0,0 +1,41 @@ + + + + + + + + <list> + + regress_annotation_object_get_strings + + + + AnnotationObject.prototype.get_strings + + +function get_strings(): { + // Gjs wrapper for regress_annotation_object_get_strings() +} + + + +

This is a test for returning a list of strings, where +each string needs to be freed.

+ + + + +
+

Returns :

+

list of strings

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page new file mode 100644 index 00000000..a59a446f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_annotation_object_hidden_self + + + + AnnotationObject.prototype.hidden_self + + +function hidden_self():void { + // Gjs wrapper for regress_annotation_object_hidden_self() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page new file mode 100644 index 00000000..f9c8caef --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_annotation_object_in + + Number + inarg + + + + + AnnotationObject.prototype.in + + +function in(inarg:Number):Number { + // Gjs wrapper for regress_annotation_object_in() +} + + + +

This is a test for in arguments

+ + + + +
+

inarg :

+

This is an argument test

+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page new file mode 100644 index 00000000..d2064f22 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_annotation_object_inout + + Number + inoutarg + + + + + AnnotationObject.prototype.inout + + +function inout(inoutarg:Number):Number { + // Gjs wrapper for regress_annotation_object_inout() +} + + + +

This is a test for out arguments

+ + + + +
+

inoutarg :

+

This is an argument test

+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page new file mode 100644 index 00000000..a79e4d06 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_annotation_object_inout2 + + Number + inoutarg + + + + + AnnotationObject.prototype.inout2 + + +function inout2(inoutarg:Number):Number { + // Gjs wrapper for regress_annotation_object_inout2() +} + + + +

This is a second test for out arguments

+ + + + +
+

inoutarg :

+

This is an argument test

+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page new file mode 100644 index 00000000..d421cbbb --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_annotation_object_inout3 + + Number + inoutarg + + + + + AnnotationObject.prototype.inout3 + + +function inout3(inoutarg:Number):Number { + // Gjs wrapper for regress_annotation_object_inout3() +} + + + +

This is a 3th test for out arguments

+ + + + +
+

inoutarg :

+

This is an argument test

+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page new file mode 100644 index 00000000..93015f3c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page @@ -0,0 +1,40 @@ + + + + + + + + Number + + regress_annotation_object_method + + + + AnnotationObject.prototype.method + + +function method():Number { + // Gjs wrapper for regress_annotation_object_method() +} + + + + + + + + +
+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page new file mode 100644 index 00000000..94f5173d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page @@ -0,0 +1,40 @@ + + + + + + + + GObject.Object + + regress_annotation_object_notrans + + + + AnnotationObject.prototype.notrans + + +function notrans():GObject.Object { + // Gjs wrapper for regress_annotation_object_notrans() +} + + + + + + + + +
+

Returns :

+

An object, not referenced

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page new file mode 100644 index 00000000..227eacc4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page @@ -0,0 +1,40 @@ + + + + + + + + Number + + regress_annotation_object_out + + + + AnnotationObject.prototype.out + + +function out():Number { + // Gjs wrapper for regress_annotation_object_out() +} + + + +

This is a test for out arguments

+ + + + +
+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page new file mode 100644 index 00000000..8bcae31c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page @@ -0,0 +1,62 @@ + + + + + + + + Regress.AnnotationObject + + +from gi.repository import Regress + +annotation_object = Regress.AnnotationObject(function_property=value, string_property=value, tab_property=value) + + +

This is an object used to test regress_annotations.

+ + + + + + Hierarchy + + + GObject.Object + + Regress.AnnotationObject + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page new file mode 100644 index 00000000..6940eca1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_object_parse_args + + [String] + argv + + + + + AnnotationObject.prototype.parse_args + + +function parse_args(argv:[String]):void { + // Gjs wrapper for regress_annotation_object_parse_args() +} + + + +

Test taking a zero-terminated array with length parameter

+ + + + +
+

argv :

+

Argument vector

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page new file mode 100644 index 00000000..6912c993 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_object_set_data + + [guint8] + data + + + + + AnnotationObject.prototype.set_data + + +function set_data(data:[guint8]):void { + // Gjs wrapper for regress_annotation_object_set_data() +} + + + +

Test taking a guchar * with a length.

+ + + + +
+

data :

+

The data

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page new file mode 100644 index 00000000..68185d5e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_object_set_data2 + + [gint8] + data + + + + + AnnotationObject.prototype.set_data2 + + +function set_data2(data:[gint8]):void { + // Gjs wrapper for regress_annotation_object_set_data2() +} + + + +

Test taking a gchar * with a length.

+ + + + +
+

data :

+

The data

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page new file mode 100644 index 00000000..62dcf839 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page @@ -0,0 +1,45 @@ + + + + + + + + void + + regress_annotation_object_set_data3 + + [guint8] + data + + + + + AnnotationObject.prototype.set_data3 + + +function set_data3(data:[guint8]):void { + // Gjs wrapper for regress_annotation_object_set_data3() +} + + + +

Test taking a gchar * with a length, overriding the array element +type.

+ + + + +
+

data :

+

The data

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page new file mode 100644 index 00000000..91f12525 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page @@ -0,0 +1,40 @@ + + + + + + + + Boolean + + regress_annotation_object_string_out + + + + AnnotationObject.prototype.string_out + + +function string_out():Boolean { + // Gjs wrapper for regress_annotation_object_string_out() +} + + + +

Test returning a string as an out parameter

+ + + + +
+

Returns :

+

some boolean

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page new file mode 100644 index 00000000..1d61e1de --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_object_use_buffer + + guint8 + bytes + + + + + AnnotationObject.prototype.use_buffer + + +function use_buffer(bytes:guint8):void { + // Gjs wrapper for regress_annotation_object_use_buffer() +} + + + + + + + + +
+

bytes :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch.page new file mode 100644 index 00000000..085bf0a0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch.page @@ -0,0 +1,45 @@ + + + + + + + + void + + regress_annotation_object_watch + + Regress.AnnotationForeachFunc + func + + + + + AnnotationObject.prototype.watch + + +function watch(func:Regress.AnnotationForeachFunc):void { + // Gjs wrapper for regress_annotation_object_watch() +} + + + +

This is here just for the sake of being overriden by its +.

+ + + + +
+

func :

+

The callback

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page new file mode 100644 index 00000000..3fa6debd --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_object_watch_full + + Regress.AnnotationForeachFunc + func + + + + + AnnotationObject.prototype.watch_full + + +function watch_full(func:Regress.AnnotationForeachFunc):void { + // Gjs wrapper for regress_annotation_object_watch_full() +} + + + +

Test overriding via the "Rename To" regress_annotation.

+ + + + +
+

func :

+

The callback

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page new file mode 100644 index 00000000..5b0e46a9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_object_with_voidp + + gpointer + data + + + + + AnnotationObject.prototype.with_voidp + + +function with_voidp(data:gpointer):void { + // Gjs wrapper for regress_annotation_object_with_voidp() +} + + + + + + + + +
+

data :

+

Opaque pointer handle

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct.page new file mode 100644 index 00000000..edc9fd18 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.AnnotationStruct + + + +

This is a test of an array of object in an field of a struct.

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.DOUBLE_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.DOUBLE_CONSTANT.page new file mode 100644 index 00000000..b1aa32d8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.DOUBLE_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.DOUBLE_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page new file mode 100644 index 00000000..357665de --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FOO_DEFINE_SHOULD_BE_EXPOSED + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_PIE_IS_TASTY.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_PIE_IS_TASTY.page new file mode 100644 index 00000000..7dc308a1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_PIE_IS_TASTY.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FOO_PIE_IS_TASTY + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_SUCCESS_INT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_SUCCESS_INT.page new file mode 100644 index 00000000..f20f426f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_SUCCESS_INT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FOO_SUCCESS_INT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page new file mode 100644 index 00000000..34f1ed7c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page @@ -0,0 +1,29 @@ + + + + + + + + Regress.FooASingle + + + + + + + + +
+

FooASingle.FOO_SOME_SINGLE_ENUM :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page new file mode 100644 index 00000000..2dafde03 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.FooAddressType + + + + + + + + +
+

FooAddressType.INVALID :

+
+

FooAddressType.IPV4 :

+
+

FooAddressType.IPV6 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page new file mode 100644 index 00000000..f46e101a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_brect_add + + Regress.FooBRect + b2 + + + + + FooBRect.prototype.add + + +function add(b2:Regress.FooBRect):void { + // Gjs wrapper for regress_foo_brect_add() +} + + + + + + + + +
+

b2 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page new file mode 100644 index 00000000..66972b02 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page @@ -0,0 +1,52 @@ + + + + + + + + Regress.FooBRect + + regress_foo_brect_new + + Number + x + + + Number + y + + + + + FooBRect.new + + +function new(x:Number, y:Number):Regress.FooBRect { + // Gjs wrapper for regress_foo_brect_new() +} + + + + + + + + +
+

x :

+
+

y :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.page new file mode 100644 index 00000000..57e26525 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooBRect + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.page new file mode 100644 index 00000000..63831e74 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooBUnion + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page new file mode 100644 index 00000000..447c9913 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_foo_boxed_method + + + + FooBoxed.prototype.method + + +function method():void { + // Gjs wrapper for regress_foo_boxed_method() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page new file mode 100644 index 00000000..edad8cdf --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.FooBoxed + + regress_foo_boxed_new + + + + FooBoxed.new + + +function new():Regress.FooBoxed { + // Gjs wrapper for regress_foo_boxed_new() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.page new file mode 100644 index 00000000..962300f3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooBoxed + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page new file mode 100644 index 00000000..a3b5101c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page @@ -0,0 +1,65 @@ + + + + + + + + Regress.FooBuffer + + +from gi.repository import Regress + +foo_buffer = Regress.FooBuffer() + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.FooObject + + Regress.FooBuffer + + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page new file mode 100644 index 00000000..2a25e79a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_foo_buffer_some_method + + + + FooBuffer.prototype.some_method + + +function some_method():void { + // Gjs wrapper for regress_foo_buffer_some_method() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page new file mode 100644 index 00000000..241296e1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooCallback + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page new file mode 100644 index 00000000..bbcd055b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_foo_dbus_data_method + + + + FooDBusData.prototype.method + + +function method():void { + // Gjs wrapper for regress_foo_dbus_data_method() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.page new file mode 100644 index 00000000..08ad0d2e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooDBusData + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page new file mode 100644 index 00000000..a46070da --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.FooEnumFullname + + + + + + + + +
+

FooEnumFullname.ONE :

+
+

FooEnumFullname.TWO :

+
+

FooEnumFullname.THREE :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page new file mode 100644 index 00000000..2313192d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page @@ -0,0 +1,35 @@ + + + + + + + + Regress.FooEnumNoType + + + + + + + + +
+

FooEnumNoType.UN :

+
+

FooEnumNoType.DEUX :

+
+

FooEnumNoType.TROIS :

+
+

FooEnumNoType.NEUF :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page new file mode 100644 index 00000000..37510f5c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.FooEnumType + + + + + + + + +
+

FooEnumType.ALPHA :

+
+

FooEnumType.BETA :

+
+

FooEnumType.DELTA :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page new file mode 100644 index 00000000..0877e7c8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.FooError + + + + + + + + +
+

FooError.GOOD :

+
+

FooError.BAD :

+
+

FooError.UGLY :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent.page new file mode 100644 index 00000000..0b77bcbb --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooEvent + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny.page new file mode 100644 index 00000000..45cd3a13 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooEventAny + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose.page new file mode 100644 index 00000000..7e9ca7d4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooEventExpose + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page new file mode 100644 index 00000000..d4db757a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooFlagsNoType + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page new file mode 100644 index 00000000..e4f3edef --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooFlagsType + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page new file mode 100644 index 00000000..9a3af8c0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.FooForeignStruct + + regress_foo_foreign_struct_copy + + + + FooForeignStruct.prototype.copy + + +function copy():Regress.FooForeignStruct { + // Gjs wrapper for regress_foo_foreign_struct_copy() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page new file mode 100644 index 00000000..3f9478af --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.FooForeignStruct + + regress_foo_foreign_struct_new + + + + FooForeignStruct.new + + +function new():Regress.FooForeignStruct { + // Gjs wrapper for regress_foo_foreign_struct_new() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.page new file mode 100644 index 00000000..06c5793f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooForeignStruct + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page new file mode 100644 index 00000000..0148788f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.FooInterface::do_regress_foo + + +function vfunc_do_regress_foo(x:Number):void { +} + + + + + + + + +
+

x :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page new file mode 100644 index 00000000..96cbe499 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_interface_do_regress_foo + + Number + x + + + + + FooInterface.prototype.do_regress_foo + + +function do_regress_foo(x:Number):void { + // Gjs wrapper for regress_foo_interface_do_regress_foo() +} + + + + + + + + +
+

x :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page new file mode 100644 index 00000000..a195bb89 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page @@ -0,0 +1,59 @@ + + + + + + + + Regress.FooInterface + + +from gi.repository import Regress + +foo_interface = Regress.FooInterface() + + + + + + + + + Hierarchy + + + Regress.FooInterface + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page new file mode 100644 index 00000000..ff890981 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_interface_static_method + + Number + x + + + + + static_method + + +function static_method(x:Number):void { + // Gjs wrapper for regress_foo_interface_static_method() +} + + + + + + + + +
+

x :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-hidden.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-hidden.page new file mode 100644 index 00000000..b751ddb4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-hidden.page @@ -0,0 +1,29 @@ + + + + + + hidden + + + Regress.FooObject:hidden + + +"hidden" None : Read / Write / Construct Only + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page new file mode 100644 index 00000000..9c7b8ee5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page @@ -0,0 +1,35 @@ + + + + + + + + Regress.FooObject::read_fn + + +function vfunc_read_fn(offset:Number, length:Number):void { +} + + + +

Read some stuff.

+ + + + +
+

offset :

+

offset

+

length :

+

length

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page new file mode 100644 index 00000000..96617abc --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page @@ -0,0 +1,43 @@ + + + + + + signal + + + Regress.FooObject::signal + + +function callback(foo_object, object:GObject.Object, p0:gpointer, user_param1, ...):String; + + + + + + + + +
+

foo_object :

+

instance of Regress.FooObject that is emitting the signal

+

object :

+
+

p0 :

+
+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+

Returns :

+
gchar*
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-string.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-string.page new file mode 100644 index 00000000..d86283d8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-string.page @@ -0,0 +1,29 @@ + + + + + + string + + + Regress.FooObject:string + + +"string" String : Read / Write / Construct + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page new file mode 100644 index 00000000..0608ce16 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page @@ -0,0 +1,35 @@ + + + + + + + + Regress.FooObject::virtual_method + + +function vfunc_virtual_method(first_param:Number):Boolean { +} + + + + + + + + +
+

first_param :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page new file mode 100644 index 00000000..ddc25bcc --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_object_a_global_method + + Utility.Object + obj + + + + + a_global_method + + +function a_global_method(obj:Utility.Object):void { + // Gjs wrapper for regress_foo_object_a_global_method() +} + + + + + + + + +
+

obj :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page new file mode 100644 index 00000000..6929812e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page @@ -0,0 +1,46 @@ + + + + + + + + Regress.FooOtherObject + + regress_foo_object_append_new_stack_layer + + Number + x + + + + + FooObject.prototype.append_new_stack_layer + + +function append_new_stack_layer(x:Number):Regress.FooOtherObject { + // Gjs wrapper for regress_foo_object_append_new_stack_layer() +} + + + +

This shouldn't be scanned as a constructor.

+ + + + +
+

x :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page new file mode 100644 index 00000000..078402a5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page @@ -0,0 +1,40 @@ + + + + + + + + String + + regress_foo_object_dup_name + + + + FooObject.prototype.dup_name + + +function dup_name():String { + // Gjs wrapper for regress_foo_object_dup_name() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page new file mode 100644 index 00000000..9b037def --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page @@ -0,0 +1,40 @@ + + + + + + + + Utility.Object + + regress_foo_object_external_type + + + + FooObject.prototype.external_type + + +function external_type():Utility.Object { + // Gjs wrapper for regress_foo_object_external_type() +} + + + + + + + + +
+

Returns :

+

null always

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page new file mode 100644 index 00000000..733048bf --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page @@ -0,0 +1,41 @@ + + + + + + + + Regress.FooSubobject + + regress_foo_object_get_default + + + + get_default + + +function get_default():Regress.FooSubobject { + // Gjs wrapper for regress_foo_object_get_default() +} + + + +

This function is intended to match clutter_stage_get_default which +uses a C sugar return type.

+ + + + +
+

Returns :

+

The global

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page new file mode 100644 index 00000000..175cfd1b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page @@ -0,0 +1,40 @@ + + + + + + + + String + + regress_foo_object_get_name + + + + FooObject.prototype.get_name + + +function get_name():String { + // Gjs wrapper for regress_foo_object_get_name() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page new file mode 100644 index 00000000..ecc5f33c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_object_handle_glyph + + Utility.Glyph + glyph + + + + + FooObject.prototype.handle_glyph + + +function handle_glyph(glyph:Utility.Glyph):void { + // Gjs wrapper for regress_foo_object_handle_glyph() +} + + + + + + + + +
+

glyph :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page new file mode 100644 index 00000000..cf8374c8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_object_is_it_time_yet + + Number + time + + + + + FooObject.prototype.is_it_time_yet + + +function is_it_time_yet(time:Number):void { + // Gjs wrapper for regress_foo_object_is_it_time_yet() +} + + + + + + + + +
+

time :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page new file mode 100644 index 00000000..ed357619 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.FooObject + + regress_foo_object_new + + + + FooObject.new + + +function new():Regress.FooObject { + // Gjs wrapper for regress_foo_object_new() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page new file mode 100644 index 00000000..295cb68b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page @@ -0,0 +1,40 @@ + + + + + + + + GObject.Object + + regress_foo_object_new_as_super + + + + FooObject.new_as_super + + +function new_as_super():GObject.Object { + // Gjs wrapper for regress_foo_object_new_as_super() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_cookie.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_cookie.page new file mode 100644 index 00000000..71c12ff5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_cookie.page @@ -0,0 +1,46 @@ + + + + + + + + Regress.FooObjectCookie + + regress_foo_object_new_cookie + + String + target + + + + + FooObject.prototype.new_cookie + + +function new_cookie(target:String):Regress.FooObjectCookie { + // Gjs wrapper for regress_foo_object_new_cookie() +} + + + +

Not sure why this test is here...

+ + + + +
+

target :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page new file mode 100644 index 00000000..6a0810ef --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page @@ -0,0 +1,62 @@ + + + + + + + + Regress.FooObject + + +from gi.repository import Regress + +foo_object = Regress.FooObject(hidden=value, string=value) + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.FooObject + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page new file mode 100644 index 00000000..a348b662 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page @@ -0,0 +1,50 @@ + + + + + + + + void + + regress_foo_object_read + + Number + offset + + + Number + length + + + + + FooObject.prototype.read + + +function read(offset:Number, length:Number):void { + // Gjs wrapper for regress_foo_object_read() +} + + + +

Read some stuff.

+ + + + +
+

offset :

+

offset

+

length :

+

length

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.skipped_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.skipped_method.page new file mode 100644 index 00000000..b60c677e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.skipped_method.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_foo_object_skipped_method + + + + FooObject.prototype.skipped_method + + +function skipped_method():void { + // Gjs wrapper for regress_foo_object_skipped_method() +} + + + +

This is only useful from C.

+ + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page new file mode 100644 index 00000000..b9c4f204 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page @@ -0,0 +1,40 @@ + + + + + + + + Number + + regress_foo_object_static_meth + + + + static_meth + + +function static_meth():Number { + // Gjs wrapper for regress_foo_object_static_meth() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.take_all.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.take_all.page new file mode 100644 index 00000000..35c2a7e4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.take_all.page @@ -0,0 +1,47 @@ + + + + + + + + void + + regress_foo_object_take_all + + Number + x + + + + + + FooObject.prototype.take_all + + +function take_all(x:Number, None:):void { + // Gjs wrapper for regress_foo_object_take_all() +} + + + + + + + + +
+

x :

+
+

None :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page new file mode 100644 index 00000000..cbe37447 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page @@ -0,0 +1,50 @@ + + + + + + + + void + + regress_foo_object_various + + gpointer + data + + + GType + some_type + + + + + FooObject.prototype.various + + +function various(data:gpointer, some_type:GType):void { + // Gjs wrapper for regress_foo_object_various() +} + + + + + + + + +
+

data :

+
+

some_type :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page new file mode 100644 index 00000000..fede11b4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page @@ -0,0 +1,46 @@ + + + + + + + + Boolean + + regress_foo_object_virtual_method + + Number + first_param + + + + + FooObject.prototype.virtual_method + + +function virtual_method(first_param:Number):Boolean { + // Gjs wrapper for regress_foo_object_virtual_method() +} + + + + + + + + +
+

first_param :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObjectCookie.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObjectCookie.page new file mode 100644 index 00000000..4d9cabc6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObjectCookie.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooObjectCookie + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page new file mode 100644 index 00000000..56e0fcbe --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page @@ -0,0 +1,62 @@ + + + + + + + + Regress.FooOtherObject + + +from gi.repository import Regress + +foo_other_object = Regress.FooOtherObject() + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.FooOtherObject + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page new file mode 100644 index 00000000..1fcc81b6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_rectangle_add + + Regress.FooRectangle + r2 + + + + + FooRectangle.prototype.add + + +function add(r2:Regress.FooRectangle):void { + // Gjs wrapper for regress_foo_rectangle_add() +} + + + + + + + + +
+

r2 :

+

source rectangle

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.new.page new file mode 100644 index 00000000..80a242d1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.new.page @@ -0,0 +1,65 @@ + + + + + + + + Regress.FooRectangle + + regress_foo_rectangle_new + + Number + x + + + Number + y + + + Number + width + + + Number + height + + + + + new + + +function new(x:Number, y:Number, width:Number, height:Number):Regress.FooRectangle { + // Gjs wrapper for regress_foo_rectangle_new() +} + + + +

This is a C convenience constructor; we have to (skip) +it because it's not a boxed type.

+ + + + +
+

x :

+
+

y :

+
+

width :

+
+

height :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.page new file mode 100644 index 00000000..521a68bc --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooRectangle + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSkippable.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSkippable.page new file mode 100644 index 00000000..605ccf5b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSkippable.page @@ -0,0 +1,32 @@ + + + + + + + + Regress.FooSkippable + + + +

Some type that is only interesting from C and should not be +exposed to language bindings.

+ + + + +
+

FooSkippable.ONE :

+

a skippable enum value

+

FooSkippable.TWO :

+

another skippable enum value

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page new file mode 100644 index 00000000..83ca6a12 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page @@ -0,0 +1,45 @@ + + + + + + + + Regress.FooStackLayer + + + + + + + + +
+

FooStackLayer.DESKTOP :

+
+

FooStackLayer.BOTTOM :

+
+

FooStackLayer.NORMAL :

+
+

FooStackLayer.TOP :

+
+

FooStackLayer.DOCK :

+
+

FooStackLayer.FULLSCREEN :

+
+

FooStackLayer.FOCUSED_WINDOW :

+
+

FooStackLayer.OVERRIDE_REDIRECT :

+
+

FooStackLayer.LAST :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct.page new file mode 100644 index 00000000..4088a6c2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooStruct + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page new file mode 100644 index 00000000..f73adeb5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page @@ -0,0 +1,37 @@ + + + + + + destroy-event + + + Regress.FooSubInterface::destroy-event + + +function callback(foo_sub_interface, user_param1, ...):void; + + + + + + + + +
+

foo_sub_interface :

+

instance of Regress.FooSubInterface that is emitting the signal

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page new file mode 100644 index 00000000..caa25fe1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page @@ -0,0 +1,31 @@ + + + + + + + + Regress.FooSubInterface::destroy_event + + +function vfunc_destroy_event():void { +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page new file mode 100644 index 00000000..f3dbed54 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page @@ -0,0 +1,31 @@ + + + + + + + + Regress.FooSubInterface::do_bar + + +function vfunc_do_bar():void { +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page new file mode 100644 index 00000000..59e09b4a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.FooSubInterface::do_baz + + +function vfunc_do_baz(callback:GObject.Callback):void { +} + + + + + + + + +
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page new file mode 100644 index 00000000..e31cf574 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_foo_sub_interface_do_bar + + + + FooSubInterface.prototype.do_bar + + +function do_bar():void { + // Gjs wrapper for regress_foo_sub_interface_do_bar() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page new file mode 100644 index 00000000..e0751860 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_sub_interface_do_baz + + GObject.Callback + callback + + + + + FooSubInterface.prototype.do_baz + + +function do_baz(callback:GObject.Callback):void { + // Gjs wrapper for regress_foo_sub_interface_do_baz() +} + + + + + + + + +
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page new file mode 100644 index 00000000..3b093726 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page @@ -0,0 +1,59 @@ + + + + + + + + Regress.FooSubInterface + + +from gi.repository import Regress + +foo_sub_interface = Regress.FooSubInterface() + + + + + + + + + Hierarchy + + + Regress.FooSubInterface + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page new file mode 100644 index 00000000..a2a244f6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.FooSubobject + + regress_foo_subobject_new + + + + FooSubobject.new + + +function new():Regress.FooSubobject { + // Gjs wrapper for regress_foo_subobject_new() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page new file mode 100644 index 00000000..f3a8b6d7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page @@ -0,0 +1,65 @@ + + + + + + + + Regress.FooSubobject + + +from gi.repository import Regress + +foo_subobject = Regress.FooSubobject() + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.FooObject + + Regress.FooSubobject + + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray.page new file mode 100644 index 00000000..7ae6ae56 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooThingWithArray + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUnion.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUnion.page new file mode 100644 index 00000000..06d2e800 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUnion.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooUnion + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct.page new file mode 100644 index 00000000..0471b871 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooUtilityStruct + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooVarargsCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooVarargsCallback.page new file mode 100644 index 00000000..d477638a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooVarargsCallback.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooVarargsCallback + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooXEvent.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooXEvent.page new file mode 100644 index 00000000..18122490 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooXEvent.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooXEvent + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANT.page new file mode 100644 index 00000000..9a0cd162 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.GUINT64_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANTA.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANTA.page new file mode 100644 index 00000000..4faf765f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANTA.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.GUINT64_CONSTANTA + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.G_GINT64_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.G_GINT64_CONSTANT.page new file mode 100644 index 00000000..b4a66f69 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.G_GINT64_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.G_GINT64_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.INT_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.INT_CONSTANT.page new file mode 100644 index 00000000..e4df9a1e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.INT_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.INT_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.IntSet.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.IntSet.page new file mode 100644 index 00000000..e285bc28 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.IntSet.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.IntSet + + + +

Compatibility typedef, like telepathy-glib's TpIntSet

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LONG_STRING_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LONG_STRING_CONSTANT.page new file mode 100644 index 00000000..3c0409a7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LONG_STRING_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.LONG_STRING_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema.page new file mode 100644 index 00000000..05362e5c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.LikeGnomeKeyringPasswordSchema + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.MAXUINT64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.MAXUINT64.page new file mode 100644 index 00000000..be1afd19 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.MAXUINT64.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.MAXUINT64 + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.MININT64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.MININT64.page new file mode 100644 index 00000000..35c3e584 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.MININT64.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.MININT64 + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.Mixed_Case_Constant.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.Mixed_Case_Constant.page new file mode 100644 index 00000000..5ea8d9b0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.Mixed_Case_Constant.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.Mixed_Case_Constant + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.NEGATIVE_INT_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.NEGATIVE_INT_CONSTANT.page new file mode 100644 index 00000000..576c690f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.NEGATIVE_INT_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.NEGATIVE_INT_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.PtrArrayAlias.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.PtrArrayAlias.page new file mode 100644 index 00000000..9af00b51 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.PtrArrayAlias.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.PtrArrayAlias + + + +

Typedef'd GPtrArray for some reason

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.STRING_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.STRING_CONSTANT.page new file mode 100644 index 00000000..945ba986 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.STRING_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.STRING_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.SkippedStructure.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.SkippedStructure.page new file mode 100644 index 00000000..2e67ac03 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.SkippedStructure.page @@ -0,0 +1,26 @@ + + + + + + + + Regress.SkippedStructure + + + +

This should be skipped, and moreover, all function which +use it should be.

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page new file mode 100644 index 00000000..fea8d58e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.TestABCError + + + + + + + + +
+

TestABCError.CODE1 :

+
+

TestABCError.CODE2 :

+
+

TestABCError.CODE3 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page new file mode 100644 index 00000000..59c0701f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.TestBoxed + + regress_test_boxed_copy + + + + TestBoxed.prototype.copy + + +function copy():Regress.TestBoxed { + // Gjs wrapper for regress_test_boxed_copy() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page new file mode 100644 index 00000000..4a4f394e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page @@ -0,0 +1,46 @@ + + + + + + + + Boolean + + regress_test_boxed_equals + + Regress.TestBoxed + other + + + + + TestBoxed.prototype.equals + + +function equals(other:Regress.TestBoxed):Boolean { + // Gjs wrapper for regress_test_boxed_equals() +} + + + + + + + + +
+

other :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page new file mode 100644 index 00000000..72921e74 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.TestBoxed + + regress_test_boxed_new + + + + TestBoxed.new + + +function new():Regress.TestBoxed { + // Gjs wrapper for regress_test_boxed_new() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page new file mode 100644 index 00000000..72c866f3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page @@ -0,0 +1,46 @@ + + + + + + + + Regress.TestBoxed + + regress_test_boxed_new_alternative_constructor1 + + Number + i + + + + + TestBoxed.new_alternative_constructor1 + + +function new_alternative_constructor1(i:Number):Regress.TestBoxed { + // Gjs wrapper for regress_test_boxed_new_alternative_constructor1() +} + + + + + + + + +
+

i :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page new file mode 100644 index 00000000..e8e3cf91 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page @@ -0,0 +1,52 @@ + + + + + + + + Regress.TestBoxed + + regress_test_boxed_new_alternative_constructor2 + + Number + i + + + Number + j + + + + + TestBoxed.new_alternative_constructor2 + + +function new_alternative_constructor2(i:Number, j:Number):Regress.TestBoxed { + // Gjs wrapper for regress_test_boxed_new_alternative_constructor2() +} + + + + + + + + +
+

i :

+
+

j :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page new file mode 100644 index 00000000..1f516125 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page @@ -0,0 +1,46 @@ + + + + + + + + Regress.TestBoxed + + regress_test_boxed_new_alternative_constructor3 + + String + s + + + + + TestBoxed.new_alternative_constructor3 + + +function new_alternative_constructor3(s:String):Regress.TestBoxed { + // Gjs wrapper for regress_test_boxed_new_alternative_constructor3() +} + + + + + + + + +
+

s :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.page new file mode 100644 index 00000000..c6792c50 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestBoxed + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page new file mode 100644 index 00000000..6fb2b3b0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.TestBoxedB + + regress_test_boxed_b_copy + + + + TestBoxedB.prototype.copy + + +function copy():Regress.TestBoxedB { + // Gjs wrapper for regress_test_boxed_b_copy() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page new file mode 100644 index 00000000..dcf0105f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page @@ -0,0 +1,52 @@ + + + + + + + + Regress.TestBoxedB + + regress_test_boxed_b_new + + gint8 + some_int8 + + + Number + some_long + + + + + TestBoxedB.new + + +function new(some_int8:gint8, some_long:Number):Regress.TestBoxedB { + // Gjs wrapper for regress_test_boxed_b_new() +} + + + + + + + + +
+

some_int8 :

+
+

some_long :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.page new file mode 100644 index 00000000..46cf7c15 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestBoxedB + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page new file mode 100644 index 00000000..2475baed --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.TestBoxedC + + regress_test_boxed_c_new + + + + TestBoxedC.new + + +function new():Regress.TestBoxedC { + // Gjs wrapper for regress_test_boxed_c_new() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.page new file mode 100644 index 00000000..88dd1a4c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestBoxedC + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page new file mode 100644 index 00000000..9b9e0cac --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.TestBoxedD + + regress_test_boxed_d_copy + + + + TestBoxedD.prototype.copy + + +function copy():Regress.TestBoxedD { + // Gjs wrapper for regress_test_boxed_d_copy() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page new file mode 100644 index 00000000..1b96fd20 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_boxed_d_free + + + + TestBoxedD.prototype.free + + +function free():void { + // Gjs wrapper for regress_test_boxed_d_free() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page new file mode 100644 index 00000000..8b7bf9a5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page @@ -0,0 +1,40 @@ + + + + + + + + Number + + regress_test_boxed_d_get_magic + + + + TestBoxedD.prototype.get_magic + + +function get_magic():Number { + // Gjs wrapper for regress_test_boxed_d_get_magic() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page new file mode 100644 index 00000000..0568050d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page @@ -0,0 +1,52 @@ + + + + + + + + Regress.TestBoxedD + + regress_test_boxed_d_new + + String + a_string + + + Number + a_int + + + + + TestBoxedD.new + + +function new(a_string:String, a_int:Number):Regress.TestBoxedD { + // Gjs wrapper for regress_test_boxed_d_new() +} + + + + + + + + +
+

a_string :

+
+

a_int :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page new file mode 100644 index 00000000..17b3c79b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestBoxedD + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallback.page new file mode 100644 index 00000000..9a219e9e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallback.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallback + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackArray.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackArray.page new file mode 100644 index 00000000..7ceb2e07 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackArray.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallbackArray + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackFull.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackFull.page new file mode 100644 index 00000000..3de1fbe8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackFull.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallbackFull + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page new file mode 100644 index 00000000..1f6f2bdb --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallbackGError + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackHashtable.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackHashtable.page new file mode 100644 index 00000000..906947c1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackHashtable.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallbackHashtable + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page new file mode 100644 index 00000000..e7397a1b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallbackOwnedGError + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackUserData.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackUserData.page new file mode 100644 index 00000000..f3047cfd --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackUserData.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallbackUserData + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page new file mode 100644 index 00000000..b6f0eb88 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.TestDEFError + + + + + + + + +
+

TestDEFError.CODE0 :

+
+

TestDEFError.CODE1 :

+
+

TestDEFError.CODE2 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page new file mode 100644 index 00000000..3de1bbf6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page @@ -0,0 +1,35 @@ + + + + + + + + Regress.TestEnum + + + +

By purpose, not all members have documentation

+ + + + +
+

TestEnum.VALUE1 :

+

value 1

+

TestEnum.VALUE2 :

+

value 2

+

TestEnum.VALUE3 :

+
+

TestEnum.VALUE4 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page new file mode 100644 index 00000000..625c8703 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.TestEnumNoGEnum + + + + + + + + +
+

TestEnumNoGEnum.EVALUE1 :

+
+

TestEnumNoGEnum.EVALUE2 :

+
+

TestEnumNoGEnum.EVALUE3 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page new file mode 100644 index 00000000..3069d8e3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page @@ -0,0 +1,31 @@ + + + + + + + + Regress.TestEnumUnsigned + + + + + + + + +
+

TestEnumUnsigned.VALUE1 :

+
+

TestEnumUnsigned.VALUE2 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page new file mode 100644 index 00000000..57a21163 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.TestError + + + + + + + + +
+

TestError.CODE1 :

+
+

TestError.CODE2 :

+
+

TestError.CODE3 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page new file mode 100644 index 00000000..d5451972 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestFlags + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page new file mode 100644 index 00000000..889f5d1f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.TestFloating + + regress_test_floating_new + + + + TestFloating.new + + +function new():Regress.TestFloating { + // Gjs wrapper for regress_test_floating_new() +} + + + + + + + + +
+

Returns :

+

A new floating

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page new file mode 100644 index 00000000..4f1c3233 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page @@ -0,0 +1,65 @@ + + + + + + + + Regress.TestFloating + + +from gi.repository import Regress + +test_floating = Regress.TestFloating() + + + + + + + + + Hierarchy + + + GObject.Object + + GObject.InitiallyUnowned + + Regress.TestFloating + + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page new file mode 100644 index 00000000..ee5ea928 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page @@ -0,0 +1,59 @@ + + + + + + + + Regress.TestFundamentalObject + + +from gi.repository import Regress + +test_fundamental_object = Regress.TestFundamentalObject() + + + + + + + + + Hierarchy + + + Regress.TestFundamentalObject + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page new file mode 100644 index 00000000..c2c23f29 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.TestFundamentalObject + + regress_test_fundamental_object_ref + + + + TestFundamentalObject.prototype.ref + + +function ref():Regress.TestFundamentalObject { + // Gjs wrapper for regress_test_fundamental_object_ref() +} + + + + + + + + +
+

Returns :

+

A new

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page new file mode 100644 index 00000000..efeb0c3b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_fundamental_object_unref + + + + TestFundamentalObject.prototype.unref + + +function unref():void { + // Gjs wrapper for regress_test_fundamental_object_unref() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectCopyFunction.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectCopyFunction.page new file mode 100644 index 00000000..dfd65cef --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectCopyFunction.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestFundamentalObjectCopyFunction + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectFinalizeFunction.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectFinalizeFunction.page new file mode 100644 index 00000000..2b9d965c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectFinalizeFunction.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestFundamentalObjectFinalizeFunction + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page new file mode 100644 index 00000000..d9b958aa --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page @@ -0,0 +1,46 @@ + + + + + + + + Regress.TestFundamentalSubObject + + regress_test_fundamental_sub_object_new + + String + data + + + + + TestFundamentalSubObject.new + + +function new(data:String):Regress.TestFundamentalSubObject { + // Gjs wrapper for regress_test_fundamental_sub_object_new() +} + + + + + + + + +
+

data :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page new file mode 100644 index 00000000..1418f6f7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page @@ -0,0 +1,62 @@ + + + + + + + + Regress.TestFundamentalSubObject + + +from gi.repository import Regress + +test_fundamental_sub_object = Regress.TestFundamentalSubObject() + + + + + + + + + Hierarchy + + + Regress.TestFundamentalObject + + Regress.TestFundamentalSubObject + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page new file mode 100644 index 00000000..11c87305 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_inherit_drawable_do_foo + + Number + x + + + + + TestInheritDrawable.prototype.do_foo + + +function do_foo(x:Number):void { + // Gjs wrapper for regress_test_inherit_drawable_do_foo() +} + + + + + + + + +
+

x :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page new file mode 100644 index 00000000..05917260 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_inherit_drawable_do_foo_maybe_throw + + Number + x + + + + + TestInheritDrawable.prototype.do_foo_maybe_throw + + +function do_foo_maybe_throw(x:Number):void { + // Gjs wrapper for regress_test_inherit_drawable_do_foo_maybe_throw() +} + + + + + + + + +
+

x :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page new file mode 100644 index 00000000..0c87efc9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_inherit_drawable_get_origin + + + + TestInheritDrawable.prototype.get_origin + + +function get_origin():void { + // Gjs wrapper for regress_test_inherit_drawable_get_origin() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page new file mode 100644 index 00000000..0fb936cc --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_inherit_drawable_get_size + + + + TestInheritDrawable.prototype.get_size + + +function get_size():void { + // Gjs wrapper for regress_test_inherit_drawable_get_size() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page new file mode 100644 index 00000000..e5622894 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page @@ -0,0 +1,62 @@ + + + + + + + + Regress.TestInheritDrawable + + +from gi.repository import Regress + +test_inherit_drawable = Regress.TestInheritDrawable() + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.TestInheritDrawable + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass.page new file mode 100644 index 00000000..deaeea50 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestInheritPixmapObjectClass + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page new file mode 100644 index 00000000..09c9898a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page @@ -0,0 +1,59 @@ + + + + + + + + Regress.TestInterface + + +from gi.repository import Regress + +test_interface = Regress.TestInterface() + + + + + + + + + Hierarchy + + + Regress.TestInterface + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page new file mode 100644 index 00000000..32565ee3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page @@ -0,0 +1,37 @@ + + + + + + all + + + Regress.TestObj::all + + +function callback(test_obj, user_param1, ...):void; + + + + + + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page new file mode 100644 index 00000000..f16bc29d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.TestObj::allow_none_vfunc + + +function vfunc_allow_none_vfunc(two:Regress.TestObj):void { +} + + + + + + + + +
+

two :

+

Another object

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page new file mode 100644 index 00000000..97c7ee68 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page @@ -0,0 +1,29 @@ + + + + + + bare + + + Regress.TestObj:bare + + +"bare" GObject.Object : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-boxed.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-boxed.page new file mode 100644 index 00000000..e8706270 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-boxed.page @@ -0,0 +1,29 @@ + + + + + + boxed + + + Regress.TestObj:boxed + + +"boxed" Regress.TestBoxed : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page new file mode 100644 index 00000000..b9938f6a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page @@ -0,0 +1,37 @@ + + + + + + cleanup + + + Regress.TestObj::cleanup + + +function callback(test_obj, user_param1, ...):void; + + + + + + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-double.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-double.page new file mode 100644 index 00000000..df735051 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-double.page @@ -0,0 +1,29 @@ + + + + + + double + + + Regress.TestObj:double + + +"double" Number : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page new file mode 100644 index 00000000..ff33157e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page @@ -0,0 +1,37 @@ + + + + + + first + + + Regress.TestObj::first + + +function callback(test_obj, user_param1, ...):void; + + + + + + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-float.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-float.page new file mode 100644 index 00000000..ea02ac24 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-float.page @@ -0,0 +1,29 @@ + + + + + + float + + + Regress.TestObj:float + + +"float" Number : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-gtype.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-gtype.page new file mode 100644 index 00000000..b477bed4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-gtype.page @@ -0,0 +1,29 @@ + + + + + + gtype + + + Regress.TestObj:gtype + + +"gtype" GType : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table-old.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table-old.page new file mode 100644 index 00000000..ca81a39a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table-old.page @@ -0,0 +1,29 @@ + + + + + + hash-table-old + + + Regress.TestObj:hash-table-old + + +"hash-table-old" {String: gint8} : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table.page new file mode 100644 index 00000000..abd64ea0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table.page @@ -0,0 +1,29 @@ + + + + + + hash-table + + + Regress.TestObj:hash-table + + +"hash-table" {String: gint8} : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-int.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-int.page new file mode 100644 index 00000000..88652345 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-int.page @@ -0,0 +1,29 @@ + + + + + + int + + + Regress.TestObj:int + + +"int" Number : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page new file mode 100644 index 00000000..fe821889 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page @@ -0,0 +1,29 @@ + + + + + + list-old + + + Regress.TestObj:list-old + + +"list-old" : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page new file mode 100644 index 00000000..30d452db --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page @@ -0,0 +1,29 @@ + + + + + + list + + + Regress.TestObj:list + + +"list" : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page new file mode 100644 index 00000000..4133baa8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page @@ -0,0 +1,37 @@ + + + + + + + + Regress.TestObj::matrix + + +function vfunc_matrix(somestr:String):Number { +} + + + +

This method is virtual. Notably its name differs from the virtual +slot name, which makes it useful for testing bindings handle this +case.

+ + + + +
+

somestr :

+

Meaningless string

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page new file mode 100644 index 00000000..d966ae2c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page @@ -0,0 +1,40 @@ + + + + + + sig-with-array-prop + + + Regress.TestObj::sig-with-array-prop + + +function callback(test_obj, arr:[Number], user_param1, ...):void; + + + +

This test signal is like TelepathyGlib's + TpChannel:: group-members-changed-detailed:

+ + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

arr :

+

numbers

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page new file mode 100644 index 00000000..8ffd0af2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page @@ -0,0 +1,39 @@ + + + + + + sig-with-foreign-struct + + + Regress.TestObj::sig-with-foreign-struct + + +function callback(test_obj, cr:cairo.Context, user_param1, ...):void; + + + + + + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

cr :

+

A cairo context.

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page new file mode 100644 index 00000000..154181c4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page @@ -0,0 +1,40 @@ + + + + + + sig-with-hash-prop + + + Regress.TestObj::sig-with-hash-prop + + +function callback(test_obj, hash:{String: GObject.Value}, user_param1, ...):void; + + + +

This test signal is like TelepathyGlib's + TpAccount::status-changed

+ + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

hash :

+
+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page new file mode 100644 index 00000000..beebb08a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page @@ -0,0 +1,42 @@ + + + + + + sig-with-int64-prop + + + Regress.TestObj::sig-with-int64-prop + + +function callback(test_obj, i:Number, user_param1, ...):Number; + + + +

You can use this with regress_test_obj_emit_sig_with_int64, or raise from +the introspection client langage.

+ + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

i :

+

an integer

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+

Returns :

+
gint64
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page new file mode 100644 index 00000000..cad30933 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page @@ -0,0 +1,39 @@ + + + + + + sig-with-intarray-ret + + + Regress.TestObj::sig-with-intarray-ret + + +function callback(test_obj, i:Number, user_param1, ...):[Number]; + + + + + + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

i :

+

an integer

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page new file mode 100644 index 00000000..c56e7933 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page @@ -0,0 +1,40 @@ + + + + + + sig-with-obj + + + Regress.TestObj::sig-with-obj + + +function callback(test_obj, obj:GObject.Object, user_param1, ...):void; + + + +

Test transfer none GObject as a param (tests refcounting). +Use with regress_test_obj_emit_sig_with_obj

+ + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

obj :

+

A newly created RegressTestObj

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page new file mode 100644 index 00000000..9f4461dd --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page @@ -0,0 +1,39 @@ + + + + + + sig-with-strv + + + Regress.TestObj::sig-with-strv + + +function callback(test_obj, strs:[String], user_param1, ...):void; + + + +

Test GStrv as a param.

+ + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

strs :

+

strings

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page new file mode 100644 index 00000000..870aefa5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -0,0 +1,42 @@ + + + + + + sig-with-uint64-prop + + + Regress.TestObj::sig-with-uint64-prop + + +function callback(test_obj, i:Number, user_param1, ...):Number; + + + +

You can use this with regress_test_obj_emit_sig_with_uint64, or raise from +the introspection client langage.

+ + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

i :

+

an integer

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+

Returns :

+
guint64
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-string.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-string.page new file mode 100644 index 00000000..13f2b4b1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-string.page @@ -0,0 +1,29 @@ + + + + + + string + + + Regress.TestObj:string + + +"string" String : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page new file mode 100644 index 00000000..ee0ed943 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page @@ -0,0 +1,39 @@ + + + + + + test-with-static-scope-arg + + + Regress.TestObj::test-with-static-scope-arg + + +function callback(test_obj, object:Regress.TestSimpleBoxedA, user_param1, ...):void; + + + + + + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

object :

+
+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page new file mode 100644 index 00000000..6180999b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page @@ -0,0 +1,37 @@ + + + + + + test + + + Regress.TestObj::test + + +function callback(test_obj, user_param1, ...):void; + + + + + + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page new file mode 100644 index 00000000..b22362d6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.TestObj + + regress_constructor + + + + TestObj.constructor + + +function constructor():Regress.TestObj { + // Gjs wrapper for regress_constructor() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page new file mode 100644 index 00000000..1d35e44b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page @@ -0,0 +1,48 @@ + + + + + + + + Number + + regress_test_obj_do_matrix + + String + somestr + + + + + TestObj.prototype.do_matrix + + +function do_matrix(somestr:String):Number { + // Gjs wrapper for regress_test_obj_do_matrix() +} + + + +

This method is virtual. Notably its name differs from the virtual +slot name, which makes it useful for testing bindings handle this +case.

+ + + + +
+

somestr :

+

Meaningless string

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page new file mode 100644 index 00000000..da6e8b22 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_obj_emit_sig_with_foreign_struct + + + + TestObj.prototype.emit_sig_with_foreign_struct + + +function emit_sig_with_foreign_struct():void { + // Gjs wrapper for regress_test_obj_emit_sig_with_foreign_struct() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page new file mode 100644 index 00000000..4f54523f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_obj_emit_sig_with_int64 + + + + TestObj.prototype.emit_sig_with_int64 + + +function emit_sig_with_int64():void { + // Gjs wrapper for regress_test_obj_emit_sig_with_int64() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page new file mode 100644 index 00000000..1bdcd9c3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_obj_emit_sig_with_obj + + + + TestObj.prototype.emit_sig_with_obj + + +function emit_sig_with_obj():void { + // Gjs wrapper for regress_test_obj_emit_sig_with_obj() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page new file mode 100644 index 00000000..06b4bf52 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_obj_emit_sig_with_uint64 + + + + TestObj.prototype.emit_sig_with_uint64 + + +function emit_sig_with_uint64():void { + // Gjs wrapper for regress_test_obj_emit_sig_with_uint64() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page new file mode 100644 index 00000000..abb6c63c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_forced_method + + + + TestObj.prototype.forced_method + + +function forced_method():void { + // Gjs wrapper for regress_forced_method() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page new file mode 100644 index 00000000..aa903206 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page @@ -0,0 +1,40 @@ + + + + + + + + Number + + regress_test_obj_instance_method + + + + TestObj.prototype.instance_method + + +function instance_method():Number { + // Gjs wrapper for regress_test_obj_instance_method() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page new file mode 100644 index 00000000..bd5ceaf3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_obj_instance_method_callback + + Regress.TestCallback + callback + + + + + TestObj.prototype.instance_method_callback + + +function instance_method_callback(callback:Regress.TestCallback):void { + // Gjs wrapper for regress_test_obj_instance_method_callback() +} + + + + + + + + +
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page new file mode 100644 index 00000000..a9df4838 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page @@ -0,0 +1,46 @@ + + + + + + + + Regress.TestObj + + regress_test_obj_new + + Regress.TestObj + obj + + + + + TestObj.new + + +function new(obj:Regress.TestObj):Regress.TestObj { + // Gjs wrapper for regress_test_obj_new() +} + + + + + + + + +
+

obj :

+

A

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page new file mode 100644 index 00000000..1af95263 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page @@ -0,0 +1,46 @@ + + + + + + + + Regress.TestObj + + regress_test_obj_new_callback + + Regress.TestCallbackUserData + callback + + + + + TestObj.new_callback + + +function new_callback(callback:Regress.TestCallbackUserData):Regress.TestObj { + // Gjs wrapper for regress_test_obj_new_callback() +} + + + + + + + + +
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page new file mode 100644 index 00000000..c12559a9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page @@ -0,0 +1,46 @@ + + + + + + + + Regress.TestObj + + regress_test_obj_new_from_file + + String + x + + + + + TestObj.new_from_file + + +function new_from_file(x:String):Regress.TestObj { + // Gjs wrapper for regress_test_obj_new_from_file() +} + + + + + + + + +
+

x :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page new file mode 100644 index 00000000..f194391a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_obj_null_out + + + + null_out + + +function null_out():void { + // Gjs wrapper for regress_test_obj_null_out() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page new file mode 100644 index 00000000..7ee950e7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page @@ -0,0 +1,62 @@ + + + + + + + + Regress.TestObj + + +from gi.repository import Regress + +test_obj = Regress.TestObj(bare=value, boxed=value, double=value, float=value, gtype=value, hash_table=value, hash_table_old=value, int=value, list=value, list_old=value, string=value) + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.TestObj + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page new file mode 100644 index 00000000..3a963cad --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_obj_set_bare + + GObject.Object + bare + + + + + TestObj.prototype.set_bare + + +function set_bare(bare:GObject.Object):void { + // Gjs wrapper for regress_test_obj_set_bare() +} + + + + + + + + +
+

bare :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page new file mode 100644 index 00000000..200835be --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page @@ -0,0 +1,70 @@ + + + + + + + + Boolean + + regress_test_obj_skip_inout_param + + Number + a + + + Number + c + + + Number + inout_d + + + Number + num1 + + + Number + num2 + + + + + TestObj.prototype.skip_inout_param + + +function skip_inout_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean { + // Gjs wrapper for regress_test_obj_skip_inout_param() +} + + + +

Check that the out value is skipped

+ + + + +
+

a :

+

Parameter.

+

c :

+

Other parameter.

+

inout_d :

+

Will be incremented.

+

num1 :

+

Number.

+

num2 :

+

Number.

+

Returns :

+

true if the call succeeds, false if @error is set.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page new file mode 100644 index 00000000..7ee261d9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page @@ -0,0 +1,70 @@ + + + + + + + + Boolean + + regress_test_obj_skip_out_param + + Number + a + + + Number + c + + + Number + inout_d + + + Number + num1 + + + Number + num2 + + + + + TestObj.prototype.skip_out_param + + +function skip_out_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean { + // Gjs wrapper for regress_test_obj_skip_out_param() +} + + + +

Check that the out value is skipped

+ + + + +
+

a :

+

Parameter.

+

c :

+

Other parameter.

+

inout_d :

+

Will be incremented.

+

num1 :

+

Number.

+

num2 :

+

Number.

+

Returns :

+

true if the call succeeds, false if @error is set.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page new file mode 100644 index 00000000..8b5a6a76 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page @@ -0,0 +1,70 @@ + + + + + + + + Boolean + + regress_test_obj_skip_param + + Number + a + + + Number + c + + + Number + inout_d + + + Number + num1 + + + Number + num2 + + + + + TestObj.prototype.skip_param + + +function skip_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean { + // Gjs wrapper for regress_test_obj_skip_param() +} + + + +

Check that a parameter is skipped

+ + + + +
+

a :

+

Parameter.

+

c :

+

Other parameter.

+

inout_d :

+

Will be incremented.

+

num1 :

+

Number.

+

num2 :

+

Number.

+

Returns :

+

true if the call succeeds, false if @error is set.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page new file mode 100644 index 00000000..e8aa83c8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page @@ -0,0 +1,70 @@ + + + + + + + + Boolean + + regress_test_obj_skip_return_val + + Number + a + + + Number + c + + + Number + inout_d + + + Number + num1 + + + Number + num2 + + + + + TestObj.prototype.skip_return_val + + +function skip_return_val(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean { + // Gjs wrapper for regress_test_obj_skip_return_val() +} + + + +

Check that the return value is skipped

+ + + + +
+

a :

+

Parameter.

+

c :

+

Other parameter.

+

inout_d :

+

Will be incremented.

+

num1 :

+

Number.

+

num2 :

+

Number.

+

Returns :

+

true if the call succeeds, false if @error is set.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page new file mode 100644 index 00000000..875164b9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page @@ -0,0 +1,47 @@ + + + + + + + + Boolean + + regress_test_obj_skip_return_val_no_out + + Number + a + + + + + TestObj.prototype.skip_return_val_no_out + + +function skip_return_val_no_out(a:Number):Boolean { + // Gjs wrapper for regress_test_obj_skip_return_val_no_out() +} + + + +

Check that the return value is skipped. Succeed if a is nonzero, otherwise +raise an error.

+ + + + +
+

a :

+

Parameter.

+

Returns :

+

true if the call succeeds, false if @error is set.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page new file mode 100644 index 00000000..53cbdd2e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_obj_static_method + + Number + x + + + + + static_method + + +function static_method(x:Number):Number { + // Gjs wrapper for regress_test_obj_static_method() +} + + + + + + + + +
+

x :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page new file mode 100644 index 00000000..a2b3868d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_obj_static_method_callback + + Regress.TestCallback + callback + + + + + static_method_callback + + +function static_method_callback(callback:Regress.TestCallback):void { + // Gjs wrapper for regress_test_obj_static_method_callback() +} + + + + + + + + +
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page new file mode 100644 index 00000000..01f97d61 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page @@ -0,0 +1,56 @@ + + + + + + + + void + + regress_test_obj_torture_signature_0 + + Number + x + + + String + foo + + + Number + m + + + + + TestObj.prototype.torture_signature_0 + + +function torture_signature_0(x:Number, foo:String, m:Number):void { + // Gjs wrapper for regress_test_obj_torture_signature_0() +} + + + + + + + + +
+

x :

+
+

foo :

+
+

m :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page new file mode 100644 index 00000000..205b1a31 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page @@ -0,0 +1,58 @@ + + + + + + + + Boolean + + regress_test_obj_torture_signature_1 + + Number + x + + + String + foo + + + Number + m + + + + + TestObj.prototype.torture_signature_1 + + +function torture_signature_1(x:Number, foo:String, m:Number):Boolean { + // Gjs wrapper for regress_test_obj_torture_signature_1() +} + + + +

This function throws an error if m is odd.

+ + + + +
+

x :

+
+

foo :

+
+

m :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page new file mode 100644 index 00000000..1d907d24 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.TestOtherError + + + + + + + + +
+

TestOtherError.CODE1 :

+
+

TestOtherError.CODE2 :

+
+

TestOtherError.CODE3 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page new file mode 100644 index 00000000..788441ac --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestPrivateEnum + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct.page new file mode 100644 index 00000000..fa508137 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestPrivateStruct + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page new file mode 100644 index 00000000..ab33fce3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.TestSimpleBoxedA + + regress_test_simple_boxed_a_const_return + + + + const_return + + +function const_return():Regress.TestSimpleBoxedA { + // Gjs wrapper for regress_test_simple_boxed_a_const_return() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page new file mode 100644 index 00000000..c4559527 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.TestSimpleBoxedA + + regress_test_simple_boxed_a_copy + + + + TestSimpleBoxedA.prototype.copy + + +function copy():Regress.TestSimpleBoxedA { + // Gjs wrapper for regress_test_simple_boxed_a_copy() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page new file mode 100644 index 00000000..de4ade80 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page @@ -0,0 +1,46 @@ + + + + + + + + Boolean + + regress_test_simple_boxed_a_equals + + Regress.TestSimpleBoxedA + other_a + + + + + TestSimpleBoxedA.prototype.equals + + +function equals(other_a:Regress.TestSimpleBoxedA):Boolean { + // Gjs wrapper for regress_test_simple_boxed_a_equals() +} + + + + + + + + +
+

other_a :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.page new file mode 100644 index 00000000..2a8dd629 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestSimpleBoxedA + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page new file mode 100644 index 00000000..695bed63 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.TestSimpleBoxedB + + regress_test_simple_boxed_b_copy + + + + TestSimpleBoxedB.prototype.copy + + +function copy():Regress.TestSimpleBoxedB { + // Gjs wrapper for regress_test_simple_boxed_b_copy() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.page new file mode 100644 index 00000000..b775b867 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestSimpleBoxedB + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleCallback.page new file mode 100644 index 00000000..61bafb5f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleCallback.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestSimpleCallback + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page new file mode 100644 index 00000000..8e50284e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_struct_a_clone + + + + TestStructA.prototype.clone + + +function clone():void { + // Gjs wrapper for regress_test_struct_a_clone() +} + + + +

Make a copy of a RegressTestStructA

+ + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.page new file mode 100644 index 00000000..07b1752d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructA + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page new file mode 100644 index 00000000..3577ad78 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_struct_a_parse + + String + string + + + + + parse + + +function parse(string:String):void { + // Gjs wrapper for regress_test_struct_a_parse() +} + + + + + + + + +
+

string :

+

ignored

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page new file mode 100644 index 00000000..ce72cfd1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_struct_b_clone + + + + TestStructB.prototype.clone + + +function clone():void { + // Gjs wrapper for regress_test_struct_b_clone() +} + + + +

Make a copy of a RegressTestStructB

+ + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.page new file mode 100644 index 00000000..b5b2ff3f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructB + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC.page new file mode 100644 index 00000000..1db74ca2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructC + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD.page new file mode 100644 index 00000000..cf224e3e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructD + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE.page new file mode 100644 index 00000000..75684f3d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructE + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union.page new file mode 100644 index 00000000..6f77035b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructE__some_union__union + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page new file mode 100644 index 00000000..fe5e7bc6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructF + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page new file mode 100644 index 00000000..a72301a2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_struct_fixed_array_frob + + + + TestStructFixedArray.prototype.frob + + +function frob():void { + // Gjs wrapper for regress_test_struct_fixed_array_frob() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.page new file mode 100644 index 00000000..b5df5294 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructFixedArray + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page new file mode 100644 index 00000000..d537cb6e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page @@ -0,0 +1,40 @@ + + + + + + + + Number + + regress_test_sub_obj_instance_method + + + + TestSubObj.prototype.instance_method + + +function instance_method():Number { + // Gjs wrapper for regress_test_sub_obj_instance_method() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page new file mode 100644 index 00000000..86fcd533 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.TestObj + + regress_test_sub_obj_new + + + + TestSubObj.new + + +function new():Regress.TestObj { + // Gjs wrapper for regress_test_sub_obj_new() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page new file mode 100644 index 00000000..fe84d57f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page @@ -0,0 +1,65 @@ + + + + + + + + Regress.TestSubObj + + +from gi.repository import Regress + +test_sub_obj = Regress.TestSubObj() + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.TestObj + + Regress.TestSubObj + + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page new file mode 100644 index 00000000..391f291d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_sub_obj_unset_bare + + + + TestSubObj.prototype.unset_bare + + +function unset_bare():void { + // Gjs wrapper for regress_test_sub_obj_unset_bare() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestTypeGUInt64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestTypeGUInt64.page new file mode 100644 index 00000000..d815a3fe --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestTypeGUInt64.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestTypeGUInt64 + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x-testbool.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x-testbool.page new file mode 100644 index 00000000..7835ee50 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x-testbool.page @@ -0,0 +1,29 @@ + + + + + + testbool + + + Regress.TestWi8021x:testbool + + +"testbool" Boolean : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page new file mode 100644 index 00000000..e6bf3d37 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page @@ -0,0 +1,40 @@ + + + + + + + + Boolean + + regress_test_wi_802_1x_get_testbool + + + + TestWi8021x.prototype.get_testbool + + +function get_testbool():Boolean { + // Gjs wrapper for regress_test_wi_802_1x_get_testbool() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page new file mode 100644 index 00000000..11f813db --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.TestWi8021x + + regress_test_wi_802_1x_new + + + + TestWi8021x.new + + +function new():Regress.TestWi8021x { + // Gjs wrapper for regress_test_wi_802_1x_new() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page new file mode 100644 index 00000000..2ea9c575 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page @@ -0,0 +1,62 @@ + + + + + + + + Regress.TestWi8021x + + +from gi.repository import Regress + +test_wi8021x = Regress.TestWi8021x(testbool=value) + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.TestWi8021x + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page new file mode 100644 index 00000000..67356504 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_wi_802_1x_set_testbool + + Boolean + v + + + + + TestWi8021x.prototype.set_testbool + + +function set_testbool(v:Boolean):void { + // Gjs wrapper for regress_test_wi_802_1x_set_testbool() +} + + + + + + + + +
+

v :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page new file mode 100644 index 00000000..632758a6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_wi_802_1x_static_method + + Number + x + + + + + static_method + + +function static_method(x:Number):Number { + // Gjs wrapper for regress_test_wi_802_1x_static_method() +} + + + + + + + + +
+

x :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.UTF8_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.UTF8_CONSTANT.page new file mode 100644 index 00000000..8f3f5324 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.UTF8_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.UTF8_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.VaListAlias.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.VaListAlias.page new file mode 100644 index 00000000..bfd52d28 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.VaListAlias.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.VaListAlias + + + +

Typedef'd va_list for additional reasons

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page new file mode 100644 index 00000000..fb7c16d0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_aliased_caller_alloc + + + + aliased_caller_alloc + + +function aliased_caller_alloc():void { + // Gjs wrapper for regress_aliased_caller_alloc() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page new file mode 100644 index 00000000..1547d02c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page @@ -0,0 +1,52 @@ + + + + + + + + Number + + regress_annotation_attribute_func + + Regress.AnnotationObject + object + + + String + data + + + + + annotation_attribute_func + + +function annotation_attribute_func(object:Regress.AnnotationObject, data:String):Number { + // Gjs wrapper for regress_annotation_attribute_func() +} + + + + + + + + +
+

object :

+

A .

+

data :

+

Some data.

+

Returns :

+

The return value.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page new file mode 100644 index 00000000..5c9042cc --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page @@ -0,0 +1,45 @@ + + + + + + + + void + + regress_annotation_custom_destroy + + Regress.AnnotationCallback + callback + + + + + annotation_custom_destroy + + +function annotation_custom_destroy(callback:Regress.AnnotationCallback):void { + // Gjs wrapper for regress_annotation_custom_destroy() +} + + + +

Test messing up the heuristic of closure/destroy-notification +detection, and fixing it via regress_annotations.

+ + + + +
+

callback :

+

Destroy notification

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page new file mode 100644 index 00000000..cb782e6a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page @@ -0,0 +1,40 @@ + + + + + + + + filename + + regress_annotation_get_source_file + + + + annotation_get_source_file + + +function annotation_get_source_file():filename { + // Gjs wrapper for regress_annotation_get_source_file() +} + + + + + + + + +
+

Returns :

+

Source file

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page new file mode 100644 index 00000000..753a719d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_init + + [String] + argv + + + + + annotation_init + + +function annotation_init(argv:[String]):void { + // Gjs wrapper for regress_annotation_init() +} + + + + + + + + +
+

argv :

+

The arguments.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page new file mode 100644 index 00000000..1d532dfb --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_invalid_regress_annotation + + Number + foo + + + + + annotation_invalid_regress_annotation + + +function annotation_invalid_regress_annotation(foo:Number):void { + // Gjs wrapper for regress_annotation_invalid_regress_annotation() +} + + + + + + + + +
+

foo :

+

some text (e.g. example) or else

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page new file mode 100644 index 00000000..8c1805fd --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_ptr_array + + [GObject.Value] + array + + + + + annotation_ptr_array + + +function annotation_ptr_array(array:[GObject.Value]):void { + // Gjs wrapper for regress_annotation_ptr_array() +} + + + + + + + + +
+

array :

+

the array

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page new file mode 100644 index 00000000..842bd600 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page @@ -0,0 +1,40 @@ + + + + + + + + [String] + + regress_annotation_return_array + + + + annotation_return_array + + +function annotation_return_array():[String] { + // Gjs wrapper for regress_annotation_return_array() +} + + + + + + + + +
+

Returns :

+

The return value

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page new file mode 100644 index 00000000..6790d9ff --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page @@ -0,0 +1,40 @@ + + + + + + + + filename + + regress_annotation_return_filename + + + + annotation_return_filename + + +function annotation_return_filename():filename { + // Gjs wrapper for regress_annotation_return_filename() +} + + + + + + + + +
+

Returns :

+

An annotated filename

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page new file mode 100644 index 00000000..151e84f6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_set_source_file + + filename + fname + + + + + annotation_set_source_file + + +function annotation_set_source_file(fname:filename):void { + // Gjs wrapper for regress_annotation_set_source_file() +} + + + + + + + + +
+

fname :

+

Source file

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page new file mode 100644 index 00000000..de11fc5a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_annotation_space_after_comment_bug631690 + + + + annotation_space_after_comment_bug631690 + + +function annotation_space_after_comment_bug631690():void { + // Gjs wrapper for regress_annotation_space_after_comment_bug631690() +} + + + +

Explicitly test having a space after the ** here.

+ + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page new file mode 100644 index 00000000..f1bbd9c4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_string_array_length + + [String] + properties + + + + + annotation_string_array_length + + +function annotation_string_array_length(properties:[String]):void { + // Gjs wrapper for regress_annotation_string_array_length() +} + + + + + + + + +
+

properties :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page new file mode 100644 index 00000000..00af2f16 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page @@ -0,0 +1,40 @@ + + + + + + + + [String] + + regress_annotation_string_zero_terminated + + + + annotation_string_zero_terminated + + +function annotation_string_zero_terminated():[String] { + // Gjs wrapper for regress_annotation_string_zero_terminated() +} + + + + + + + + +
+

Returns :

+

The return value

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page new file mode 100644 index 00000000..cf823b72 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_annotation_string_zero_terminated_out + + [String] + out + + + + + annotation_string_zero_terminated_out + + +function annotation_string_zero_terminated_out(out:[String]):void { + // Gjs wrapper for regress_annotation_string_zero_terminated_out() +} + + + + + + + + +
+

out :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page new file mode 100644 index 00000000..8d954edd --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page @@ -0,0 +1,40 @@ + + + + + + + + GObject.Object + + regress_annotation_test_parsing_bug630862 + + + + annotation_test_parsing_bug630862 + + +function annotation_test_parsing_bug630862():GObject.Object { + // Gjs wrapper for regress_annotation_test_parsing_bug630862() +} + + + +

See https://bugzilla.gnome.org/show_bug.cgi?id=630862

+ + + + +
+

Returns :

+

An object, note the colon:in here

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page new file mode 100644 index 00000000..e2466681 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page @@ -0,0 +1,40 @@ + + + + + + + + GObject.Object + + regress_annotation_transfer_floating + + + + annotation_transfer_floating + + +function annotation_transfer_floating():GObject.Object { + // Gjs wrapper for regress_annotation_transfer_floating() +} + + + + + + + + +
+

Returns :

+

A floating object

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page new file mode 100644 index 00000000..f5aafc26 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page @@ -0,0 +1,39 @@ + + + + + + + + void + + regress_annotation_versioned + + + + annotation_versioned + + +function annotation_versioned():void { + // Gjs wrapper for regress_annotation_versioned() +} + + + + + + +

Since 0.6

+ + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page new file mode 100644 index 00000000..e72ee9b1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page @@ -0,0 +1,40 @@ + + + + + + + + GLib.Quark + + regress_atest_error_quark + + + + atest_error_quark + + +function atest_error_quark():GLib.Quark { + // Gjs wrapper for regress_atest_error_quark() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page new file mode 100644 index 00000000..c3db813e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page @@ -0,0 +1,50 @@ + + + + + + + + void + + regress_foo_async_ready_callback + + Gio.Cancellable + cancellable + + + Gio.AsyncReadyCallback + callback + + + + + foo_async_ready_callback + + +function foo_async_ready_callback(cancellable:Gio.Cancellable, callback:Gio.AsyncReadyCallback):void { + // Gjs wrapper for regress_foo_async_ready_callback() +} + + + + + + + + +
+

cancellable :

+
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page new file mode 100644 index 00000000..ac1b97d2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_destroy_notify_callback + + Regress.FooCallback + callback + + + + + foo_destroy_notify_callback + + +function foo_destroy_notify_callback(callback:Regress.FooCallback):void { + // Gjs wrapper for regress_foo_destroy_notify_callback() +} + + + + + + + + +
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page new file mode 100644 index 00000000..242c00de --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page @@ -0,0 +1,40 @@ + + + + + + + + Number + + regress_foo_init + + + + foo_init + + +function foo_init():Number { + // Gjs wrapper for regress_foo_init() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page new file mode 100644 index 00000000..e7f1c4f0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page @@ -0,0 +1,62 @@ + + + + + + + + void + + regress_foo_method_external_references + + Utility.Object + object + + + Utility.EnumType + e + + + Utility.FlagType + f + + + Utility.Struct + s + + + + + foo_method_external_references + + +function foo_method_external_references(object:Utility.Object, e:Utility.EnumType, f:Utility.FlagType, s:Utility.Struct):void { + // Gjs wrapper for regress_foo_method_external_references() +} + + + + + + + + +
+

object :

+
+

e :

+
+

f :

+
+

s :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page new file mode 100644 index 00000000..7efaffcf --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page @@ -0,0 +1,41 @@ + + + + + + + + Regress.FooObject + + regress_foo_not_a_constructor_new + + + + foo_not_a_constructor_new + + +function foo_not_a_constructor_new():Regress.FooObject { + // Gjs wrapper for regress_foo_not_a_constructor_new() +} + + + +

This should be scanned as a top-level function, and shouldn't cause +a "Can't find matching type for constructor" warning.

+ + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_skip_me.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_skip_me.page new file mode 100644 index 00000000..1458b278 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_skip_me.page @@ -0,0 +1,45 @@ + + + + + + + + void + + regress_foo_skip_me + + Regress.FooSkippable + fs + + + + + foo_skip_me + + +function foo_skip_me(fs:Regress.FooSkippable):void { + // Gjs wrapper for regress_foo_skip_me() +} + + + +

Does something that's only interesting from C and should not be +exposed to language bindings.

+ + + + +
+

fs :

+

a

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant.page new file mode 100644 index 00000000..09740618 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant.page @@ -0,0 +1,50 @@ + + + + + + + + void + + regress_foo_some_variant + + Number + x + + + va_list + args + + + + + foo_some_variant + + +function foo_some_variant(x:Number, args:va_list):void { + // Gjs wrapper for regress_foo_some_variant() +} + + + + + + + + +
+

x :

+
+

args :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant_ptr.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant_ptr.page new file mode 100644 index 00000000..d63650fc --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant_ptr.page @@ -0,0 +1,50 @@ + + + + + + + + void + + regress_foo_some_variant_ptr + + Number + x + + + va_list + args + + + + + foo_some_variant_ptr + + +function foo_some_variant_ptr(x:Number, args:va_list):void { + // Gjs wrapper for regress_foo_some_variant_ptr() +} + + + + + + + + +
+

x :

+
+

args :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page new file mode 100644 index 00000000..c77f18a5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page @@ -0,0 +1,40 @@ + + + + + + + + [String] + + regress_foo_test_array + + + + foo_test_array + + +function foo_test_array():[String] { + // Gjs wrapper for regress_foo_test_array() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page new file mode 100644 index 00000000..c46680c2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_test_const_char_param + + String + param + + + + + foo_test_const_char_param + + +function foo_test_const_char_param(param:String):void { + // Gjs wrapper for regress_foo_test_const_char_param() +} + + + + + + + + +
+

param :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page new file mode 100644 index 00000000..f42f0a27 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page @@ -0,0 +1,40 @@ + + + + + + + + String + + regress_foo_test_const_char_retval + + + + foo_test_const_char_retval + + +function foo_test_const_char_retval():String { + // Gjs wrapper for regress_foo_test_const_char_retval() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page new file mode 100644 index 00000000..9a104a7e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_test_const_struct_param + + Regress.FooStruct + param + + + + + foo_test_const_struct_param + + +function foo_test_const_struct_param(param:Regress.FooStruct):void { + // Gjs wrapper for regress_foo_test_const_struct_param() +} + + + + + + + + +
+

param :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page new file mode 100644 index 00000000..7a3295d9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.FooStruct + + regress_foo_test_const_struct_retval + + + + foo_test_const_struct_retval + + +function foo_test_const_struct_retval():Regress.FooStruct { + // Gjs wrapper for regress_foo_test_const_struct_retval() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page new file mode 100644 index 00000000..96239704 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_test_string_array + + [String] + array + + + + + foo_test_string_array + + +function foo_test_string_array(array:[String]):void { + // Gjs wrapper for regress_foo_test_string_array() +} + + + + + + + + +
+

array :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page new file mode 100644 index 00000000..872ed05f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_test_string_array_with_g + + [String] + array + + + + + foo_test_string_array_with_g + + +function foo_test_string_array_with_g(array:[String]):void { + // Gjs wrapper for regress_foo_test_string_array_with_g() +} + + + + + + + + +
+

array :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page new file mode 100644 index 00000000..8545e846 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_test_unsigned_qualifier + + Number + unsigned_param + + + + + foo_test_unsigned_qualifier + + +function foo_test_unsigned_qualifier(unsigned_param:Number):void { + // Gjs wrapper for regress_foo_test_unsigned_qualifier() +} + + + + + + + + +
+

unsigned_param :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page new file mode 100644 index 00000000..25bfbd94 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_test_unsigned_type + + Number + unsigned_param + + + + + foo_test_unsigned_type + + +function foo_test_unsigned_type(unsigned_param:Number):void { + // Gjs wrapper for regress_foo_test_unsigned_type() +} + + + + + + + + +
+

unsigned_param :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback.page new file mode 100644 index 00000000..4ae258fa --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback.page @@ -0,0 +1,50 @@ + + + + + + + + void + + regress_foo_test_varargs_callback + + Number + i + + + Regress.FooVarargsCallback + callback + + + + + foo_test_varargs_callback + + +function foo_test_varargs_callback(i:Number, callback:Regress.FooVarargsCallback):void { + // Gjs wrapper for regress_foo_test_varargs_callback() +} + + + + + + + + +
+

i :

+
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback2.page new file mode 100644 index 00000000..c65a8188 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback2.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_foo_test_varargs_callback2 + + Regress.FooVarargsCallback + callback + + + + + foo_test_varargs_callback2 + + +function foo_test_varargs_callback2(callback:Regress.FooVarargsCallback):void { + // Gjs wrapper for regress_foo_test_varargs_callback2() +} + + + + + + + + +
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback3.page new file mode 100644 index 00000000..56cc6c00 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback3.page @@ -0,0 +1,50 @@ + + + + + + + + void + + regress_foo_test_varargs_callback3 + + Regress.FooVarargsCallback + callback + + + Regress.FooVarargsCallback + callback2 + + + + + foo_test_varargs_callback3 + + +function foo_test_varargs_callback3(callback:Regress.FooVarargsCallback, callback2:Regress.FooVarargsCallback):void { + // Gjs wrapper for regress_foo_test_varargs_callback3() +} + + + + + + + + +
+

callback :

+
+

callback2 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page new file mode 100644 index 00000000..1b8cab1b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_func_obj_null_in + + Regress.TestObj + obj + + + + + func_obj_null_in + + +function func_obj_null_in(obj:Regress.TestObj):void { + // Gjs wrapper for regress_func_obj_null_in() +} + + + + + + + + +
+

obj :

+

A

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page new file mode 100644 index 00000000..df39d486 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_global_get_flags_out + + + + global_get_flags_out + + +function global_get_flags_out():void { + // Gjs wrapper for regress_global_get_flags_out() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page new file mode 100644 index 00000000..39013096 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page @@ -0,0 +1,51 @@ + + + + + + + + void + + regress_has_parameter_named_attrs + + Number + foo + + + [guint32] + attributes + + + + + has_parameter_named_attrs + + +function has_parameter_named_attrs(foo:Number, attributes:[guint32]):void { + // Gjs wrapper for regress_has_parameter_named_attrs() +} + + + +

This test case mirrors GnomeKeyringPasswordSchema from +libgnome-keyring.

+ + + + +
+

foo :

+

some int

+

attributes :

+

list of attributes

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page new file mode 100644 index 00000000..9d7f75de --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_introspectable_via_alias + + Regress.PtrArrayAlias + data + + + + + introspectable_via_alias + + +function introspectable_via_alias(data:Regress.PtrArrayAlias):void { + // Gjs wrapper for regress_introspectable_via_alias() +} + + + + + + + + +
+

data :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.not_introspectable_via_alias.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.not_introspectable_via_alias.page new file mode 100644 index 00000000..b1192a9d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.not_introspectable_via_alias.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_not_introspectable_via_alias + + Regress.VaListAlias + ok + + + + + not_introspectable_via_alias + + +function not_introspectable_via_alias(ok:Regress.VaListAlias):void { + // Gjs wrapper for regress_not_introspectable_via_alias() +} + + + + + + + + +
+

ok :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.random_function_with_skipped_structure.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.random_function_with_skipped_structure.page new file mode 100644 index 00000000..5981e901 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.random_function_with_skipped_structure.page @@ -0,0 +1,56 @@ + + + + + + + + void + + regress_random_function_with_skipped_structure + + Number + x + + + Regress.SkippedStructure + foo + + + Number + v + + + + + random_function_with_skipped_structure + + +function random_function_with_skipped_structure(x:Number, foo:Regress.SkippedStructure, v:Number):void { + // Gjs wrapper for regress_random_function_with_skipped_structure() +} + + + + + + + + +
+

x :

+
+

foo :

+
+

v :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page new file mode 100644 index 00000000..8d85040f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_set_abort_on_error + + Boolean + abort_on_error + + + + + set_abort_on_error + + +function set_abort_on_error(abort_on_error:Boolean):void { + // Gjs wrapper for regress_set_abort_on_error() +} + + + + + + + + +
+

abort_on_error :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page new file mode 100644 index 00000000..bf026dbb --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_array_callback + + Regress.TestCallbackArray + callback + + + + + test_array_callback + + +function test_array_callback(callback:Regress.TestCallbackArray):Number { + // Gjs wrapper for regress_test_array_callback() +} + + + + + + + + +
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page new file mode 100644 index 00000000..c560c5af --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_array_fixed_out_objects + + + + test_array_fixed_out_objects + + +function test_array_fixed_out_objects():void { + // Gjs wrapper for regress_test_array_fixed_out_objects() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page new file mode 100644 index 00000000..9670d04e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_array_fixed_size_int_in + + [Number] + ints + + + + + test_array_fixed_size_int_in + + +function test_array_fixed_size_int_in(ints:[Number]):Number { + // Gjs wrapper for regress_test_array_fixed_size_int_in() +} + + + + + + + + +
+

ints :

+

a list of 5 integers

+

Returns :

+

the sum of the items in ints

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page new file mode 100644 index 00000000..e3519249 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_array_fixed_size_int_out + + + + test_array_fixed_size_int_out + + +function test_array_fixed_size_int_out():void { + // Gjs wrapper for regress_test_array_fixed_size_int_out() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page new file mode 100644 index 00000000..7773cf28 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page @@ -0,0 +1,40 @@ + + + + + + + + [Number] + + regress_test_array_fixed_size_int_return + + + + test_array_fixed_size_int_return + + +function test_array_fixed_size_int_return():[Number] { + // Gjs wrapper for regress_test_array_fixed_size_int_return() +} + + + + + + + + +
+

Returns :

+

a list of 5 integers ranging from 0 to 4

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page new file mode 100644 index 00000000..20a8fb15 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_array_gint16_in + + [gint16] + ints + + + + + test_array_gint16_in + + +function test_array_gint16_in(ints:[gint16]):Number { + // Gjs wrapper for regress_test_array_gint16_in() +} + + + + + + + + +
+

ints :

+

List of ints

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page new file mode 100644 index 00000000..121a81f9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page @@ -0,0 +1,46 @@ + + + + + + + + gint32 + + regress_test_array_gint32_in + + [gint32] + ints + + + + + test_array_gint32_in + + +function test_array_gint32_in(ints:[gint32]):gint32 { + // Gjs wrapper for regress_test_array_gint32_in() +} + + + + + + + + +
+

ints :

+

List of ints

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page new file mode 100644 index 00000000..82652a5f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_array_gint64_in + + [Number] + ints + + + + + test_array_gint64_in + + +function test_array_gint64_in(ints:[Number]):Number { + // Gjs wrapper for regress_test_array_gint64_in() +} + + + + + + + + +
+

ints :

+

List of ints

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page new file mode 100644 index 00000000..0ed3479c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_array_gint8_in + + [gint8] + ints + + + + + test_array_gint8_in + + +function test_array_gint8_in(ints:[gint8]):Number { + // Gjs wrapper for regress_test_array_gint8_in() +} + + + + + + + + +
+

ints :

+

List of ints

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page new file mode 100644 index 00000000..e7acd2b9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page @@ -0,0 +1,46 @@ + + + + + + + + String + + regress_test_array_gtype_in + + [GType] + types + + + + + test_array_gtype_in + + +function test_array_gtype_in(types:[GType]):String { + // Gjs wrapper for regress_test_array_gtype_in() +} + + + + + + + + +
+

types :

+

List of types

+

Returns :

+

string representation of provided types

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page new file mode 100644 index 00000000..c7f8ddd6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page @@ -0,0 +1,40 @@ + + + + + + + + [Number] + + regress_test_array_int_full_out + + + + test_array_int_full_out + + +function test_array_int_full_out():[Number] { + // Gjs wrapper for regress_test_array_int_full_out() +} + + + + + + + + +
+

Returns :

+

a new array of integers.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page new file mode 100644 index 00000000..9339276a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_array_int_in + + [Number] + ints + + + + + test_array_int_in + + +function test_array_int_in(ints:[Number]):Number { + // Gjs wrapper for regress_test_array_int_in() +} + + + + + + + + +
+

ints :

+

List of ints

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page new file mode 100644 index 00000000..4f1fc06d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_array_int_inout + + [Number] + ints + + + + + test_array_int_inout + + +function test_array_int_inout(ints:[Number]):void { + // Gjs wrapper for regress_test_array_int_inout() +} + + + + + + + + +
+

ints :

+

a list of integers whose items will be increased by 1, except the first that will be dropped

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page new file mode 100644 index 00000000..1c47a95a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page @@ -0,0 +1,40 @@ + + + + + + + + [Number] + + regress_test_array_int_none_out + + + + test_array_int_none_out + + +function test_array_int_none_out():[Number] { + // Gjs wrapper for regress_test_array_int_none_out() +} + + + + + + + + +
+

Returns :

+

a static array of integers.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page new file mode 100644 index 00000000..b37cb539 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_array_int_null_in + + [Number] + arr + + + + + test_array_int_null_in + + +function test_array_int_null_in(arr:[Number]):void { + // Gjs wrapper for regress_test_array_int_null_in() +} + + + + + + + + +
+

arr :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page new file mode 100644 index 00000000..bdc8eabb --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_array_int_null_out + + + + test_array_int_null_out + + +function test_array_int_null_out():void { + // Gjs wrapper for regress_test_array_int_null_out() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page new file mode 100644 index 00000000..987667f7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_array_int_out + + + + test_array_int_out + + +function test_array_int_out():void { + // Gjs wrapper for regress_test_array_int_out() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page new file mode 100644 index 00000000..c6ccd906 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_async_ready_callback + + Gio.AsyncReadyCallback + callback + + + + + test_async_ready_callback + + +function test_async_ready_callback(callback:Gio.AsyncReadyCallback):void { + // Gjs wrapper for regress_test_async_ready_callback() +} + + + + + + + + +
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page new file mode 100644 index 00000000..9e505ac4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page @@ -0,0 +1,46 @@ + + + + + + + + Boolean + + regress_test_boolean + + Boolean + in + + + + + test_boolean + + +function test_boolean(in:Boolean):Boolean { + // Gjs wrapper for regress_test_boolean() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page new file mode 100644 index 00000000..3d3aec15 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page @@ -0,0 +1,46 @@ + + + + + + + + Boolean + + regress_test_boolean_false + + Boolean + in + + + + + test_boolean_false + + +function test_boolean_false(in:Boolean):Boolean { + // Gjs wrapper for regress_test_boolean_false() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page new file mode 100644 index 00000000..a25d7048 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page @@ -0,0 +1,46 @@ + + + + + + + + Boolean + + regress_test_boolean_true + + Boolean + in + + + + + test_boolean_true + + +function test_boolean_true(in:Boolean):Boolean { + // Gjs wrapper for regress_test_boolean_true() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page new file mode 100644 index 00000000..d51550e7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page @@ -0,0 +1,40 @@ + + + + + + + + cairo.Context + + regress_test_cairo_context_full_return + + + + test_cairo_context_full_return + + +function test_cairo_context_full_return():cairo.Context { + // Gjs wrapper for regress_test_cairo_context_full_return() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page new file mode 100644 index 00000000..b0f4f9b2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_cairo_context_none_in + + cairo.Context + context + + + + + test_cairo_context_none_in + + +function test_cairo_context_none_in(context:cairo.Context):void { + // Gjs wrapper for regress_test_cairo_context_none_in() +} + + + + + + + + +
+

context :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page new file mode 100644 index 00000000..be96339d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_cairo_surface_full_out + + + + test_cairo_surface_full_out + + +function test_cairo_surface_full_out():void { + // Gjs wrapper for regress_test_cairo_surface_full_out() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page new file mode 100644 index 00000000..be1ca3f1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page @@ -0,0 +1,40 @@ + + + + + + + + cairo.Surface + + regress_test_cairo_surface_full_return + + + + test_cairo_surface_full_return + + +function test_cairo_surface_full_return():cairo.Surface { + // Gjs wrapper for regress_test_cairo_surface_full_return() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page new file mode 100644 index 00000000..e875ab1d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_cairo_surface_none_in + + cairo.Surface + surface + + + + + test_cairo_surface_none_in + + +function test_cairo_surface_none_in(surface:cairo.Surface):void { + // Gjs wrapper for regress_test_cairo_surface_none_in() +} + + + + + + + + +
+

surface :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page new file mode 100644 index 00000000..cbfd688e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page @@ -0,0 +1,40 @@ + + + + + + + + cairo.Surface + + regress_test_cairo_surface_none_return + + + + test_cairo_surface_none_return + + +function test_cairo_surface_none_return():cairo.Surface { + // Gjs wrapper for regress_test_cairo_surface_none_return() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page new file mode 100644 index 00000000..a9db3a5a --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_callback + + Regress.TestCallback + callback + + + + + test_callback + + +function test_callback(callback:Regress.TestCallback):Number { + // Gjs wrapper for regress_test_callback() +} + + + + + + + + +
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page new file mode 100644 index 00000000..f9db1242 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_callback_async + + Regress.TestCallbackUserData + callback + + + + + test_callback_async + + +function test_callback_async(callback:Regress.TestCallbackUserData):void { + // Gjs wrapper for regress_test_callback_async() +} + + + + + + + + +
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page new file mode 100644 index 00000000..3e0c93e3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page @@ -0,0 +1,47 @@ + + + + + + + + Number + + regress_test_callback_destroy_notify + + Regress.TestCallbackUserData + callback + + + + + test_callback_destroy_notify + + +function test_callback_destroy_notify(callback:Regress.TestCallbackUserData):Number { + // Gjs wrapper for regress_test_callback_destroy_notify() +} + + + +

Notified - callback persists until a DestroyNotify delegate +is invoked.

+ + + + +
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page new file mode 100644 index 00000000..a009729e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page @@ -0,0 +1,47 @@ + + + + + + + + Number + + regress_test_callback_destroy_notify_no_user_data + + Regress.TestCallbackUserData + callback + + + + + test_callback_destroy_notify_no_user_data + + +function test_callback_destroy_notify_no_user_data(callback:Regress.TestCallbackUserData):Number { + // Gjs wrapper for regress_test_callback_destroy_notify_no_user_data() +} + + + +

Adds a scope notified callback with no user data. This can invoke an error +condition in bindings which needs to be tested.

+ + + + +
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page new file mode 100644 index 00000000..10d2088b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page @@ -0,0 +1,40 @@ + + + + + + + + Number + + regress_test_callback_thaw_async + + + + test_callback_thaw_async + + +function test_callback_thaw_async():Number { + // Gjs wrapper for regress_test_callback_thaw_async() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page new file mode 100644 index 00000000..49c482ca --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page @@ -0,0 +1,42 @@ + + + + + + + + Number + + regress_test_callback_thaw_notifications + + + + test_callback_thaw_notifications + + +function test_callback_thaw_notifications():Number { + // Gjs wrapper for regress_test_callback_thaw_notifications() +} + + + +

Invokes all callbacks installed by #test_callback_destroy_notify(), +adding up their return values, and removes them, invoking the +corresponding destroy notfications.

+ + + + +
+

Returns :

+

Sum of the return values of the invoked callbacks.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page new file mode 100644 index 00000000..c17015a1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page @@ -0,0 +1,47 @@ + + + + + + + + Number + + regress_test_callback_user_data + + Regress.TestCallbackUserData + callback + + + + + test_callback_user_data + + +function test_callback_user_data(callback:Regress.TestCallbackUserData):Number { + // Gjs wrapper for regress_test_callback_user_data() +} + + + +

Call - callback parameter persists for the duration of the method +call and can be released on return.

+ + + + +
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page new file mode 100644 index 00000000..23347814 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_closure + + GObject.Closure + closure + + + + + test_closure + + +function test_closure(closure:GObject.Closure):Number { + // Gjs wrapper for regress_test_closure() +} + + + + + + + + +
+

closure :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page new file mode 100644 index 00000000..71d015b6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page @@ -0,0 +1,52 @@ + + + + + + + + Number + + regress_test_closure_one_arg + + GObject.Closure + closure + + + Number + arg + + + + + test_closure_one_arg + + +function test_closure_one_arg(closure:GObject.Closure, arg:Number):Number { + // Gjs wrapper for regress_test_closure_one_arg() +} + + + + + + + + +
+

closure :

+
+

arg :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page new file mode 100644 index 00000000..f0d84088 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page @@ -0,0 +1,52 @@ + + + + + + + + GLib.Variant + + regress_test_closure_variant + + GObject.Closure + closure + + + GLib.Variant + arg + + + + + test_closure_variant + + +function test_closure_variant(closure:GObject.Closure, arg:GLib.Variant):GLib.Variant { + // Gjs wrapper for regress_test_closure_variant() +} + + + + + + + + +
+

closure :

+

GClosure which takes one GVariant and returns a GVariant

+

arg :

+

a GVariant passed as argument to closure

+

Returns :

+

the return value of closure

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page new file mode 100644 index 00000000..1bbead66 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page @@ -0,0 +1,40 @@ + + + + + + + + GObject.Value + + regress_test_date_in_gvalue + + + + test_date_in_gvalue + + +function test_date_in_gvalue():GObject.Value { + // Gjs wrapper for regress_test_date_in_gvalue() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page new file mode 100644 index 00000000..c93ebefd --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page @@ -0,0 +1,40 @@ + + + + + + + + GLib.Quark + + regress_test_def_error_quark + + + + test_def_error_quark + + +function test_def_error_quark():GLib.Quark { + // Gjs wrapper for regress_test_def_error_quark() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page new file mode 100644 index 00000000..3074d369 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_double + + Number + in + + + + + test_double + + +function test_double(in:Number):Number { + // Gjs wrapper for regress_test_double() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page new file mode 100644 index 00000000..1b316534 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page @@ -0,0 +1,40 @@ + + + + + + + + <list> + + regress_test_filename_return + + + + test_filename_return + + +function test_filename_return(): { + // Gjs wrapper for regress_test_filename_return() +} + + + + + + + + +
+

Returns :

+

list of strings

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page new file mode 100644 index 00000000..e255ede8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_float + + Number + in + + + + + test_float + + +function test_float(in:Number):Number { + // Gjs wrapper for regress_test_float() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page new file mode 100644 index 00000000..996d9d1c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page @@ -0,0 +1,40 @@ + + + + + + + + [String] + + regress_test_garray_container_return + + + + test_garray_container_return + + +function test_garray_container_return():[String] { + // Gjs wrapper for regress_test_garray_container_return() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page new file mode 100644 index 00000000..9b9bfbe4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page @@ -0,0 +1,40 @@ + + + + + + + + [String] + + regress_test_garray_full_return + + + + test_garray_full_return + + +function test_garray_full_return():[String] { + // Gjs wrapper for regress_test_garray_full_return() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page new file mode 100644 index 00000000..f34a4220 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_gerror_callback + + Regress.TestCallbackGError + callback + + + + + test_gerror_callback + + +function test_gerror_callback(callback:Regress.TestCallbackGError):void { + // Gjs wrapper for regress_test_gerror_callback() +} + + + + + + + + +
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page new file mode 100644 index 00000000..46f1663d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page @@ -0,0 +1,40 @@ + + + + + + + + {String: String} + + regress_test_ghash_container_return + + + + test_ghash_container_return + + +function test_ghash_container_return():{String: String} { + // Gjs wrapper for regress_test_ghash_container_return() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page new file mode 100644 index 00000000..863d3a6e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page @@ -0,0 +1,40 @@ + + + + + + + + {String: String} + + regress_test_ghash_everything_return + + + + test_ghash_everything_return + + +function test_ghash_everything_return():{String: String} { + // Gjs wrapper for regress_test_ghash_everything_return() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page new file mode 100644 index 00000000..629039dc --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_ghash_gvalue_in + + {String: GObject.Value} + hash + + + + + test_ghash_gvalue_in + + +function test_ghash_gvalue_in(hash:{String: GObject.Value}):void { + // Gjs wrapper for regress_test_ghash_gvalue_in() +} + + + + + + + + +
+

hash :

+

the hash table returned by .

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page new file mode 100644 index 00000000..881fc772 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page @@ -0,0 +1,40 @@ + + + + + + + + {String: GObject.Value} + + regress_test_ghash_gvalue_return + + + + test_ghash_gvalue_return + + +function test_ghash_gvalue_return():{String: GObject.Value} { + // Gjs wrapper for regress_test_ghash_gvalue_return() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page new file mode 100644 index 00000000..a7503357 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page @@ -0,0 +1,40 @@ + + + + + + + + {String: {String: String}} + + regress_test_ghash_nested_everything_return + + + + test_ghash_nested_everything_return + + +function test_ghash_nested_everything_return():{String: {String: String}} { + // Gjs wrapper for regress_test_ghash_nested_everything_return() +} + + + +

Specify nested parameterized types directly with the (type ) annotation.

+ + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page new file mode 100644 index 00000000..ec6d7128 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page @@ -0,0 +1,41 @@ + + + + + + + + {String: {String: String}} + + regress_test_ghash_nested_everything_return2 + + + + test_ghash_nested_everything_return2 + + +function test_ghash_nested_everything_return2():{String: {String: String}} { + // Gjs wrapper for regress_test_ghash_nested_everything_return2() +} + + + +

Another way of specifying nested parameterized types: using the +element-type annotation.

+ + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page new file mode 100644 index 00000000..d54a6594 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_ghash_nothing_in + + {String: String} + in + + + + + test_ghash_nothing_in + + +function test_ghash_nothing_in(in:{String: String}):void { + // Gjs wrapper for regress_test_ghash_nothing_in() +} + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page new file mode 100644 index 00000000..a6d376e1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_ghash_nothing_in2 + + {String: String} + in + + + + + test_ghash_nothing_in2 + + +function test_ghash_nothing_in2(in:{String: String}):void { + // Gjs wrapper for regress_test_ghash_nothing_in2() +} + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page new file mode 100644 index 00000000..5e18e086 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page @@ -0,0 +1,40 @@ + + + + + + + + {String: String} + + regress_test_ghash_nothing_return + + + + test_ghash_nothing_return + + +function test_ghash_nothing_return():{String: String} { + // Gjs wrapper for regress_test_ghash_nothing_return() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page new file mode 100644 index 00000000..fe99a700 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page @@ -0,0 +1,40 @@ + + + + + + + + {String: String} + + regress_test_ghash_nothing_return2 + + + + test_ghash_nothing_return2 + + +function test_ghash_nothing_return2():{String: String} { + // Gjs wrapper for regress_test_ghash_nothing_return2() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page new file mode 100644 index 00000000..f984cc68 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_ghash_null_in + + {String: String} + in + + + + + test_ghash_null_in + + +function test_ghash_null_in(in:{String: String}):void { + // Gjs wrapper for regress_test_ghash_null_in() +} + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page new file mode 100644 index 00000000..e4c1583d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_ghash_null_out + + + + test_ghash_null_out + + +function test_ghash_null_out():void { + // Gjs wrapper for regress_test_ghash_null_out() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page new file mode 100644 index 00000000..60c23f56 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page @@ -0,0 +1,40 @@ + + + + + + + + {String: String} + + regress_test_ghash_null_return + + + + test_ghash_null_return + + +function test_ghash_null_return():{String: String} { + // Gjs wrapper for regress_test_ghash_null_return() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page new file mode 100644 index 00000000..f1c08c40 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page @@ -0,0 +1,40 @@ + + + + + + + + <list> + + regress_test_glist_container_return + + + + test_glist_container_return + + +function test_glist_container_return(): { + // Gjs wrapper for regress_test_glist_container_return() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page new file mode 100644 index 00000000..d54c8884 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page @@ -0,0 +1,40 @@ + + + + + + + + <list> + + regress_test_glist_everything_return + + + + test_glist_everything_return + + +function test_glist_everything_return(): { + // Gjs wrapper for regress_test_glist_everything_return() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page new file mode 100644 index 00000000..b041b94d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_glist_nothing_in + + <list> + in + + + + + test_glist_nothing_in + + +function test_glist_nothing_in(in:):void { + // Gjs wrapper for regress_test_glist_nothing_in() +} + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page new file mode 100644 index 00000000..c5a7d9b3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_glist_nothing_in2 + + <list> + in + + + + + test_glist_nothing_in2 + + +function test_glist_nothing_in2(in:):void { + // Gjs wrapper for regress_test_glist_nothing_in2() +} + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page new file mode 100644 index 00000000..2a0af9f9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page @@ -0,0 +1,40 @@ + + + + + + + + <list> + + regress_test_glist_nothing_return + + + + test_glist_nothing_return + + +function test_glist_nothing_return(): { + // Gjs wrapper for regress_test_glist_nothing_return() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page new file mode 100644 index 00000000..4c2a63cd --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page @@ -0,0 +1,40 @@ + + + + + + + + <list> + + regress_test_glist_nothing_return2 + + + + test_glist_nothing_return2 + + +function test_glist_nothing_return2(): { + // Gjs wrapper for regress_test_glist_nothing_return2() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page new file mode 100644 index 00000000..4579c800 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_glist_null_in + + <list> + in + + + + + test_glist_null_in + + +function test_glist_null_in(in:):void { + // Gjs wrapper for regress_test_glist_null_in() +} + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page new file mode 100644 index 00000000..5b82c2e4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_glist_null_out + + + + test_glist_null_out + + +function test_glist_null_out():void { + // Gjs wrapper for regress_test_glist_null_out() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page new file mode 100644 index 00000000..14334e03 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page @@ -0,0 +1,40 @@ + + + + + + + + <list> + + regress_test_gslist_container_return + + + + test_gslist_container_return + + +function test_gslist_container_return(): { + // Gjs wrapper for regress_test_gslist_container_return() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page new file mode 100644 index 00000000..d9746870 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page @@ -0,0 +1,40 @@ + + + + + + + + <list> + + regress_test_gslist_everything_return + + + + test_gslist_everything_return + + +function test_gslist_everything_return(): { + // Gjs wrapper for regress_test_gslist_everything_return() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page new file mode 100644 index 00000000..9379cef6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_gslist_nothing_in + + <list> + in + + + + + test_gslist_nothing_in + + +function test_gslist_nothing_in(in:):void { + // Gjs wrapper for regress_test_gslist_nothing_in() +} + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page new file mode 100644 index 00000000..87607bc7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_gslist_nothing_in2 + + <list> + in + + + + + test_gslist_nothing_in2 + + +function test_gslist_nothing_in2(in:):void { + // Gjs wrapper for regress_test_gslist_nothing_in2() +} + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page new file mode 100644 index 00000000..79637032 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page @@ -0,0 +1,40 @@ + + + + + + + + <list> + + regress_test_gslist_nothing_return + + + + test_gslist_nothing_return + + +function test_gslist_nothing_return(): { + // Gjs wrapper for regress_test_gslist_nothing_return() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page new file mode 100644 index 00000000..761b7b67 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page @@ -0,0 +1,40 @@ + + + + + + + + <list> + + regress_test_gslist_nothing_return2 + + + + test_gslist_nothing_return2 + + +function test_gslist_nothing_return2(): { + // Gjs wrapper for regress_test_gslist_nothing_return2() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page new file mode 100644 index 00000000..928f1d30 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_gslist_null_in + + <list> + in + + + + + test_gslist_null_in + + +function test_gslist_null_in(in:):void { + // Gjs wrapper for regress_test_gslist_null_in() +} + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page new file mode 100644 index 00000000..a25e08e9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_gslist_null_out + + + + test_gslist_null_out + + +function test_gslist_null_out():void { + // Gjs wrapper for regress_test_gslist_null_out() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page new file mode 100644 index 00000000..9adb3fad --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page @@ -0,0 +1,46 @@ + + + + + + + + GType + + regress_test_gtype + + GType + in + + + + + test_gtype + + +function test_gtype(in:GType):GType { + // Gjs wrapper for regress_test_gtype() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page new file mode 100644 index 00000000..8558a6bd --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page @@ -0,0 +1,40 @@ + + + + + + + + GLib.Variant + + regress_test_gvariant_as + + + + test_gvariant_as + + +function test_gvariant_as():GLib.Variant { + // Gjs wrapper for regress_test_gvariant_as() +} + + + + + + + + +
+

Returns :

+

New variant

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page new file mode 100644 index 00000000..2671f72e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page @@ -0,0 +1,40 @@ + + + + + + + + GLib.Variant + + regress_test_gvariant_asv + + + + test_gvariant_asv + + +function test_gvariant_asv():GLib.Variant { + // Gjs wrapper for regress_test_gvariant_asv() +} + + + + + + + + +
+

Returns :

+

New variant

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page new file mode 100644 index 00000000..e54e6221 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page @@ -0,0 +1,40 @@ + + + + + + + + GLib.Variant + + regress_test_gvariant_i + + + + test_gvariant_i + + +function test_gvariant_i():GLib.Variant { + // Gjs wrapper for regress_test_gvariant_i() +} + + + + + + + + +
+

Returns :

+

New variant

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page new file mode 100644 index 00000000..61cf1e7c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page @@ -0,0 +1,40 @@ + + + + + + + + GLib.Variant + + regress_test_gvariant_s + + + + test_gvariant_s + + +function test_gvariant_s():GLib.Variant { + // Gjs wrapper for regress_test_gvariant_s() +} + + + + + + + + +
+

Returns :

+

New variant

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page new file mode 100644 index 00000000..3cecce56 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page @@ -0,0 +1,40 @@ + + + + + + + + GLib.Variant + + regress_test_gvariant_v + + + + test_gvariant_v + + +function test_gvariant_v():GLib.Variant { + // Gjs wrapper for regress_test_gvariant_v() +} + + + + + + + + +
+

Returns :

+

New variant

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page new file mode 100644 index 00000000..67790100 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page @@ -0,0 +1,50 @@ + + + + + + + + void + + regress_test_hash_table_callback + + {String: Number} + data + + + Regress.TestCallbackHashtable + callback + + + + + test_hash_table_callback + + +function test_hash_table_callback(data:{String: Number}, callback:Regress.TestCallbackHashtable):void { + // Gjs wrapper for regress_test_hash_table_callback() +} + + + + + + + + +
+

data :

+

GHashTable that gets passed to callback

+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page new file mode 100644 index 00000000..5007da2f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_int + + Number + in + + + + + test_int + + +function test_int(in:Number):Number { + // Gjs wrapper for regress_test_int() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page new file mode 100644 index 00000000..16a4a0b2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page @@ -0,0 +1,46 @@ + + + + + + + + gint16 + + regress_test_int16 + + gint16 + in + + + + + test_int16 + + +function test_int16(in:gint16):gint16 { + // Gjs wrapper for regress_test_int16() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page new file mode 100644 index 00000000..e8ecc278 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page @@ -0,0 +1,46 @@ + + + + + + + + gint32 + + regress_test_int32 + + gint32 + in + + + + + test_int32 + + +function test_int32(in:gint32):gint32 { + // Gjs wrapper for regress_test_int32() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page new file mode 100644 index 00000000..16851bbd --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_int64 + + Number + in + + + + + test_int64 + + +function test_int64(in:Number):Number { + // Gjs wrapper for regress_test_int64() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page new file mode 100644 index 00000000..c4f86698 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page @@ -0,0 +1,46 @@ + + + + + + + + gint8 + + regress_test_int8 + + gint8 + in + + + + + test_int8 + + +function test_int8(in:gint8):gint8 { + // Gjs wrapper for regress_test_int8() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page new file mode 100644 index 00000000..3f1aac0d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_int_out_utf8 + + String + in + + + + + test_int_out_utf8 + + +function test_int_out_utf8(in:String):void { + // Gjs wrapper for regress_test_int_out_utf8() +} + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page new file mode 100644 index 00000000..a7fc7317 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_int_value_arg + + GObject.Value + v + + + + + test_int_value_arg + + +function test_int_value_arg(v:GObject.Value):Number { + // Gjs wrapper for regress_test_int_value_arg() +} + + + + + + + + +
+

v :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page new file mode 100644 index 00000000..fb7aa3f4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_long + + Number + in + + + + + test_long + + +function test_long(in:Number):Number { + // Gjs wrapper for regress_test_long() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page new file mode 100644 index 00000000..56fc3228 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_multi_callback + + Regress.TestCallback + callback + + + + + test_multi_callback + + +function test_multi_callback(callback:Regress.TestCallback):Number { + // Gjs wrapper for regress_test_multi_callback() +} + + + + + + + + +
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page new file mode 100644 index 00000000..5a699956 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_multi_double_args + + Number + in + + + + + test_multi_double_args + + +function test_multi_double_args(in:Number):void { + // Gjs wrapper for regress_test_multi_double_args() +} + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page new file mode 100644 index 00000000..21e97a2f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_multiline_doc_comments + + + + test_multiline_doc_comments + + +function test_multiline_doc_comments():void { + // Gjs wrapper for regress_test_multiline_doc_comments() +} + + + +

This is a function.

It has multiple lines in the documentation.

The sky is blue.

You will give me your credit card number.

+ + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page new file mode 100644 index 00000000..087a2482 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page @@ -0,0 +1,69 @@ + + + + + + + + void + + regress_test_nested_parameter + + Number + a + + + + + test_nested_parameter + + +function test_nested_parameter(a:Number):void { + // Gjs wrapper for regress_test_nested_parameter() +} + + + +

<informaltable> + <tgroup cols="3"> + <thead> + <row> + <entry>Syntax</entry> + <entry>Explanation</entry> + <entry>Examples</entry> + </row> + </thead> + <tbody> + <row> + <entry>rgb(@r, @g, @b)</entry> + <entry>An opaque color; @r, @g, @b can be either integers between + 0 and 255 or percentages</entry> + <entry><literallayout>rgb(128, 10, 54) +rgb(20%, 30%, 0%)</literallayout></entry> + </row> + <row> + <entry>rgba(@r, @g, @b, a)</entry> + <entry>A translucent color; @r, @g, @b are as in the previous row, + a is a floating point number between 0 and 1</entry> + <entry><literallayout>rgba(255, 255, 0, 0.5)</literallayout></entry> + </row> + </tbody> + </tgroup> +</informaltable>

What we're testing here is that the scanner ignores the a nested inside XML.

+ + + + +
+

a :

+

An integer

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page new file mode 100644 index 00000000..632be614 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_null_gerror_callback + + Regress.TestCallbackGError + callback + + + + + test_null_gerror_callback + + +function test_null_gerror_callback(callback:Regress.TestCallbackGError):void { + // Gjs wrapper for regress_test_null_gerror_callback() +} + + + + + + + + +
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page new file mode 100644 index 00000000..5266607c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_owned_gerror_callback + + Regress.TestCallbackOwnedGError + callback + + + + + test_owned_gerror_callback + + +function test_owned_gerror_callback(callback:Regress.TestCallbackOwnedGError):void { + // Gjs wrapper for regress_test_owned_gerror_callback() +} + + + + + + + + +
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page new file mode 100644 index 00000000..ade0d1ec --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page @@ -0,0 +1,46 @@ + + + + + + + + gshort + + regress_test_short + + gshort + in + + + + + test_short + + +function test_short(in:gshort):gshort { + // Gjs wrapper for regress_test_short() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page new file mode 100644 index 00000000..1c44d090 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_simple_callback + + Regress.TestSimpleCallback + callback + + + + + test_simple_callback + + +function test_simple_callback(callback:Regress.TestSimpleCallback):void { + // Gjs wrapper for regress_test_simple_callback() +} + + + + + + + + +
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page new file mode 100644 index 00000000..eead974e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page @@ -0,0 +1,46 @@ + + + + + + + + gsize + + regress_test_size + + gsize + in + + + + + test_size + + +function test_size(in:gsize):gsize { + // Gjs wrapper for regress_test_size() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_skip_unannotated_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_skip_unannotated_callback.page new file mode 100644 index 00000000..0107162b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_skip_unannotated_callback.page @@ -0,0 +1,45 @@ + + + + + + + + void + + regress_test_skip_unannotated_callback + + Regress.TestCallback + callback + + + + + test_skip_unannotated_callback + + +function test_skip_unannotated_callback(callback:Regress.TestCallback):void { + // Gjs wrapper for regress_test_skip_unannotated_callback() +} + + + +

Should not emit a warning: +https://bugzilla.gnome.org/show_bug.cgi?id=685399

+ + + + +
+

callback :

+

No annotation here

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page new file mode 100644 index 00000000..53c93808 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page @@ -0,0 +1,46 @@ + + + + + + + + gssize + + regress_test_ssize + + gssize + in + + + + + test_ssize + + +function test_ssize(in:gssize):gssize { + // Gjs wrapper for regress_test_ssize() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page new file mode 100644 index 00000000..ab2afcab --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page @@ -0,0 +1,46 @@ + + + + + + + + Boolean + + regress_test_strv_in + + [String] + arr + + + + + test_strv_in + + +function test_strv_in(arr:[String]):Boolean { + // Gjs wrapper for regress_test_strv_in() +} + + + + + + + + +
+

arr :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page new file mode 100644 index 00000000..8a025d32 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page @@ -0,0 +1,40 @@ + + + + + + + + GObject.Value + + regress_test_strv_in_gvalue + + + + test_strv_in_gvalue + + +function test_strv_in_gvalue():GObject.Value { + // Gjs wrapper for regress_test_strv_in_gvalue() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page new file mode 100644 index 00000000..b9273dd9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page @@ -0,0 +1,40 @@ + + + + + + + + [String] + + regress_test_strv_out + + + + test_strv_out + + +function test_strv_out():[String] { + // Gjs wrapper for regress_test_strv_out() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page new file mode 100644 index 00000000..b7854212 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page @@ -0,0 +1,40 @@ + + + + + + + + [String] + + regress_test_strv_out_c + + + + test_strv_out_c + + +function test_strv_out_c():[String] { + // Gjs wrapper for regress_test_strv_out_c() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page new file mode 100644 index 00000000..dcf19318 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page @@ -0,0 +1,40 @@ + + + + + + + + [String] + + regress_test_strv_out_container + + + + test_strv_out_container + + +function test_strv_out_container():[String] { + // Gjs wrapper for regress_test_strv_out_container() +} + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page new file mode 100644 index 00000000..a465b61d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_strv_outarg + + + + test_strv_outarg + + +function test_strv_outarg():void { + // Gjs wrapper for regress_test_strv_outarg() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page new file mode 100644 index 00000000..f75c9ad9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_timet + + Number + in + + + + + test_timet + + +function test_timet(in:Number):Number { + // Gjs wrapper for regress_test_timet() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page new file mode 100644 index 00000000..269f16ac --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page @@ -0,0 +1,56 @@ + + + + + + + + void + + regress_test_torture_signature_0 + + Number + x + + + String + foo + + + Number + m + + + + + test_torture_signature_0 + + +function test_torture_signature_0(x:Number, foo:String, m:Number):void { + // Gjs wrapper for regress_test_torture_signature_0() +} + + + + + + + + +
+

x :

+
+

foo :

+
+

m :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page new file mode 100644 index 00000000..7951588f --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page @@ -0,0 +1,58 @@ + + + + + + + + Boolean + + regress_test_torture_signature_1 + + Number + x + + + String + foo + + + Number + m + + + + + test_torture_signature_1 + + +function test_torture_signature_1(x:Number, foo:String, m:Number):Boolean { + // Gjs wrapper for regress_test_torture_signature_1() +} + + + +

This function throws an error if m is odd.

+ + + + +
+

x :

+
+

foo :

+
+

m :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page new file mode 100644 index 00000000..4504cf42 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page @@ -0,0 +1,62 @@ + + + + + + + + void + + regress_test_torture_signature_2 + + Number + x + + + Regress.TestCallbackUserData + callback + + + String + foo + + + Number + m + + + + + test_torture_signature_2 + + +function test_torture_signature_2(x:Number, callback:Regress.TestCallbackUserData, foo:String, m:Number):void { + // Gjs wrapper for regress_test_torture_signature_2() +} + + + + + + + + +
+

x :

+
+

callback :

+
+

foo :

+
+

m :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page new file mode 100644 index 00000000..0c514f34 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_uint + + Number + in + + + + + test_uint + + +function test_uint(in:Number):Number { + // Gjs wrapper for regress_test_uint() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page new file mode 100644 index 00000000..dc0601f8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page @@ -0,0 +1,46 @@ + + + + + + + + guint16 + + regress_test_uint16 + + guint16 + in + + + + + test_uint16 + + +function test_uint16(in:guint16):guint16 { + // Gjs wrapper for regress_test_uint16() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page new file mode 100644 index 00000000..282967df --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page @@ -0,0 +1,46 @@ + + + + + + + + guint32 + + regress_test_uint32 + + guint32 + in + + + + + test_uint32 + + +function test_uint32(in:guint32):guint32 { + // Gjs wrapper for regress_test_uint32() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page new file mode 100644 index 00000000..ec408e66 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_uint64 + + Number + in + + + + + test_uint64 + + +function test_uint64(in:Number):Number { + // Gjs wrapper for regress_test_uint64() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page new file mode 100644 index 00000000..77ac3334 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page @@ -0,0 +1,46 @@ + + + + + + + + guint8 + + regress_test_uint8 + + guint8 + in + + + + + test_uint8 + + +function test_uint8(in:guint8):guint8 { + // Gjs wrapper for regress_test_uint8() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page new file mode 100644 index 00000000..4eb5f81d --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page @@ -0,0 +1,46 @@ + + + + + + + + Number + + regress_test_ulong + + Number + in + + + + + test_ulong + + +function test_ulong(in:Number):Number { + // Gjs wrapper for regress_test_ulong() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page new file mode 100644 index 00000000..23a78300 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page @@ -0,0 +1,46 @@ + + + + + + + + String + + regress_test_unichar + + String + in + + + + + test_unichar + + +function test_unichar(in:String):String { + // Gjs wrapper for regress_test_unichar() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page new file mode 100644 index 00000000..0bbc1735 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page @@ -0,0 +1,46 @@ + + + + + + + + String + + regress_test_unsigned_enum_param + + Regress.TestEnumUnsigned + e + + + + + test_unsigned_enum_param + + +function test_unsigned_enum_param(e:Regress.TestEnumUnsigned):String { + // Gjs wrapper for regress_test_unsigned_enum_param() +} + + + + + + + + +
+

e :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page new file mode 100644 index 00000000..3a7b2607 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page @@ -0,0 +1,46 @@ + + + + + + + + gushort + + regress_test_ushort + + gushort + in + + + + + test_ushort + + +function test_ushort(in:gushort):gushort { + // Gjs wrapper for regress_test_ushort() +} + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page new file mode 100644 index 00000000..9bfb3fd9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_utf8_const_in + + String + in + + + + + test_utf8_const_in + + +function test_utf8_const_in(in:String):void { + // Gjs wrapper for regress_test_utf8_const_in() +} + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page new file mode 100644 index 00000000..d8c76555 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page @@ -0,0 +1,40 @@ + + + + + + + + String + + regress_test_utf8_const_return + + + + test_utf8_const_return + + +function test_utf8_const_return():String { + // Gjs wrapper for regress_test_utf8_const_return() +} + + + + + + + + +
+

Returns :

+

UTF-8 string

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page new file mode 100644 index 00000000..df85d8a8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_utf8_inout + + String + inout + + + + + test_utf8_inout + + +function test_utf8_inout(inout:String):void { + // Gjs wrapper for regress_test_utf8_inout() +} + + + + + + + + +
+

inout :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page new file mode 100644 index 00000000..d4a00847 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page @@ -0,0 +1,40 @@ + + + + + + + + String + + regress_test_utf8_nonconst_return + + + + test_utf8_nonconst_return + + +function test_utf8_nonconst_return():String { + // Gjs wrapper for regress_test_utf8_nonconst_return() +} + + + + + + + + +
+

Returns :

+

UTF-8 string

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page new file mode 100644 index 00000000..15c583bd --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page @@ -0,0 +1,44 @@ + + + + + + + + void + + regress_test_utf8_null_in + + String + in + + + + + test_utf8_null_in + + +function test_utf8_null_in(in:String):void { + // Gjs wrapper for regress_test_utf8_null_in() +} + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page new file mode 100644 index 00000000..af8db3af --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_utf8_null_out + + + + test_utf8_null_out + + +function test_utf8_null_out():void { + // Gjs wrapper for regress_test_utf8_null_out() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page new file mode 100644 index 00000000..9692dc6b --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_utf8_out + + + + test_utf8_out + + +function test_utf8_out():void { + // Gjs wrapper for regress_test_utf8_out() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page new file mode 100644 index 00000000..4e2cf0ed --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page @@ -0,0 +1,40 @@ + + + + + + + + String + + regress_test_utf8_out_nonconst_return + + + + test_utf8_out_nonconst_return + + +function test_utf8_out_nonconst_return():String { + // Gjs wrapper for regress_test_utf8_out_nonconst_return() +} + + + + + + + + +
+

Returns :

+

a copy of "first"

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page new file mode 100644 index 00000000..43e35d1c --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page @@ -0,0 +1,38 @@ + + + + + + + + void + + regress_test_utf8_out_out + + + + test_utf8_out_out + + +function test_utf8_out_out():void { + // Gjs wrapper for regress_test_utf8_out_out() +} + + + + + + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_get_fundamental_object.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_get_fundamental_object.page new file mode 100644 index 00000000..e3b85a80 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_get_fundamental_object.page @@ -0,0 +1,46 @@ + + + + + + + + Regress.TestFundamentalObject + + regress_test_value_get_fundamental_object + + GObject.Value + value + + + + + test_value_get_fundamental_object + + +function test_value_get_fundamental_object(value:GObject.Value):Regress.TestFundamentalObject { + // Gjs wrapper for regress_test_value_get_fundamental_object() +} + + + + + + + + +
+

value :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page new file mode 100644 index 00000000..542af0ba --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page @@ -0,0 +1,46 @@ + + + + + + + + GObject.Value + + regress_test_value_return + + Number + i + + + + + test_value_return + + +function test_value_return(i:Number):GObject.Value { + // Gjs wrapper for regress_test_value_return() +} + + + + + + + + +
+

i :

+

an int

+

Returns :

+

the int wrapped in a GValue.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_set_fundamental_object.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_set_fundamental_object.page new file mode 100644 index 00000000..1c8b445e --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_set_fundamental_object.page @@ -0,0 +1,50 @@ + + + + + + + + void + + regress_test_value_set_fundamental_object + + GObject.Value + value + + + Regress.TestFundamentalObject + fundamental_object + + + + + test_value_set_fundamental_object + + +function test_value_set_fundamental_object(value:GObject.Value, fundamental_object:Regress.TestFundamentalObject):void { + // Gjs wrapper for regress_test_value_set_fundamental_object() +} + + + + + + + + +
+

value :

+
+

fundamental_object :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page new file mode 100644 index 00000000..d3cfc1d4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page @@ -0,0 +1,39 @@ + + + + + + + + void + + regress_test_versioning + + + + test_versioning + + +function test_versioning():void { + // Gjs wrapper for regress_test_versioning() +} + + + + + + +

Since 1.32.1

+ + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/index.page b/tests/scanner/Regress-1.0-Gjs-expected/index.page new file mode 100644 index 00000000..1d89dedd --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/index.page @@ -0,0 +1,33 @@ + + + + + + + + Index + + + + + + + + + + + Classes + + + Functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page new file mode 100644 index 00000000..ebe71b0d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.ANNOTATION_CALCULATED_DEFINE + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE.page new file mode 100644 index 00000000..4b38cc01 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE.page @@ -0,0 +1,26 @@ + + + + + + + + Regress.ANNOTATION_CALCULATED_LARGE + + + +

Constant to define a calculated large value

+ + +

Since 1.4

+ + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page new file mode 100644 index 00000000..d6c8e76a --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.ANNOTATION_CALCULATED_LARGE_DIV + + + +

Constant to define a calculated large value

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page new file mode 100644 index 00000000..dff139fd --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.ATestError + + + + + + + + +
+

ATestError.CODE0 :

+
+

ATestError.CODE1 :

+
+

ATestError.CODE2 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page new file mode 100644 index 00000000..2229245a --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.AliasedTestBoxed + + + +

Typedef TestBoxed to test caller-allocates correctness

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page new file mode 100644 index 00000000..8cbc8326 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.AnnotationBitfield + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page new file mode 100644 index 00000000..30f950c2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.AnnotationCallback + + + +

This is a callback.

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page new file mode 100644 index 00000000..506ceffd --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.AnnotationForeachFunc + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page new file mode 100644 index 00000000..3f9409ed --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.AnnotationListCallback + + + +

This is a callback taking a list.

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page new file mode 100644 index 00000000..b2dc717c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page @@ -0,0 +1,26 @@ + + + + + + + + Regress.AnnotationNotifyFunc + + + +

This is a callback with a 'closure' argument that is not named +'user_data' and hence has to be annotated.

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page new file mode 100644 index 00000000..221c269a --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page @@ -0,0 +1,43 @@ + + + + + + attribute-signal + + + Regress.AnnotationObject::attribute-signal + + +def callback(annotation_object, arg1, arg2, user_param1, ...) + + + +

This signal tests a signal with attributes.

+ + + + +
+

annotation_object :

+

instance of Regress.AnnotationObject that is emitting the signal

+

arg1 :

+

a value

+

arg2 :

+

another value

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+

Returns :

+
gchar*

the return value

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page new file mode 100644 index 00000000..03b488b2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page @@ -0,0 +1,39 @@ + + + + + + doc-empty-arg-parsing + + + Regress.AnnotationObject::doc-empty-arg-parsing + + +def callback(annotation_object, arg1, user_param1, ...) + + + +

This signal tests an empty document argument (arg1)

+ + + + +
+

annotation_object :

+

instance of Regress.AnnotationObject that is emitting the signal

+

arg1 :

+
+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page new file mode 100644 index 00000000..f526ea9b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page @@ -0,0 +1,29 @@ + + + + + + function-property + + + Regress.AnnotationObject:function-property + + +"function-property" Regress.AnnotationCallback : Read / Write / Construct + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page new file mode 100644 index 00000000..d0da8d63 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page @@ -0,0 +1,40 @@ + + + + + + list-signal + + + Regress.AnnotationObject::list-signal + + +def callback(annotation_object, list, user_param1, ...) + + + +

This is a signal which takes a list of strings, but it's not +known by GObject as it's only marked as G_TYPE_POINTER

+ + + + +
+

annotation_object :

+

instance of Regress.AnnotationObject that is emitting the signal

+

list :

+

a list of strings

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page new file mode 100644 index 00000000..97391bc4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page @@ -0,0 +1,30 @@ + + + + + + string-property + + + Regress.AnnotationObject:string-property + + +"string-property" unicode : Read / Write / Construct + + + +

This is a property which is a string

+ + +

Since 1.0

+ + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page new file mode 100644 index 00000000..66e2ee60 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page @@ -0,0 +1,41 @@ + + + + + + string-signal + + + Regress.AnnotationObject::string-signal + + +def callback(annotation_object, string, user_param1, ...) + + + +

This is a signal which has a broken signal handler, +it says it's pointer but it's actually a string.

+ + +

Since 1.0

+ + +
+

annotation_object :

+

instance of Regress.AnnotationObject that is emitting the signal

+

string :

+

a string

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page new file mode 100644 index 00000000..db243c63 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page @@ -0,0 +1,31 @@ + + + + + + tab-property + + + Regress.AnnotationObject:tab-property + + +"tab-property" unicode : Read / Write / Construct + + + +

This is a property regress_annotation intentionally indented with a mix +of tabs and strings to test the tab handling capabilities of the scanner.

+ + +

Since 1.2

+ + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page new file mode 100644 index 00000000..7d94a776 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page @@ -0,0 +1,53 @@ + + + + + + + + GObject.Object + + regress_annotation_object_allow_none + + Regress.AnnotationObject + self + + + unicode + somearg + + + + + AnnotationObject.allow_none + + +@accepts(Regress.AnnotationObject, unicode) +@returns(GObject.Object) +def allow_none(self, somearg): + # Python wrapper for regress_annotation_object_allow_none() + + + + + + + + +
+

self :

+

a

+

somearg :

+
+

Returns :

+

None always

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page new file mode 100644 index 00000000..157739d7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page @@ -0,0 +1,53 @@ + + + + + + + + int + + regress_annotation_object_calleeowns + + Regress.AnnotationObject + self + + + GObject.Object + toown + + + + + AnnotationObject.calleeowns + + +@accepts(Regress.AnnotationObject, GObject.Object) +@returns(int) +def calleeowns(self, toown): + # Python wrapper for regress_annotation_object_calleeowns() + + + +

This is a test for out arguments; GObject defaults to transfer

+ + + + +
+

self :

+

a

+

toown :

+

a

+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page new file mode 100644 index 00000000..e9436824 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page @@ -0,0 +1,59 @@ + + + + + + + + int + + regress_annotation_object_calleesowns + + Regress.AnnotationObject + self + + + GObject.Object + toown1 + + + GObject.Object + toown2 + + + + + AnnotationObject.calleesowns + + +@accepts(Regress.AnnotationObject, GObject.Object, GObject.Object) +@returns(int) +def calleesowns(self, toown1, toown2): + # Python wrapper for regress_annotation_object_calleesowns() + + + +

This is a test for out arguments, one transferred, other not

+ + + + +
+

self :

+

a

+

toown1 :

+

a

+

toown2 :

+

a

+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page new file mode 100644 index 00000000..31c8d37e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_annotation_object_compute_sum + + Regress.AnnotationObject + self + + + [int] + nums + + + + + AnnotationObject.compute_sum + + +@accepts(Regress.AnnotationObject, [int]) +@returns(none) +def compute_sum(self, nums): + # Python wrapper for regress_annotation_object_compute_sum() + + + +

Test taking a zero-terminated array

+ + + + +
+

self :

+

a

+

nums :

+

Sequence of numbers

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page new file mode 100644 index 00000000..f017eb3a --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page @@ -0,0 +1,57 @@ + + + + + + + + none + + regress_annotation_object_compute_sum_n + + Regress.AnnotationObject + self + + + [int] + nums + + + int + n_nums + + + + + AnnotationObject.compute_sum_n + + +@accepts(Regress.AnnotationObject, [int], int) +@returns(none) +def compute_sum_n(self, nums, n_nums): + # Python wrapper for regress_annotation_object_compute_sum_n() + + + +

Test taking an array with length parameter

+ + + + +
+

self :

+

a

+

nums :

+

Sequence of numbers that are zero-terminated

+

n_nums :

+

Length of number array

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page new file mode 100644 index 00000000..c7ae439f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page @@ -0,0 +1,57 @@ + + + + + + + + none + + regress_annotation_object_compute_sum_nz + + Regress.AnnotationObject + self + + + [int] + nums + + + int + n_nums + + + + + AnnotationObject.compute_sum_nz + + +@accepts(Regress.AnnotationObject, [int], int) +@returns(none) +def compute_sum_nz(self, nums, n_nums): + # Python wrapper for regress_annotation_object_compute_sum_nz() + + + +

Test taking a zero-terminated array with length parameter

+ + + + +
+

self :

+

a

+

nums :

+

Sequence of numbers that are zero-terminated

+

n_nums :

+

Length of number array

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page new file mode 100644 index 00000000..66b74067 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page @@ -0,0 +1,47 @@ + + + + + + + + GObject.Object + + regress_annotation_object_create_object + + Regress.AnnotationObject + self + + + + + AnnotationObject.create_object + + +@accepts(Regress.AnnotationObject) +@returns(GObject.Object) +def create_object(self): + # Python wrapper for regress_annotation_object_create_object() + + + +

Test returning a caller-owned object

+ + + + +
+

self :

+

a

+

Returns :

+

The object

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page new file mode 100644 index 00000000..648dc52b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page @@ -0,0 +1,47 @@ + + + + + + + + GObject.Object + + regress_annotation_object_do_not_use + + Regress.AnnotationObject + self + + + + + AnnotationObject.do_not_use + + +@accepts(Regress.AnnotationObject) +@returns(GObject.Object) +def do_not_use(self): + # Python wrapper for regress_annotation_object_do_not_use() + + + + + + + + +
+

self :

+

a

+

Returns :

+

None always

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page new file mode 100644 index 00000000..b3fa22dd --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_annotation_object_extra_annos + + Regress.AnnotationObject + self + + + + + AnnotationObject.extra_annos + + +@accepts(Regress.AnnotationObject) +@returns(none) +def extra_annos(self): + # Python wrapper for regress_annotation_object_extra_annos() + + + + + + + + +
+

self :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page new file mode 100644 index 00000000..be20587c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page @@ -0,0 +1,57 @@ + + + + + + + + none + + regress_annotation_object_foreach + + Regress.AnnotationObject + self + + + Regress.AnnotationForeachFunc + func + + + gpointer + user_data + + + + + AnnotationObject.foreach + + +@accepts(Regress.AnnotationObject, Regress.AnnotationForeachFunc, gpointer) +@returns(none) +def foreach(self, func, user_data): + # Python wrapper for regress_annotation_object_foreach() + + + +

Test taking a call-scoped callback

+ + + + +
+

self :

+

a

+

func :

+

Callback to invoke

+

user_data :

+

Callback user data

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page new file mode 100644 index 00000000..66d4b85c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page @@ -0,0 +1,48 @@ + + + + + + + + {unicode: GObject.Object} + + regress_annotation_object_get_hash + + Regress.AnnotationObject + self + + + + + AnnotationObject.get_hash + + +@accepts(Regress.AnnotationObject) +@returns({unicode: GObject.Object}) +def get_hash(self): + # Python wrapper for regress_annotation_object_get_hash() + + + +

This is a test for returning a hash table mapping strings to +objects.

+ + + + +
+

self :

+

a

+

Returns :

+

hash table

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page new file mode 100644 index 00000000..4b0b3a05 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page @@ -0,0 +1,49 @@ + + + + + + + + <list> + + regress_annotation_object_get_objects + + Regress.AnnotationObject + self + + + + + AnnotationObject.get_objects + + +@accepts(Regress.AnnotationObject) +@returns(<list>) +def get_objects(self): + # Python wrapper for regress_annotation_object_get_objects() + + + +

This is a test for returning a list of objects. +The list itself should be freed, but not the internal objects, +intentionally similar example to gtk_container_get_children

+ + + + +
+

self :

+

a

+

Returns :

+

list of objects

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page new file mode 100644 index 00000000..818168ba --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page @@ -0,0 +1,48 @@ + + + + + + + + <list> + + regress_annotation_object_get_strings + + Regress.AnnotationObject + self + + + + + AnnotationObject.get_strings + + +@accepts(Regress.AnnotationObject) +@returns(<list>) +def get_strings(self): + # Python wrapper for regress_annotation_object_get_strings() + + + +

This is a test for returning a list of strings, where +each string needs to be freed.

+ + + + +
+

self :

+

a

+

Returns :

+

list of strings

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page new file mode 100644 index 00000000..328a7bac --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_annotation_object_hidden_self + + Regress.AnnotationObject + self + + + + + AnnotationObject.hidden_self + + +@accepts(Regress.AnnotationObject) +@returns(none) +def hidden_self(self): + # Python wrapper for regress_annotation_object_hidden_self() + + + + + + + + +
+

self :

+

A

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page new file mode 100644 index 00000000..71a0aef1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page @@ -0,0 +1,53 @@ + + + + + + + + int + + regress_annotation_object_in + + Regress.AnnotationObject + self + + + int + inarg + + + + + AnnotationObject.in + + +@accepts(Regress.AnnotationObject, int) +@returns(int) +def in(self, inarg): + # Python wrapper for regress_annotation_object_in() + + + +

This is a test for in arguments

+ + + + +
+

self :

+

a

+

inarg :

+

This is an argument test

+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page new file mode 100644 index 00000000..7ddf3a7e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page @@ -0,0 +1,53 @@ + + + + + + + + int + + regress_annotation_object_inout + + Regress.AnnotationObject + self + + + int + inoutarg + + + + + AnnotationObject.inout + + +@accepts(Regress.AnnotationObject, int) +@returns(int) +def inout(self, inoutarg): + # Python wrapper for regress_annotation_object_inout() + + + +

This is a test for out arguments

+ + + + +
+

self :

+

a

+

inoutarg :

+

This is an argument test

+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page new file mode 100644 index 00000000..82056c3b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page @@ -0,0 +1,53 @@ + + + + + + + + int + + regress_annotation_object_inout2 + + Regress.AnnotationObject + self + + + int + inoutarg + + + + + AnnotationObject.inout2 + + +@accepts(Regress.AnnotationObject, int) +@returns(int) +def inout2(self, inoutarg): + # Python wrapper for regress_annotation_object_inout2() + + + +

This is a second test for out arguments

+ + + + +
+

self :

+

a

+

inoutarg :

+

This is an argument test

+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page new file mode 100644 index 00000000..45b89591 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page @@ -0,0 +1,53 @@ + + + + + + + + int + + regress_annotation_object_inout3 + + Regress.AnnotationObject + self + + + int + inoutarg + + + + + AnnotationObject.inout3 + + +@accepts(Regress.AnnotationObject, int) +@returns(int) +def inout3(self, inoutarg): + # Python wrapper for regress_annotation_object_inout3() + + + +

This is a 3th test for out arguments

+ + + + +
+

self :

+

a

+

inoutarg :

+

This is an argument test

+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page new file mode 100644 index 00000000..bb23ba15 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page @@ -0,0 +1,47 @@ + + + + + + + + int + + regress_annotation_object_method + + Regress.AnnotationObject + self + + + + + AnnotationObject.method + + +@accepts(Regress.AnnotationObject) +@returns(int) +def method(self): + # Python wrapper for regress_annotation_object_method() + + + + + + + + +
+

self :

+

a

+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page new file mode 100644 index 00000000..73731e73 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page @@ -0,0 +1,47 @@ + + + + + + + + GObject.Object + + regress_annotation_object_notrans + + Regress.AnnotationObject + self + + + + + AnnotationObject.notrans + + +@accepts(Regress.AnnotationObject) +@returns(GObject.Object) +def notrans(self): + # Python wrapper for regress_annotation_object_notrans() + + + + + + + + +
+

self :

+

a

+

Returns :

+

An object, not referenced

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page new file mode 100644 index 00000000..ba69737f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page @@ -0,0 +1,53 @@ + + + + + + + + int + + regress_annotation_object_out + + Regress.AnnotationObject + self + + + int + outarg + + + + + AnnotationObject.out + + +@accepts(Regress.AnnotationObject, int) +@returns(int) +def out(self, outarg): + # Python wrapper for regress_annotation_object_out() + + + +

This is a test for out arguments

+ + + + +
+

self :

+

a

+

outarg :

+

This is an argument test

+

Returns :

+

an int

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page new file mode 100644 index 00000000..94313a6f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page @@ -0,0 +1,62 @@ + + + + + + + + Regress.AnnotationObject + + +from gi.repository import Regress + +annotation_object = Regress.AnnotationObject(function_property=value, string_property=value, tab_property=value) + + +

This is an object used to test regress_annotations.

+ + + + + + Hierarchy + + + GObject.Object + + Regress.AnnotationObject + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page new file mode 100644 index 00000000..ac28c6fb --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page @@ -0,0 +1,57 @@ + + + + + + + + none + + regress_annotation_object_parse_args + + Regress.AnnotationObject + self + + + int + argc + + + [unicode] + argv + + + + + AnnotationObject.parse_args + + +@accepts(Regress.AnnotationObject, int, [unicode]) +@returns(none) +def parse_args(self, argc, argv): + # Python wrapper for regress_annotation_object_parse_args() + + + +

Test taking a zero-terminated array with length parameter

+ + + + +
+

self :

+

a

+

argc :

+

Length of the argument vector

+

argv :

+

Argument vector

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page new file mode 100644 index 00000000..8f949161 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page @@ -0,0 +1,57 @@ + + + + + + + + none + + regress_annotation_object_set_data + + Regress.AnnotationObject + self + + + [guint8] + data + + + gsize + length + + + + + AnnotationObject.set_data + + +@accepts(Regress.AnnotationObject, [guint8], gsize) +@returns(none) +def set_data(self, data, length): + # Python wrapper for regress_annotation_object_set_data() + + + +

Test taking a guchar * with a length.

+ + + + +
+

self :

+

a

+

data :

+

The data

+

length :

+

Length of the data

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page new file mode 100644 index 00000000..70c3e62a --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page @@ -0,0 +1,57 @@ + + + + + + + + none + + regress_annotation_object_set_data2 + + Regress.AnnotationObject + self + + + [gint8] + data + + + gsize + length + + + + + AnnotationObject.set_data2 + + +@accepts(Regress.AnnotationObject, [gint8], gsize) +@returns(none) +def set_data2(self, data, length): + # Python wrapper for regress_annotation_object_set_data2() + + + +

Test taking a gchar * with a length.

+ + + + +
+

self :

+

a

+

data :

+

The data

+

length :

+

Length of the data

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page new file mode 100644 index 00000000..1a5bb115 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page @@ -0,0 +1,58 @@ + + + + + + + + none + + regress_annotation_object_set_data3 + + Regress.AnnotationObject + self + + + [guint8] + data + + + gsize + length + + + + + AnnotationObject.set_data3 + + +@accepts(Regress.AnnotationObject, [guint8], gsize) +@returns(none) +def set_data3(self, data, length): + # Python wrapper for regress_annotation_object_set_data3() + + + +

Test taking a gchar * with a length, overriding the array element +type.

+ + + + +
+

self :

+

a

+

data :

+

The data

+

length :

+

Length of the data

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page new file mode 100644 index 00000000..5c02dbdb --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page @@ -0,0 +1,53 @@ + + + + + + + + bool + + regress_annotation_object_string_out + + Regress.AnnotationObject + self + + + unicode + str_out + + + + + AnnotationObject.string_out + + +@accepts(Regress.AnnotationObject, unicode) +@returns(bool) +def string_out(self, str_out): + # Python wrapper for regress_annotation_object_string_out() + + + +

Test returning a string as an out parameter

+ + + + +
+

self :

+

a

+

str_out :

+

string return value

+

Returns :

+

some boolean

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page new file mode 100644 index 00000000..2e5bba23 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_annotation_object_use_buffer + + Regress.AnnotationObject + self + + + guint8 + bytes + + + + + AnnotationObject.use_buffer + + +@accepts(Regress.AnnotationObject, guint8) +@returns(none) +def use_buffer(self, bytes): + # Python wrapper for regress_annotation_object_use_buffer() + + + + + + + + +
+

self :

+

a

+

bytes :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch.page new file mode 100644 index 00000000..87fbe044 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch.page @@ -0,0 +1,58 @@ + + + + + + + + none + + regress_annotation_object_watch + + Regress.AnnotationObject + self + + + Regress.AnnotationForeachFunc + func + + + gpointer + user_data + + + + + AnnotationObject.watch + + +@accepts(Regress.AnnotationObject, Regress.AnnotationForeachFunc, gpointer) +@returns(none) +def watch(self, func, user_data): + # Python wrapper for regress_annotation_object_watch() + + + +

This is here just for the sake of being overriden by its +.

+ + + + +
+

self :

+

A

+

func :

+

The callback

+

user_data :

+

The callback data

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page new file mode 100644 index 00000000..ced0ddcd --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page @@ -0,0 +1,63 @@ + + + + + + + + none + + regress_annotation_object_watch_full + + Regress.AnnotationObject + self + + + Regress.AnnotationForeachFunc + func + + + gpointer + user_data + + + GLib.DestroyNotify + destroy + + + + + AnnotationObject.watch_full + + +@accepts(Regress.AnnotationObject, Regress.AnnotationForeachFunc, gpointer, GLib.DestroyNotify) +@returns(none) +def watch_full(self, func, user_data, destroy): + # Python wrapper for regress_annotation_object_watch_full() + + + +

Test overriding via the "Rename To" regress_annotation.

+ + + + +
+

self :

+

A

+

func :

+

The callback

+

user_data :

+

The callback data

+

destroy :

+

Destroy notification

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page new file mode 100644 index 00000000..086223d7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_annotation_object_with_voidp + + Regress.AnnotationObject + self + + + gpointer + data + + + + + AnnotationObject.with_voidp + + +@accepts(Regress.AnnotationObject, gpointer) +@returns(none) +def with_voidp(self, data): + # Python wrapper for regress_annotation_object_with_voidp() + + + + + + + + +
+

self :

+
+

data :

+

Opaque pointer handle

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct.page new file mode 100644 index 00000000..edc9fd18 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.AnnotationStruct + + + +

This is a test of an array of object in an field of a struct.

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.DOUBLE_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.DOUBLE_CONSTANT.page new file mode 100644 index 00000000..b1aa32d8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.DOUBLE_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.DOUBLE_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page new file mode 100644 index 00000000..357665de --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FOO_DEFINE_SHOULD_BE_EXPOSED + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_PIE_IS_TASTY.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_PIE_IS_TASTY.page new file mode 100644 index 00000000..7dc308a1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_PIE_IS_TASTY.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FOO_PIE_IS_TASTY + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_SUCCESS_INT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_SUCCESS_INT.page new file mode 100644 index 00000000..f20f426f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_SUCCESS_INT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FOO_SUCCESS_INT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page new file mode 100644 index 00000000..34f1ed7c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page @@ -0,0 +1,29 @@ + + + + + + + + Regress.FooASingle + + + + + + + + +
+

FooASingle.FOO_SOME_SINGLE_ENUM :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page new file mode 100644 index 00000000..2dafde03 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.FooAddressType + + + + + + + + +
+

FooAddressType.INVALID :

+
+

FooAddressType.IPV4 :

+
+

FooAddressType.IPV6 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page new file mode 100644 index 00000000..8654fb42 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_foo_brect_add + + Regress.FooBRect + self + + + Regress.FooBRect + b2 + + + + + FooBRect.add + + +@accepts(Regress.FooBRect, Regress.FooBRect) +@returns(none) +def add(self, b2): + # Python wrapper for regress_foo_brect_add() + + + + + + + + +
+

self :

+
+

b2 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.page new file mode 100644 index 00000000..57e26525 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooBRect + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.page new file mode 100644 index 00000000..63831e74 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooBUnion + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page new file mode 100644 index 00000000..b357ea2f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_foo_boxed_method + + Regress.FooBoxed + self + + + + + FooBoxed.method + + +@accepts(Regress.FooBoxed) +@returns(none) +def method(self): + # Python wrapper for regress_foo_boxed_method() + + + + + + + + +
+

self :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.page new file mode 100644 index 00000000..962300f3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooBoxed + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.page new file mode 100644 index 00000000..c93a1f7f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.page @@ -0,0 +1,65 @@ + + + + + + + + Regress.FooBuffer + + +from gi.repository import Regress + +foo_buffer = Regress.FooBuffer() + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.FooObject + + Regress.FooBuffer + + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page new file mode 100644 index 00000000..472d16b7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_foo_buffer_some_method + + Regress.FooBuffer + self + + + + + FooBuffer.some_method + + +@accepts(Regress.FooBuffer) +@returns(none) +def some_method(self): + # Python wrapper for regress_foo_buffer_some_method() + + + + + + + + +
+

self :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooCallback.page new file mode 100644 index 00000000..241296e1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooCallback.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooCallback + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page new file mode 100644 index 00000000..db6a6b05 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_foo_dbus_data_method + + Regress.FooDBusData + self + + + + + FooDBusData.method + + +@accepts(Regress.FooDBusData) +@returns(none) +def method(self): + # Python wrapper for regress_foo_dbus_data_method() + + + + + + + + +
+

self :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.page new file mode 100644 index 00000000..08ad0d2e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooDBusData + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page new file mode 100644 index 00000000..a46070da --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.FooEnumFullname + + + + + + + + +
+

FooEnumFullname.ONE :

+
+

FooEnumFullname.TWO :

+
+

FooEnumFullname.THREE :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page new file mode 100644 index 00000000..2313192d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page @@ -0,0 +1,35 @@ + + + + + + + + Regress.FooEnumNoType + + + + + + + + +
+

FooEnumNoType.UN :

+
+

FooEnumNoType.DEUX :

+
+

FooEnumNoType.TROIS :

+
+

FooEnumNoType.NEUF :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page new file mode 100644 index 00000000..37510f5c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.FooEnumType + + + + + + + + +
+

FooEnumType.ALPHA :

+
+

FooEnumType.BETA :

+
+

FooEnumType.DELTA :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page new file mode 100644 index 00000000..0877e7c8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.FooError + + + + + + + + +
+

FooError.GOOD :

+
+

FooError.BAD :

+
+

FooError.UGLY :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent.page new file mode 100644 index 00000000..0b77bcbb --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooEvent + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny.page new file mode 100644 index 00000000..45cd3a13 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooEventAny + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose.page new file mode 100644 index 00000000..7e9ca7d4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooEventExpose + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page new file mode 100644 index 00000000..d4db757a --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooFlagsNoType + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page new file mode 100644 index 00000000..e4f3edef --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooFlagsType + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page new file mode 100644 index 00000000..8b7835fc --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page @@ -0,0 +1,47 @@ + + + + + + + + Regress.FooForeignStruct + + regress_foo_foreign_struct_copy + + Regress.FooForeignStruct + self + + + + + FooForeignStruct.copy + + +@accepts(Regress.FooForeignStruct) +@returns(Regress.FooForeignStruct) +def copy(self): + # Python wrapper for regress_foo_foreign_struct_copy() + + + + + + + + +
+

self :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.page new file mode 100644 index 00000000..06c5793f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooForeignStruct + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page new file mode 100644 index 00000000..b942b553 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page @@ -0,0 +1,36 @@ + + + + + + + + Regress.FooInterface::do_regress_foo + + +@accepts(Regress.FooInterface, int) +@returns(none) +def do_do_regress_foo(self, x): + + + + + + + + +
+

self :

+
+

x :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page new file mode 100644 index 00000000..60af8445 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_foo_interface_do_regress_foo + + Regress.FooInterface + self + + + int + x + + + + + FooInterface.do_regress_foo + + +@accepts(Regress.FooInterface, int) +@returns(none) +def do_regress_foo(self, x): + # Python wrapper for regress_foo_interface_do_regress_foo() + + + + + + + + +
+

self :

+
+

x :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.page new file mode 100644 index 00000000..bc0b7df2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.page @@ -0,0 +1,59 @@ + + + + + + + + Regress.FooInterface + + +from gi.repository import Regress + +foo_interface = Regress.FooInterface() + + + + + + + + + Hierarchy + + + Regress.FooInterface + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page new file mode 100644 index 00000000..947a5e97 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_foo_interface_static_method + + int + x + + + + + FooInterface.static_method + + +@accepts(int) +@returns(none) +def static_method(x): + # Python wrapper for regress_foo_interface_static_method() + + + + + + + + +
+

x :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-hidden.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-hidden.page new file mode 100644 index 00000000..b751ddb4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-hidden.page @@ -0,0 +1,29 @@ + + + + + + hidden + + + Regress.FooObject:hidden + + +"hidden" None : Read / Write / Construct Only + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page new file mode 100644 index 00000000..a634e4e2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page @@ -0,0 +1,38 @@ + + + + + + + + Regress.FooObject::read_fn + + +@accepts(Regress.FooObject, int, int) +@returns(none) +def do_read_fn(object, offset, length): + + + +

Read some stuff.

+ + + + +
+

object :

+
+

offset :

+

offset

+

length :

+

length

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page new file mode 100644 index 00000000..c663823d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page @@ -0,0 +1,43 @@ + + + + + + signal + + + Regress.FooObject::signal + + +def callback(foo_object, object, p0, user_param1, ...) + + + + + + + + +
+

foo_object :

+

instance of Regress.FooObject that is emitting the signal

+

object :

+
+

p0 :

+
+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+

Returns :

+
gchar*
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-string.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-string.page new file mode 100644 index 00000000..ce48885e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-string.page @@ -0,0 +1,29 @@ + + + + + + string + + + Regress.FooObject:string + + +"string" unicode : Read / Write / Construct + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page new file mode 100644 index 00000000..1ad7512f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page @@ -0,0 +1,38 @@ + + + + + + + + Regress.FooObject::virtual_method + + +@accepts(Regress.FooObject, int) +@returns(bool) +def do_virtual_method(object, first_param): + + + + + + + + +
+

object :

+
+

first_param :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page new file mode 100644 index 00000000..6cb51386 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_foo_object_a_global_method + + Utility.Object + obj + + + + + FooObject.a_global_method + + +@accepts(Utility.Object) +@returns(none) +def a_global_method(obj): + # Python wrapper for regress_foo_object_a_global_method() + + + + + + + + +
+

obj :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page new file mode 100644 index 00000000..a3e39f1c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page @@ -0,0 +1,53 @@ + + + + + + + + Regress.FooOtherObject + + regress_foo_object_append_new_stack_layer + + Regress.FooObject + self + + + int + x + + + + + FooObject.append_new_stack_layer + + +@accepts(Regress.FooObject, int) +@returns(Regress.FooOtherObject) +def append_new_stack_layer(self, x): + # Python wrapper for regress_foo_object_append_new_stack_layer() + + + +

This shouldn't be scanned as a constructor.

+ + + + +
+

self :

+
+

x :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page new file mode 100644 index 00000000..a0237951 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page @@ -0,0 +1,47 @@ + + + + + + + + unicode + + regress_foo_object_dup_name + + Regress.FooObject + self + + + + + FooObject.dup_name + + +@accepts(Regress.FooObject) +@returns(unicode) +def dup_name(self): + # Python wrapper for regress_foo_object_dup_name() + + + + + + + + +
+

self :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page new file mode 100644 index 00000000..48d5e591 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page @@ -0,0 +1,47 @@ + + + + + + + + Utility.Object + + regress_foo_object_external_type + + Regress.FooObject + self + + + + + FooObject.external_type + + +@accepts(Regress.FooObject) +@returns(Utility.Object) +def external_type(self): + # Python wrapper for regress_foo_object_external_type() + + + + + + + + +
+

self :

+

a

+

Returns :

+

None always

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page new file mode 100644 index 00000000..b1208bdc --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page @@ -0,0 +1,41 @@ + + + + + + + + Regress.FooSubobject + + regress_foo_object_get_default + + + + FooObject.get_default + + +@returns(Regress.FooSubobject) +def get_default(): + # Python wrapper for regress_foo_object_get_default() + + + +

This function is intended to match clutter_stage_get_default which +uses a C sugar return type.

+ + + + +
+

Returns :

+

The global

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page new file mode 100644 index 00000000..fc87e4a9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page @@ -0,0 +1,47 @@ + + + + + + + + unicode + + regress_foo_object_get_name + + Regress.FooObject + self + + + + + FooObject.get_name + + +@accepts(Regress.FooObject) +@returns(unicode) +def get_name(self): + # Python wrapper for regress_foo_object_get_name() + + + + + + + + +
+

self :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page new file mode 100644 index 00000000..20fea248 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_foo_object_handle_glyph + + Regress.FooObject + self + + + Utility.Glyph + glyph + + + + + FooObject.handle_glyph + + +@accepts(Regress.FooObject, Utility.Glyph) +@returns(none) +def handle_glyph(self, glyph): + # Python wrapper for regress_foo_object_handle_glyph() + + + + + + + + +
+

self :

+
+

glyph :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page new file mode 100644 index 00000000..3ee60dd2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_foo_object_is_it_time_yet + + Regress.FooObject + self + + + int + time + + + + + FooObject.is_it_time_yet + + +@accepts(Regress.FooObject, int) +@returns(none) +def is_it_time_yet(self, time): + # Python wrapper for regress_foo_object_is_it_time_yet() + + + + + + + + +
+

self :

+
+

time :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.new_cookie.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.new_cookie.page new file mode 100644 index 00000000..aadefdff --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.new_cookie.page @@ -0,0 +1,53 @@ + + + + + + + + Regress.FooObjectCookie + + regress_foo_object_new_cookie + + Regress.FooObject + self + + + unicode + target + + + + + FooObject.new_cookie + + +@accepts(Regress.FooObject, unicode) +@returns(Regress.FooObjectCookie) +def new_cookie(self, target): + # Python wrapper for regress_foo_object_new_cookie() + + + +

Not sure why this test is here...

+ + + + +
+

self :

+
+

target :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page new file mode 100644 index 00000000..9a635381 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page @@ -0,0 +1,62 @@ + + + + + + + + Regress.FooObject + + +from gi.repository import Regress + +foo_object = Regress.FooObject(hidden=value, string=value) + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.FooObject + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page new file mode 100644 index 00000000..d3ec000f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page @@ -0,0 +1,57 @@ + + + + + + + + none + + regress_foo_object_read + + Regress.FooObject + self + + + int + offset + + + int + length + + + + + FooObject.read + + +@accepts(Regress.FooObject, int, int) +@returns(none) +def read(self, offset, length): + # Python wrapper for regress_foo_object_read() + + + +

Read some stuff.

+ + + + +
+

self :

+

obj

+

offset :

+

offset

+

length :

+

length

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.skipped_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.skipped_method.page new file mode 100644 index 00000000..7a56e3c9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.skipped_method.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_foo_object_skipped_method + + Regress.FooObject + self + + + + + FooObject.skipped_method + + +@accepts(Regress.FooObject) +@returns(none) +def skipped_method(self): + # Python wrapper for regress_foo_object_skipped_method() + + + +

This is only useful from C.

+ + + + +
+

self :

+

obj

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page new file mode 100644 index 00000000..2212da02 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page @@ -0,0 +1,40 @@ + + + + + + + + int + + regress_foo_object_static_meth + + + + FooObject.static_meth + + +@returns(int) +def static_meth(): + # Python wrapper for regress_foo_object_static_meth() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.take_all.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.take_all.page new file mode 100644 index 00000000..be7b23f5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.take_all.page @@ -0,0 +1,54 @@ + + + + + + + + none + + regress_foo_object_take_all + + Regress.FooObject + self + + + int + x + + + + + + FooObject.take_all + + +@accepts(Regress.FooObject, int, ) +@returns(none) +def take_all(self, x, ...): + # Python wrapper for regress_foo_object_take_all() + + + + + + + + +
+

self :

+
+

x :

+
+

... :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page new file mode 100644 index 00000000..702a6e85 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page @@ -0,0 +1,57 @@ + + + + + + + + none + + regress_foo_object_various + + Regress.FooObject + self + + + gpointer + data + + + GType + some_type + + + + + FooObject.various + + +@accepts(Regress.FooObject, gpointer, GType) +@returns(none) +def various(self, data, some_type): + # Python wrapper for regress_foo_object_various() + + + + + + + + +
+

self :

+
+

data :

+
+

some_type :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page new file mode 100644 index 00000000..68a94097 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page @@ -0,0 +1,53 @@ + + + + + + + + bool + + regress_foo_object_virtual_method + + Regress.FooObject + self + + + int + first_param + + + + + FooObject.virtual_method + + +@accepts(Regress.FooObject, int) +@returns(bool) +def virtual_method(self, first_param): + # Python wrapper for regress_foo_object_virtual_method() + + + + + + + + +
+

self :

+
+

first_param :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page new file mode 100644 index 00000000..4d9cabc6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooObjectCookie + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page new file mode 100644 index 00000000..111b2aca --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page @@ -0,0 +1,62 @@ + + + + + + + + Regress.FooOtherObject + + +from gi.repository import Regress + +foo_other_object = Regress.FooOtherObject() + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.FooOtherObject + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page new file mode 100644 index 00000000..ea8bf20c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_foo_rectangle_add + + Regress.FooRectangle + self + + + Regress.FooRectangle + r2 + + + + + FooRectangle.add + + +@accepts(Regress.FooRectangle, Regress.FooRectangle) +@returns(none) +def add(self, r2): + # Python wrapper for regress_foo_rectangle_add() + + + + + + + + +
+

self :

+

add to this rect

+

r2 :

+

source rectangle

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.new.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.new.page new file mode 100644 index 00000000..392f67ae --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.new.page @@ -0,0 +1,66 @@ + + + + + + + + Regress.FooRectangle + + regress_foo_rectangle_new + + int + x + + + int + y + + + int + width + + + int + height + + + + + FooRectangle.new + + +@accepts(int, int, int, int) +@returns(Regress.FooRectangle) +def new(x, y, width, height): + # Python wrapper for regress_foo_rectangle_new() + + + +

This is a C convenience constructor; we have to (skip) +it because it's not a boxed type.

+ + + + +
+

x :

+
+

y :

+
+

width :

+
+

height :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page new file mode 100644 index 00000000..521a68bc --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooRectangle + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSkippable.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSkippable.page new file mode 100644 index 00000000..605ccf5b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSkippable.page @@ -0,0 +1,32 @@ + + + + + + + + Regress.FooSkippable + + + +

Some type that is only interesting from C and should not be +exposed to language bindings.

+ + + + +
+

FooSkippable.ONE :

+

a skippable enum value

+

FooSkippable.TWO :

+

another skippable enum value

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page new file mode 100644 index 00000000..83ca6a12 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page @@ -0,0 +1,45 @@ + + + + + + + + Regress.FooStackLayer + + + + + + + + +
+

FooStackLayer.DESKTOP :

+
+

FooStackLayer.BOTTOM :

+
+

FooStackLayer.NORMAL :

+
+

FooStackLayer.TOP :

+
+

FooStackLayer.DOCK :

+
+

FooStackLayer.FULLSCREEN :

+
+

FooStackLayer.FOCUSED_WINDOW :

+
+

FooStackLayer.OVERRIDE_REDIRECT :

+
+

FooStackLayer.LAST :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page new file mode 100644 index 00000000..4088a6c2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooStruct + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page new file mode 100644 index 00000000..bb146abf --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page @@ -0,0 +1,37 @@ + + + + + + destroy-event + + + Regress.FooSubInterface::destroy-event + + +def callback(foo_sub_interface, user_param1, ...) + + + + + + + + +
+

foo_sub_interface :

+

instance of Regress.FooSubInterface that is emitting the signal

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page new file mode 100644 index 00000000..5f014dfa --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page @@ -0,0 +1,34 @@ + + + + + + + + Regress.FooSubInterface::destroy_event + + +@accepts(Regress.FooSubInterface) +@returns(none) +def do_destroy_event(self): + + + + + + + + +
+

self :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page new file mode 100644 index 00000000..fd55d897 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page @@ -0,0 +1,34 @@ + + + + + + + + Regress.FooSubInterface::do_bar + + +@accepts(Regress.FooSubInterface) +@returns(none) +def do_do_bar(self): + + + + + + + + +
+

self :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page new file mode 100644 index 00000000..1078dfca --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page @@ -0,0 +1,38 @@ + + + + + + + + Regress.FooSubInterface::do_baz + + +@accepts(Regress.FooSubInterface, GObject.Callback, gpointer) +@returns(none) +def do_do_baz(self, callback, user_data): + + + + + + + + +
+

self :

+
+

callback :

+
+

user_data :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page new file mode 100644 index 00000000..6be01ab8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_foo_sub_interface_do_bar + + Regress.FooSubInterface + self + + + + + FooSubInterface.do_bar + + +@accepts(Regress.FooSubInterface) +@returns(none) +def do_bar(self): + # Python wrapper for regress_foo_sub_interface_do_bar() + + + + + + + + +
+

self :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page new file mode 100644 index 00000000..af759a15 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page @@ -0,0 +1,57 @@ + + + + + + + + none + + regress_foo_sub_interface_do_baz + + Regress.FooSubInterface + self + + + GObject.Callback + callback + + + gpointer + user_data + + + + + FooSubInterface.do_baz + + +@accepts(Regress.FooSubInterface, GObject.Callback, gpointer) +@returns(none) +def do_baz(self, callback, user_data): + # Python wrapper for regress_foo_sub_interface_do_baz() + + + + + + + + +
+

self :

+
+

callback :

+
+

user_data :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page new file mode 100644 index 00000000..e4d936ab --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page @@ -0,0 +1,59 @@ + + + + + + + + Regress.FooSubInterface + + +from gi.repository import Regress + +foo_sub_interface = Regress.FooSubInterface() + + + + + + + + + Hierarchy + + + Regress.FooSubInterface + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page new file mode 100644 index 00000000..c4e1ce26 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page @@ -0,0 +1,65 @@ + + + + + + + + Regress.FooSubobject + + +from gi.repository import Regress + +foo_subobject = Regress.FooSubobject() + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.FooObject + + Regress.FooSubobject + + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page new file mode 100644 index 00000000..7ae6ae56 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooThingWithArray + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page new file mode 100644 index 00000000..06d2e800 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooUnion + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page new file mode 100644 index 00000000..0471b871 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooUtilityStruct + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooVarargsCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooVarargsCallback.page new file mode 100644 index 00000000..d477638a --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooVarargsCallback.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooVarargsCallback + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page new file mode 100644 index 00000000..18122490 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooXEvent + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANT.page new file mode 100644 index 00000000..9a0cd162 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.GUINT64_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANTA.page b/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANTA.page new file mode 100644 index 00000000..4faf765f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANTA.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.GUINT64_CONSTANTA + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.G_GINT64_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.G_GINT64_CONSTANT.page new file mode 100644 index 00000000..b4a66f69 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.G_GINT64_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.G_GINT64_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.INT_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.INT_CONSTANT.page new file mode 100644 index 00000000..e4df9a1e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.INT_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.INT_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.IntSet.page b/tests/scanner/Regress-1.0-Python-expected/Regress.IntSet.page new file mode 100644 index 00000000..e285bc28 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.IntSet.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.IntSet + + + +

Compatibility typedef, like telepathy-glib's TpIntSet

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LONG_STRING_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LONG_STRING_CONSTANT.page new file mode 100644 index 00000000..3c0409a7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.LONG_STRING_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.LONG_STRING_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page new file mode 100644 index 00000000..05362e5c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.LikeGnomeKeyringPasswordSchema + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.MAXUINT64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.MAXUINT64.page new file mode 100644 index 00000000..be1afd19 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.MAXUINT64.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.MAXUINT64 + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.MININT64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.MININT64.page new file mode 100644 index 00000000..35c3e584 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.MININT64.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.MININT64 + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.Mixed_Case_Constant.page b/tests/scanner/Regress-1.0-Python-expected/Regress.Mixed_Case_Constant.page new file mode 100644 index 00000000..5ea8d9b0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.Mixed_Case_Constant.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.Mixed_Case_Constant + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.NEGATIVE_INT_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.NEGATIVE_INT_CONSTANT.page new file mode 100644 index 00000000..576c690f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.NEGATIVE_INT_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.NEGATIVE_INT_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page b/tests/scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page new file mode 100644 index 00000000..9af00b51 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.PtrArrayAlias + + + +

Typedef'd GPtrArray for some reason

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.STRING_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.STRING_CONSTANT.page new file mode 100644 index 00000000..945ba986 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.STRING_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.STRING_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.SkippedStructure.page b/tests/scanner/Regress-1.0-Python-expected/Regress.SkippedStructure.page new file mode 100644 index 00000000..2e67ac03 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.SkippedStructure.page @@ -0,0 +1,26 @@ + + + + + + + + Regress.SkippedStructure + + + +

This should be skipped, and moreover, all function which +use it should be.

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page new file mode 100644 index 00000000..fea8d58e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.TestABCError + + + + + + + + +
+

TestABCError.CODE1 :

+
+

TestABCError.CODE2 :

+
+

TestABCError.CODE3 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page new file mode 100644 index 00000000..489f3ffa --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page @@ -0,0 +1,47 @@ + + + + + + + + Regress.TestBoxed + + regress_test_boxed_copy + + Regress.TestBoxed + self + + + + + TestBoxed.copy + + +@accepts(Regress.TestBoxed) +@returns(Regress.TestBoxed) +def copy(self): + # Python wrapper for regress_test_boxed_copy() + + + + + + + + +
+

self :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page new file mode 100644 index 00000000..68a19e07 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page @@ -0,0 +1,53 @@ + + + + + + + + bool + + regress_test_boxed_equals + + Regress.TestBoxed + self + + + Regress.TestBoxed + other + + + + + TestBoxed.equals + + +@accepts(Regress.TestBoxed, Regress.TestBoxed) +@returns(bool) +def equals(self, other): + # Python wrapper for regress_test_boxed_equals() + + + + + + + + +
+

self :

+
+

other :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page new file mode 100644 index 00000000..c6792c50 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestBoxed + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page new file mode 100644 index 00000000..f770ecfe --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page @@ -0,0 +1,47 @@ + + + + + + + + Regress.TestBoxedB + + regress_test_boxed_b_copy + + Regress.TestBoxedB + self + + + + + TestBoxedB.copy + + +@accepts(Regress.TestBoxedB) +@returns(Regress.TestBoxedB) +def copy(self): + # Python wrapper for regress_test_boxed_b_copy() + + + + + + + + +
+

self :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page new file mode 100644 index 00000000..46cf7c15 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestBoxedB + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page new file mode 100644 index 00000000..88dd1a4c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestBoxedC + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page new file mode 100644 index 00000000..84a66e51 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page @@ -0,0 +1,47 @@ + + + + + + + + Regress.TestBoxedD + + regress_test_boxed_d_copy + + Regress.TestBoxedD + self + + + + + TestBoxedD.copy + + +@accepts(Regress.TestBoxedD) +@returns(Regress.TestBoxedD) +def copy(self): + # Python wrapper for regress_test_boxed_d_copy() + + + + + + + + +
+

self :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page new file mode 100644 index 00000000..5c37368c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_boxed_d_free + + Regress.TestBoxedD + self + + + + + TestBoxedD.free + + +@accepts(Regress.TestBoxedD) +@returns(none) +def free(self): + # Python wrapper for regress_test_boxed_d_free() + + + + + + + + +
+

self :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page new file mode 100644 index 00000000..af75b8f6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page @@ -0,0 +1,47 @@ + + + + + + + + int + + regress_test_boxed_d_get_magic + + Regress.TestBoxedD + self + + + + + TestBoxedD.get_magic + + +@accepts(Regress.TestBoxedD) +@returns(int) +def get_magic(self): + # Python wrapper for regress_test_boxed_d_get_magic() + + + + + + + + +
+

self :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page new file mode 100644 index 00000000..17b3c79b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestBoxedD + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page new file mode 100644 index 00000000..9a219e9e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallback + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page new file mode 100644 index 00000000..7ceb2e07 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallbackArray + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackFull.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackFull.page new file mode 100644 index 00000000..3de1fbe8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackFull.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallbackFull + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page new file mode 100644 index 00000000..1f6f2bdb --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallbackGError + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page new file mode 100644 index 00000000..906947c1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallbackHashtable + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page new file mode 100644 index 00000000..e7397a1b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallbackOwnedGError + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page new file mode 100644 index 00000000..f3047cfd --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestCallbackUserData + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page new file mode 100644 index 00000000..b6f0eb88 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.TestDEFError + + + + + + + + +
+

TestDEFError.CODE0 :

+
+

TestDEFError.CODE1 :

+
+

TestDEFError.CODE2 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page new file mode 100644 index 00000000..3de1bbf6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page @@ -0,0 +1,35 @@ + + + + + + + + Regress.TestEnum + + + +

By purpose, not all members have documentation

+ + + + +
+

TestEnum.VALUE1 :

+

value 1

+

TestEnum.VALUE2 :

+

value 2

+

TestEnum.VALUE3 :

+
+

TestEnum.VALUE4 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page new file mode 100644 index 00000000..625c8703 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.TestEnumNoGEnum + + + + + + + + +
+

TestEnumNoGEnum.EVALUE1 :

+
+

TestEnumNoGEnum.EVALUE2 :

+
+

TestEnumNoGEnum.EVALUE3 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page new file mode 100644 index 00000000..3069d8e3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page @@ -0,0 +1,31 @@ + + + + + + + + Regress.TestEnumUnsigned + + + + + + + + +
+

TestEnumUnsigned.VALUE1 :

+
+

TestEnumUnsigned.VALUE2 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page new file mode 100644 index 00000000..57a21163 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.TestError + + + + + + + + +
+

TestError.CODE1 :

+
+

TestError.CODE2 :

+
+

TestError.CODE3 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page new file mode 100644 index 00000000..d5451972 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestFlags + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page new file mode 100644 index 00000000..87520bd8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page @@ -0,0 +1,65 @@ + + + + + + + + Regress.TestFloating + + +from gi.repository import Regress + +test_floating = Regress.TestFloating() + + + + + + + + + Hierarchy + + + GObject.Object + + GObject.InitiallyUnowned + + Regress.TestFloating + + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page new file mode 100644 index 00000000..af4623a2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page @@ -0,0 +1,59 @@ + + + + + + + + Regress.TestFundamentalObject + + +from gi.repository import Regress + +test_fundamental_object = Regress.TestFundamentalObject() + + + + + + + + + Hierarchy + + + Regress.TestFundamentalObject + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page new file mode 100644 index 00000000..243e8fdb --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page @@ -0,0 +1,47 @@ + + + + + + + + Regress.TestFundamentalObject + + regress_test_fundamental_object_ref + + Regress.TestFundamentalObject + self + + + + + TestFundamentalObject.ref + + +@accepts(Regress.TestFundamentalObject) +@returns(Regress.TestFundamentalObject) +def ref(self): + # Python wrapper for regress_test_fundamental_object_ref() + + + + + + + + +
+

self :

+
+

Returns :

+

A new

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page new file mode 100644 index 00000000..eec1dbf7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_fundamental_object_unref + + Regress.TestFundamentalObject + self + + + + + TestFundamentalObject.unref + + +@accepts(Regress.TestFundamentalObject) +@returns(none) +def unref(self): + # Python wrapper for regress_test_fundamental_object_unref() + + + + + + + + +
+

self :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page new file mode 100644 index 00000000..dfd65cef --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestFundamentalObjectCopyFunction + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page new file mode 100644 index 00000000..2b9d965c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestFundamentalObjectFinalizeFunction + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page new file mode 100644 index 00000000..6f3a246e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page @@ -0,0 +1,62 @@ + + + + + + + + Regress.TestFundamentalSubObject + + +from gi.repository import Regress + +test_fundamental_sub_object = Regress.TestFundamentalSubObject() + + + + + + + + + Hierarchy + + + Regress.TestFundamentalObject + + Regress.TestFundamentalSubObject + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page new file mode 100644 index 00000000..5c97095e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_test_inherit_drawable_do_foo + + Regress.TestInheritDrawable + self + + + int + x + + + + + TestInheritDrawable.do_foo + + +@accepts(Regress.TestInheritDrawable, int) +@returns(none) +def do_foo(self, x): + # Python wrapper for regress_test_inherit_drawable_do_foo() + + + + + + + + +
+

self :

+
+

x :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page new file mode 100644 index 00000000..1e3d0419 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_test_inherit_drawable_do_foo_maybe_throw + + Regress.TestInheritDrawable + self + + + int + x + + + + + TestInheritDrawable.do_foo_maybe_throw + + +@accepts(Regress.TestInheritDrawable, int) +@returns(none) +def do_foo_maybe_throw(self, x): + # Python wrapper for regress_test_inherit_drawable_do_foo_maybe_throw() + + + + + + + + +
+

self :

+
+

x :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page new file mode 100644 index 00000000..908bdec2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page @@ -0,0 +1,57 @@ + + + + + + + + none + + regress_test_inherit_drawable_get_origin + + Regress.TestInheritDrawable + self + + + int + x + + + int + y + + + + + TestInheritDrawable.get_origin + + +@accepts(Regress.TestInheritDrawable, int, int) +@returns(none) +def get_origin(self, x, y): + # Python wrapper for regress_test_inherit_drawable_get_origin() + + + + + + + + +
+

self :

+
+

x :

+
+

y :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page new file mode 100644 index 00000000..f6bb0368 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page @@ -0,0 +1,57 @@ + + + + + + + + none + + regress_test_inherit_drawable_get_size + + Regress.TestInheritDrawable + self + + + int + width + + + int + height + + + + + TestInheritDrawable.get_size + + +@accepts(Regress.TestInheritDrawable, int, int) +@returns(none) +def get_size(self, width, height): + # Python wrapper for regress_test_inherit_drawable_get_size() + + + + + + + + +
+

self :

+
+

width :

+
+

height :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page new file mode 100644 index 00000000..d7ed30bc --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page @@ -0,0 +1,62 @@ + + + + + + + + Regress.TestInheritDrawable + + +from gi.repository import Regress + +test_inherit_drawable = Regress.TestInheritDrawable() + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.TestInheritDrawable + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page new file mode 100644 index 00000000..deaeea50 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestInheritPixmapObjectClass + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page new file mode 100644 index 00000000..454ff74f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page @@ -0,0 +1,59 @@ + + + + + + + + Regress.TestInterface + + +from gi.repository import Regress + +test_interface = Regress.TestInterface() + + + + + + + + + Hierarchy + + + Regress.TestInterface + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page new file mode 100644 index 00000000..1a1be536 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page @@ -0,0 +1,37 @@ + + + + + + all + + + Regress.TestObj::all + + +def callback(test_obj, user_param1, ...) + + + + + + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page new file mode 100644 index 00000000..3f72a491 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page @@ -0,0 +1,36 @@ + + + + + + + + Regress.TestObj::allow_none_vfunc + + +@accepts(Regress.TestObj, Regress.TestObj) +@returns(none) +def do_allow_none_vfunc(obj, two): + + + + + + + + +
+

obj :

+
+

two :

+

Another object

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page new file mode 100644 index 00000000..97c7ee68 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page @@ -0,0 +1,29 @@ + + + + + + bare + + + Regress.TestObj:bare + + +"bare" GObject.Object : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page new file mode 100644 index 00000000..e8706270 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page @@ -0,0 +1,29 @@ + + + + + + boxed + + + Regress.TestObj:boxed + + +"boxed" Regress.TestBoxed : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page new file mode 100644 index 00000000..6c3bca29 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page @@ -0,0 +1,37 @@ + + + + + + cleanup + + + Regress.TestObj::cleanup + + +def callback(test_obj, user_param1, ...) + + + + + + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page new file mode 100644 index 00000000..8243a454 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page @@ -0,0 +1,29 @@ + + + + + + double + + + Regress.TestObj:double + + +"double" float : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page new file mode 100644 index 00000000..8a05f090 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page @@ -0,0 +1,37 @@ + + + + + + first + + + Regress.TestObj::first + + +def callback(test_obj, user_param1, ...) + + + + + + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page new file mode 100644 index 00000000..8ff32c00 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page @@ -0,0 +1,29 @@ + + + + + + float + + + Regress.TestObj:float + + +"float" float : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page new file mode 100644 index 00000000..b477bed4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page @@ -0,0 +1,29 @@ + + + + + + gtype + + + Regress.TestObj:gtype + + +"gtype" GType : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page new file mode 100644 index 00000000..57d37ae5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page @@ -0,0 +1,29 @@ + + + + + + hash-table-old + + + Regress.TestObj:hash-table-old + + +"hash-table-old" {unicode: gint8} : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page new file mode 100644 index 00000000..1c5a6eaf --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page @@ -0,0 +1,29 @@ + + + + + + hash-table + + + Regress.TestObj:hash-table + + +"hash-table" {unicode: gint8} : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page new file mode 100644 index 00000000..18089ad7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page @@ -0,0 +1,29 @@ + + + + + + int + + + Regress.TestObj:int + + +"int" int : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page new file mode 100644 index 00000000..fe821889 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page @@ -0,0 +1,29 @@ + + + + + + list-old + + + Regress.TestObj:list-old + + +"list-old" : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page new file mode 100644 index 00000000..30d452db --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page @@ -0,0 +1,29 @@ + + + + + + list + + + Regress.TestObj:list + + +"list" : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page new file mode 100644 index 00000000..b41a4072 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.TestObj::matrix + + +@accepts(Regress.TestObj, unicode) +@returns(int) +def do_matrix(obj, somestr): + + + +

This method is virtual. Notably its name differs from the virtual +slot name, which makes it useful for testing bindings handle this +case.

+ + + + +
+

obj :

+
+

somestr :

+

Meaningless string

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page new file mode 100644 index 00000000..d326c878 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page @@ -0,0 +1,40 @@ + + + + + + sig-with-array-prop + + + Regress.TestObj::sig-with-array-prop + + +def callback(test_obj, arr, user_param1, ...) + + + +

This test signal is like TelepathyGlib's + TpChannel:: group-members-changed-detailed:

+ + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

arr :

+

numbers

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page new file mode 100644 index 00000000..38e632a0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page @@ -0,0 +1,39 @@ + + + + + + sig-with-foreign-struct + + + Regress.TestObj::sig-with-foreign-struct + + +def callback(test_obj, cr, user_param1, ...) + + + + + + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

cr :

+

A cairo context.

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page new file mode 100644 index 00000000..467f995f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page @@ -0,0 +1,40 @@ + + + + + + sig-with-hash-prop + + + Regress.TestObj::sig-with-hash-prop + + +def callback(test_obj, hash, user_param1, ...) + + + +

This test signal is like TelepathyGlib's + TpAccount::status-changed

+ + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

hash :

+
+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page new file mode 100644 index 00000000..357847ba --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page @@ -0,0 +1,42 @@ + + + + + + sig-with-int64-prop + + + Regress.TestObj::sig-with-int64-prop + + +def callback(test_obj, i, user_param1, ...) + + + +

You can use this with regress_test_obj_emit_sig_with_int64, or raise from +the introspection client langage.

+ + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

i :

+

an integer

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+

Returns :

+
gint64
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page new file mode 100644 index 00000000..7f2bd5c6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page @@ -0,0 +1,39 @@ + + + + + + sig-with-intarray-ret + + + Regress.TestObj::sig-with-intarray-ret + + +def callback(test_obj, i, user_param1, ...) + + + + + + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

i :

+

an integer

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page new file mode 100644 index 00000000..a4106050 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page @@ -0,0 +1,40 @@ + + + + + + sig-with-obj + + + Regress.TestObj::sig-with-obj + + +def callback(test_obj, obj, user_param1, ...) + + + +

Test transfer none GObject as a param (tests refcounting). +Use with regress_test_obj_emit_sig_with_obj

+ + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

obj :

+

A newly created RegressTestObj

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page new file mode 100644 index 00000000..b6b5b25c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page @@ -0,0 +1,39 @@ + + + + + + sig-with-strv + + + Regress.TestObj::sig-with-strv + + +def callback(test_obj, strs, user_param1, ...) + + + +

Test GStrv as a param.

+ + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

strs :

+

strings

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page new file mode 100644 index 00000000..5617c5c7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -0,0 +1,42 @@ + + + + + + sig-with-uint64-prop + + + Regress.TestObj::sig-with-uint64-prop + + +def callback(test_obj, i, user_param1, ...) + + + +

You can use this with regress_test_obj_emit_sig_with_uint64, or raise from +the introspection client langage.

+ + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

i :

+

an integer

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+

Returns :

+
guint64
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page new file mode 100644 index 00000000..345a8218 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page @@ -0,0 +1,29 @@ + + + + + + string + + + Regress.TestObj:string + + +"string" unicode : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page new file mode 100644 index 00000000..bdd3b3eb --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page @@ -0,0 +1,39 @@ + + + + + + test-with-static-scope-arg + + + Regress.TestObj::test-with-static-scope-arg + + +def callback(test_obj, object, user_param1, ...) + + + + + + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

object :

+
+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page new file mode 100644 index 00000000..74a74548 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page @@ -0,0 +1,37 @@ + + + + + + test + + + Regress.TestObj::test + + +def callback(test_obj, user_param1, ...) + + + + + + + + +
+

test_obj :

+

instance of Regress.TestObj that is emitting the signal

+

user_param1 :

+

first user parameter (if any) specified with the connect() method

+

... :

+

additional user parameters (if any)

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page new file mode 100644 index 00000000..a7140188 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page @@ -0,0 +1,55 @@ + + + + + + + + int + + regress_test_obj_do_matrix + + Regress.TestObj + self + + + unicode + somestr + + + + + TestObj.do_matrix + + +@accepts(Regress.TestObj, unicode) +@returns(int) +def do_matrix(self, somestr): + # Python wrapper for regress_test_obj_do_matrix() + + + +

This method is virtual. Notably its name differs from the virtual +slot name, which makes it useful for testing bindings handle this +case.

+ + + + +
+

self :

+

A

+

somestr :

+

Meaningless string

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page new file mode 100644 index 00000000..b0eafb02 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_obj_emit_sig_with_foreign_struct + + Regress.TestObj + self + + + + + TestObj.emit_sig_with_foreign_struct + + +@accepts(Regress.TestObj) +@returns(none) +def emit_sig_with_foreign_struct(self): + # Python wrapper for regress_test_obj_emit_sig_with_foreign_struct() + + + + + + + + +
+

self :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page new file mode 100644 index 00000000..86c6b93d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_obj_emit_sig_with_int64 + + Regress.TestObj + self + + + + + TestObj.emit_sig_with_int64 + + +@accepts(Regress.TestObj) +@returns(none) +def emit_sig_with_int64(self): + # Python wrapper for regress_test_obj_emit_sig_with_int64() + + + + + + + + +
+

self :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page new file mode 100644 index 00000000..ccd5ad82 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_obj_emit_sig_with_obj + + Regress.TestObj + self + + + + + TestObj.emit_sig_with_obj + + +@accepts(Regress.TestObj) +@returns(none) +def emit_sig_with_obj(self): + # Python wrapper for regress_test_obj_emit_sig_with_obj() + + + + + + + + +
+

self :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page new file mode 100644 index 00000000..e2f98768 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_obj_emit_sig_with_uint64 + + Regress.TestObj + self + + + + + TestObj.emit_sig_with_uint64 + + +@accepts(Regress.TestObj) +@returns(none) +def emit_sig_with_uint64(self): + # Python wrapper for regress_test_obj_emit_sig_with_uint64() + + + + + + + + +
+

self :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page new file mode 100644 index 00000000..8cb577f9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_forced_method + + Regress.TestObj + self + + + + + TestObj.forced_method + + +@accepts(Regress.TestObj) +@returns(none) +def forced_method(self): + # Python wrapper for regress_forced_method() + + + + + + + + +
+

self :

+

A

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page new file mode 100644 index 00000000..165c467e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page @@ -0,0 +1,47 @@ + + + + + + + + int + + regress_test_obj_instance_method + + Regress.TestObj + self + + + + + TestObj.instance_method + + +@accepts(Regress.TestObj) +@returns(int) +def instance_method(self): + # Python wrapper for regress_test_obj_instance_method() + + + + + + + + +
+

self :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page new file mode 100644 index 00000000..e57bcb6d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_test_obj_instance_method_callback + + Regress.TestObj + self + + + Regress.TestCallback + callback + + + + + TestObj.instance_method_callback + + +@accepts(Regress.TestObj, Regress.TestCallback) +@returns(none) +def instance_method_callback(self, callback): + # Python wrapper for regress_test_obj_instance_method_callback() + + + + + + + + +
+

self :

+
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page new file mode 100644 index 00000000..24c015c8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_obj_null_out + + Regress.TestObj + obj + + + + + TestObj.null_out + + +@accepts(Regress.TestObj) +@returns(none) +def null_out(obj): + # Python wrapper for regress_test_obj_null_out() + + + + + + + + +
+

obj :

+

A

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page new file mode 100644 index 00000000..2da014f5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page @@ -0,0 +1,62 @@ + + + + + + + + Regress.TestObj + + +from gi.repository import Regress + +test_obj = Regress.TestObj(bare=value, boxed=value, double=value, float=value, gtype=value, hash_table=value, hash_table_old=value, int=value, list=value, list_old=value, string=value) + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.TestObj + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page new file mode 100644 index 00000000..b4681739 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_test_obj_set_bare + + Regress.TestObj + self + + + GObject.Object + bare + + + + + TestObj.set_bare + + +@accepts(Regress.TestObj, GObject.Object) +@returns(none) +def set_bare(self, bare): + # Python wrapper for regress_test_obj_set_bare() + + + + + + + + +
+

self :

+
+

bare :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page new file mode 100644 index 00000000..21f9418f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page @@ -0,0 +1,89 @@ + + + + + + + + bool + + regress_test_obj_skip_inout_param + + Regress.TestObj + self + + + int + a + + + int + out_b + + + float + c + + + int + inout_d + + + int + out_sum + + + int + num1 + + + int + num2 + + + + + TestObj.skip_inout_param + + +@accepts(Regress.TestObj, int, int, float, int, int, int, int) +@returns(bool) +def skip_inout_param(self, a, out_b, c, inout_d, out_sum, num1, num2): + # Python wrapper for regress_test_obj_skip_inout_param() + + + +

Check that the out value is skipped

+ + + + +
+

self :

+

A .

+

a :

+

Parameter.

+

out_b :

+

Return value.

+

c :

+

Other parameter.

+

inout_d :

+

Will be incremented.

+

out_sum :

+

Return value.

+

num1 :

+

Number.

+

num2 :

+

Number.

+

Returns :

+

True if the call succeeds, False if @error is set.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page new file mode 100644 index 00000000..b8eab28e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page @@ -0,0 +1,89 @@ + + + + + + + + bool + + regress_test_obj_skip_out_param + + Regress.TestObj + self + + + int + a + + + int + out_b + + + float + c + + + int + inout_d + + + int + out_sum + + + int + num1 + + + int + num2 + + + + + TestObj.skip_out_param + + +@accepts(Regress.TestObj, int, int, float, int, int, int, int) +@returns(bool) +def skip_out_param(self, a, out_b, c, inout_d, out_sum, num1, num2): + # Python wrapper for regress_test_obj_skip_out_param() + + + +

Check that the out value is skipped

+ + + + +
+

self :

+

A .

+

a :

+

Parameter.

+

out_b :

+

Return value.

+

c :

+

Other parameter.

+

inout_d :

+

Will be incremented.

+

out_sum :

+

Return value.

+

num1 :

+

Number.

+

num2 :

+

Number.

+

Returns :

+

True if the call succeeds, False if @error is set.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page new file mode 100644 index 00000000..57f91672 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page @@ -0,0 +1,89 @@ + + + + + + + + bool + + regress_test_obj_skip_param + + Regress.TestObj + self + + + int + a + + + int + out_b + + + float + c + + + int + inout_d + + + int + out_sum + + + int + num1 + + + int + num2 + + + + + TestObj.skip_param + + +@accepts(Regress.TestObj, int, int, float, int, int, int, int) +@returns(bool) +def skip_param(self, a, out_b, c, inout_d, out_sum, num1, num2): + # Python wrapper for regress_test_obj_skip_param() + + + +

Check that a parameter is skipped

+ + + + +
+

self :

+

A .

+

a :

+

Parameter.

+

out_b :

+

Return value.

+

c :

+

Other parameter.

+

inout_d :

+

Will be incremented.

+

out_sum :

+

Return value.

+

num1 :

+

Number.

+

num2 :

+

Number.

+

Returns :

+

True if the call succeeds, False if @error is set.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page new file mode 100644 index 00000000..92d58ebd --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page @@ -0,0 +1,89 @@ + + + + + + + + bool + + regress_test_obj_skip_return_val + + Regress.TestObj + self + + + int + a + + + int + out_b + + + float + c + + + int + inout_d + + + int + out_sum + + + int + num1 + + + int + num2 + + + + + TestObj.skip_return_val + + +@accepts(Regress.TestObj, int, int, float, int, int, int, int) +@returns(bool) +def skip_return_val(self, a, out_b, c, inout_d, out_sum, num1, num2): + # Python wrapper for regress_test_obj_skip_return_val() + + + +

Check that the return value is skipped

+ + + + +
+

self :

+

a

+

a :

+

Parameter.

+

out_b :

+

A return value.

+

c :

+

Other parameter.

+

inout_d :

+

Will be incremented.

+

out_sum :

+

Return value.

+

num1 :

+

Number.

+

num2 :

+

Number.

+

Returns :

+

True if the call succeeds, False if @error is set.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page new file mode 100644 index 00000000..5feb3153 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page @@ -0,0 +1,54 @@ + + + + + + + + bool + + regress_test_obj_skip_return_val_no_out + + Regress.TestObj + self + + + int + a + + + + + TestObj.skip_return_val_no_out + + +@accepts(Regress.TestObj, int) +@returns(bool) +def skip_return_val_no_out(self, a): + # Python wrapper for regress_test_obj_skip_return_val_no_out() + + + +

Check that the return value is skipped. Succeed if a is nonzero, otherwise +raise an error.

+ + + + +
+

self :

+

a

+

a :

+

Parameter.

+

Returns :

+

True if the call succeeds, False if @error is set.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page new file mode 100644 index 00000000..1294c2ad --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page @@ -0,0 +1,47 @@ + + + + + + + + float + + regress_test_obj_static_method + + int + x + + + + + TestObj.static_method + + +@accepts(int) +@returns(float) +def static_method(x): + # Python wrapper for regress_test_obj_static_method() + + + + + + + + +
+

x :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page new file mode 100644 index 00000000..3d7d2645 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_obj_static_method_callback + + Regress.TestCallback + callback + + + + + TestObj.static_method_callback + + +@accepts(Regress.TestCallback) +@returns(none) +def static_method_callback(callback): + # Python wrapper for regress_test_obj_static_method_callback() + + + + + + + + +
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page new file mode 100644 index 00000000..c4e4e774 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page @@ -0,0 +1,81 @@ + + + + + + + + none + + regress_test_obj_torture_signature_0 + + Regress.TestObj + self + + + int + x + + + float + y + + + int + z + + + unicode + foo + + + int + q + + + int + m + + + + + TestObj.torture_signature_0 + + +@accepts(Regress.TestObj, int, float, int, unicode, int, int) +@returns(none) +def torture_signature_0(self, x, y, z, foo, q, m): + # Python wrapper for regress_test_obj_torture_signature_0() + + + + + + + + +
+

self :

+

A

+

x :

+
+

y :

+
+

z :

+
+

foo :

+
+

q :

+
+

m :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page new file mode 100644 index 00000000..787a5c35 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page @@ -0,0 +1,83 @@ + + + + + + + + bool + + regress_test_obj_torture_signature_1 + + Regress.TestObj + self + + + int + x + + + float + y + + + int + z + + + unicode + foo + + + int + q + + + int + m + + + + + TestObj.torture_signature_1 + + +@accepts(Regress.TestObj, int, float, int, unicode, int, int) +@returns(bool) +def torture_signature_1(self, x, y, z, foo, q, m): + # Python wrapper for regress_test_obj_torture_signature_1() + + + +

This function throws an error if m is odd.

+ + + + +
+

self :

+

A

+

x :

+
+

y :

+
+

z :

+
+

foo :

+
+

q :

+
+

m :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page new file mode 100644 index 00000000..1d907d24 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page @@ -0,0 +1,33 @@ + + + + + + + + Regress.TestOtherError + + + + + + + + +
+

TestOtherError.CODE1 :

+
+

TestOtherError.CODE2 :

+
+

TestOtherError.CODE3 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page new file mode 100644 index 00000000..788441ac --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestPrivateEnum + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page new file mode 100644 index 00000000..fa508137 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestPrivateStruct + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page new file mode 100644 index 00000000..b4444d2e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.TestSimpleBoxedA + + regress_test_simple_boxed_a_const_return + + + + TestSimpleBoxedA.const_return + + +@returns(Regress.TestSimpleBoxedA) +def const_return(): + # Python wrapper for regress_test_simple_boxed_a_const_return() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page new file mode 100644 index 00000000..4976e9ac --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page @@ -0,0 +1,47 @@ + + + + + + + + Regress.TestSimpleBoxedA + + regress_test_simple_boxed_a_copy + + Regress.TestSimpleBoxedA + self + + + + + TestSimpleBoxedA.copy + + +@accepts(Regress.TestSimpleBoxedA) +@returns(Regress.TestSimpleBoxedA) +def copy(self): + # Python wrapper for regress_test_simple_boxed_a_copy() + + + + + + + + +
+

self :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page new file mode 100644 index 00000000..a9f6577e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page @@ -0,0 +1,53 @@ + + + + + + + + bool + + regress_test_simple_boxed_a_equals + + Regress.TestSimpleBoxedA + self + + + Regress.TestSimpleBoxedA + other_a + + + + + TestSimpleBoxedA.equals + + +@accepts(Regress.TestSimpleBoxedA, Regress.TestSimpleBoxedA) +@returns(bool) +def equals(self, other_a): + # Python wrapper for regress_test_simple_boxed_a_equals() + + + + + + + + +
+

self :

+
+

other_a :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page new file mode 100644 index 00000000..2a8dd629 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestSimpleBoxedA + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page new file mode 100644 index 00000000..c04d3cda --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page @@ -0,0 +1,47 @@ + + + + + + + + Regress.TestSimpleBoxedB + + regress_test_simple_boxed_b_copy + + Regress.TestSimpleBoxedB + self + + + + + TestSimpleBoxedB.copy + + +@accepts(Regress.TestSimpleBoxedB) +@returns(Regress.TestSimpleBoxedB) +def copy(self): + # Python wrapper for regress_test_simple_boxed_b_copy() + + + + + + + + +
+

self :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page new file mode 100644 index 00000000..b775b867 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestSimpleBoxedB + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page new file mode 100644 index 00000000..61bafb5f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestSimpleCallback + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page new file mode 100644 index 00000000..2b609bb4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_test_struct_a_clone + + Regress.TestStructA + self + + + Regress.TestStructA + a_out + + + + + TestStructA.clone + + +@accepts(Regress.TestStructA, Regress.TestStructA) +@returns(none) +def clone(self, a_out): + # Python wrapper for regress_test_struct_a_clone() + + + +

Make a copy of a RegressTestStructA

+ + + + +
+

self :

+

the structure

+

a_out :

+

the cloned structure

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page new file mode 100644 index 00000000..07b1752d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructA + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page new file mode 100644 index 00000000..d18fcf7b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_test_struct_a_parse + + Regress.TestStructA + a_out + + + unicode + string + + + + + TestStructA.parse + + +@accepts(Regress.TestStructA, unicode) +@returns(none) +def parse(a_out, string): + # Python wrapper for regress_test_struct_a_parse() + + + + + + + + +
+

a_out :

+

the structure that is to be filled

+

string :

+

ignored

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page new file mode 100644 index 00000000..2a95a23d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_test_struct_b_clone + + Regress.TestStructB + self + + + Regress.TestStructB + b_out + + + + + TestStructB.clone + + +@accepts(Regress.TestStructB, Regress.TestStructB) +@returns(none) +def clone(self, b_out): + # Python wrapper for regress_test_struct_b_clone() + + + +

Make a copy of a RegressTestStructB

+ + + + +
+

self :

+

the structure

+

b_out :

+

the cloned structure

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page new file mode 100644 index 00000000..b5b2ff3f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructB + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page new file mode 100644 index 00000000..1db74ca2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructC + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page new file mode 100644 index 00000000..cf224e3e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructD + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page new file mode 100644 index 00000000..75684f3d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructE + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page new file mode 100644 index 00000000..6f77035b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructE__some_union__union + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page new file mode 100644 index 00000000..fe5e7bc6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructF + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page new file mode 100644 index 00000000..ffd3fae0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_struct_fixed_array_frob + + Regress.TestStructFixedArray + self + + + + + TestStructFixedArray.frob + + +@accepts(Regress.TestStructFixedArray) +@returns(none) +def frob(self): + # Python wrapper for regress_test_struct_fixed_array_frob() + + + + + + + + +
+

self :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page new file mode 100644 index 00000000..b5df5294 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestStructFixedArray + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page new file mode 100644 index 00000000..bc854f46 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page @@ -0,0 +1,47 @@ + + + + + + + + int + + regress_test_sub_obj_instance_method + + Regress.TestSubObj + self + + + + + TestSubObj.instance_method + + +@accepts(Regress.TestSubObj) +@returns(int) +def instance_method(self): + # Python wrapper for regress_test_sub_obj_instance_method() + + + + + + + + +
+

self :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page new file mode 100644 index 00000000..fef2f914 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page @@ -0,0 +1,65 @@ + + + + + + + + Regress.TestSubObj + + +from gi.repository import Regress + +test_sub_obj = Regress.TestSubObj() + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.TestObj + + Regress.TestSubObj + + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page new file mode 100644 index 00000000..fa4dcc1a --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_sub_obj_unset_bare + + Regress.TestSubObj + self + + + + + TestSubObj.unset_bare + + +@accepts(Regress.TestSubObj) +@returns(none) +def unset_bare(self): + # Python wrapper for regress_test_sub_obj_unset_bare() + + + + + + + + +
+

self :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page new file mode 100644 index 00000000..d815a3fe --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestTypeGUInt64 + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page new file mode 100644 index 00000000..5846ac62 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page @@ -0,0 +1,29 @@ + + + + + + testbool + + + Regress.TestWi8021x:testbool + + +"testbool" bool : Read / Write + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page new file mode 100644 index 00000000..c0bffe8a --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page @@ -0,0 +1,47 @@ + + + + + + + + bool + + regress_test_wi_802_1x_get_testbool + + Regress.TestWi8021x + self + + + + + TestWi8021x.get_testbool + + +@accepts(Regress.TestWi8021x) +@returns(bool) +def get_testbool(self): + # Python wrapper for regress_test_wi_802_1x_get_testbool() + + + + + + + + +
+

self :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page new file mode 100644 index 00000000..67b7ecae --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page @@ -0,0 +1,62 @@ + + + + + + + + Regress.TestWi8021x + + +from gi.repository import Regress + +test_wi8021x = Regress.TestWi8021x(testbool=value) + + + + + + + + + Hierarchy + + + GObject.Object + + Regress.TestWi8021x + + + + + + + + Methods + + + Functions + + + Properties + + + Signals + + + Virtual functions + + + Other + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page new file mode 100644 index 00000000..ae043639 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_test_wi_802_1x_set_testbool + + Regress.TestWi8021x + self + + + bool + v + + + + + TestWi8021x.set_testbool + + +@accepts(Regress.TestWi8021x, bool) +@returns(none) +def set_testbool(self, v): + # Python wrapper for regress_test_wi_802_1x_set_testbool() + + + + + + + + +
+

self :

+
+

v :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page new file mode 100644 index 00000000..3c04ae74 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page @@ -0,0 +1,47 @@ + + + + + + + + int + + regress_test_wi_802_1x_static_method + + int + x + + + + + TestWi8021x.static_method + + +@accepts(int) +@returns(int) +def static_method(x): + # Python wrapper for regress_test_wi_802_1x_static_method() + + + + + + + + +
+

x :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.UTF8_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.UTF8_CONSTANT.page new file mode 100644 index 00000000..8f3f5324 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.UTF8_CONSTANT.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.UTF8_CONSTANT + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.VaListAlias.page b/tests/scanner/Regress-1.0-Python-expected/Regress.VaListAlias.page new file mode 100644 index 00000000..bfd52d28 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.VaListAlias.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.VaListAlias + + + +

Typedef'd va_list for additional reasons

+ + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page new file mode 100644 index 00000000..f0476b84 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_aliased_caller_alloc + + Regress.AliasedTestBoxed + boxed + + + + + aliased_caller_alloc + + +@accepts(Regress.AliasedTestBoxed) +@returns(none) +def aliased_caller_alloc(boxed): + # Python wrapper for regress_aliased_caller_alloc() + + + + + + + + +
+

boxed :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page new file mode 100644 index 00000000..f48f724e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page @@ -0,0 +1,53 @@ + + + + + + + + int + + regress_annotation_attribute_func + + Regress.AnnotationObject + object + + + unicode + data + + + + + annotation_attribute_func + + +@accepts(Regress.AnnotationObject, unicode) +@returns(int) +def annotation_attribute_func(object, data): + # Python wrapper for regress_annotation_attribute_func() + + + + + + + + +
+

object :

+

A .

+

data :

+

Some data.

+

Returns :

+

The return value.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page new file mode 100644 index 00000000..439bd57f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page @@ -0,0 +1,58 @@ + + + + + + + + none + + regress_annotation_custom_destroy + + Regress.AnnotationCallback + callback + + + Regress.AnnotationNotifyFunc + destroy + + + gpointer + data + + + + + annotation_custom_destroy + + +@accepts(Regress.AnnotationCallback, Regress.AnnotationNotifyFunc, gpointer) +@returns(none) +def annotation_custom_destroy(callback, destroy, data): + # Python wrapper for regress_annotation_custom_destroy() + + + +

Test messing up the heuristic of closure/destroy-notification +detection, and fixing it via regress_annotations.

+ + + + +
+

callback :

+

Destroy notification

+

destroy :

+
+

data :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page new file mode 100644 index 00000000..339ad90b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page @@ -0,0 +1,40 @@ + + + + + + + + filename + + regress_annotation_get_source_file + + + + annotation_get_source_file + + +@returns(filename) +def annotation_get_source_file(): + # Python wrapper for regress_annotation_get_source_file() + + + + + + + + +
+

Returns :

+

Source file

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page new file mode 100644 index 00000000..0fc0f5c4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_annotation_init + + int + argc + + + [unicode] + argv + + + + + annotation_init + + +@accepts(int, [unicode]) +@returns(none) +def annotation_init(argc, argv): + # Python wrapper for regress_annotation_init() + + + + + + + + +
+

argc :

+

The number of args.

+

argv :

+

The arguments.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page new file mode 100644 index 00000000..d173a8f2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_annotation_invalid_regress_annotation + + int + foo + + + + + annotation_invalid_regress_annotation + + +@accepts(int) +@returns(none) +def annotation_invalid_regress_annotation(foo): + # Python wrapper for regress_annotation_invalid_regress_annotation() + + + + + + + + +
+

foo :

+

some text (e.g. example) or else

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page new file mode 100644 index 00000000..774a0181 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_annotation_ptr_array + + [GObject.Value] + array + + + + + annotation_ptr_array + + +@accepts([GObject.Value]) +@returns(none) +def annotation_ptr_array(array): + # Python wrapper for regress_annotation_ptr_array() + + + + + + + + +
+

array :

+

the array

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page new file mode 100644 index 00000000..5902fd07 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page @@ -0,0 +1,47 @@ + + + + + + + + [unicode] + + regress_annotation_return_array + + int + length + + + + + annotation_return_array + + +@accepts(int) +@returns([unicode]) +def annotation_return_array(length): + # Python wrapper for regress_annotation_return_array() + + + + + + + + +
+

length :

+

Number of return values

+

Returns :

+

The return value

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page new file mode 100644 index 00000000..961a4030 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page @@ -0,0 +1,40 @@ + + + + + + + + filename + + regress_annotation_return_filename + + + + annotation_return_filename + + +@returns(filename) +def annotation_return_filename(): + # Python wrapper for regress_annotation_return_filename() + + + + + + + + +
+

Returns :

+

An annotated filename

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page new file mode 100644 index 00000000..67ab7414 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_annotation_set_source_file + + filename + fname + + + + + annotation_set_source_file + + +@accepts(filename) +@returns(none) +def annotation_set_source_file(fname): + # Python wrapper for regress_annotation_set_source_file() + + + + + + + + +
+

fname :

+

Source file

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page new file mode 100644 index 00000000..4f718065 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page @@ -0,0 +1,38 @@ + + + + + + + + none + + regress_annotation_space_after_comment_bug631690 + + + + annotation_space_after_comment_bug631690 + + +@returns(none) +def annotation_space_after_comment_bug631690(): + # Python wrapper for regress_annotation_space_after_comment_bug631690() + + + +

Explicitly test having a space after the ** here.

+ + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page new file mode 100644 index 00000000..a1f859a3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_annotation_string_array_length + + int + n_properties + + + [unicode] + properties + + + + + annotation_string_array_length + + +@accepts(int, [unicode]) +@returns(none) +def annotation_string_array_length(n_properties, properties): + # Python wrapper for regress_annotation_string_array_length() + + + + + + + + +
+

n_properties :

+
+

properties :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page new file mode 100644 index 00000000..7aff5099 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page @@ -0,0 +1,40 @@ + + + + + + + + [unicode] + + regress_annotation_string_zero_terminated + + + + annotation_string_zero_terminated + + +@returns([unicode]) +def annotation_string_zero_terminated(): + # Python wrapper for regress_annotation_string_zero_terminated() + + + + + + + + +
+

Returns :

+

The return value

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page new file mode 100644 index 00000000..d7401ed5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_annotation_string_zero_terminated_out + + [unicode] + out + + + + + annotation_string_zero_terminated_out + + +@accepts([unicode]) +@returns(none) +def annotation_string_zero_terminated_out(out): + # Python wrapper for regress_annotation_string_zero_terminated_out() + + + + + + + + +
+

out :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page new file mode 100644 index 00000000..60210394 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page @@ -0,0 +1,40 @@ + + + + + + + + GObject.Object + + regress_annotation_test_parsing_bug630862 + + + + annotation_test_parsing_bug630862 + + +@returns(GObject.Object) +def annotation_test_parsing_bug630862(): + # Python wrapper for regress_annotation_test_parsing_bug630862() + + + +

See https://bugzilla.gnome.org/show_bug.cgi?id=630862

+ + + + +
+

Returns :

+

An object, note the colon:in here

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page new file mode 100644 index 00000000..321cd92d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page @@ -0,0 +1,40 @@ + + + + + + + + GObject.Object + + regress_annotation_transfer_floating + + + + annotation_transfer_floating + + +@returns(GObject.Object) +def annotation_transfer_floating(): + # Python wrapper for regress_annotation_transfer_floating() + + + + + + + + +
+

Returns :

+

A floating object

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page new file mode 100644 index 00000000..046fa115 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page @@ -0,0 +1,39 @@ + + + + + + + + none + + regress_annotation_versioned + + + + annotation_versioned + + +@returns(none) +def annotation_versioned(): + # Python wrapper for regress_annotation_versioned() + + + + + + +

Since 0.6

+ + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page new file mode 100644 index 00000000..dcaa8148 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page @@ -0,0 +1,40 @@ + + + + + + + + GLib.Quark + + regress_atest_error_quark + + + + atest_error_quark + + +@returns(GLib.Quark) +def atest_error_quark(): + # Python wrapper for regress_atest_error_quark() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page new file mode 100644 index 00000000..ef1f6142 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page @@ -0,0 +1,57 @@ + + + + + + + + none + + regress_foo_async_ready_callback + + Gio.Cancellable + cancellable + + + Gio.AsyncReadyCallback + callback + + + gpointer + user_data + + + + + foo_async_ready_callback + + +@accepts(Gio.Cancellable, Gio.AsyncReadyCallback, gpointer) +@returns(none) +def foo_async_ready_callback(cancellable, callback, user_data): + # Python wrapper for regress_foo_async_ready_callback() + + + + + + + + +
+

cancellable :

+
+

callback :

+
+

user_data :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page new file mode 100644 index 00000000..dad0e224 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page @@ -0,0 +1,57 @@ + + + + + + + + none + + regress_foo_destroy_notify_callback + + Regress.FooCallback + callback + + + gpointer + data + + + GLib.DestroyNotify + destroy + + + + + foo_destroy_notify_callback + + +@accepts(Regress.FooCallback, gpointer, GLib.DestroyNotify) +@returns(none) +def foo_destroy_notify_callback(callback, data, destroy): + # Python wrapper for regress_foo_destroy_notify_callback() + + + + + + + + +
+

callback :

+
+

data :

+
+

destroy :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page new file mode 100644 index 00000000..f7b916ef --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page @@ -0,0 +1,40 @@ + + + + + + + + int + + regress_foo_init + + + + foo_init + + +@returns(int) +def foo_init(): + # Python wrapper for regress_foo_init() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page new file mode 100644 index 00000000..ce521acb --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page @@ -0,0 +1,63 @@ + + + + + + + + none + + regress_foo_method_external_references + + Utility.Object + object + + + Utility.EnumType + e + + + Utility.FlagType + f + + + Utility.Struct + s + + + + + foo_method_external_references + + +@accepts(Utility.Object, Utility.EnumType, Utility.FlagType, Utility.Struct) +@returns(none) +def foo_method_external_references(object, e, f, s): + # Python wrapper for regress_foo_method_external_references() + + + + + + + + +
+

object :

+
+

e :

+
+

f :

+
+

s :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page new file mode 100644 index 00000000..d70d3375 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page @@ -0,0 +1,41 @@ + + + + + + + + Regress.FooObject + + regress_foo_not_a_constructor_new + + + + foo_not_a_constructor_new + + +@returns(Regress.FooObject) +def foo_not_a_constructor_new(): + # Python wrapper for regress_foo_not_a_constructor_new() + + + +

This should be scanned as a top-level function, and shouldn't cause +a "Can't find matching type for constructor" warning.

+ + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_skip_me.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_skip_me.page new file mode 100644 index 00000000..8dc4a728 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_skip_me.page @@ -0,0 +1,46 @@ + + + + + + + + none + + regress_foo_skip_me + + Regress.FooSkippable + fs + + + + + foo_skip_me + + +@accepts(Regress.FooSkippable) +@returns(none) +def foo_skip_me(fs): + # Python wrapper for regress_foo_skip_me() + + + +

Does something that's only interesting from C and should not be +exposed to language bindings.

+ + + + +
+

fs :

+

a

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant.page new file mode 100644 index 00000000..3933bebe --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_foo_some_variant + + int + x + + + va_list + args + + + + + foo_some_variant + + +@accepts(int, va_list) +@returns(none) +def foo_some_variant(x, args): + # Python wrapper for regress_foo_some_variant() + + + + + + + + +
+

x :

+
+

args :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant_ptr.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant_ptr.page new file mode 100644 index 00000000..dbe2d598 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant_ptr.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_foo_some_variant_ptr + + int + x + + + va_list + args + + + + + foo_some_variant_ptr + + +@accepts(int, va_list) +@returns(none) +def foo_some_variant_ptr(x, args): + # Python wrapper for regress_foo_some_variant_ptr() + + + + + + + + +
+

x :

+
+

args :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page new file mode 100644 index 00000000..c1c46521 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page @@ -0,0 +1,40 @@ + + + + + + + + [unicode] + + regress_foo_test_array + + + + foo_test_array + + +@returns([unicode]) +def foo_test_array(): + # Python wrapper for regress_foo_test_array() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page new file mode 100644 index 00000000..61b2a569 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_foo_test_const_char_param + + unicode + param + + + + + foo_test_const_char_param + + +@accepts(unicode) +@returns(none) +def foo_test_const_char_param(param): + # Python wrapper for regress_foo_test_const_char_param() + + + + + + + + +
+

param :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page new file mode 100644 index 00000000..d3079e2e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page @@ -0,0 +1,40 @@ + + + + + + + + unicode + + regress_foo_test_const_char_retval + + + + foo_test_const_char_retval + + +@returns(unicode) +def foo_test_const_char_retval(): + # Python wrapper for regress_foo_test_const_char_retval() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page new file mode 100644 index 00000000..9c757d41 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_foo_test_const_struct_param + + Regress.FooStruct + param + + + + + foo_test_const_struct_param + + +@accepts(Regress.FooStruct) +@returns(none) +def foo_test_const_struct_param(param): + # Python wrapper for regress_foo_test_const_struct_param() + + + + + + + + +
+

param :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page new file mode 100644 index 00000000..870cca02 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page @@ -0,0 +1,40 @@ + + + + + + + + Regress.FooStruct + + regress_foo_test_const_struct_retval + + + + foo_test_const_struct_retval + + +@returns(Regress.FooStruct) +def foo_test_const_struct_retval(): + # Python wrapper for regress_foo_test_const_struct_retval() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page new file mode 100644 index 00000000..f5c7798f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_foo_test_string_array + + [unicode] + array + + + + + foo_test_string_array + + +@accepts([unicode]) +@returns(none) +def foo_test_string_array(array): + # Python wrapper for regress_foo_test_string_array() + + + + + + + + +
+

array :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page new file mode 100644 index 00000000..4d46cef6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_foo_test_string_array_with_g + + [unicode] + array + + + + + foo_test_string_array_with_g + + +@accepts([unicode]) +@returns(none) +def foo_test_string_array_with_g(array): + # Python wrapper for regress_foo_test_string_array_with_g() + + + + + + + + +
+

array :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page new file mode 100644 index 00000000..8d795167 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_foo_test_unsigned_qualifier + + int + unsigned_param + + + + + foo_test_unsigned_qualifier + + +@accepts(int) +@returns(none) +def foo_test_unsigned_qualifier(unsigned_param): + # Python wrapper for regress_foo_test_unsigned_qualifier() + + + + + + + + +
+

unsigned_param :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page new file mode 100644 index 00000000..97672a0d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_foo_test_unsigned_type + + int + unsigned_param + + + + + foo_test_unsigned_type + + +@accepts(int) +@returns(none) +def foo_test_unsigned_type(unsigned_param): + # Python wrapper for regress_foo_test_unsigned_type() + + + + + + + + +
+

unsigned_param :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback.page new file mode 100644 index 00000000..3b2f1f3c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_foo_test_varargs_callback + + int + i + + + Regress.FooVarargsCallback + callback + + + + + foo_test_varargs_callback + + +@accepts(int, Regress.FooVarargsCallback) +@returns(none) +def foo_test_varargs_callback(i, callback): + # Python wrapper for regress_foo_test_varargs_callback() + + + + + + + + +
+

i :

+
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback2.page new file mode 100644 index 00000000..3a20a84c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback2.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_foo_test_varargs_callback2 + + Regress.FooVarargsCallback + callback + + + + + foo_test_varargs_callback2 + + +@accepts(Regress.FooVarargsCallback) +@returns(none) +def foo_test_varargs_callback2(callback): + # Python wrapper for regress_foo_test_varargs_callback2() + + + + + + + + +
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback3.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback3.page new file mode 100644 index 00000000..b2380f36 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback3.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_foo_test_varargs_callback3 + + Regress.FooVarargsCallback + callback + + + Regress.FooVarargsCallback + callback2 + + + + + foo_test_varargs_callback3 + + +@accepts(Regress.FooVarargsCallback, Regress.FooVarargsCallback) +@returns(none) +def foo_test_varargs_callback3(callback, callback2): + # Python wrapper for regress_foo_test_varargs_callback3() + + + + + + + + +
+

callback :

+
+

callback2 :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page new file mode 100644 index 00000000..681f45b2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_func_obj_null_in + + Regress.TestObj + obj + + + + + func_obj_null_in + + +@accepts(Regress.TestObj) +@returns(none) +def func_obj_null_in(obj): + # Python wrapper for regress_func_obj_null_in() + + + + + + + + +
+

obj :

+

A

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page new file mode 100644 index 00000000..816a722f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_global_get_flags_out + + Regress.TestFlags + v + + + + + global_get_flags_out + + +@accepts(Regress.TestFlags) +@returns(none) +def global_get_flags_out(v): + # Python wrapper for regress_global_get_flags_out() + + + + + + + + +
+

v :

+

A flags value

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page b/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page new file mode 100644 index 00000000..ed405229 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page @@ -0,0 +1,52 @@ + + + + + + + + none + + regress_has_parameter_named_attrs + + int + foo + + + [guint32] + attributes + + + + + has_parameter_named_attrs + + +@accepts(int, [guint32]) +@returns(none) +def has_parameter_named_attrs(foo, attributes): + # Python wrapper for regress_has_parameter_named_attrs() + + + +

This test case mirrors GnomeKeyringPasswordSchema from +libgnome-keyring.

+ + + + +
+

foo :

+

some int

+

attributes :

+

list of attributes

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page b/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page new file mode 100644 index 00000000..63ef956e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_introspectable_via_alias + + Regress.PtrArrayAlias + data + + + + + introspectable_via_alias + + +@accepts(Regress.PtrArrayAlias) +@returns(none) +def introspectable_via_alias(data): + # Python wrapper for regress_introspectable_via_alias() + + + + + + + + +
+

data :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.not_introspectable_via_alias.page b/tests/scanner/Regress-1.0-Python-expected/Regress.not_introspectable_via_alias.page new file mode 100644 index 00000000..174a8660 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.not_introspectable_via_alias.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_not_introspectable_via_alias + + Regress.VaListAlias + ok + + + + + not_introspectable_via_alias + + +@accepts(Regress.VaListAlias) +@returns(none) +def not_introspectable_via_alias(ok): + # Python wrapper for regress_not_introspectable_via_alias() + + + + + + + + +
+

ok :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.random_function_with_skipped_structure.page b/tests/scanner/Regress-1.0-Python-expected/Regress.random_function_with_skipped_structure.page new file mode 100644 index 00000000..e175decd --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.random_function_with_skipped_structure.page @@ -0,0 +1,57 @@ + + + + + + + + none + + regress_random_function_with_skipped_structure + + int + x + + + Regress.SkippedStructure + foo + + + float + v + + + + + random_function_with_skipped_structure + + +@accepts(int, Regress.SkippedStructure, float) +@returns(none) +def random_function_with_skipped_structure(x, foo, v): + # Python wrapper for regress_random_function_with_skipped_structure() + + + + + + + + +
+

x :

+
+

foo :

+
+

v :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page b/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page new file mode 100644 index 00000000..aa725200 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_set_abort_on_error + + bool + abort_on_error + + + + + set_abort_on_error + + +@accepts(bool) +@returns(none) +def set_abort_on_error(abort_on_error): + # Python wrapper for regress_set_abort_on_error() + + + + + + + + +
+

abort_on_error :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page new file mode 100644 index 00000000..9a170d7d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page @@ -0,0 +1,47 @@ + + + + + + + + int + + regress_test_array_callback + + Regress.TestCallbackArray + callback + + + + + test_array_callback + + +@accepts(Regress.TestCallbackArray) +@returns(int) +def test_array_callback(callback): + # Python wrapper for regress_test_array_callback() + + + + + + + + +
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page new file mode 100644 index 00000000..a5cb3976 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_array_fixed_out_objects + + [Regress.TestObj] + objs + + + + + test_array_fixed_out_objects + + +@accepts([Regress.TestObj]) +@returns(none) +def test_array_fixed_out_objects(objs): + # Python wrapper for regress_test_array_fixed_out_objects() + + + + + + + + +
+

objs :

+

An array of

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page new file mode 100644 index 00000000..de526c40 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page @@ -0,0 +1,47 @@ + + + + + + + + int + + regress_test_array_fixed_size_int_in + + [int] + ints + + + + + test_array_fixed_size_int_in + + +@accepts([int]) +@returns(int) +def test_array_fixed_size_int_in(ints): + # Python wrapper for regress_test_array_fixed_size_int_in() + + + + + + + + +
+

ints :

+

a list of 5 integers

+

Returns :

+

the sum of the items in ints

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page new file mode 100644 index 00000000..9d7ec741 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_array_fixed_size_int_out + + [int] + ints + + + + + test_array_fixed_size_int_out + + +@accepts([int]) +@returns(none) +def test_array_fixed_size_int_out(ints): + # Python wrapper for regress_test_array_fixed_size_int_out() + + + + + + + + +
+

ints :

+

a list of 5 integers ranging from 0 to 4

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page new file mode 100644 index 00000000..bc33d6df --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page @@ -0,0 +1,40 @@ + + + + + + + + [int] + + regress_test_array_fixed_size_int_return + + + + test_array_fixed_size_int_return + + +@returns([int]) +def test_array_fixed_size_int_return(): + # Python wrapper for regress_test_array_fixed_size_int_return() + + + + + + + + +
+

Returns :

+

a list of 5 integers ranging from 0 to 4

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page new file mode 100644 index 00000000..98f1e19e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page @@ -0,0 +1,53 @@ + + + + + + + + int + + regress_test_array_gint16_in + + int + n_ints + + + [gint16] + ints + + + + + test_array_gint16_in + + +@accepts(int, [gint16]) +@returns(int) +def test_array_gint16_in(n_ints, ints): + # Python wrapper for regress_test_array_gint16_in() + + + + + + + + +
+

n_ints :

+
+

ints :

+

List of ints

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page new file mode 100644 index 00000000..74fb671f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page @@ -0,0 +1,53 @@ + + + + + + + + gint32 + + regress_test_array_gint32_in + + int + n_ints + + + [gint32] + ints + + + + + test_array_gint32_in + + +@accepts(int, [gint32]) +@returns(gint32) +def test_array_gint32_in(n_ints, ints): + # Python wrapper for regress_test_array_gint32_in() + + + + + + + + +
+

n_ints :

+
+

ints :

+

List of ints

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page new file mode 100644 index 00000000..0f2ad40b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page @@ -0,0 +1,53 @@ + + + + + + + + int + + regress_test_array_gint64_in + + int + n_ints + + + [int] + ints + + + + + test_array_gint64_in + + +@accepts(int, [int]) +@returns(int) +def test_array_gint64_in(n_ints, ints): + # Python wrapper for regress_test_array_gint64_in() + + + + + + + + +
+

n_ints :

+
+

ints :

+

List of ints

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page new file mode 100644 index 00000000..4ad4fc7c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page @@ -0,0 +1,53 @@ + + + + + + + + int + + regress_test_array_gint8_in + + int + n_ints + + + [gint8] + ints + + + + + test_array_gint8_in + + +@accepts(int, [gint8]) +@returns(int) +def test_array_gint8_in(n_ints, ints): + # Python wrapper for regress_test_array_gint8_in() + + + + + + + + +
+

n_ints :

+
+

ints :

+

List of ints

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page new file mode 100644 index 00000000..bc9057b0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page @@ -0,0 +1,53 @@ + + + + + + + + unicode + + regress_test_array_gtype_in + + int + n_types + + + [GType] + types + + + + + test_array_gtype_in + + +@accepts(int, [GType]) +@returns(unicode) +def test_array_gtype_in(n_types, types): + # Python wrapper for regress_test_array_gtype_in() + + + + + + + + +
+

n_types :

+
+

types :

+

List of types

+

Returns :

+

string representation of provided types

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page new file mode 100644 index 00000000..088ccfa2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page @@ -0,0 +1,47 @@ + + + + + + + + [int] + + regress_test_array_int_full_out + + int + len + + + + + test_array_int_full_out + + +@accepts(int) +@returns([int]) +def test_array_int_full_out(len): + # Python wrapper for regress_test_array_int_full_out() + + + + + + + + +
+

len :

+

length of the returned array.

+

Returns :

+

a new array of integers.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page new file mode 100644 index 00000000..8bc291b1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page @@ -0,0 +1,53 @@ + + + + + + + + int + + regress_test_array_int_in + + int + n_ints + + + [int] + ints + + + + + test_array_int_in + + +@accepts(int, [int]) +@returns(int) +def test_array_int_in(n_ints, ints): + # Python wrapper for regress_test_array_int_in() + + + + + + + + +
+

n_ints :

+
+

ints :

+

List of ints

+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page new file mode 100644 index 00000000..881cc86e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_test_array_int_inout + + int + n_ints + + + [int] + ints + + + + + test_array_int_inout + + +@accepts(int, [int]) +@returns(none) +def test_array_int_inout(n_ints, ints): + # Python wrapper for regress_test_array_int_inout() + + + + + + + + +
+

n_ints :

+

the length of ints

+

ints :

+

a list of integers whose items will be increased by 1, except the first that will be dropped

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page new file mode 100644 index 00000000..39542be1 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page @@ -0,0 +1,47 @@ + + + + + + + + [int] + + regress_test_array_int_none_out + + int + len + + + + + test_array_int_none_out + + +@accepts(int) +@returns([int]) +def test_array_int_none_out(len): + # Python wrapper for regress_test_array_int_none_out() + + + + + + + + +
+

len :

+

length of the returned array.

+

Returns :

+

a static array of integers.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page new file mode 100644 index 00000000..1e8007f7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_test_array_int_null_in + + [int] + arr + + + int + len + + + + + test_array_int_null_in + + +@accepts([int], int) +@returns(none) +def test_array_int_null_in(arr, len): + # Python wrapper for regress_test_array_int_null_in() + + + + + + + + +
+

arr :

+
+

len :

+

length

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page new file mode 100644 index 00000000..894a37e3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_test_array_int_null_out + + [int] + arr + + + int + len + + + + + test_array_int_null_out + + +@accepts([int], int) +@returns(none) +def test_array_int_null_out(arr, len): + # Python wrapper for regress_test_array_int_null_out() + + + + + + + + +
+

arr :

+
+

len :

+

length

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page new file mode 100644 index 00000000..3bfad946 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_test_array_int_out + + int + n_ints + + + [int] + ints + + + + + test_array_int_out + + +@accepts(int, [int]) +@returns(none) +def test_array_int_out(n_ints, ints): + # Python wrapper for regress_test_array_int_out() + + + + + + + + +
+

n_ints :

+

the length of ints

+

ints :

+

a list of 5 integers, from 0 to 4 in consecutive order

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page new file mode 100644 index 00000000..39a24a23 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_async_ready_callback + + Gio.AsyncReadyCallback + callback + + + + + test_async_ready_callback + + +@accepts(Gio.AsyncReadyCallback) +@returns(none) +def test_async_ready_callback(callback): + # Python wrapper for regress_test_async_ready_callback() + + + + + + + + +
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page new file mode 100644 index 00000000..e7217be4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page @@ -0,0 +1,47 @@ + + + + + + + + bool + + regress_test_boolean + + bool + in + + + + + test_boolean + + +@accepts(bool) +@returns(bool) +def test_boolean(in): + # Python wrapper for regress_test_boolean() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page new file mode 100644 index 00000000..0f7783ab --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page @@ -0,0 +1,47 @@ + + + + + + + + bool + + regress_test_boolean_false + + bool + in + + + + + test_boolean_false + + +@accepts(bool) +@returns(bool) +def test_boolean_false(in): + # Python wrapper for regress_test_boolean_false() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page new file mode 100644 index 00000000..65fec5ed --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page @@ -0,0 +1,47 @@ + + + + + + + + bool + + regress_test_boolean_true + + bool + in + + + + + test_boolean_true + + +@accepts(bool) +@returns(bool) +def test_boolean_true(in): + # Python wrapper for regress_test_boolean_true() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page new file mode 100644 index 00000000..dfebfd05 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page @@ -0,0 +1,40 @@ + + + + + + + + cairo.Context + + regress_test_cairo_context_full_return + + + + test_cairo_context_full_return + + +@returns(cairo.Context) +def test_cairo_context_full_return(): + # Python wrapper for regress_test_cairo_context_full_return() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page new file mode 100644 index 00000000..922330df --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_cairo_context_none_in + + cairo.Context + context + + + + + test_cairo_context_none_in + + +@accepts(cairo.Context) +@returns(none) +def test_cairo_context_none_in(context): + # Python wrapper for regress_test_cairo_context_none_in() + + + + + + + + +
+

context :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page new file mode 100644 index 00000000..1b32629a --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_cairo_surface_full_out + + cairo.Surface + surface + + + + + test_cairo_surface_full_out + + +@accepts(cairo.Surface) +@returns(none) +def test_cairo_surface_full_out(surface): + # Python wrapper for regress_test_cairo_surface_full_out() + + + + + + + + +
+

surface :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page new file mode 100644 index 00000000..1cfa1513 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page @@ -0,0 +1,40 @@ + + + + + + + + cairo.Surface + + regress_test_cairo_surface_full_return + + + + test_cairo_surface_full_return + + +@returns(cairo.Surface) +def test_cairo_surface_full_return(): + # Python wrapper for regress_test_cairo_surface_full_return() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page new file mode 100644 index 00000000..ad456c10 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_cairo_surface_none_in + + cairo.Surface + surface + + + + + test_cairo_surface_none_in + + +@accepts(cairo.Surface) +@returns(none) +def test_cairo_surface_none_in(surface): + # Python wrapper for regress_test_cairo_surface_none_in() + + + + + + + + +
+

surface :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page new file mode 100644 index 00000000..4e5dd409 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page @@ -0,0 +1,40 @@ + + + + + + + + cairo.Surface + + regress_test_cairo_surface_none_return + + + + test_cairo_surface_none_return + + +@returns(cairo.Surface) +def test_cairo_surface_none_return(): + # Python wrapper for regress_test_cairo_surface_none_return() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page new file mode 100644 index 00000000..5da4505b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page @@ -0,0 +1,47 @@ + + + + + + + + int + + regress_test_callback + + Regress.TestCallback + callback + + + + + test_callback + + +@accepts(Regress.TestCallback) +@returns(int) +def test_callback(callback): + # Python wrapper for regress_test_callback() + + + + + + + + +
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page new file mode 100644 index 00000000..8ffd9661 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_test_callback_async + + Regress.TestCallbackUserData + callback + + + gpointer + user_data + + + + + test_callback_async + + +@accepts(Regress.TestCallbackUserData, gpointer) +@returns(none) +def test_callback_async(callback, user_data): + # Python wrapper for regress_test_callback_async() + + + + + + + + +
+

callback :

+
+

user_data :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page new file mode 100644 index 00000000..fed66313 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page @@ -0,0 +1,60 @@ + + + + + + + + int + + regress_test_callback_destroy_notify + + Regress.TestCallbackUserData + callback + + + gpointer + user_data + + + GLib.DestroyNotify + notify + + + + + test_callback_destroy_notify + + +@accepts(Regress.TestCallbackUserData, gpointer, GLib.DestroyNotify) +@returns(int) +def test_callback_destroy_notify(callback, user_data, notify): + # Python wrapper for regress_test_callback_destroy_notify() + + + +

Notified - callback persists until a DestroyNotify delegate +is invoked.

+ + + + +
+

callback :

+
+

user_data :

+
+

notify :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page new file mode 100644 index 00000000..a343923a --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page @@ -0,0 +1,54 @@ + + + + + + + + int + + regress_test_callback_destroy_notify_no_user_data + + Regress.TestCallbackUserData + callback + + + GLib.DestroyNotify + notify + + + + + test_callback_destroy_notify_no_user_data + + +@accepts(Regress.TestCallbackUserData, GLib.DestroyNotify) +@returns(int) +def test_callback_destroy_notify_no_user_data(callback, notify): + # Python wrapper for regress_test_callback_destroy_notify_no_user_data() + + + +

Adds a scope notified callback with no user data. This can invoke an error +condition in bindings which needs to be tested.

+ + + + +
+

callback :

+
+

notify :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page new file mode 100644 index 00000000..459bd47d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page @@ -0,0 +1,40 @@ + + + + + + + + int + + regress_test_callback_thaw_async + + + + test_callback_thaw_async + + +@returns(int) +def test_callback_thaw_async(): + # Python wrapper for regress_test_callback_thaw_async() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page new file mode 100644 index 00000000..24c45e90 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page @@ -0,0 +1,42 @@ + + + + + + + + int + + regress_test_callback_thaw_notifications + + + + test_callback_thaw_notifications + + +@returns(int) +def test_callback_thaw_notifications(): + # Python wrapper for regress_test_callback_thaw_notifications() + + + +

Invokes all callbacks installed by #test_callback_destroy_notify(), +adding up their return values, and removes them, invoking the +corresponding destroy notfications.

+ + + + +
+

Returns :

+

Sum of the return values of the invoked callbacks.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page new file mode 100644 index 00000000..2b03a8fd --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page @@ -0,0 +1,54 @@ + + + + + + + + int + + regress_test_callback_user_data + + Regress.TestCallbackUserData + callback + + + gpointer + user_data + + + + + test_callback_user_data + + +@accepts(Regress.TestCallbackUserData, gpointer) +@returns(int) +def test_callback_user_data(callback, user_data): + # Python wrapper for regress_test_callback_user_data() + + + +

Call - callback parameter persists for the duration of the method +call and can be released on return.

+ + + + +
+

callback :

+
+

user_data :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page new file mode 100644 index 00000000..a3290e54 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page @@ -0,0 +1,47 @@ + + + + + + + + int + + regress_test_closure + + GObject.Closure + closure + + + + + test_closure + + +@accepts(GObject.Closure) +@returns(int) +def test_closure(closure): + # Python wrapper for regress_test_closure() + + + + + + + + +
+

closure :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page new file mode 100644 index 00000000..c766153c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page @@ -0,0 +1,53 @@ + + + + + + + + int + + regress_test_closure_one_arg + + GObject.Closure + closure + + + int + arg + + + + + test_closure_one_arg + + +@accepts(GObject.Closure, int) +@returns(int) +def test_closure_one_arg(closure, arg): + # Python wrapper for regress_test_closure_one_arg() + + + + + + + + +
+

closure :

+
+

arg :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page new file mode 100644 index 00000000..2151555c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page @@ -0,0 +1,53 @@ + + + + + + + + GLib.Variant + + regress_test_closure_variant + + GObject.Closure + closure + + + GLib.Variant + arg + + + + + test_closure_variant + + +@accepts(GObject.Closure, GLib.Variant) +@returns(GLib.Variant) +def test_closure_variant(closure, arg): + # Python wrapper for regress_test_closure_variant() + + + + + + + + +
+

closure :

+

GClosure which takes one GVariant and returns a GVariant

+

arg :

+

a GVariant passed as argument to closure

+

Returns :

+

the return value of closure

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page new file mode 100644 index 00000000..7e9400e4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page @@ -0,0 +1,40 @@ + + + + + + + + GObject.Value + + regress_test_date_in_gvalue + + + + test_date_in_gvalue + + +@returns(GObject.Value) +def test_date_in_gvalue(): + # Python wrapper for regress_test_date_in_gvalue() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page new file mode 100644 index 00000000..dc3c910a --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page @@ -0,0 +1,40 @@ + + + + + + + + GLib.Quark + + regress_test_def_error_quark + + + + test_def_error_quark + + +@returns(GLib.Quark) +def test_def_error_quark(): + # Python wrapper for regress_test_def_error_quark() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page new file mode 100644 index 00000000..986f57a5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page @@ -0,0 +1,47 @@ + + + + + + + + float + + regress_test_double + + float + in + + + + + test_double + + +@accepts(float) +@returns(float) +def test_double(in): + # Python wrapper for regress_test_double() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page new file mode 100644 index 00000000..9b259bfd --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page @@ -0,0 +1,40 @@ + + + + + + + + <list> + + regress_test_filename_return + + + + test_filename_return + + +@returns(<list>) +def test_filename_return(): + # Python wrapper for regress_test_filename_return() + + + + + + + + +
+

Returns :

+

list of strings

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page new file mode 100644 index 00000000..5b5bdb81 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page @@ -0,0 +1,47 @@ + + + + + + + + float + + regress_test_float + + float + in + + + + + test_float + + +@accepts(float) +@returns(float) +def test_float(in): + # Python wrapper for regress_test_float() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page new file mode 100644 index 00000000..132de1fa --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page @@ -0,0 +1,40 @@ + + + + + + + + [unicode] + + regress_test_garray_container_return + + + + test_garray_container_return + + +@returns([unicode]) +def test_garray_container_return(): + # Python wrapper for regress_test_garray_container_return() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page new file mode 100644 index 00000000..e7c1b0fc --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page @@ -0,0 +1,40 @@ + + + + + + + + [unicode] + + regress_test_garray_full_return + + + + test_garray_full_return + + +@returns([unicode]) +def test_garray_full_return(): + # Python wrapper for regress_test_garray_full_return() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page new file mode 100644 index 00000000..52ef85d3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_gerror_callback + + Regress.TestCallbackGError + callback + + + + + test_gerror_callback + + +@accepts(Regress.TestCallbackGError) +@returns(none) +def test_gerror_callback(callback): + # Python wrapper for regress_test_gerror_callback() + + + + + + + + +
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page new file mode 100644 index 00000000..676e6652 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page @@ -0,0 +1,40 @@ + + + + + + + + {unicode: unicode} + + regress_test_ghash_container_return + + + + test_ghash_container_return + + +@returns({unicode: unicode}) +def test_ghash_container_return(): + # Python wrapper for regress_test_ghash_container_return() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page new file mode 100644 index 00000000..0cca64bc --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page @@ -0,0 +1,40 @@ + + + + + + + + {unicode: unicode} + + regress_test_ghash_everything_return + + + + test_ghash_everything_return + + +@returns({unicode: unicode}) +def test_ghash_everything_return(): + # Python wrapper for regress_test_ghash_everything_return() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page new file mode 100644 index 00000000..39c476b5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_ghash_gvalue_in + + {unicode: GObject.Value} + hash + + + + + test_ghash_gvalue_in + + +@accepts({unicode: GObject.Value}) +@returns(none) +def test_ghash_gvalue_in(hash): + # Python wrapper for regress_test_ghash_gvalue_in() + + + + + + + + +
+

hash :

+

the hash table returned by .

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page new file mode 100644 index 00000000..9a94e398 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page @@ -0,0 +1,40 @@ + + + + + + + + {unicode: GObject.Value} + + regress_test_ghash_gvalue_return + + + + test_ghash_gvalue_return + + +@returns({unicode: GObject.Value}) +def test_ghash_gvalue_return(): + # Python wrapper for regress_test_ghash_gvalue_return() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page new file mode 100644 index 00000000..6d0a2a7a --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page @@ -0,0 +1,40 @@ + + + + + + + + {unicode: {unicode: unicode}} + + regress_test_ghash_nested_everything_return + + + + test_ghash_nested_everything_return + + +@returns({unicode: {unicode: unicode}}) +def test_ghash_nested_everything_return(): + # Python wrapper for regress_test_ghash_nested_everything_return() + + + +

Specify nested parameterized types directly with the (type ) annotation.

+ + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page new file mode 100644 index 00000000..a6837dad --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page @@ -0,0 +1,41 @@ + + + + + + + + {unicode: {unicode: unicode}} + + regress_test_ghash_nested_everything_return2 + + + + test_ghash_nested_everything_return2 + + +@returns({unicode: {unicode: unicode}}) +def test_ghash_nested_everything_return2(): + # Python wrapper for regress_test_ghash_nested_everything_return2() + + + +

Another way of specifying nested parameterized types: using the +element-type annotation.

+ + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page new file mode 100644 index 00000000..623aee60 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_ghash_nothing_in + + {unicode: unicode} + in + + + + + test_ghash_nothing_in + + +@accepts({unicode: unicode}) +@returns(none) +def test_ghash_nothing_in(in): + # Python wrapper for regress_test_ghash_nothing_in() + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page new file mode 100644 index 00000000..72e7c669 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_ghash_nothing_in2 + + {unicode: unicode} + in + + + + + test_ghash_nothing_in2 + + +@accepts({unicode: unicode}) +@returns(none) +def test_ghash_nothing_in2(in): + # Python wrapper for regress_test_ghash_nothing_in2() + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page new file mode 100644 index 00000000..64438430 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page @@ -0,0 +1,40 @@ + + + + + + + + {unicode: unicode} + + regress_test_ghash_nothing_return + + + + test_ghash_nothing_return + + +@returns({unicode: unicode}) +def test_ghash_nothing_return(): + # Python wrapper for regress_test_ghash_nothing_return() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page new file mode 100644 index 00000000..5748c38a --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page @@ -0,0 +1,40 @@ + + + + + + + + {unicode: unicode} + + regress_test_ghash_nothing_return2 + + + + test_ghash_nothing_return2 + + +@returns({unicode: unicode}) +def test_ghash_nothing_return2(): + # Python wrapper for regress_test_ghash_nothing_return2() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page new file mode 100644 index 00000000..5eff48f8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_ghash_null_in + + {unicode: unicode} + in + + + + + test_ghash_null_in + + +@accepts({unicode: unicode}) +@returns(none) +def test_ghash_null_in(in): + # Python wrapper for regress_test_ghash_null_in() + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page new file mode 100644 index 00000000..a1c9b5bf --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_ghash_null_out + + {unicode: unicode} + out + + + + + test_ghash_null_out + + +@accepts({unicode: unicode}) +@returns(none) +def test_ghash_null_out(out): + # Python wrapper for regress_test_ghash_null_out() + + + + + + + + +
+

out :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page new file mode 100644 index 00000000..0683dbed --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page @@ -0,0 +1,40 @@ + + + + + + + + {unicode: unicode} + + regress_test_ghash_null_return + + + + test_ghash_null_return + + +@returns({unicode: unicode}) +def test_ghash_null_return(): + # Python wrapper for regress_test_ghash_null_return() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page new file mode 100644 index 00000000..6963fb41 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page @@ -0,0 +1,40 @@ + + + + + + + + <list> + + regress_test_glist_container_return + + + + test_glist_container_return + + +@returns(<list>) +def test_glist_container_return(): + # Python wrapper for regress_test_glist_container_return() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page new file mode 100644 index 00000000..7c1d2313 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page @@ -0,0 +1,40 @@ + + + + + + + + <list> + + regress_test_glist_everything_return + + + + test_glist_everything_return + + +@returns(<list>) +def test_glist_everything_return(): + # Python wrapper for regress_test_glist_everything_return() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page new file mode 100644 index 00000000..bb93930b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_glist_nothing_in + + <list> + in + + + + + test_glist_nothing_in + + +@accepts() +@returns(none) +def test_glist_nothing_in(in): + # Python wrapper for regress_test_glist_nothing_in() + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page new file mode 100644 index 00000000..fa87b14c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_glist_nothing_in2 + + <list> + in + + + + + test_glist_nothing_in2 + + +@accepts() +@returns(none) +def test_glist_nothing_in2(in): + # Python wrapper for regress_test_glist_nothing_in2() + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page new file mode 100644 index 00000000..926d5f5f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page @@ -0,0 +1,40 @@ + + + + + + + + <list> + + regress_test_glist_nothing_return + + + + test_glist_nothing_return + + +@returns(<list>) +def test_glist_nothing_return(): + # Python wrapper for regress_test_glist_nothing_return() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page new file mode 100644 index 00000000..b6163879 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page @@ -0,0 +1,40 @@ + + + + + + + + <list> + + regress_test_glist_nothing_return2 + + + + test_glist_nothing_return2 + + +@returns(<list>) +def test_glist_nothing_return2(): + # Python wrapper for regress_test_glist_nothing_return2() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page new file mode 100644 index 00000000..4da827e9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_glist_null_in + + <list> + in + + + + + test_glist_null_in + + +@accepts() +@returns(none) +def test_glist_null_in(in): + # Python wrapper for regress_test_glist_null_in() + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page new file mode 100644 index 00000000..e96a9652 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_glist_null_out + + <list> + out_list + + + + + test_glist_null_out + + +@accepts() +@returns(none) +def test_glist_null_out(out_list): + # Python wrapper for regress_test_glist_null_out() + + + + + + + + +
+

out_list :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page new file mode 100644 index 00000000..e7ab5c11 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page @@ -0,0 +1,40 @@ + + + + + + + + <list> + + regress_test_gslist_container_return + + + + test_gslist_container_return + + +@returns(<list>) +def test_gslist_container_return(): + # Python wrapper for regress_test_gslist_container_return() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page new file mode 100644 index 00000000..ea32632f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page @@ -0,0 +1,40 @@ + + + + + + + + <list> + + regress_test_gslist_everything_return + + + + test_gslist_everything_return + + +@returns(<list>) +def test_gslist_everything_return(): + # Python wrapper for regress_test_gslist_everything_return() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page new file mode 100644 index 00000000..1cbf247c --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_gslist_nothing_in + + <list> + in + + + + + test_gslist_nothing_in + + +@accepts() +@returns(none) +def test_gslist_nothing_in(in): + # Python wrapper for regress_test_gslist_nothing_in() + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page new file mode 100644 index 00000000..3325a41a --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_gslist_nothing_in2 + + <list> + in + + + + + test_gslist_nothing_in2 + + +@accepts() +@returns(none) +def test_gslist_nothing_in2(in): + # Python wrapper for regress_test_gslist_nothing_in2() + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page new file mode 100644 index 00000000..0a4a5aaa --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page @@ -0,0 +1,40 @@ + + + + + + + + <list> + + regress_test_gslist_nothing_return + + + + test_gslist_nothing_return + + +@returns(<list>) +def test_gslist_nothing_return(): + # Python wrapper for regress_test_gslist_nothing_return() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page new file mode 100644 index 00000000..4fb5489f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page @@ -0,0 +1,40 @@ + + + + + + + + <list> + + regress_test_gslist_nothing_return2 + + + + test_gslist_nothing_return2 + + +@returns(<list>) +def test_gslist_nothing_return2(): + # Python wrapper for regress_test_gslist_nothing_return2() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page new file mode 100644 index 00000000..470a6fff --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_gslist_null_in + + <list> + in + + + + + test_gslist_null_in + + +@accepts() +@returns(none) +def test_gslist_null_in(in): + # Python wrapper for regress_test_gslist_null_in() + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page new file mode 100644 index 00000000..6c2dd5b4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_gslist_null_out + + <list> + out_list + + + + + test_gslist_null_out + + +@accepts() +@returns(none) +def test_gslist_null_out(out_list): + # Python wrapper for regress_test_gslist_null_out() + + + + + + + + +
+

out_list :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page new file mode 100644 index 00000000..f98195ac --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page @@ -0,0 +1,47 @@ + + + + + + + + GType + + regress_test_gtype + + GType + in + + + + + test_gtype + + +@accepts(GType) +@returns(GType) +def test_gtype(in): + # Python wrapper for regress_test_gtype() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page new file mode 100644 index 00000000..edd0a830 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page @@ -0,0 +1,40 @@ + + + + + + + + GLib.Variant + + regress_test_gvariant_as + + + + test_gvariant_as + + +@returns(GLib.Variant) +def test_gvariant_as(): + # Python wrapper for regress_test_gvariant_as() + + + + + + + + +
+

Returns :

+

New variant

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page new file mode 100644 index 00000000..2e9eeeb7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page @@ -0,0 +1,40 @@ + + + + + + + + GLib.Variant + + regress_test_gvariant_asv + + + + test_gvariant_asv + + +@returns(GLib.Variant) +def test_gvariant_asv(): + # Python wrapper for regress_test_gvariant_asv() + + + + + + + + +
+

Returns :

+

New variant

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page new file mode 100644 index 00000000..c47377b5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page @@ -0,0 +1,40 @@ + + + + + + + + GLib.Variant + + regress_test_gvariant_i + + + + test_gvariant_i + + +@returns(GLib.Variant) +def test_gvariant_i(): + # Python wrapper for regress_test_gvariant_i() + + + + + + + + +
+

Returns :

+

New variant

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page new file mode 100644 index 00000000..dfd123f8 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page @@ -0,0 +1,40 @@ + + + + + + + + GLib.Variant + + regress_test_gvariant_s + + + + test_gvariant_s + + +@returns(GLib.Variant) +def test_gvariant_s(): + # Python wrapper for regress_test_gvariant_s() + + + + + + + + +
+

Returns :

+

New variant

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page new file mode 100644 index 00000000..1f5d309e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page @@ -0,0 +1,40 @@ + + + + + + + + GLib.Variant + + regress_test_gvariant_v + + + + test_gvariant_v + + +@returns(GLib.Variant) +def test_gvariant_v(): + # Python wrapper for regress_test_gvariant_v() + + + + + + + + +
+

Returns :

+

New variant

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page new file mode 100644 index 00000000..6429848b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_test_hash_table_callback + + {unicode: int} + data + + + Regress.TestCallbackHashtable + callback + + + + + test_hash_table_callback + + +@accepts({unicode: int}, Regress.TestCallbackHashtable) +@returns(none) +def test_hash_table_callback(data, callback): + # Python wrapper for regress_test_hash_table_callback() + + + + + + + + +
+

data :

+

GHashTable that gets passed to callback

+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page new file mode 100644 index 00000000..22c435f5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page @@ -0,0 +1,47 @@ + + + + + + + + int + + regress_test_int + + int + in + + + + + test_int + + +@accepts(int) +@returns(int) +def test_int(in): + # Python wrapper for regress_test_int() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page new file mode 100644 index 00000000..6f0945af --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page @@ -0,0 +1,47 @@ + + + + + + + + gint16 + + regress_test_int16 + + gint16 + in + + + + + test_int16 + + +@accepts(gint16) +@returns(gint16) +def test_int16(in): + # Python wrapper for regress_test_int16() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page new file mode 100644 index 00000000..8070a644 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page @@ -0,0 +1,47 @@ + + + + + + + + gint32 + + regress_test_int32 + + gint32 + in + + + + + test_int32 + + +@accepts(gint32) +@returns(gint32) +def test_int32(in): + # Python wrapper for regress_test_int32() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page new file mode 100644 index 00000000..c9456ad6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page @@ -0,0 +1,47 @@ + + + + + + + + int + + regress_test_int64 + + int + in + + + + + test_int64 + + +@accepts(int) +@returns(int) +def test_int64(in): + # Python wrapper for regress_test_int64() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page new file mode 100644 index 00000000..73c17498 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page @@ -0,0 +1,47 @@ + + + + + + + + gint8 + + regress_test_int8 + + gint8 + in + + + + + test_int8 + + +@accepts(gint8) +@returns(gint8) +def test_int8(in): + # Python wrapper for regress_test_int8() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page new file mode 100644 index 00000000..9b5b728e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_test_int_out_utf8 + + int + length + + + unicode + in + + + + + test_int_out_utf8 + + +@accepts(int, unicode) +@returns(none) +def test_int_out_utf8(length, in): + # Python wrapper for regress_test_int_out_utf8() + + + + + + + + +
+

length :

+
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page new file mode 100644 index 00000000..2d6d569b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page @@ -0,0 +1,47 @@ + + + + + + + + int + + regress_test_int_value_arg + + GObject.Value + v + + + + + test_int_value_arg + + +@accepts(GObject.Value) +@returns(int) +def test_int_value_arg(v): + # Python wrapper for regress_test_int_value_arg() + + + + + + + + +
+

v :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page new file mode 100644 index 00000000..3b56821e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page @@ -0,0 +1,47 @@ + + + + + + + + int + + regress_test_long + + int + in + + + + + test_long + + +@accepts(int) +@returns(int) +def test_long(in): + # Python wrapper for regress_test_long() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page new file mode 100644 index 00000000..ed15aba2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page @@ -0,0 +1,47 @@ + + + + + + + + int + + regress_test_multi_callback + + Regress.TestCallback + callback + + + + + test_multi_callback + + +@accepts(Regress.TestCallback) +@returns(int) +def test_multi_callback(callback): + # Python wrapper for regress_test_multi_callback() + + + + + + + + +
+

callback :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page new file mode 100644 index 00000000..b781e796 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page @@ -0,0 +1,57 @@ + + + + + + + + none + + regress_test_multi_double_args + + float + in + + + float + one + + + float + two + + + + + test_multi_double_args + + +@accepts(float, float, float) +@returns(none) +def test_multi_double_args(in, one, two): + # Python wrapper for regress_test_multi_double_args() + + + + + + + + +
+

in :

+
+

one :

+
+

two :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page new file mode 100644 index 00000000..6cfdbcd6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page @@ -0,0 +1,38 @@ + + + + + + + + none + + regress_test_multiline_doc_comments + + + + test_multiline_doc_comments + + +@returns(none) +def test_multiline_doc_comments(): + # Python wrapper for regress_test_multiline_doc_comments() + + + +

This is a function.

It has multiple lines in the documentation.

The sky is blue.

You will give me your credit card number.

+ + + + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page new file mode 100644 index 00000000..571dd0a5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page @@ -0,0 +1,70 @@ + + + + + + + + none + + regress_test_nested_parameter + + int + a + + + + + test_nested_parameter + + +@accepts(int) +@returns(none) +def test_nested_parameter(a): + # Python wrapper for regress_test_nested_parameter() + + + +

<informaltable> + <tgroup cols="3"> + <thead> + <row> + <entry>Syntax</entry> + <entry>Explanation</entry> + <entry>Examples</entry> + </row> + </thead> + <tbody> + <row> + <entry>rgb(@r, @g, @b)</entry> + <entry>An opaque color; @r, @g, @b can be either integers between + 0 and 255 or percentages</entry> + <entry><literallayout>rgb(128, 10, 54) +rgb(20%, 30%, 0%)</literallayout></entry> + </row> + <row> + <entry>rgba(@r, @g, @b, a)</entry> + <entry>A translucent color; @r, @g, @b are as in the previous row, + a is a floating point number between 0 and 1</entry> + <entry><literallayout>rgba(255, 255, 0, 0.5)</literallayout></entry> + </row> + </tbody> + </tgroup> +</informaltable>

What we're testing here is that the scanner ignores the a nested inside XML.

+ + + + +
+

a :

+

An integer

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page new file mode 100644 index 00000000..ce50e43e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_null_gerror_callback + + Regress.TestCallbackGError + callback + + + + + test_null_gerror_callback + + +@accepts(Regress.TestCallbackGError) +@returns(none) +def test_null_gerror_callback(callback): + # Python wrapper for regress_test_null_gerror_callback() + + + + + + + + +
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page new file mode 100644 index 00000000..93cd72fc --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_owned_gerror_callback + + Regress.TestCallbackOwnedGError + callback + + + + + test_owned_gerror_callback + + +@accepts(Regress.TestCallbackOwnedGError) +@returns(none) +def test_owned_gerror_callback(callback): + # Python wrapper for regress_test_owned_gerror_callback() + + + + + + + + +
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page new file mode 100644 index 00000000..77ddd585 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page @@ -0,0 +1,47 @@ + + + + + + + + gshort + + regress_test_short + + gshort + in + + + + + test_short + + +@accepts(gshort) +@returns(gshort) +def test_short(in): + # Python wrapper for regress_test_short() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page new file mode 100644 index 00000000..241d0a86 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_simple_callback + + Regress.TestSimpleCallback + callback + + + + + test_simple_callback + + +@accepts(Regress.TestSimpleCallback) +@returns(none) +def test_simple_callback(callback): + # Python wrapper for regress_test_simple_callback() + + + + + + + + +
+

callback :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page new file mode 100644 index 00000000..3496e370 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page @@ -0,0 +1,47 @@ + + + + + + + + gsize + + regress_test_size + + gsize + in + + + + + test_size + + +@accepts(gsize) +@returns(gsize) +def test_size(in): + # Python wrapper for regress_test_size() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_skip_unannotated_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_skip_unannotated_callback.page new file mode 100644 index 00000000..8dc6a486 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_skip_unannotated_callback.page @@ -0,0 +1,46 @@ + + + + + + + + none + + regress_test_skip_unannotated_callback + + Regress.TestCallback + callback + + + + + test_skip_unannotated_callback + + +@accepts(Regress.TestCallback) +@returns(none) +def test_skip_unannotated_callback(callback): + # Python wrapper for regress_test_skip_unannotated_callback() + + + +

Should not emit a warning: +https://bugzilla.gnome.org/show_bug.cgi?id=685399

+ + + + +
+

callback :

+

No annotation here

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page new file mode 100644 index 00000000..6e61bc83 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page @@ -0,0 +1,47 @@ + + + + + + + + gssize + + regress_test_ssize + + gssize + in + + + + + test_ssize + + +@accepts(gssize) +@returns(gssize) +def test_ssize(in): + # Python wrapper for regress_test_ssize() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page new file mode 100644 index 00000000..dee44c02 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page @@ -0,0 +1,47 @@ + + + + + + + + bool + + regress_test_strv_in + + [unicode] + arr + + + + + test_strv_in + + +@accepts([unicode]) +@returns(bool) +def test_strv_in(arr): + # Python wrapper for regress_test_strv_in() + + + + + + + + +
+

arr :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page new file mode 100644 index 00000000..ab03bda9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page @@ -0,0 +1,40 @@ + + + + + + + + GObject.Value + + regress_test_strv_in_gvalue + + + + test_strv_in_gvalue + + +@returns(GObject.Value) +def test_strv_in_gvalue(): + # Python wrapper for regress_test_strv_in_gvalue() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page new file mode 100644 index 00000000..e87d979f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page @@ -0,0 +1,40 @@ + + + + + + + + [unicode] + + regress_test_strv_out + + + + test_strv_out + + +@returns([unicode]) +def test_strv_out(): + # Python wrapper for regress_test_strv_out() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page new file mode 100644 index 00000000..8d5a73a7 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page @@ -0,0 +1,40 @@ + + + + + + + + [unicode] + + regress_test_strv_out_c + + + + test_strv_out_c + + +@returns([unicode]) +def test_strv_out_c(): + # Python wrapper for regress_test_strv_out_c() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page new file mode 100644 index 00000000..feaf8c78 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page @@ -0,0 +1,40 @@ + + + + + + + + [unicode] + + regress_test_strv_out_container + + + + test_strv_out_container + + +@returns([unicode]) +def test_strv_out_container(): + # Python wrapper for regress_test_strv_out_container() + + + + + + + + +
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page new file mode 100644 index 00000000..7cea6b43 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_strv_outarg + + [unicode] + retp + + + + + test_strv_outarg + + +@accepts([unicode]) +@returns(none) +def test_strv_outarg(retp): + # Python wrapper for regress_test_strv_outarg() + + + + + + + + +
+

retp :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page new file mode 100644 index 00000000..3e7637ec --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page @@ -0,0 +1,47 @@ + + + + + + + + int + + regress_test_timet + + int + in + + + + + test_timet + + +@accepts(int) +@returns(int) +def test_timet(in): + # Python wrapper for regress_test_timet() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page new file mode 100644 index 00000000..542dc1f2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page @@ -0,0 +1,75 @@ + + + + + + + + none + + regress_test_torture_signature_0 + + int + x + + + float + y + + + int + z + + + unicode + foo + + + int + q + + + int + m + + + + + test_torture_signature_0 + + +@accepts(int, float, int, unicode, int, int) +@returns(none) +def test_torture_signature_0(x, y, z, foo, q, m): + # Python wrapper for regress_test_torture_signature_0() + + + + + + + + +
+

x :

+
+

y :

+
+

z :

+
+

foo :

+
+

q :

+
+

m :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page new file mode 100644 index 00000000..333d386e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page @@ -0,0 +1,77 @@ + + + + + + + + bool + + regress_test_torture_signature_1 + + int + x + + + float + y + + + int + z + + + unicode + foo + + + int + q + + + int + m + + + + + test_torture_signature_1 + + +@accepts(int, float, int, unicode, int, int) +@returns(bool) +def test_torture_signature_1(x, y, z, foo, q, m): + # Python wrapper for regress_test_torture_signature_1() + + + +

This function throws an error if m is odd.

+ + + + +
+

x :

+
+

y :

+
+

z :

+
+

foo :

+
+

q :

+
+

m :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page new file mode 100644 index 00000000..449793bb --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page @@ -0,0 +1,93 @@ + + + + + + + + none + + regress_test_torture_signature_2 + + int + x + + + Regress.TestCallbackUserData + callback + + + gpointer + user_data + + + GLib.DestroyNotify + notify + + + float + y + + + int + z + + + unicode + foo + + + int + q + + + int + m + + + + + test_torture_signature_2 + + +@accepts(int, Regress.TestCallbackUserData, gpointer, GLib.DestroyNotify, float, int, unicode, int, int) +@returns(none) +def test_torture_signature_2(x, callback, user_data, notify, y, z, foo, q, m): + # Python wrapper for regress_test_torture_signature_2() + + + + + + + + +
+

x :

+
+

callback :

+
+

user_data :

+
+

notify :

+
+

y :

+
+

z :

+
+

foo :

+
+

q :

+
+

m :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page new file mode 100644 index 00000000..84f702af --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page @@ -0,0 +1,47 @@ + + + + + + + + int + + regress_test_uint + + int + in + + + + + test_uint + + +@accepts(int) +@returns(int) +def test_uint(in): + # Python wrapper for regress_test_uint() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page new file mode 100644 index 00000000..b8e444a0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page @@ -0,0 +1,47 @@ + + + + + + + + guint16 + + regress_test_uint16 + + guint16 + in + + + + + test_uint16 + + +@accepts(guint16) +@returns(guint16) +def test_uint16(in): + # Python wrapper for regress_test_uint16() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page new file mode 100644 index 00000000..37da5482 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page @@ -0,0 +1,47 @@ + + + + + + + + guint32 + + regress_test_uint32 + + guint32 + in + + + + + test_uint32 + + +@accepts(guint32) +@returns(guint32) +def test_uint32(in): + # Python wrapper for regress_test_uint32() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page new file mode 100644 index 00000000..b11cfbb2 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page @@ -0,0 +1,47 @@ + + + + + + + + int + + regress_test_uint64 + + int + in + + + + + test_uint64 + + +@accepts(int) +@returns(int) +def test_uint64(in): + # Python wrapper for regress_test_uint64() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page new file mode 100644 index 00000000..58f7817a --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page @@ -0,0 +1,47 @@ + + + + + + + + guint8 + + regress_test_uint8 + + guint8 + in + + + + + test_uint8 + + +@accepts(guint8) +@returns(guint8) +def test_uint8(in): + # Python wrapper for regress_test_uint8() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page new file mode 100644 index 00000000..f94fff0d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page @@ -0,0 +1,47 @@ + + + + + + + + int + + regress_test_ulong + + int + in + + + + + test_ulong + + +@accepts(int) +@returns(int) +def test_ulong(in): + # Python wrapper for regress_test_ulong() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page new file mode 100644 index 00000000..363a5e33 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page @@ -0,0 +1,47 @@ + + + + + + + + unicode + + regress_test_unichar + + unicode + in + + + + + test_unichar + + +@accepts(unicode) +@returns(unicode) +def test_unichar(in): + # Python wrapper for regress_test_unichar() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page new file mode 100644 index 00000000..4e77143e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page @@ -0,0 +1,47 @@ + + + + + + + + unicode + + regress_test_unsigned_enum_param + + Regress.TestEnumUnsigned + e + + + + + test_unsigned_enum_param + + +@accepts(Regress.TestEnumUnsigned) +@returns(unicode) +def test_unsigned_enum_param(e): + # Python wrapper for regress_test_unsigned_enum_param() + + + + + + + + +
+

e :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page new file mode 100644 index 00000000..2b0f0822 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page @@ -0,0 +1,47 @@ + + + + + + + + gushort + + regress_test_ushort + + gushort + in + + + + + test_ushort + + +@accepts(gushort) +@returns(gushort) +def test_ushort(in): + # Python wrapper for regress_test_ushort() + + + + + + + + +
+

in :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page new file mode 100644 index 00000000..36e992bb --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_utf8_const_in + + unicode + in + + + + + test_utf8_const_in + + +@accepts(unicode) +@returns(none) +def test_utf8_const_in(in): + # Python wrapper for regress_test_utf8_const_in() + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page new file mode 100644 index 00000000..9aef1f17 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page @@ -0,0 +1,40 @@ + + + + + + + + unicode + + regress_test_utf8_const_return + + + + test_utf8_const_return + + +@returns(unicode) +def test_utf8_const_return(): + # Python wrapper for regress_test_utf8_const_return() + + + + + + + + +
+

Returns :

+

UTF-8 string

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page new file mode 100644 index 00000000..c7c32ccc --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_utf8_inout + + unicode + inout + + + + + test_utf8_inout + + +@accepts(unicode) +@returns(none) +def test_utf8_inout(inout): + # Python wrapper for regress_test_utf8_inout() + + + + + + + + +
+

inout :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page new file mode 100644 index 00000000..fd5de6a9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page @@ -0,0 +1,40 @@ + + + + + + + + unicode + + regress_test_utf8_nonconst_return + + + + test_utf8_nonconst_return + + +@returns(unicode) +def test_utf8_nonconst_return(): + # Python wrapper for regress_test_utf8_nonconst_return() + + + + + + + + +
+

Returns :

+

UTF-8 string

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page new file mode 100644 index 00000000..c6aff047 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_utf8_null_in + + unicode + in + + + + + test_utf8_null_in + + +@accepts(unicode) +@returns(none) +def test_utf8_null_in(in): + # Python wrapper for regress_test_utf8_null_in() + + + + + + + + +
+

in :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page new file mode 100644 index 00000000..65b277af --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_utf8_null_out + + unicode + char_out + + + + + test_utf8_null_out + + +@accepts(unicode) +@returns(none) +def test_utf8_null_out(char_out): + # Python wrapper for regress_test_utf8_null_out() + + + + + + + + +
+

char_out :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page new file mode 100644 index 00000000..7f73b8d0 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page @@ -0,0 +1,45 @@ + + + + + + + + none + + regress_test_utf8_out + + unicode + out + + + + + test_utf8_out + + +@accepts(unicode) +@returns(none) +def test_utf8_out(out): + # Python wrapper for regress_test_utf8_out() + + + + + + + + +
+

out :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page new file mode 100644 index 00000000..ed43d541 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page @@ -0,0 +1,47 @@ + + + + + + + + unicode + + regress_test_utf8_out_nonconst_return + + unicode + out + + + + + test_utf8_out_nonconst_return + + +@accepts(unicode) +@returns(unicode) +def test_utf8_out_nonconst_return(out): + # Python wrapper for regress_test_utf8_out_nonconst_return() + + + + + + + + +
+

out :

+

a copy of "second"

+

Returns :

+

a copy of "first"

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page new file mode 100644 index 00000000..763053fa --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_test_utf8_out_out + + unicode + out0 + + + unicode + out1 + + + + + test_utf8_out_out + + +@accepts(unicode, unicode) +@returns(none) +def test_utf8_out_out(out0, out1): + # Python wrapper for regress_test_utf8_out_out() + + + + + + + + +
+

out0 :

+

a copy of "first"

+

out1 :

+

a copy of "second"

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_get_fundamental_object.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_get_fundamental_object.page new file mode 100644 index 00000000..2f13d40f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_get_fundamental_object.page @@ -0,0 +1,47 @@ + + + + + + + + Regress.TestFundamentalObject + + regress_test_value_get_fundamental_object + + GObject.Value + value + + + + + test_value_get_fundamental_object + + +@accepts(GObject.Value) +@returns(Regress.TestFundamentalObject) +def test_value_get_fundamental_object(value): + # Python wrapper for regress_test_value_get_fundamental_object() + + + + + + + + +
+

value :

+
+

Returns :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page new file mode 100644 index 00000000..54aaaa66 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page @@ -0,0 +1,47 @@ + + + + + + + + GObject.Value + + regress_test_value_return + + int + i + + + + + test_value_return + + +@accepts(int) +@returns(GObject.Value) +def test_value_return(i): + # Python wrapper for regress_test_value_return() + + + + + + + + +
+

i :

+

an int

+

Returns :

+

the int wrapped in a GValue.

+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_set_fundamental_object.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_set_fundamental_object.page new file mode 100644 index 00000000..e1efb486 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_set_fundamental_object.page @@ -0,0 +1,51 @@ + + + + + + + + none + + regress_test_value_set_fundamental_object + + GObject.Value + value + + + Regress.TestFundamentalObject + fundamental_object + + + + + test_value_set_fundamental_object + + +@accepts(GObject.Value, Regress.TestFundamentalObject) +@returns(none) +def test_value_set_fundamental_object(value, fundamental_object): + # Python wrapper for regress_test_value_set_fundamental_object() + + + + + + + + +
+

value :

+
+

fundamental_object :

+
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page new file mode 100644 index 00000000..4a5cfd82 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page @@ -0,0 +1,39 @@ + + + + + + + + none + + regress_test_versioning + + + + test_versioning + + +@returns(none) +def test_versioning(): + # Python wrapper for regress_test_versioning() + + + + + + +

Since 1.32.1

+ + +
+
+ + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/index.page b/tests/scanner/Regress-1.0-Python-expected/index.page new file mode 100644 index 00000000..1d89dedd --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/index.page @@ -0,0 +1,33 @@ + + + + + + + + Index + + + + + + + + + + + Classes + + + Functions + + + Other + + + -- cgit v1.2.1 From 09bde86a11064a5b9573d2a674fae4223c33634d Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 8 Feb 2013 23:23:36 -0500 Subject: ast: Allow more options in unresolved_type If there's an unresolved type for an annotation, it's very likely it's using a target_giname. https://bugzilla.gnome.org/show_bug.cgi?id=693598 --- giscanner/ast.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/giscanner/ast.py b/giscanner/ast.py index 1806720e..efa39a91 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -84,6 +84,8 @@ from a C type string, or a gtype_name (from g_type_name()). return self.ctype elif self.gtype_name: return self.gtype_name + elif self.target_giname: + return self.target_giname else: assert False -- cgit v1.2.1 From cfc41bb6fd3b350fbed03d81637fe94e66779993 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Tue, 12 Feb 2013 21:02:08 +0100 Subject: tests/scanner: add Regress-1.0-*-expected to EXTRA_DIST --- tests/scanner/Makefile.am | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index e07bdd3e..e8781d40 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -231,4 +231,7 @@ EXTRA_DIST += \ annotationparser/gtkdoc/annotations/tester.h.xml \ annotationparser/gtkdoc/annotations/tester.c.xml \ annotationparser/gtkdoc/gobject/gobject.h.xml \ - annotationparser/gtkdoc/gobject/gobject.c.xml + annotationparser/gtkdoc/gobject/gobject.c.xml \ + Regress-1.0-C-expected \ + Regress-1.0-Gjs-expected \ + Regress-1.0-Python-expected -- cgit v1.2.1 From a7ad2cc6081ef44a721966736c56f45c7506fa4c Mon Sep 17 00:00:00 2001 From: Stef Walter Date: Wed, 13 Feb 2013 22:16:50 +0100 Subject: giscanner: Suppress deprecation warnings when introspecting types https://bugzilla.gnome.org/show_bug.cgi?id=693742 --- giscanner/dumper.py | 1 + 1 file changed, 1 insertion(+) diff --git a/giscanner/dumper.py b/giscanner/dumper.py index 24ab3ce1..dd1813f2 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py @@ -206,6 +206,7 @@ class DumpCompiler(object): # header of the library being introspected if self._compiler_cmd == 'gcc' and not self._options.init_sections: args.append('-Wall') + args.append("-Wno-deprecated-declarations") pkgconfig_flags = self._run_pkgconfig('--cflags') args.extend(pkgconfig_flags) cflags = os.environ.get('CFLAGS', '') -- cgit v1.2.1 From c5bb3d0693739b3ffc2657ad2522cf0e752b0d38 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 14 Feb 2013 23:15:03 -0500 Subject: .gitignore: Update for some testing stuff I'm building html docs to test, and I don't want git thinking it's untracked stuff. --- .gitignore | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.gitignore b/.gitignore index 1e0a0262..c54f034d 100644 --- a/.gitignore +++ b/.gitignore @@ -89,6 +89,16 @@ tests/*/*.log tests/*/*.trs .make-check-passed +#yelp-build +*.html +C.css +jquery.js +jquery.syntax.js +jquery.syntax.core.js +jquery.syntax.brush.python.js +jquery.syntax.layout.yelp.js +yelp.js + #GTK-Doc output docs/reference/html docs/reference/xml -- cgit v1.2.1 From 9c8a86bb6740a3ca10eb58797d09c657acb64d4b Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 14 Feb 2013 22:15:30 -0500 Subject: docwriter: Format list types as if they are arrays Language bindings don't actually care --- giscanner/docwriter.py | 4 ++-- .../Regress.AnnotationObject-list-signal.page | 2 +- .../Regress.AnnotationObject.get_objects.page | 4 ++-- .../Regress.AnnotationObject.get_strings.page | 4 ++-- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_filename_return.page | 4 ++-- .../Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page | 4 ++-- .../Regress.test_glist_everything_return.page | 4 ++-- .../Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page | 4 ++-- .../Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page | 4 ++-- .../Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page | 4 ++-- .../Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page | 4 ++-- .../scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page | 4 ++-- .../Regress.test_gslist_container_return.page | 4 ++-- .../Regress.test_gslist_everything_return.page | 4 ++-- .../Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page | 4 ++-- .../Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page | 4 ++-- .../Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page | 4 ++-- .../Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page | 4 ++-- .../scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page | 4 ++-- .../Regress.AnnotationObject.get_objects.page | 4 ++-- .../Regress.AnnotationObject.get_strings.page | 4 ++-- .../scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_filename_return.page | 4 ++-- .../Regress.test_glist_container_return.page | 4 ++-- .../Regress.test_glist_everything_return.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page | 4 ++-- .../Regress.test_glist_nothing_return.page | 4 ++-- .../Regress.test_glist_nothing_return2.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_glist_null_in.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_glist_null_out.page | 4 ++-- .../Regress.test_gslist_container_return.page | 4 ++-- .../Regress.test_gslist_everything_return.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page | 4 ++-- .../Regress.test_gslist_nothing_return.page | 4 ++-- .../Regress.test_gslist_nothing_return2.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_gslist_null_in.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_gslist_null_out.page | 4 ++-- 42 files changed, 79 insertions(+), 79 deletions(-) diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py index 8a03aefe..9d0d5b8f 100644 --- a/giscanner/docwriter.py +++ b/giscanner/docwriter.py @@ -448,7 +448,7 @@ class DocFormatterPython(DocFormatter): return fundamental_types.get(name, name) def format_type(self, type_): - if isinstance(type_, ast.Array): + if isinstance(type_, (ast.List, ast.Array)): return '[' + self.format_type(type_.element_type) + ']' elif isinstance(type_, ast.Map): return '{%s: %s}' % (self.format_type(type_.key_type), @@ -517,7 +517,7 @@ class DocFormatterGjs(DocFormatter): return fundamental_types.get(name, name) def format_type(self, type_): - if isinstance(type_, ast.Array): + if isinstance(type_, (ast.List, ast.Array)): return '[' + self.format_type(type_.element_type) + ']' elif isinstance(type_, ast.Map): return '{%s: %s}' % (self.format_type(type_.key_type), diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page index 35d0edd1..b29e2a6a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page @@ -14,7 +14,7 @@ Regress.AnnotationObject::list-signal -function callback(annotation_object, list:, user_param1, ...):void; +function callback(annotation_object, list:[String], user_param1, ...):void; diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page index 4db2b5f1..7245a0b6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page @@ -10,7 +10,7 @@ - <list> + [Regress.AnnotationObject] regress_annotation_object_get_objects @@ -19,7 +19,7 @@ AnnotationObject.prototype.get_objects -function get_objects(): { +function get_objects():[Regress.AnnotationObject] { // Gjs wrapper for regress_annotation_object_get_objects() } diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page index f12734f1..2b9dde17 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page @@ -10,7 +10,7 @@ - <list> + [String] regress_annotation_object_get_strings @@ -19,7 +19,7 @@ AnnotationObject.prototype.get_strings -function get_strings(): { +function get_strings():[String] { // Gjs wrapper for regress_annotation_object_get_strings() } diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page index fe821889..19331f31 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page @@ -14,7 +14,7 @@ Regress.TestObj:list-old -"list-old" : Read / Write +"list-old" [String] : Read / Write diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page index 30d452db..93252b2b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page @@ -14,7 +14,7 @@ Regress.TestObj:list -"list" : Read / Write +"list" [String] : Read / Write diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page index 1b316534..7922381c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page @@ -10,7 +10,7 @@ - <list> + [filename] regress_test_filename_return @@ -19,7 +19,7 @@ test_filename_return -function test_filename_return(): { +function test_filename_return():[filename] { // Gjs wrapper for regress_test_filename_return() } diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page index f1c08c40..d35f72b9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page @@ -10,7 +10,7 @@ - <list> + [String] regress_test_glist_container_return @@ -19,7 +19,7 @@ test_glist_container_return -function test_glist_container_return(): { +function test_glist_container_return():[String] { // Gjs wrapper for regress_test_glist_container_return() } diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page index d54c8884..4989dd86 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page @@ -10,7 +10,7 @@ - <list> + [String] regress_test_glist_everything_return @@ -19,7 +19,7 @@ test_glist_everything_return -function test_glist_everything_return(): { +function test_glist_everything_return():[String] { // Gjs wrapper for regress_test_glist_everything_return() } diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page index b041b94d..9b13e1b3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page @@ -14,7 +14,7 @@ regress_test_glist_nothing_in - <list> + [String] in @@ -23,7 +23,7 @@ test_glist_nothing_in -function test_glist_nothing_in(in:):void { +function test_glist_nothing_in(in:[String]):void { // Gjs wrapper for regress_test_glist_nothing_in() } diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page index c5a7d9b3..84037606 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page @@ -14,7 +14,7 @@ regress_test_glist_nothing_in2 - <list> + [String] in @@ -23,7 +23,7 @@ test_glist_nothing_in2 -function test_glist_nothing_in2(in:):void { +function test_glist_nothing_in2(in:[String]):void { // Gjs wrapper for regress_test_glist_nothing_in2() } diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page index 2a0af9f9..9ae9a958 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page @@ -10,7 +10,7 @@ - <list> + [String] regress_test_glist_nothing_return @@ -19,7 +19,7 @@ test_glist_nothing_return -function test_glist_nothing_return(): { +function test_glist_nothing_return():[String] { // Gjs wrapper for regress_test_glist_nothing_return() } diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page index 4c2a63cd..069f5b0b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page @@ -10,7 +10,7 @@ - <list> + [String] regress_test_glist_nothing_return2 @@ -19,7 +19,7 @@ test_glist_nothing_return2 -function test_glist_nothing_return2(): { +function test_glist_nothing_return2():[String] { // Gjs wrapper for regress_test_glist_nothing_return2() } diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page index 4579c800..8426bbff 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page @@ -14,7 +14,7 @@ regress_test_glist_null_in - <list> + [String] in @@ -23,7 +23,7 @@ test_glist_null_in -function test_glist_null_in(in:):void { +function test_glist_null_in(in:[String]):void { // Gjs wrapper for regress_test_glist_null_in() } diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page index 14334e03..7dd60e37 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page @@ -10,7 +10,7 @@ - <list> + [String] regress_test_gslist_container_return @@ -19,7 +19,7 @@ test_gslist_container_return -function test_gslist_container_return(): { +function test_gslist_container_return():[String] { // Gjs wrapper for regress_test_gslist_container_return() } diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page index d9746870..c65a3490 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page @@ -10,7 +10,7 @@ - <list> + [String] regress_test_gslist_everything_return @@ -19,7 +19,7 @@ test_gslist_everything_return -function test_gslist_everything_return(): { +function test_gslist_everything_return():[String] { // Gjs wrapper for regress_test_gslist_everything_return() } diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page index 9379cef6..3c09413a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page @@ -14,7 +14,7 @@ regress_test_gslist_nothing_in - <list> + [String] in @@ -23,7 +23,7 @@ test_gslist_nothing_in -function test_gslist_nothing_in(in:):void { +function test_gslist_nothing_in(in:[String]):void { // Gjs wrapper for regress_test_gslist_nothing_in() } diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page index 87607bc7..5eb3aa3f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page @@ -14,7 +14,7 @@ regress_test_gslist_nothing_in2 - <list> + [String] in @@ -23,7 +23,7 @@ test_gslist_nothing_in2 -function test_gslist_nothing_in2(in:):void { +function test_gslist_nothing_in2(in:[String]):void { // Gjs wrapper for regress_test_gslist_nothing_in2() } diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page index 79637032..80f6f7e2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page @@ -10,7 +10,7 @@ - <list> + [String] regress_test_gslist_nothing_return @@ -19,7 +19,7 @@ test_gslist_nothing_return -function test_gslist_nothing_return(): { +function test_gslist_nothing_return():[String] { // Gjs wrapper for regress_test_gslist_nothing_return() } diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page index 761b7b67..3119bf03 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page @@ -10,7 +10,7 @@ - <list> + [String] regress_test_gslist_nothing_return2 @@ -19,7 +19,7 @@ test_gslist_nothing_return2 -function test_gslist_nothing_return2(): { +function test_gslist_nothing_return2():[String] { // Gjs wrapper for regress_test_gslist_nothing_return2() } diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page index 928f1d30..3cc8d428 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page @@ -14,7 +14,7 @@ regress_test_gslist_null_in - <list> + [String] in @@ -23,7 +23,7 @@ test_gslist_null_in -function test_gslist_null_in(in:):void { +function test_gslist_null_in(in:[String]):void { // Gjs wrapper for regress_test_gslist_null_in() } diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page index 4b0b3a05..d2883854 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page @@ -10,7 +10,7 @@ - <list> + [Regress.AnnotationObject] regress_annotation_object_get_objects @@ -24,7 +24,7 @@ @accepts(Regress.AnnotationObject) -@returns(<list>) +@returns([Regress.AnnotationObject]) def get_objects(self): # Python wrapper for regress_annotation_object_get_objects() diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page index 818168ba..6b5f4391 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page @@ -10,7 +10,7 @@ - <list> + [unicode] regress_annotation_object_get_strings @@ -24,7 +24,7 @@ @accepts(Regress.AnnotationObject) -@returns(<list>) +@returns([unicode]) def get_strings(self): # Python wrapper for regress_annotation_object_get_strings() diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page index fe821889..70fe6185 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page @@ -14,7 +14,7 @@ Regress.TestObj:list-old -"list-old" : Read / Write +"list-old" [unicode] : Read / Write diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page index 30d452db..b21f7238 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page @@ -14,7 +14,7 @@ Regress.TestObj:list -"list" : Read / Write +"list" [unicode] : Read / Write diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page index 9b259bfd..ccf1af1d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page @@ -10,7 +10,7 @@ - <list> + [filename] regress_test_filename_return @@ -19,7 +19,7 @@ test_filename_return -@returns(<list>) +@returns([filename]) def test_filename_return(): # Python wrapper for regress_test_filename_return() diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page index 6963fb41..16ae13ab 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page @@ -10,7 +10,7 @@ - <list> + [unicode] regress_test_glist_container_return @@ -19,7 +19,7 @@ test_glist_container_return -@returns(<list>) +@returns([unicode]) def test_glist_container_return(): # Python wrapper for regress_test_glist_container_return() diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page index 7c1d2313..44f09fdd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page @@ -10,7 +10,7 @@ - <list> + [unicode] regress_test_glist_everything_return @@ -19,7 +19,7 @@ test_glist_everything_return -@returns(<list>) +@returns([unicode]) def test_glist_everything_return(): # Python wrapper for regress_test_glist_everything_return() diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page index bb93930b..1950b99a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page @@ -14,7 +14,7 @@ regress_test_glist_nothing_in - <list> + [unicode] in @@ -23,7 +23,7 @@ test_glist_nothing_in -@accepts() +@accepts([unicode]) @returns(none) def test_glist_nothing_in(in): # Python wrapper for regress_test_glist_nothing_in() diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page index fa87b14c..3a5d966d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page @@ -14,7 +14,7 @@ regress_test_glist_nothing_in2 - <list> + [unicode] in @@ -23,7 +23,7 @@ test_glist_nothing_in2 -@accepts() +@accepts([unicode]) @returns(none) def test_glist_nothing_in2(in): # Python wrapper for regress_test_glist_nothing_in2() diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page index 926d5f5f..13854024 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page @@ -10,7 +10,7 @@ - <list> + [unicode] regress_test_glist_nothing_return @@ -19,7 +19,7 @@ test_glist_nothing_return -@returns(<list>) +@returns([unicode]) def test_glist_nothing_return(): # Python wrapper for regress_test_glist_nothing_return() diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page index b6163879..3a78443f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page @@ -10,7 +10,7 @@ - <list> + [unicode] regress_test_glist_nothing_return2 @@ -19,7 +19,7 @@ test_glist_nothing_return2 -@returns(<list>) +@returns([unicode]) def test_glist_nothing_return2(): # Python wrapper for regress_test_glist_nothing_return2() diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page index 4da827e9..6f1ce10d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page @@ -14,7 +14,7 @@ regress_test_glist_null_in - <list> + [unicode] in @@ -23,7 +23,7 @@ test_glist_null_in -@accepts() +@accepts([unicode]) @returns(none) def test_glist_null_in(in): # Python wrapper for regress_test_glist_null_in() diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page index e96a9652..1bc2c2de 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page @@ -14,7 +14,7 @@ regress_test_glist_null_out - <list> + [unicode] out_list @@ -23,7 +23,7 @@ test_glist_null_out -@accepts() +@accepts([unicode]) @returns(none) def test_glist_null_out(out_list): # Python wrapper for regress_test_glist_null_out() diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page index e7ab5c11..b328b0f0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page @@ -10,7 +10,7 @@ - <list> + [unicode] regress_test_gslist_container_return @@ -19,7 +19,7 @@ test_gslist_container_return -@returns(<list>) +@returns([unicode]) def test_gslist_container_return(): # Python wrapper for regress_test_gslist_container_return() diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page index ea32632f..749adc28 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page @@ -10,7 +10,7 @@ - <list> + [unicode] regress_test_gslist_everything_return @@ -19,7 +19,7 @@ test_gslist_everything_return -@returns(<list>) +@returns([unicode]) def test_gslist_everything_return(): # Python wrapper for regress_test_gslist_everything_return() diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page index 1cbf247c..86e240eb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page @@ -14,7 +14,7 @@ regress_test_gslist_nothing_in - <list> + [unicode] in @@ -23,7 +23,7 @@ test_gslist_nothing_in -@accepts() +@accepts([unicode]) @returns(none) def test_gslist_nothing_in(in): # Python wrapper for regress_test_gslist_nothing_in() diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page index 3325a41a..8edd87e2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page @@ -14,7 +14,7 @@ regress_test_gslist_nothing_in2 - <list> + [unicode] in @@ -23,7 +23,7 @@ test_gslist_nothing_in2 -@accepts() +@accepts([unicode]) @returns(none) def test_gslist_nothing_in2(in): # Python wrapper for regress_test_gslist_nothing_in2() diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page index 0a4a5aaa..a6af8a2a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page @@ -10,7 +10,7 @@ - <list> + [unicode] regress_test_gslist_nothing_return @@ -19,7 +19,7 @@ test_gslist_nothing_return -@returns(<list>) +@returns([unicode]) def test_gslist_nothing_return(): # Python wrapper for regress_test_gslist_nothing_return() diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page index 4fb5489f..146643c6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page @@ -10,7 +10,7 @@ - <list> + [unicode] regress_test_gslist_nothing_return2 @@ -19,7 +19,7 @@ test_gslist_nothing_return2 -@returns(<list>) +@returns([unicode]) def test_gslist_nothing_return2(): # Python wrapper for regress_test_gslist_nothing_return2() diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page index 470a6fff..b3117c01 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page @@ -14,7 +14,7 @@ regress_test_gslist_null_in - <list> + [unicode] in @@ -23,7 +23,7 @@ test_gslist_null_in -@accepts() +@accepts([unicode]) @returns(none) def test_gslist_null_in(in): # Python wrapper for regress_test_gslist_null_in() diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page index 6c2dd5b4..3a0fa92e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page @@ -14,7 +14,7 @@ regress_test_gslist_null_out - <list> + [unicode] out_list @@ -23,7 +23,7 @@ test_gslist_null_out -@accepts() +@accepts([unicode]) @returns(none) def test_gslist_null_out(out_list): # Python wrapper for regress_test_gslist_null_out() -- cgit v1.2.1 From f5d315c9d2ad64ffe096e13367f934608e42b817 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 14 Feb 2013 22:24:52 -0500 Subject: docwriter: Introduce a base formatter for introspectable languages Introspectable languages share a non-zero set of base semantics, so it will become easier to implement these shared semantics here, rather than copy-paste code. --- giscanner/docwriter.py | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py index 9d0d5b8f..9b27e0d9 100644 --- a/giscanner/docwriter.py +++ b/giscanner/docwriter.py @@ -386,7 +386,14 @@ class DocFormatterC(DocFormatter): def get_parameters(self, node): return node.all_parameters -class DocFormatterPython(DocFormatter): +class DocFormatterIntrospectableBase(DocFormatter): + def should_render_node(self, node): + if isinstance(node, ast.Record) and node.is_gtype_struct_for is not None: + return False + + return True + +class DocFormatterPython(DocFormatterIntrospectableBase): language = "Python" mime_type = "text/python" @@ -400,10 +407,7 @@ class DocFormatterPython(DocFormatter): if getattr(node, "is_constructor", False): return False - if isinstance(node, ast.Record) and node.is_gtype_struct_for is not None: - return False - - return True + return super(DocFormatterPython, self).should_render_node(node) def is_method(self, node): if getattr(node, "is_method", False): @@ -467,7 +471,7 @@ class DocFormatterPython(DocFormatter): def get_parameters(self, node): return node.all_parameters -class DocFormatterGjs(DocFormatter): +class DocFormatterGjs(DocFormatterIntrospectableBase): language = "Gjs" mime_type = "text/x-gjs" @@ -477,12 +481,6 @@ class DocFormatterGjs(DocFormatter): "NULL": "null", } - def should_render_node(self, node): - if isinstance(node, ast.Record) and node.is_gtype_struct_for is not None: - return False - - return True - def is_method(self, node): if getattr(node, "is_method", False): return True -- cgit v1.2.1 From afe9d25896491db94bdbfac109f003d9ec9ff852 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 14 Feb 2013 22:28:16 -0500 Subject: docwriter: Skip non-introspectable nodes in introspectable languages --- giscanner/docwriter.py | 3 + .../Regress.AnnotationObject.watch.page | 45 --------------- .../Regress.FooObject-hidden.page | 29 ---------- .../Regress.FooObject.new_cookie.page | 46 --------------- .../Regress.FooObject.skipped_method.page | 38 ------------- .../Regress.FooObject.take_all.page | 47 --------------- .../Regress.FooRectangle.new.page | 65 --------------------- .../Regress.FooSkippable.page | 32 ----------- .../Regress.FooVarargsCallback.page | 25 -------- .../Regress-1.0-Gjs-expected/Regress.IntSet.page | 25 -------- .../Regress.SkippedStructure.page | 26 --------- .../Regress.VaListAlias.page | 25 -------- .../Regress.foo_skip_me.page | 45 --------------- .../Regress.foo_some_variant.page | 50 ---------------- .../Regress.foo_some_variant_ptr.page | 50 ---------------- .../Regress.foo_test_varargs_callback.page | 50 ---------------- .../Regress.foo_test_varargs_callback2.page | 44 --------------- .../Regress.foo_test_varargs_callback3.page | 50 ---------------- .../Regress.not_introspectable_via_alias.page | 44 --------------- ...ess.random_function_with_skipped_structure.page | 56 ------------------ .../Regress.test_skip_unannotated_callback.page | 45 --------------- .../Regress.test_value_get_fundamental_object.page | 46 --------------- .../Regress.test_value_set_fundamental_object.page | 50 ---------------- .../Regress.AnnotationObject.watch.page | 58 ------------------- .../Regress.FooObject-hidden.page | 29 ---------- .../Regress.FooObject.new_cookie.page | 53 ----------------- .../Regress.FooObject.skipped_method.page | 45 --------------- .../Regress.FooObject.take_all.page | 54 ------------------ .../Regress.FooRectangle.new.page | 66 ---------------------- .../Regress.FooSkippable.page | 32 ----------- .../Regress.FooVarargsCallback.page | 25 -------- .../Regress.IntSet.page | 25 -------- .../Regress.SkippedStructure.page | 26 --------- .../Regress.VaListAlias.page | 25 -------- .../Regress.foo_skip_me.page | 46 --------------- .../Regress.foo_some_variant.page | 51 ----------------- .../Regress.foo_some_variant_ptr.page | 51 ----------------- .../Regress.foo_test_varargs_callback.page | 51 ----------------- .../Regress.foo_test_varargs_callback2.page | 45 --------------- .../Regress.foo_test_varargs_callback3.page | 51 ----------------- .../Regress.not_introspectable_via_alias.page | 45 --------------- ...ess.random_function_with_skipped_structure.page | 57 ------------------- .../Regress.test_skip_unannotated_callback.page | 46 --------------- .../Regress.test_value_get_fundamental_object.page | 47 --------------- .../Regress.test_value_set_fundamental_object.page | 51 ----------------- 45 files changed, 3 insertions(+), 1912 deletions(-) delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-hidden.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_cookie.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.skipped_method.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.take_all.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.new.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSkippable.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooVarargsCallback.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.IntSet.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.SkippedStructure.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.VaListAlias.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_skip_me.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant_ptr.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback2.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback3.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.not_introspectable_via_alias.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.random_function_with_skipped_structure.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_skip_unannotated_callback.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_get_fundamental_object.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_set_fundamental_object.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-hidden.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.new_cookie.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.skipped_method.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.take_all.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.new.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooSkippable.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooVarargsCallback.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.IntSet.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.SkippedStructure.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.VaListAlias.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_skip_me.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant_ptr.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback2.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback3.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.not_introspectable_via_alias.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.random_function_with_skipped_structure.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_skip_unannotated_callback.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_value_get_fundamental_object.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.test_value_set_fundamental_object.page diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py index 9b27e0d9..bf0ca20d 100644 --- a/giscanner/docwriter.py +++ b/giscanner/docwriter.py @@ -391,6 +391,9 @@ class DocFormatterIntrospectableBase(DocFormatter): if isinstance(node, ast.Record) and node.is_gtype_struct_for is not None: return False + if not getattr(node, "introspectable", True): + return False + return True class DocFormatterPython(DocFormatterIntrospectableBase): diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch.page deleted file mode 100644 index 085bf0a0..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch.page +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - void - - regress_annotation_object_watch - - Regress.AnnotationForeachFunc - func - - - - - AnnotationObject.prototype.watch - - -function watch(func:Regress.AnnotationForeachFunc):void { - // Gjs wrapper for regress_annotation_object_watch() -} - - - -

This is here just for the sake of being overriden by its -.

- - - - -
-

func :

-

The callback

-
- - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-hidden.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-hidden.page deleted file mode 100644 index b751ddb4..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-hidden.page +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - hidden - - - Regress.FooObject:hidden - - -"hidden" None : Read / Write / Construct Only - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_cookie.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_cookie.page deleted file mode 100644 index 71c12ff5..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_cookie.page +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - Regress.FooObjectCookie - - regress_foo_object_new_cookie - - String - target - - - - - FooObject.prototype.new_cookie - - -function new_cookie(target:String):Regress.FooObjectCookie { - // Gjs wrapper for regress_foo_object_new_cookie() -} - - - -

Not sure why this test is here...

- - - - -
-

target :

-
-

Returns :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.skipped_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.skipped_method.page deleted file mode 100644 index b60c677e..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.skipped_method.page +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - void - - regress_foo_object_skipped_method - - - - FooObject.prototype.skipped_method - - -function skipped_method():void { - // Gjs wrapper for regress_foo_object_skipped_method() -} - - - -

This is only useful from C.

- - - - -
-
- - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.take_all.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.take_all.page deleted file mode 100644 index 35c2a7e4..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.take_all.page +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - void - - regress_foo_object_take_all - - Number - x - - - - - - FooObject.prototype.take_all - - -function take_all(x:Number, None:):void { - // Gjs wrapper for regress_foo_object_take_all() -} - - - - - - - - -
-

x :

-
-

None :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.new.page deleted file mode 100644 index 80a242d1..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.new.page +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - Regress.FooRectangle - - regress_foo_rectangle_new - - Number - x - - - Number - y - - - Number - width - - - Number - height - - - - - new - - -function new(x:Number, y:Number, width:Number, height:Number):Regress.FooRectangle { - // Gjs wrapper for regress_foo_rectangle_new() -} - - - -

This is a C convenience constructor; we have to (skip) -it because it's not a boxed type.

- - - - -
-

x :

-
-

y :

-
-

width :

-
-

height :

-
-

Returns :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSkippable.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSkippable.page deleted file mode 100644 index 605ccf5b..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSkippable.page +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - Regress.FooSkippable - - - -

Some type that is only interesting from C and should not be -exposed to language bindings.

- - - - -
-

FooSkippable.ONE :

-

a skippable enum value

-

FooSkippable.TWO :

-

another skippable enum value

-
- - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooVarargsCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooVarargsCallback.page deleted file mode 100644 index d477638a..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooVarargsCallback.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.FooVarargsCallback - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.IntSet.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.IntSet.page deleted file mode 100644 index e285bc28..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.IntSet.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.IntSet - - - -

Compatibility typedef, like telepathy-glib's TpIntSet

- - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.SkippedStructure.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.SkippedStructure.page deleted file mode 100644 index 2e67ac03..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.SkippedStructure.page +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - Regress.SkippedStructure - - - -

This should be skipped, and moreover, all function which -use it should be.

- - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.VaListAlias.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.VaListAlias.page deleted file mode 100644 index bfd52d28..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.VaListAlias.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.VaListAlias - - - -

Typedef'd va_list for additional reasons

- - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_skip_me.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_skip_me.page deleted file mode 100644 index 1458b278..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_skip_me.page +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - void - - regress_foo_skip_me - - Regress.FooSkippable - fs - - - - - foo_skip_me - - -function foo_skip_me(fs:Regress.FooSkippable):void { - // Gjs wrapper for regress_foo_skip_me() -} - - - -

Does something that's only interesting from C and should not be -exposed to language bindings.

- - - - -
-

fs :

-

a

-
- - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant.page deleted file mode 100644 index 09740618..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant.page +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - void - - regress_foo_some_variant - - Number - x - - - va_list - args - - - - - foo_some_variant - - -function foo_some_variant(x:Number, args:va_list):void { - // Gjs wrapper for regress_foo_some_variant() -} - - - - - - - - -
-

x :

-
-

args :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant_ptr.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant_ptr.page deleted file mode 100644 index d63650fc..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_some_variant_ptr.page +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - void - - regress_foo_some_variant_ptr - - Number - x - - - va_list - args - - - - - foo_some_variant_ptr - - -function foo_some_variant_ptr(x:Number, args:va_list):void { - // Gjs wrapper for regress_foo_some_variant_ptr() -} - - - - - - - - -
-

x :

-
-

args :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback.page deleted file mode 100644 index 4ae258fa..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback.page +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - void - - regress_foo_test_varargs_callback - - Number - i - - - Regress.FooVarargsCallback - callback - - - - - foo_test_varargs_callback - - -function foo_test_varargs_callback(i:Number, callback:Regress.FooVarargsCallback):void { - // Gjs wrapper for regress_foo_test_varargs_callback() -} - - - - - - - - -
-

i :

-
-

callback :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback2.page deleted file mode 100644 index c65a8188..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback2.page +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - void - - regress_foo_test_varargs_callback2 - - Regress.FooVarargsCallback - callback - - - - - foo_test_varargs_callback2 - - -function foo_test_varargs_callback2(callback:Regress.FooVarargsCallback):void { - // Gjs wrapper for regress_foo_test_varargs_callback2() -} - - - - - - - - -
-

callback :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback3.page deleted file mode 100644 index 56cc6c00..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_varargs_callback3.page +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - void - - regress_foo_test_varargs_callback3 - - Regress.FooVarargsCallback - callback - - - Regress.FooVarargsCallback - callback2 - - - - - foo_test_varargs_callback3 - - -function foo_test_varargs_callback3(callback:Regress.FooVarargsCallback, callback2:Regress.FooVarargsCallback):void { - // Gjs wrapper for regress_foo_test_varargs_callback3() -} - - - - - - - - -
-

callback :

-
-

callback2 :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.not_introspectable_via_alias.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.not_introspectable_via_alias.page deleted file mode 100644 index b1192a9d..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.not_introspectable_via_alias.page +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - void - - regress_not_introspectable_via_alias - - Regress.VaListAlias - ok - - - - - not_introspectable_via_alias - - -function not_introspectable_via_alias(ok:Regress.VaListAlias):void { - // Gjs wrapper for regress_not_introspectable_via_alias() -} - - - - - - - - -
-

ok :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.random_function_with_skipped_structure.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.random_function_with_skipped_structure.page deleted file mode 100644 index 5981e901..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.random_function_with_skipped_structure.page +++ /dev/null @@ -1,56 +0,0 @@ - - - - - - - - void - - regress_random_function_with_skipped_structure - - Number - x - - - Regress.SkippedStructure - foo - - - Number - v - - - - - random_function_with_skipped_structure - - -function random_function_with_skipped_structure(x:Number, foo:Regress.SkippedStructure, v:Number):void { - // Gjs wrapper for regress_random_function_with_skipped_structure() -} - - - - - - - - -
-

x :

-
-

foo :

-
-

v :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_skip_unannotated_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_skip_unannotated_callback.page deleted file mode 100644 index 0107162b..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_skip_unannotated_callback.page +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - void - - regress_test_skip_unannotated_callback - - Regress.TestCallback - callback - - - - - test_skip_unannotated_callback - - -function test_skip_unannotated_callback(callback:Regress.TestCallback):void { - // Gjs wrapper for regress_test_skip_unannotated_callback() -} - - - -

Should not emit a warning: -https://bugzilla.gnome.org/show_bug.cgi?id=685399

- - - - -
-

callback :

-

No annotation here

-
- - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_get_fundamental_object.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_get_fundamental_object.page deleted file mode 100644 index e3b85a80..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_get_fundamental_object.page +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - Regress.TestFundamentalObject - - regress_test_value_get_fundamental_object - - GObject.Value - value - - - - - test_value_get_fundamental_object - - -function test_value_get_fundamental_object(value:GObject.Value):Regress.TestFundamentalObject { - // Gjs wrapper for regress_test_value_get_fundamental_object() -} - - - - - - - - -
-

value :

-
-

Returns :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_set_fundamental_object.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_set_fundamental_object.page deleted file mode 100644 index 1c8b445e..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_set_fundamental_object.page +++ /dev/null @@ -1,50 +0,0 @@ - - - - - - - - void - - regress_test_value_set_fundamental_object - - GObject.Value - value - - - Regress.TestFundamentalObject - fundamental_object - - - - - test_value_set_fundamental_object - - -function test_value_set_fundamental_object(value:GObject.Value, fundamental_object:Regress.TestFundamentalObject):void { - // Gjs wrapper for regress_test_value_set_fundamental_object() -} - - - - - - - - -
-

value :

-
-

fundamental_object :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch.page deleted file mode 100644 index 87fbe044..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch.page +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - none - - regress_annotation_object_watch - - Regress.AnnotationObject - self - - - Regress.AnnotationForeachFunc - func - - - gpointer - user_data - - - - - AnnotationObject.watch - - -@accepts(Regress.AnnotationObject, Regress.AnnotationForeachFunc, gpointer) -@returns(none) -def watch(self, func, user_data): - # Python wrapper for regress_annotation_object_watch() - - - -

This is here just for the sake of being overriden by its -.

- - - - -
-

self :

-

A

-

func :

-

The callback

-

user_data :

-

The callback data

-
- - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-hidden.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-hidden.page deleted file mode 100644 index b751ddb4..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-hidden.page +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - hidden - - - Regress.FooObject:hidden - - -"hidden" None : Read / Write / Construct Only - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.new_cookie.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.new_cookie.page deleted file mode 100644 index aadefdff..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.new_cookie.page +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - Regress.FooObjectCookie - - regress_foo_object_new_cookie - - Regress.FooObject - self - - - unicode - target - - - - - FooObject.new_cookie - - -@accepts(Regress.FooObject, unicode) -@returns(Regress.FooObjectCookie) -def new_cookie(self, target): - # Python wrapper for regress_foo_object_new_cookie() - - - -

Not sure why this test is here...

- - - - -
-

self :

-
-

target :

-
-

Returns :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.skipped_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.skipped_method.page deleted file mode 100644 index 7a56e3c9..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.skipped_method.page +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - none - - regress_foo_object_skipped_method - - Regress.FooObject - self - - - - - FooObject.skipped_method - - -@accepts(Regress.FooObject) -@returns(none) -def skipped_method(self): - # Python wrapper for regress_foo_object_skipped_method() - - - -

This is only useful from C.

- - - - -
-

self :

-

obj

-
- - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.take_all.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.take_all.page deleted file mode 100644 index be7b23f5..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.take_all.page +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - none - - regress_foo_object_take_all - - Regress.FooObject - self - - - int - x - - - - - - FooObject.take_all - - -@accepts(Regress.FooObject, int, ) -@returns(none) -def take_all(self, x, ...): - # Python wrapper for regress_foo_object_take_all() - - - - - - - - -
-

self :

-
-

x :

-
-

... :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.new.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.new.page deleted file mode 100644 index 392f67ae..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.new.page +++ /dev/null @@ -1,66 +0,0 @@ - - - - - - - - Regress.FooRectangle - - regress_foo_rectangle_new - - int - x - - - int - y - - - int - width - - - int - height - - - - - FooRectangle.new - - -@accepts(int, int, int, int) -@returns(Regress.FooRectangle) -def new(x, y, width, height): - # Python wrapper for regress_foo_rectangle_new() - - - -

This is a C convenience constructor; we have to (skip) -it because it's not a boxed type.

- - - - -
-

x :

-
-

y :

-
-

width :

-
-

height :

-
-

Returns :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSkippable.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSkippable.page deleted file mode 100644 index 605ccf5b..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSkippable.page +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - Regress.FooSkippable - - - -

Some type that is only interesting from C and should not be -exposed to language bindings.

- - - - -
-

FooSkippable.ONE :

-

a skippable enum value

-

FooSkippable.TWO :

-

another skippable enum value

-
- - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooVarargsCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooVarargsCallback.page deleted file mode 100644 index d477638a..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooVarargsCallback.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.FooVarargsCallback - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.IntSet.page b/tests/scanner/Regress-1.0-Python-expected/Regress.IntSet.page deleted file mode 100644 index e285bc28..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.IntSet.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.IntSet - - - -

Compatibility typedef, like telepathy-glib's TpIntSet

- - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.SkippedStructure.page b/tests/scanner/Regress-1.0-Python-expected/Regress.SkippedStructure.page deleted file mode 100644 index 2e67ac03..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.SkippedStructure.page +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - Regress.SkippedStructure - - - -

This should be skipped, and moreover, all function which -use it should be.

- - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.VaListAlias.page b/tests/scanner/Regress-1.0-Python-expected/Regress.VaListAlias.page deleted file mode 100644 index bfd52d28..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.VaListAlias.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.VaListAlias - - - -

Typedef'd va_list for additional reasons

- - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_skip_me.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_skip_me.page deleted file mode 100644 index 8dc4a728..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_skip_me.page +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - none - - regress_foo_skip_me - - Regress.FooSkippable - fs - - - - - foo_skip_me - - -@accepts(Regress.FooSkippable) -@returns(none) -def foo_skip_me(fs): - # Python wrapper for regress_foo_skip_me() - - - -

Does something that's only interesting from C and should not be -exposed to language bindings.

- - - - -
-

fs :

-

a

-
- - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant.page deleted file mode 100644 index 3933bebe..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant.page +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - none - - regress_foo_some_variant - - int - x - - - va_list - args - - - - - foo_some_variant - - -@accepts(int, va_list) -@returns(none) -def foo_some_variant(x, args): - # Python wrapper for regress_foo_some_variant() - - - - - - - - -
-

x :

-
-

args :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant_ptr.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant_ptr.page deleted file mode 100644 index dbe2d598..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_some_variant_ptr.page +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - none - - regress_foo_some_variant_ptr - - int - x - - - va_list - args - - - - - foo_some_variant_ptr - - -@accepts(int, va_list) -@returns(none) -def foo_some_variant_ptr(x, args): - # Python wrapper for regress_foo_some_variant_ptr() - - - - - - - - -
-

x :

-
-

args :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback.page deleted file mode 100644 index 3b2f1f3c..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback.page +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - none - - regress_foo_test_varargs_callback - - int - i - - - Regress.FooVarargsCallback - callback - - - - - foo_test_varargs_callback - - -@accepts(int, Regress.FooVarargsCallback) -@returns(none) -def foo_test_varargs_callback(i, callback): - # Python wrapper for regress_foo_test_varargs_callback() - - - - - - - - -
-

i :

-
-

callback :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback2.page deleted file mode 100644 index 3a20a84c..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback2.page +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - none - - regress_foo_test_varargs_callback2 - - Regress.FooVarargsCallback - callback - - - - - foo_test_varargs_callback2 - - -@accepts(Regress.FooVarargsCallback) -@returns(none) -def foo_test_varargs_callback2(callback): - # Python wrapper for regress_foo_test_varargs_callback2() - - - - - - - - -
-

callback :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback3.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback3.page deleted file mode 100644 index b2380f36..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_varargs_callback3.page +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - none - - regress_foo_test_varargs_callback3 - - Regress.FooVarargsCallback - callback - - - Regress.FooVarargsCallback - callback2 - - - - - foo_test_varargs_callback3 - - -@accepts(Regress.FooVarargsCallback, Regress.FooVarargsCallback) -@returns(none) -def foo_test_varargs_callback3(callback, callback2): - # Python wrapper for regress_foo_test_varargs_callback3() - - - - - - - - -
-

callback :

-
-

callback2 :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.not_introspectable_via_alias.page b/tests/scanner/Regress-1.0-Python-expected/Regress.not_introspectable_via_alias.page deleted file mode 100644 index 174a8660..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.not_introspectable_via_alias.page +++ /dev/null @@ -1,45 +0,0 @@ - - - - - - - - none - - regress_not_introspectable_via_alias - - Regress.VaListAlias - ok - - - - - not_introspectable_via_alias - - -@accepts(Regress.VaListAlias) -@returns(none) -def not_introspectable_via_alias(ok): - # Python wrapper for regress_not_introspectable_via_alias() - - - - - - - - -
-

ok :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.random_function_with_skipped_structure.page b/tests/scanner/Regress-1.0-Python-expected/Regress.random_function_with_skipped_structure.page deleted file mode 100644 index e175decd..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.random_function_with_skipped_structure.page +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - none - - regress_random_function_with_skipped_structure - - int - x - - - Regress.SkippedStructure - foo - - - float - v - - - - - random_function_with_skipped_structure - - -@accepts(int, Regress.SkippedStructure, float) -@returns(none) -def random_function_with_skipped_structure(x, foo, v): - # Python wrapper for regress_random_function_with_skipped_structure() - - - - - - - - -
-

x :

-
-

foo :

-
-

v :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_skip_unannotated_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_skip_unannotated_callback.page deleted file mode 100644 index 8dc6a486..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_skip_unannotated_callback.page +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - none - - regress_test_skip_unannotated_callback - - Regress.TestCallback - callback - - - - - test_skip_unannotated_callback - - -@accepts(Regress.TestCallback) -@returns(none) -def test_skip_unannotated_callback(callback): - # Python wrapper for regress_test_skip_unannotated_callback() - - - -

Should not emit a warning: -https://bugzilla.gnome.org/show_bug.cgi?id=685399

- - - - -
-

callback :

-

No annotation here

-
- - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_get_fundamental_object.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_get_fundamental_object.page deleted file mode 100644 index 2f13d40f..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_get_fundamental_object.page +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - Regress.TestFundamentalObject - - regress_test_value_get_fundamental_object - - GObject.Value - value - - - - - test_value_get_fundamental_object - - -@accepts(GObject.Value) -@returns(Regress.TestFundamentalObject) -def test_value_get_fundamental_object(value): - # Python wrapper for regress_test_value_get_fundamental_object() - - - - - - - - -
-

value :

-
-

Returns :

-
-
- - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_set_fundamental_object.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_set_fundamental_object.page deleted file mode 100644 index e1efb486..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_set_fundamental_object.page +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - none - - regress_test_value_set_fundamental_object - - GObject.Value - value - - - Regress.TestFundamentalObject - fundamental_object - - - - - test_value_set_fundamental_object - - -@accepts(GObject.Value, Regress.TestFundamentalObject) -@returns(none) -def test_value_set_fundamental_object(value, fundamental_object): - # Python wrapper for regress_test_value_set_fundamental_object() - - - - - - - - -
-

value :

-
-

fundamental_object :

-
-
- - - - -- cgit v1.2.1 From 3b64a2e808ae25b437c30bec237ada89dc4bcfb3 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 14 Feb 2013 22:47:10 -0500 Subject: doctool: Fix use of
tag in templates This isn't legal Mallard --- giscanner/doctemplates/C/function.tmpl | 16 ++++-- giscanner/doctemplates/Gjs/enum.tmpl | 10 ++-- giscanner/doctemplates/Gjs/function.tmpl | 16 ++++-- giscanner/doctemplates/Gjs/signal.tmpl | 34 ++++++++---- giscanner/doctemplates/Gjs/vfunc.tmpl | 16 ++++-- giscanner/doctemplates/Python/enum.tmpl | 10 ++-- giscanner/doctemplates/Python/function.tmpl | 16 ++++-- giscanner/doctemplates/Python/signal.tmpl | 33 ++++++----- giscanner/doctemplates/Python/vfunc.tmpl | 16 ++++-- .../Regress.AnnotationObject-attribute-signal.page | 22 +++++--- ...ess.AnnotationObject-doc-empty-arg-parsing.page | 16 ++++-- .../Regress.AnnotationObject-list-signal.page | 16 ++++-- .../Regress.AnnotationObject-string-signal.page | 16 ++++-- .../Regress.AnnotationObject.allow_none.page | 22 +++++--- .../Regress.AnnotationObject.calleeowns.page | 22 +++++--- .../Regress.AnnotationObject.calleesowns.page | 28 ++++++---- .../Regress.AnnotationObject.compute_sum.page | 22 +++++--- .../Regress.AnnotationObject.compute_sum_n.page | 28 ++++++---- .../Regress.AnnotationObject.compute_sum_nz.page | 28 ++++++---- .../Regress.AnnotationObject.create_object.page | 16 ++++-- .../Regress.AnnotationObject.do_not_use.page | 16 ++++-- .../Regress.AnnotationObject.extra_annos.page | 16 ++++-- .../Regress.AnnotationObject.foreach.page | 28 ++++++---- .../Regress.AnnotationObject.get_hash.page | 16 ++++-- .../Regress.AnnotationObject.get_objects.page | 16 ++++-- .../Regress.AnnotationObject.get_strings.page | 16 ++++-- .../Regress.AnnotationObject.hidden_self.page | 16 ++++-- .../Regress.AnnotationObject.in.page | 22 +++++--- .../Regress.AnnotationObject.inout.page | 22 +++++--- .../Regress.AnnotationObject.inout2.page | 22 +++++--- .../Regress.AnnotationObject.inout3.page | 22 +++++--- .../Regress.AnnotationObject.method.page | 16 ++++-- .../Regress.AnnotationObject.notrans.page | 16 ++++-- .../Regress.AnnotationObject.out.page | 22 +++++--- .../Regress.AnnotationObject.parse_args.page | 28 ++++++---- .../Regress.AnnotationObject.set_data.page | 28 ++++++---- .../Regress.AnnotationObject.set_data2.page | 28 ++++++---- .../Regress.AnnotationObject.set_data3.page | 28 ++++++---- .../Regress.AnnotationObject.string_out.page | 22 +++++--- .../Regress.AnnotationObject.use_buffer.page | 22 +++++--- .../Regress.AnnotationObject.watch.page | 28 ++++++---- .../Regress.AnnotationObject.watch_full.page | 34 ++++++++---- .../Regress.AnnotationObject.with_voidp.page | 22 +++++--- .../Regress.FooBRect.add.page | 22 +++++--- .../Regress.FooBRect.new.page | 22 +++++--- .../Regress.FooBoxed.method.page | 16 ++++-- .../Regress.FooBoxed.new.page | 10 ++-- .../Regress.FooBuffer.some_method.page | 16 ++++-- .../Regress.FooDBusData.method.page | 16 ++++-- .../Regress.FooForeignStruct.copy.page | 16 ++++-- .../Regress.FooForeignStruct.new.page | 10 ++-- .../Regress.FooInterface-do_regress_foo.page | 22 +++++--- .../Regress.FooInterface.do_regress_foo.page | 22 +++++--- .../Regress.FooInterface.static_method.page | 16 ++++-- .../Regress.FooObject-read_fn.page | 28 ++++++---- .../Regress.FooObject-signal.page | 22 +++++--- .../Regress.FooObject-virtual_method.page | 22 +++++--- .../Regress.FooObject.a_global_method.page | 16 ++++-- .../Regress.FooObject.append_new_stack_layer.page | 22 +++++--- .../Regress.FooObject.dup_name.page | 16 ++++-- .../Regress.FooObject.external_type.page | 16 ++++-- .../Regress.FooObject.get_default.page | 10 ++-- .../Regress.FooObject.get_name.page | 16 ++++-- .../Regress.FooObject.handle_glyph.page | 22 +++++--- .../Regress.FooObject.is_it_time_yet.page | 22 +++++--- .../Regress.FooObject.new.page | 10 ++-- .../Regress.FooObject.new_as_super.page | 10 ++-- .../Regress.FooObject.new_cookie.page | 22 +++++--- .../Regress.FooObject.read.page | 28 ++++++---- .../Regress.FooObject.skipped_method.page | 16 ++++-- .../Regress.FooObject.static_meth.page | 10 ++-- .../Regress.FooObject.take_all.page | 28 ++++++---- .../Regress.FooObject.various.page | 28 ++++++---- .../Regress.FooObject.virtual_method.page | 22 +++++--- .../Regress.FooRectangle.add.page | 22 +++++--- .../Regress.FooRectangle.new.page | 34 ++++++++---- .../Regress.FooSubInterface-destroy-event.page | 10 ++-- .../Regress.FooSubInterface-destroy_event.page | 16 ++++-- .../Regress.FooSubInterface-do_bar.page | 16 ++++-- .../Regress.FooSubInterface-do_baz.page | 28 ++++++---- .../Regress.FooSubInterface.do_bar.page | 16 ++++-- .../Regress.FooSubInterface.do_baz.page | 28 ++++++---- .../Regress.FooSubobject.new.page | 10 ++-- .../Regress.TestBoxed.copy.page | 16 ++++-- .../Regress.TestBoxed.equals.page | 22 +++++--- .../Regress.TestBoxed.new.page | 10 ++-- ...ess.TestBoxed.new_alternative_constructor1.page | 16 ++++-- ...ess.TestBoxed.new_alternative_constructor2.page | 22 +++++--- ...ess.TestBoxed.new_alternative_constructor3.page | 16 ++++-- .../Regress.TestBoxedB.copy.page | 16 ++++-- .../Regress.TestBoxedB.new.page | 22 +++++--- .../Regress.TestBoxedC.new.page | 10 ++-- .../Regress.TestBoxedD.copy.page | 16 ++++-- .../Regress.TestBoxedD.free.page | 16 ++++-- .../Regress.TestBoxedD.get_magic.page | 16 ++++-- .../Regress.TestBoxedD.new.page | 22 +++++--- .../Regress.TestFloating.new.page | 10 ++-- .../Regress.TestFundamentalObject.ref.page | 16 ++++-- .../Regress.TestFundamentalObject.unref.page | 16 ++++-- .../Regress.TestFundamentalSubObject.new.page | 16 ++++-- .../Regress.TestInheritDrawable.do_foo.page | 22 +++++--- ...ess.TestInheritDrawable.do_foo_maybe_throw.page | 22 +++++--- .../Regress.TestInheritDrawable.get_origin.page | 28 ++++++---- .../Regress.TestInheritDrawable.get_size.page | 28 ++++++---- .../Regress.TestObj-all.page | 10 ++-- .../Regress.TestObj-allow_none_vfunc.page | 22 +++++--- .../Regress.TestObj-cleanup.page | 10 ++-- .../Regress.TestObj-first.page | 10 ++-- .../Regress.TestObj-matrix.page | 22 +++++--- .../Regress.TestObj-sig-with-array-prop.page | 16 ++++-- .../Regress.TestObj-sig-with-foreign-struct.page | 16 ++++-- .../Regress.TestObj-sig-with-hash-prop.page | 16 ++++-- .../Regress.TestObj-sig-with-int64-prop.page | 16 ++++-- .../Regress.TestObj-sig-with-intarray-ret.page | 16 ++++-- .../Regress.TestObj-sig-with-obj.page | 16 ++++-- .../Regress.TestObj-sig-with-strv.page | 16 ++++-- .../Regress.TestObj-sig-with-uint64-prop.page | 16 ++++-- ...Regress.TestObj-test-with-static-scope-arg.page | 16 ++++-- .../Regress.TestObj-test.page | 10 ++-- .../Regress.TestObj.constructor.page | 10 ++-- .../Regress.TestObj.do_matrix.page | 22 +++++--- ...gress.TestObj.emit_sig_with_foreign_struct.page | 16 ++++-- .../Regress.TestObj.emit_sig_with_int64.page | 16 ++++-- .../Regress.TestObj.emit_sig_with_obj.page | 16 ++++-- .../Regress.TestObj.emit_sig_with_uint64.page | 16 ++++-- .../Regress.TestObj.forced_method.page | 16 ++++-- .../Regress.TestObj.instance_method.page | 16 ++++-- .../Regress.TestObj.instance_method_callback.page | 22 +++++--- .../Regress.TestObj.new.page | 16 ++++-- .../Regress.TestObj.new_callback.page | 28 ++++++---- .../Regress.TestObj.new_from_file.page | 16 ++++-- .../Regress.TestObj.null_out.page | 16 ++++-- .../Regress.TestObj.set_bare.page | 22 +++++--- .../Regress.TestObj.skip_inout_param.page | 58 +++++++++++++------- .../Regress.TestObj.skip_out_param.page | 58 +++++++++++++------- .../Regress.TestObj.skip_param.page | 58 +++++++++++++------- .../Regress.TestObj.skip_return_val.page | 58 +++++++++++++------- .../Regress.TestObj.skip_return_val_no_out.page | 22 +++++--- .../Regress.TestObj.static_method.page | 16 ++++-- .../Regress.TestObj.static_method_callback.page | 16 ++++-- .../Regress.TestObj.torture_signature_0.page | 52 ++++++++++++------ .../Regress.TestObj.torture_signature_1.page | 52 ++++++++++++------ .../Regress.TestSimpleBoxedA.const_return.page | 10 ++-- .../Regress.TestSimpleBoxedA.copy.page | 16 ++++-- .../Regress.TestSimpleBoxedA.equals.page | 22 +++++--- .../Regress.TestSimpleBoxedB.copy.page | 16 ++++-- .../Regress.TestStructA.clone.page | 22 +++++--- .../Regress.TestStructA.parse.page | 22 +++++--- .../Regress.TestStructB.clone.page | 22 +++++--- .../Regress.TestStructFixedArray.frob.page | 16 ++++-- .../Regress.TestSubObj.instance_method.page | 16 ++++-- .../Regress.TestSubObj.new.page | 10 ++-- .../Regress.TestSubObj.unset_bare.page | 16 ++++-- .../Regress.TestWi8021x.get_testbool.page | 16 ++++-- .../Regress.TestWi8021x.new.page | 10 ++-- .../Regress.TestWi8021x.set_testbool.page | 22 +++++--- .../Regress.TestWi8021x.static_method.page | 16 ++++-- .../Regress.aliased_caller_alloc.page | 16 ++++-- .../Regress.annotation_attribute_func.page | 22 +++++--- .../Regress.annotation_custom_destroy.page | 28 ++++++---- .../Regress.annotation_get_source_file.page | 10 ++-- .../Regress.annotation_init.page | 22 +++++--- ...ress.annotation_invalid_regress_annotation.page | 16 ++++-- .../Regress.annotation_ptr_array.page | 16 ++++-- .../Regress.annotation_return_array.page | 16 ++++-- .../Regress.annotation_return_filename.page | 10 ++-- .../Regress.annotation_set_source_file.page | 16 ++++-- ...s.annotation_space_after_comment_bug631690.page | 10 ++-- .../Regress.annotation_string_array_length.page | 22 +++++--- .../Regress.annotation_string_zero_terminated.page | 10 ++-- ...ress.annotation_string_zero_terminated_out.page | 16 ++++-- .../Regress.annotation_test_parsing_bug630862.page | 10 ++-- .../Regress.annotation_transfer_floating.page | 10 ++-- .../Regress.annotation_versioned.page | 10 ++-- .../Regress.atest_error_quark.page | 10 ++-- .../Regress.foo_async_ready_callback.page | 28 ++++++---- .../Regress.foo_destroy_notify_callback.page | 28 ++++++---- .../Regress-1.0-C-expected/Regress.foo_init.page | 10 ++-- .../Regress.foo_method_external_references.page | 34 ++++++++---- .../Regress.foo_not_a_constructor_new.page | 10 ++-- .../Regress.foo_skip_me.page | 16 ++++-- .../Regress.foo_some_variant.page | 22 +++++--- .../Regress.foo_some_variant_ptr.page | 22 +++++--- .../Regress.foo_test_array.page | 10 ++-- .../Regress.foo_test_const_char_param.page | 16 ++++-- .../Regress.foo_test_const_char_retval.page | 10 ++-- .../Regress.foo_test_const_struct_param.page | 16 ++++-- .../Regress.foo_test_const_struct_retval.page | 10 ++-- .../Regress.foo_test_string_array.page | 16 ++++-- .../Regress.foo_test_string_array_with_g.page | 16 ++++-- .../Regress.foo_test_unsigned_qualifier.page | 16 ++++-- .../Regress.foo_test_unsigned_type.page | 16 ++++-- .../Regress.foo_test_varargs_callback.page | 22 +++++--- .../Regress.foo_test_varargs_callback2.page | 16 ++++-- .../Regress.foo_test_varargs_callback3.page | 22 +++++--- .../Regress.func_obj_null_in.page | 16 ++++-- .../Regress.global_get_flags_out.page | 16 ++++-- .../Regress.has_parameter_named_attrs.page | 22 +++++--- .../Regress.introspectable_via_alias.page | 16 ++++-- .../Regress.not_introspectable_via_alias.page | 16 ++++-- ...ess.random_function_with_skipped_structure.page | 28 ++++++---- .../Regress.set_abort_on_error.page | 16 ++++-- .../Regress.test_array_callback.page | 16 ++++-- .../Regress.test_array_fixed_out_objects.page | 16 ++++-- .../Regress.test_array_fixed_size_int_in.page | 16 ++++-- .../Regress.test_array_fixed_size_int_out.page | 16 ++++-- .../Regress.test_array_fixed_size_int_return.page | 10 ++-- .../Regress.test_array_gint16_in.page | 22 +++++--- .../Regress.test_array_gint32_in.page | 22 +++++--- .../Regress.test_array_gint64_in.page | 22 +++++--- .../Regress.test_array_gint8_in.page | 22 +++++--- .../Regress.test_array_gtype_in.page | 22 +++++--- .../Regress.test_array_int_full_out.page | 16 ++++-- .../Regress.test_array_int_in.page | 22 +++++--- .../Regress.test_array_int_inout.page | 22 +++++--- .../Regress.test_array_int_none_out.page | 16 ++++-- .../Regress.test_array_int_null_in.page | 22 +++++--- .../Regress.test_array_int_null_out.page | 22 +++++--- .../Regress.test_array_int_out.page | 22 +++++--- .../Regress.test_async_ready_callback.page | 16 ++++-- .../Regress.test_boolean.page | 16 ++++-- .../Regress.test_boolean_false.page | 16 ++++-- .../Regress.test_boolean_true.page | 16 ++++-- .../Regress.test_cairo_context_full_return.page | 10 ++-- .../Regress.test_cairo_context_none_in.page | 16 ++++-- .../Regress.test_cairo_surface_full_out.page | 16 ++++-- .../Regress.test_cairo_surface_full_return.page | 10 ++-- .../Regress.test_cairo_surface_none_in.page | 16 ++++-- .../Regress.test_cairo_surface_none_return.page | 10 ++-- .../Regress.test_callback.page | 16 ++++-- .../Regress.test_callback_async.page | 22 +++++--- .../Regress.test_callback_destroy_notify.page | 28 ++++++---- ....test_callback_destroy_notify_no_user_data.page | 22 +++++--- .../Regress.test_callback_thaw_async.page | 10 ++-- .../Regress.test_callback_thaw_notifications.page | 10 ++-- .../Regress.test_callback_user_data.page | 22 +++++--- .../Regress.test_closure.page | 16 ++++-- .../Regress.test_closure_one_arg.page | 22 +++++--- .../Regress.test_closure_variant.page | 22 +++++--- .../Regress.test_date_in_gvalue.page | 10 ++-- .../Regress.test_def_error_quark.page | 10 ++-- .../Regress.test_double.page | 16 ++++-- .../Regress.test_filename_return.page | 10 ++-- .../Regress-1.0-C-expected/Regress.test_float.page | 16 ++++-- .../Regress.test_garray_container_return.page | 10 ++-- .../Regress.test_garray_full_return.page | 10 ++-- .../Regress.test_gerror_callback.page | 16 ++++-- .../Regress.test_ghash_container_return.page | 10 ++-- .../Regress.test_ghash_everything_return.page | 10 ++-- .../Regress.test_ghash_gvalue_in.page | 16 ++++-- .../Regress.test_ghash_gvalue_return.page | 10 ++-- ...egress.test_ghash_nested_everything_return.page | 10 ++-- ...gress.test_ghash_nested_everything_return2.page | 10 ++-- .../Regress.test_ghash_nothing_in.page | 16 ++++-- .../Regress.test_ghash_nothing_in2.page | 16 ++++-- .../Regress.test_ghash_nothing_return.page | 10 ++-- .../Regress.test_ghash_nothing_return2.page | 10 ++-- .../Regress.test_ghash_null_in.page | 16 ++++-- .../Regress.test_ghash_null_out.page | 16 ++++-- .../Regress.test_ghash_null_return.page | 10 ++-- .../Regress.test_glist_container_return.page | 10 ++-- .../Regress.test_glist_everything_return.page | 10 ++-- .../Regress.test_glist_nothing_in.page | 16 ++++-- .../Regress.test_glist_nothing_in2.page | 16 ++++-- .../Regress.test_glist_nothing_return.page | 10 ++-- .../Regress.test_glist_nothing_return2.page | 10 ++-- .../Regress.test_glist_null_in.page | 16 ++++-- .../Regress.test_glist_null_out.page | 16 ++++-- .../Regress.test_gslist_container_return.page | 10 ++-- .../Regress.test_gslist_everything_return.page | 10 ++-- .../Regress.test_gslist_nothing_in.page | 16 ++++-- .../Regress.test_gslist_nothing_in2.page | 16 ++++-- .../Regress.test_gslist_nothing_return.page | 10 ++-- .../Regress.test_gslist_nothing_return2.page | 10 ++-- .../Regress.test_gslist_null_in.page | 16 ++++-- .../Regress.test_gslist_null_out.page | 16 ++++-- .../Regress-1.0-C-expected/Regress.test_gtype.page | 16 ++++-- .../Regress.test_gvariant_as.page | 10 ++-- .../Regress.test_gvariant_asv.page | 10 ++-- .../Regress.test_gvariant_i.page | 10 ++-- .../Regress.test_gvariant_s.page | 10 ++-- .../Regress.test_gvariant_v.page | 10 ++-- .../Regress.test_hash_table_callback.page | 22 +++++--- .../Regress-1.0-C-expected/Regress.test_int.page | 16 ++++-- .../Regress-1.0-C-expected/Regress.test_int16.page | 16 ++++-- .../Regress-1.0-C-expected/Regress.test_int32.page | 16 ++++-- .../Regress-1.0-C-expected/Regress.test_int64.page | 16 ++++-- .../Regress-1.0-C-expected/Regress.test_int8.page | 16 ++++-- .../Regress.test_int_out_utf8.page | 22 +++++--- .../Regress.test_int_value_arg.page | 16 ++++-- .../Regress-1.0-C-expected/Regress.test_long.page | 16 ++++-- .../Regress.test_multi_callback.page | 16 ++++-- .../Regress.test_multi_double_args.page | 28 ++++++---- .../Regress.test_multiline_doc_comments.page | 10 ++-- .../Regress.test_nested_parameter.page | 16 ++++-- .../Regress.test_null_gerror_callback.page | 16 ++++-- .../Regress.test_owned_gerror_callback.page | 16 ++++-- .../Regress-1.0-C-expected/Regress.test_short.page | 16 ++++-- .../Regress.test_simple_callback.page | 16 ++++-- .../Regress-1.0-C-expected/Regress.test_size.page | 16 ++++-- .../Regress.test_skip_unannotated_callback.page | 16 ++++-- .../Regress-1.0-C-expected/Regress.test_ssize.page | 16 ++++-- .../Regress.test_strv_in.page | 16 ++++-- .../Regress.test_strv_in_gvalue.page | 10 ++-- .../Regress.test_strv_out.page | 10 ++-- .../Regress.test_strv_out_c.page | 10 ++-- .../Regress.test_strv_out_container.page | 10 ++-- .../Regress.test_strv_outarg.page | 16 ++++-- .../Regress-1.0-C-expected/Regress.test_timet.page | 16 ++++-- .../Regress.test_torture_signature_0.page | 46 ++++++++++------ .../Regress.test_torture_signature_1.page | 46 ++++++++++------ .../Regress.test_torture_signature_2.page | 64 ++++++++++++++-------- .../Regress-1.0-C-expected/Regress.test_uint.page | 16 ++++-- .../Regress.test_uint16.page | 16 ++++-- .../Regress.test_uint32.page | 16 ++++-- .../Regress.test_uint64.page | 16 ++++-- .../Regress-1.0-C-expected/Regress.test_uint8.page | 16 ++++-- .../Regress-1.0-C-expected/Regress.test_ulong.page | 16 ++++-- .../Regress.test_unichar.page | 16 ++++-- .../Regress.test_unsigned_enum_param.page | 16 ++++-- .../Regress.test_ushort.page | 16 ++++-- .../Regress.test_utf8_const_in.page | 16 ++++-- .../Regress.test_utf8_const_return.page | 10 ++-- .../Regress.test_utf8_inout.page | 16 ++++-- .../Regress.test_utf8_nonconst_return.page | 10 ++-- .../Regress.test_utf8_null_in.page | 16 ++++-- .../Regress.test_utf8_null_out.page | 16 ++++-- .../Regress.test_utf8_out.page | 16 ++++-- .../Regress.test_utf8_out_nonconst_return.page | 16 ++++-- .../Regress.test_utf8_out_out.page | 22 +++++--- .../Regress.test_value_get_fundamental_object.page | 16 ++++-- .../Regress.test_value_return.page | 16 ++++-- .../Regress.test_value_set_fundamental_object.page | 22 +++++--- .../Regress.test_versioning.page | 10 ++-- .../Regress.ATestError.page | 22 +++++--- .../Regress.AnnotationObject-attribute-signal.page | 40 +++++++++----- ...ess.AnnotationObject-doc-empty-arg-parsing.page | 28 ++++++---- .../Regress.AnnotationObject-list-signal.page | 28 ++++++---- .../Regress.AnnotationObject-string-signal.page | 28 ++++++---- .../Regress.AnnotationObject.allow_none.page | 16 ++++-- .../Regress.AnnotationObject.calleeowns.page | 10 ++-- .../Regress.AnnotationObject.calleesowns.page | 10 ++-- .../Regress.AnnotationObject.compute_sum.page | 10 ++-- .../Regress.AnnotationObject.compute_sum_n.page | 10 ++-- .../Regress.AnnotationObject.compute_sum_nz.page | 10 ++-- .../Regress.AnnotationObject.create_object.page | 10 ++-- .../Regress.AnnotationObject.do_not_use.page | 10 ++-- .../Regress.AnnotationObject.extra_annos.page | 4 +- .../Regress.AnnotationObject.foreach.page | 10 ++-- .../Regress.AnnotationObject.get_hash.page | 10 ++-- .../Regress.AnnotationObject.get_objects.page | 10 ++-- .../Regress.AnnotationObject.get_strings.page | 10 ++-- .../Regress.AnnotationObject.hidden_self.page | 4 +- .../Regress.AnnotationObject.in.page | 16 ++++-- .../Regress.AnnotationObject.inout.page | 16 ++++-- .../Regress.AnnotationObject.inout2.page | 16 ++++-- .../Regress.AnnotationObject.inout3.page | 16 ++++-- .../Regress.AnnotationObject.method.page | 10 ++-- .../Regress.AnnotationObject.notrans.page | 10 ++-- .../Regress.AnnotationObject.out.page | 10 ++-- .../Regress.AnnotationObject.parse_args.page | 10 ++-- .../Regress.AnnotationObject.set_data.page | 10 ++-- .../Regress.AnnotationObject.set_data2.page | 10 ++-- .../Regress.AnnotationObject.set_data3.page | 10 ++-- .../Regress.AnnotationObject.string_out.page | 10 ++-- .../Regress.AnnotationObject.use_buffer.page | 10 ++-- .../Regress.AnnotationObject.watch_full.page | 10 ++-- .../Regress.AnnotationObject.with_voidp.page | 10 ++-- .../Regress.FooASingle.page | 10 ++-- .../Regress.FooAddressType.page | 22 +++++--- .../Regress.FooBRect.add.page | 10 ++-- .../Regress.FooBRect.new.page | 22 +++++--- .../Regress.FooBoxed.method.page | 4 +- .../Regress.FooBoxed.new.page | 10 ++-- .../Regress.FooBuffer.some_method.page | 4 +- .../Regress.FooDBusData.method.page | 4 +- .../Regress.FooEnumFullname.page | 22 +++++--- .../Regress.FooEnumNoType.page | 28 ++++++---- .../Regress.FooEnumType.page | 22 +++++--- .../Regress-1.0-Gjs-expected/Regress.FooError.page | 22 +++++--- .../Regress.FooForeignStruct.copy.page | 10 ++-- .../Regress.FooForeignStruct.new.page | 10 ++-- .../Regress.FooInterface-do_regress_foo.page | 10 ++-- .../Regress.FooInterface.do_regress_foo.page | 10 ++-- .../Regress.FooInterface.static_method.page | 10 ++-- .../Regress.FooObject-read_fn.page | 16 ++++-- .../Regress.FooObject-signal.page | 40 +++++++++----- .../Regress.FooObject-virtual_method.page | 16 ++++-- .../Regress.FooObject.a_global_method.page | 10 ++-- .../Regress.FooObject.append_new_stack_layer.page | 16 ++++-- .../Regress.FooObject.dup_name.page | 10 ++-- .../Regress.FooObject.external_type.page | 10 ++-- .../Regress.FooObject.get_default.page | 10 ++-- .../Regress.FooObject.get_name.page | 10 ++-- .../Regress.FooObject.handle_glyph.page | 10 ++-- .../Regress.FooObject.is_it_time_yet.page | 10 ++-- .../Regress.FooObject.new.page | 10 ++-- .../Regress.FooObject.new_as_super.page | 10 ++-- .../Regress.FooObject.read.page | 16 ++++-- .../Regress.FooObject.static_meth.page | 10 ++-- .../Regress.FooObject.various.page | 16 ++++-- .../Regress.FooObject.virtual_method.page | 16 ++++-- .../Regress.FooRectangle.add.page | 10 ++-- .../Regress.FooStackLayer.page | 58 +++++++++++++------- .../Regress.FooSubInterface-destroy-event.page | 22 +++++--- .../Regress.FooSubInterface-destroy_event.page | 4 +- .../Regress.FooSubInterface-do_bar.page | 4 +- .../Regress.FooSubInterface-do_baz.page | 10 ++-- .../Regress.FooSubInterface.do_bar.page | 4 +- .../Regress.FooSubInterface.do_baz.page | 10 ++-- .../Regress.FooSubobject.new.page | 10 ++-- .../Regress.TestABCError.page | 22 +++++--- .../Regress.TestBoxed.copy.page | 10 ++-- .../Regress.TestBoxed.equals.page | 16 ++++-- .../Regress.TestBoxed.new.page | 10 ++-- ...ess.TestBoxed.new_alternative_constructor1.page | 16 ++++-- ...ess.TestBoxed.new_alternative_constructor2.page | 22 +++++--- ...ess.TestBoxed.new_alternative_constructor3.page | 16 ++++-- .../Regress.TestBoxedB.copy.page | 10 ++-- .../Regress.TestBoxedB.new.page | 22 +++++--- .../Regress.TestBoxedC.new.page | 10 ++-- .../Regress.TestBoxedD.copy.page | 10 ++-- .../Regress.TestBoxedD.free.page | 4 +- .../Regress.TestBoxedD.get_magic.page | 10 ++-- .../Regress.TestBoxedD.new.page | 22 +++++--- .../Regress.TestDEFError.page | 22 +++++--- .../Regress-1.0-Gjs-expected/Regress.TestEnum.page | 28 ++++++---- .../Regress.TestEnumNoGEnum.page | 22 +++++--- .../Regress.TestEnumUnsigned.page | 16 ++++-- .../Regress.TestError.page | 22 +++++--- .../Regress.TestFloating.new.page | 10 ++-- .../Regress.TestFundamentalObject.ref.page | 10 ++-- .../Regress.TestFundamentalObject.unref.page | 4 +- .../Regress.TestFundamentalSubObject.new.page | 16 ++++-- .../Regress.TestInheritDrawable.do_foo.page | 10 ++-- ...ess.TestInheritDrawable.do_foo_maybe_throw.page | 10 ++-- .../Regress.TestInheritDrawable.get_origin.page | 4 +- .../Regress.TestInheritDrawable.get_size.page | 4 +- .../Regress.TestObj-all.page | 22 +++++--- .../Regress.TestObj-allow_none_vfunc.page | 10 ++-- .../Regress.TestObj-cleanup.page | 22 +++++--- .../Regress.TestObj-first.page | 22 +++++--- .../Regress.TestObj-matrix.page | 16 ++++-- .../Regress.TestObj-sig-with-array-prop.page | 28 ++++++---- .../Regress.TestObj-sig-with-foreign-struct.page | 28 ++++++---- .../Regress.TestObj-sig-with-hash-prop.page | 28 ++++++---- .../Regress.TestObj-sig-with-int64-prop.page | 34 ++++++++---- .../Regress.TestObj-sig-with-intarray-ret.page | 28 ++++++---- .../Regress.TestObj-sig-with-obj.page | 28 ++++++---- .../Regress.TestObj-sig-with-strv.page | 28 ++++++---- .../Regress.TestObj-sig-with-uint64-prop.page | 34 ++++++++---- ...Regress.TestObj-test-with-static-scope-arg.page | 28 ++++++---- .../Regress.TestObj-test.page | 22 +++++--- .../Regress.TestObj.constructor.page | 10 ++-- .../Regress.TestObj.do_matrix.page | 16 ++++-- ...gress.TestObj.emit_sig_with_foreign_struct.page | 4 +- .../Regress.TestObj.emit_sig_with_int64.page | 4 +- .../Regress.TestObj.emit_sig_with_obj.page | 4 +- .../Regress.TestObj.emit_sig_with_uint64.page | 4 +- .../Regress.TestObj.forced_method.page | 4 +- .../Regress.TestObj.instance_method.page | 10 ++-- .../Regress.TestObj.instance_method_callback.page | 10 ++-- .../Regress.TestObj.new.page | 16 ++++-- .../Regress.TestObj.new_callback.page | 16 ++++-- .../Regress.TestObj.new_from_file.page | 16 ++++-- .../Regress.TestObj.null_out.page | 4 +- .../Regress.TestObj.set_bare.page | 10 ++-- .../Regress.TestObj.skip_inout_param.page | 40 +++++++++----- .../Regress.TestObj.skip_out_param.page | 40 +++++++++----- .../Regress.TestObj.skip_param.page | 40 +++++++++----- .../Regress.TestObj.skip_return_val.page | 40 +++++++++----- .../Regress.TestObj.skip_return_val_no_out.page | 16 ++++-- .../Regress.TestObj.static_method.page | 16 ++++-- .../Regress.TestObj.static_method_callback.page | 10 ++-- .../Regress.TestObj.torture_signature_0.page | 22 +++++--- .../Regress.TestObj.torture_signature_1.page | 28 ++++++---- .../Regress.TestOtherError.page | 22 +++++--- .../Regress.TestSimpleBoxedA.const_return.page | 10 ++-- .../Regress.TestSimpleBoxedA.copy.page | 10 ++-- .../Regress.TestSimpleBoxedA.equals.page | 16 ++++-- .../Regress.TestSimpleBoxedB.copy.page | 10 ++-- .../Regress.TestStructA.clone.page | 4 +- .../Regress.TestStructA.parse.page | 10 ++-- .../Regress.TestStructB.clone.page | 4 +- .../Regress.TestStructFixedArray.frob.page | 4 +- .../Regress.TestSubObj.instance_method.page | 10 ++-- .../Regress.TestSubObj.new.page | 10 ++-- .../Regress.TestSubObj.unset_bare.page | 4 +- .../Regress.TestWi8021x.get_testbool.page | 10 ++-- .../Regress.TestWi8021x.new.page | 10 ++-- .../Regress.TestWi8021x.set_testbool.page | 10 ++-- .../Regress.TestWi8021x.static_method.page | 16 ++++-- .../Regress.aliased_caller_alloc.page | 4 +- .../Regress.annotation_attribute_func.page | 22 +++++--- .../Regress.annotation_custom_destroy.page | 10 ++-- .../Regress.annotation_get_source_file.page | 10 ++-- .../Regress.annotation_init.page | 10 ++-- ...ress.annotation_invalid_regress_annotation.page | 10 ++-- .../Regress.annotation_ptr_array.page | 10 ++-- .../Regress.annotation_return_array.page | 10 ++-- .../Regress.annotation_return_filename.page | 10 ++-- .../Regress.annotation_set_source_file.page | 10 ++-- ...s.annotation_space_after_comment_bug631690.page | 4 +- .../Regress.annotation_string_array_length.page | 10 ++-- .../Regress.annotation_string_zero_terminated.page | 10 ++-- ...ress.annotation_string_zero_terminated_out.page | 10 ++-- .../Regress.annotation_test_parsing_bug630862.page | 10 ++-- .../Regress.annotation_transfer_floating.page | 10 ++-- .../Regress.annotation_versioned.page | 4 +- .../Regress.atest_error_quark.page | 10 ++-- .../Regress.foo_async_ready_callback.page | 16 ++++-- .../Regress.foo_destroy_notify_callback.page | 10 ++-- .../Regress-1.0-Gjs-expected/Regress.foo_init.page | 10 ++-- .../Regress.foo_method_external_references.page | 28 ++++++---- .../Regress.foo_not_a_constructor_new.page | 10 ++-- .../Regress.foo_test_array.page | 10 ++-- .../Regress.foo_test_const_char_param.page | 10 ++-- .../Regress.foo_test_const_char_retval.page | 10 ++-- .../Regress.foo_test_const_struct_param.page | 10 ++-- .../Regress.foo_test_const_struct_retval.page | 10 ++-- .../Regress.foo_test_string_array.page | 10 ++-- .../Regress.foo_test_string_array_with_g.page | 10 ++-- .../Regress.foo_test_unsigned_qualifier.page | 10 ++-- .../Regress.foo_test_unsigned_type.page | 10 ++-- .../Regress.func_obj_null_in.page | 10 ++-- .../Regress.global_get_flags_out.page | 4 +- .../Regress.has_parameter_named_attrs.page | 16 ++++-- .../Regress.introspectable_via_alias.page | 10 ++-- .../Regress.set_abort_on_error.page | 10 ++-- .../Regress.test_array_callback.page | 16 ++++-- .../Regress.test_array_fixed_out_objects.page | 4 +- .../Regress.test_array_fixed_size_int_in.page | 16 ++++-- .../Regress.test_array_fixed_size_int_out.page | 4 +- .../Regress.test_array_fixed_size_int_return.page | 10 ++-- .../Regress.test_array_gint16_in.page | 16 ++++-- .../Regress.test_array_gint32_in.page | 16 ++++-- .../Regress.test_array_gint64_in.page | 16 ++++-- .../Regress.test_array_gint8_in.page | 16 ++++-- .../Regress.test_array_gtype_in.page | 16 ++++-- .../Regress.test_array_int_full_out.page | 10 ++-- .../Regress.test_array_int_in.page | 16 ++++-- .../Regress.test_array_int_inout.page | 10 ++-- .../Regress.test_array_int_none_out.page | 10 ++-- .../Regress.test_array_int_null_in.page | 10 ++-- .../Regress.test_array_int_null_out.page | 4 +- .../Regress.test_array_int_out.page | 4 +- .../Regress.test_async_ready_callback.page | 10 ++-- .../Regress.test_boolean.page | 16 ++++-- .../Regress.test_boolean_false.page | 16 ++++-- .../Regress.test_boolean_true.page | 16 ++++-- .../Regress.test_cairo_context_full_return.page | 10 ++-- .../Regress.test_cairo_context_none_in.page | 10 ++-- .../Regress.test_cairo_surface_full_out.page | 4 +- .../Regress.test_cairo_surface_full_return.page | 10 ++-- .../Regress.test_cairo_surface_none_in.page | 10 ++-- .../Regress.test_cairo_surface_none_return.page | 10 ++-- .../Regress.test_callback.page | 16 ++++-- .../Regress.test_callback_async.page | 10 ++-- .../Regress.test_callback_destroy_notify.page | 16 ++++-- ....test_callback_destroy_notify_no_user_data.page | 16 ++++-- .../Regress.test_callback_thaw_async.page | 10 ++-- .../Regress.test_callback_thaw_notifications.page | 10 ++-- .../Regress.test_callback_user_data.page | 16 ++++-- .../Regress.test_closure.page | 16 ++++-- .../Regress.test_closure_one_arg.page | 22 +++++--- .../Regress.test_closure_variant.page | 22 +++++--- .../Regress.test_date_in_gvalue.page | 10 ++-- .../Regress.test_def_error_quark.page | 10 ++-- .../Regress.test_double.page | 16 ++++-- .../Regress.test_filename_return.page | 10 ++-- .../Regress.test_float.page | 16 ++++-- .../Regress.test_garray_container_return.page | 10 ++-- .../Regress.test_garray_full_return.page | 10 ++-- .../Regress.test_gerror_callback.page | 10 ++-- .../Regress.test_ghash_container_return.page | 10 ++-- .../Regress.test_ghash_everything_return.page | 10 ++-- .../Regress.test_ghash_gvalue_in.page | 10 ++-- .../Regress.test_ghash_gvalue_return.page | 10 ++-- ...egress.test_ghash_nested_everything_return.page | 10 ++-- ...gress.test_ghash_nested_everything_return2.page | 10 ++-- .../Regress.test_ghash_nothing_in.page | 10 ++-- .../Regress.test_ghash_nothing_in2.page | 10 ++-- .../Regress.test_ghash_nothing_return.page | 10 ++-- .../Regress.test_ghash_nothing_return2.page | 10 ++-- .../Regress.test_ghash_null_in.page | 10 ++-- .../Regress.test_ghash_null_out.page | 4 +- .../Regress.test_ghash_null_return.page | 10 ++-- .../Regress.test_glist_container_return.page | 10 ++-- .../Regress.test_glist_everything_return.page | 10 ++-- .../Regress.test_glist_nothing_in.page | 10 ++-- .../Regress.test_glist_nothing_in2.page | 10 ++-- .../Regress.test_glist_nothing_return.page | 10 ++-- .../Regress.test_glist_nothing_return2.page | 10 ++-- .../Regress.test_glist_null_in.page | 10 ++-- .../Regress.test_glist_null_out.page | 4 +- .../Regress.test_gslist_container_return.page | 10 ++-- .../Regress.test_gslist_everything_return.page | 10 ++-- .../Regress.test_gslist_nothing_in.page | 10 ++-- .../Regress.test_gslist_nothing_in2.page | 10 ++-- .../Regress.test_gslist_nothing_return.page | 10 ++-- .../Regress.test_gslist_nothing_return2.page | 10 ++-- .../Regress.test_gslist_null_in.page | 10 ++-- .../Regress.test_gslist_null_out.page | 4 +- .../Regress.test_gtype.page | 16 ++++-- .../Regress.test_gvariant_as.page | 10 ++-- .../Regress.test_gvariant_asv.page | 10 ++-- .../Regress.test_gvariant_i.page | 10 ++-- .../Regress.test_gvariant_s.page | 10 ++-- .../Regress.test_gvariant_v.page | 10 ++-- .../Regress.test_hash_table_callback.page | 16 ++++-- .../Regress-1.0-Gjs-expected/Regress.test_int.page | 16 ++++-- .../Regress.test_int16.page | 16 ++++-- .../Regress.test_int32.page | 16 ++++-- .../Regress.test_int64.page | 16 ++++-- .../Regress.test_int8.page | 16 ++++-- .../Regress.test_int_out_utf8.page | 10 ++-- .../Regress.test_int_value_arg.page | 16 ++++-- .../Regress.test_long.page | 16 ++++-- .../Regress.test_multi_callback.page | 16 ++++-- .../Regress.test_multi_double_args.page | 10 ++-- .../Regress.test_multiline_doc_comments.page | 4 +- .../Regress.test_nested_parameter.page | 10 ++-- .../Regress.test_null_gerror_callback.page | 10 ++-- .../Regress.test_owned_gerror_callback.page | 10 ++-- .../Regress.test_short.page | 16 ++++-- .../Regress.test_simple_callback.page | 10 ++-- .../Regress.test_size.page | 16 ++++-- .../Regress.test_ssize.page | 16 ++++-- .../Regress.test_strv_in.page | 16 ++++-- .../Regress.test_strv_in_gvalue.page | 10 ++-- .../Regress.test_strv_out.page | 10 ++-- .../Regress.test_strv_out_c.page | 10 ++-- .../Regress.test_strv_out_container.page | 10 ++-- .../Regress.test_strv_outarg.page | 4 +- .../Regress.test_timet.page | 16 ++++-- .../Regress.test_torture_signature_0.page | 22 +++++--- .../Regress.test_torture_signature_1.page | 28 ++++++---- .../Regress.test_torture_signature_2.page | 28 ++++++---- .../Regress.test_uint.page | 16 ++++-- .../Regress.test_uint16.page | 16 ++++-- .../Regress.test_uint32.page | 16 ++++-- .../Regress.test_uint64.page | 16 ++++-- .../Regress.test_uint8.page | 16 ++++-- .../Regress.test_ulong.page | 16 ++++-- .../Regress.test_unichar.page | 16 ++++-- .../Regress.test_unsigned_enum_param.page | 16 ++++-- .../Regress.test_ushort.page | 16 ++++-- .../Regress.test_utf8_const_in.page | 10 ++-- .../Regress.test_utf8_const_return.page | 10 ++-- .../Regress.test_utf8_inout.page | 10 ++-- .../Regress.test_utf8_nonconst_return.page | 10 ++-- .../Regress.test_utf8_null_in.page | 10 ++-- .../Regress.test_utf8_null_out.page | 4 +- .../Regress.test_utf8_out.page | 4 +- .../Regress.test_utf8_out_nonconst_return.page | 10 ++-- .../Regress.test_utf8_out_out.page | 4 +- .../Regress.test_value_return.page | 16 ++++-- .../Regress.test_versioning.page | 4 +- .../Regress.ATestError.page | 22 +++++--- .../Regress.AnnotationObject-attribute-signal.page | 38 ++++++++----- ...ess.AnnotationObject-doc-empty-arg-parsing.page | 26 +++++---- .../Regress.AnnotationObject-list-signal.page | 26 +++++---- .../Regress.AnnotationObject-string-signal.page | 26 +++++---- .../Regress.AnnotationObject.allow_none.page | 22 +++++--- .../Regress.AnnotationObject.calleeowns.page | 22 +++++--- .../Regress.AnnotationObject.calleesowns.page | 28 ++++++---- .../Regress.AnnotationObject.compute_sum.page | 16 ++++-- .../Regress.AnnotationObject.compute_sum_n.page | 22 +++++--- .../Regress.AnnotationObject.compute_sum_nz.page | 22 +++++--- .../Regress.AnnotationObject.create_object.page | 16 ++++-- .../Regress.AnnotationObject.do_not_use.page | 16 ++++-- .../Regress.AnnotationObject.extra_annos.page | 10 ++-- .../Regress.AnnotationObject.foreach.page | 22 +++++--- .../Regress.AnnotationObject.get_hash.page | 16 ++++-- .../Regress.AnnotationObject.get_objects.page | 16 ++++-- .../Regress.AnnotationObject.get_strings.page | 16 ++++-- .../Regress.AnnotationObject.hidden_self.page | 10 ++-- .../Regress.AnnotationObject.in.page | 22 +++++--- .../Regress.AnnotationObject.inout.page | 22 +++++--- .../Regress.AnnotationObject.inout2.page | 22 +++++--- .../Regress.AnnotationObject.inout3.page | 22 +++++--- .../Regress.AnnotationObject.method.page | 16 ++++-- .../Regress.AnnotationObject.notrans.page | 16 ++++-- .../Regress.AnnotationObject.out.page | 22 +++++--- .../Regress.AnnotationObject.parse_args.page | 22 +++++--- .../Regress.AnnotationObject.set_data.page | 22 +++++--- .../Regress.AnnotationObject.set_data2.page | 22 +++++--- .../Regress.AnnotationObject.set_data3.page | 22 +++++--- .../Regress.AnnotationObject.string_out.page | 22 +++++--- .../Regress.AnnotationObject.use_buffer.page | 16 ++++-- .../Regress.AnnotationObject.watch_full.page | 28 ++++++---- .../Regress.AnnotationObject.with_voidp.page | 16 ++++-- .../Regress.FooASingle.page | 10 ++-- .../Regress.FooAddressType.page | 22 +++++--- .../Regress.FooBRect.add.page | 16 ++++-- .../Regress.FooBoxed.method.page | 10 ++-- .../Regress.FooBuffer.some_method.page | 10 ++-- .../Regress.FooDBusData.method.page | 10 ++-- .../Regress.FooEnumFullname.page | 22 +++++--- .../Regress.FooEnumNoType.page | 28 ++++++---- .../Regress.FooEnumType.page | 22 +++++--- .../Regress.FooError.page | 22 +++++--- .../Regress.FooForeignStruct.copy.page | 16 ++++-- .../Regress.FooInterface-do_regress_foo.page | 16 ++++-- .../Regress.FooInterface.do_regress_foo.page | 16 ++++-- .../Regress.FooInterface.static_method.page | 10 ++-- .../Regress.FooObject-read_fn.page | 22 +++++--- .../Regress.FooObject-signal.page | 38 ++++++++----- .../Regress.FooObject-virtual_method.page | 22 +++++--- .../Regress.FooObject.a_global_method.page | 10 ++-- .../Regress.FooObject.append_new_stack_layer.page | 22 +++++--- .../Regress.FooObject.dup_name.page | 16 ++++-- .../Regress.FooObject.external_type.page | 16 ++++-- .../Regress.FooObject.get_default.page | 10 ++-- .../Regress.FooObject.get_name.page | 16 ++++-- .../Regress.FooObject.handle_glyph.page | 16 ++++-- .../Regress.FooObject.is_it_time_yet.page | 16 ++++-- .../Regress.FooObject.read.page | 22 +++++--- .../Regress.FooObject.static_meth.page | 10 ++-- .../Regress.FooObject.various.page | 22 +++++--- .../Regress.FooObject.virtual_method.page | 22 +++++--- .../Regress.FooRectangle.add.page | 16 ++++-- .../Regress.FooStackLayer.page | 58 +++++++++++++------- .../Regress.FooSubInterface-destroy-event.page | 20 ++++--- .../Regress.FooSubInterface-destroy_event.page | 10 ++-- .../Regress.FooSubInterface-do_bar.page | 10 ++-- .../Regress.FooSubInterface-do_baz.page | 22 +++++--- .../Regress.FooSubInterface.do_bar.page | 10 ++-- .../Regress.FooSubInterface.do_baz.page | 22 +++++--- .../Regress.TestABCError.page | 22 +++++--- .../Regress.TestBoxed.copy.page | 16 ++++-- .../Regress.TestBoxed.equals.page | 22 +++++--- .../Regress.TestBoxedB.copy.page | 16 ++++-- .../Regress.TestBoxedD.copy.page | 16 ++++-- .../Regress.TestBoxedD.free.page | 10 ++-- .../Regress.TestBoxedD.get_magic.page | 16 ++++-- .../Regress.TestDEFError.page | 22 +++++--- .../Regress.TestEnum.page | 28 ++++++---- .../Regress.TestEnumNoGEnum.page | 22 +++++--- .../Regress.TestEnumUnsigned.page | 16 ++++-- .../Regress.TestError.page | 22 +++++--- .../Regress.TestFundamentalObject.ref.page | 16 ++++-- .../Regress.TestFundamentalObject.unref.page | 10 ++-- .../Regress.TestInheritDrawable.do_foo.page | 16 ++++-- ...ess.TestInheritDrawable.do_foo_maybe_throw.page | 16 ++++-- .../Regress.TestInheritDrawable.get_origin.page | 22 +++++--- .../Regress.TestInheritDrawable.get_size.page | 22 +++++--- .../Regress.TestObj-all.page | 20 ++++--- .../Regress.TestObj-allow_none_vfunc.page | 16 ++++-- .../Regress.TestObj-cleanup.page | 20 ++++--- .../Regress.TestObj-first.page | 20 ++++--- .../Regress.TestObj-matrix.page | 22 +++++--- .../Regress.TestObj-sig-with-array-prop.page | 26 +++++---- .../Regress.TestObj-sig-with-foreign-struct.page | 26 +++++---- .../Regress.TestObj-sig-with-hash-prop.page | 26 +++++---- .../Regress.TestObj-sig-with-int64-prop.page | 32 +++++++---- .../Regress.TestObj-sig-with-intarray-ret.page | 26 +++++---- .../Regress.TestObj-sig-with-obj.page | 26 +++++---- .../Regress.TestObj-sig-with-strv.page | 26 +++++---- .../Regress.TestObj-sig-with-uint64-prop.page | 32 +++++++---- ...Regress.TestObj-test-with-static-scope-arg.page | 26 +++++---- .../Regress.TestObj-test.page | 20 ++++--- .../Regress.TestObj.do_matrix.page | 22 +++++--- ...gress.TestObj.emit_sig_with_foreign_struct.page | 10 ++-- .../Regress.TestObj.emit_sig_with_int64.page | 10 ++-- .../Regress.TestObj.emit_sig_with_obj.page | 10 ++-- .../Regress.TestObj.emit_sig_with_uint64.page | 10 ++-- .../Regress.TestObj.forced_method.page | 10 ++-- .../Regress.TestObj.instance_method.page | 16 ++++-- .../Regress.TestObj.instance_method_callback.page | 16 ++++-- .../Regress.TestObj.null_out.page | 10 ++-- .../Regress.TestObj.set_bare.page | 16 ++++-- .../Regress.TestObj.skip_inout_param.page | 58 +++++++++++++------- .../Regress.TestObj.skip_out_param.page | 58 +++++++++++++------- .../Regress.TestObj.skip_param.page | 58 +++++++++++++------- .../Regress.TestObj.skip_return_val.page | 58 +++++++++++++------- .../Regress.TestObj.skip_return_val_no_out.page | 22 +++++--- .../Regress.TestObj.static_method.page | 16 ++++-- .../Regress.TestObj.static_method_callback.page | 10 ++-- .../Regress.TestObj.torture_signature_0.page | 46 ++++++++++------ .../Regress.TestObj.torture_signature_1.page | 52 ++++++++++++------ .../Regress.TestOtherError.page | 22 +++++--- .../Regress.TestSimpleBoxedA.const_return.page | 10 ++-- .../Regress.TestSimpleBoxedA.copy.page | 16 ++++-- .../Regress.TestSimpleBoxedA.equals.page | 22 +++++--- .../Regress.TestSimpleBoxedB.copy.page | 16 ++++-- .../Regress.TestStructA.clone.page | 16 ++++-- .../Regress.TestStructA.parse.page | 16 ++++-- .../Regress.TestStructB.clone.page | 16 ++++-- .../Regress.TestStructFixedArray.frob.page | 10 ++-- .../Regress.TestSubObj.instance_method.page | 16 ++++-- .../Regress.TestSubObj.unset_bare.page | 10 ++-- .../Regress.TestWi8021x.get_testbool.page | 16 ++++-- .../Regress.TestWi8021x.set_testbool.page | 16 ++++-- .../Regress.TestWi8021x.static_method.page | 16 ++++-- .../Regress.aliased_caller_alloc.page | 10 ++-- .../Regress.annotation_attribute_func.page | 22 +++++--- .../Regress.annotation_custom_destroy.page | 22 +++++--- .../Regress.annotation_get_source_file.page | 10 ++-- .../Regress.annotation_init.page | 16 ++++-- ...ress.annotation_invalid_regress_annotation.page | 10 ++-- .../Regress.annotation_ptr_array.page | 10 ++-- .../Regress.annotation_return_array.page | 16 ++++-- .../Regress.annotation_return_filename.page | 10 ++-- .../Regress.annotation_set_source_file.page | 10 ++-- ...s.annotation_space_after_comment_bug631690.page | 4 +- .../Regress.annotation_string_array_length.page | 16 ++++-- .../Regress.annotation_string_zero_terminated.page | 10 ++-- ...ress.annotation_string_zero_terminated_out.page | 10 ++-- .../Regress.annotation_test_parsing_bug630862.page | 10 ++-- .../Regress.annotation_transfer_floating.page | 10 ++-- .../Regress.annotation_versioned.page | 4 +- .../Regress.atest_error_quark.page | 10 ++-- .../Regress.foo_async_ready_callback.page | 22 +++++--- .../Regress.foo_destroy_notify_callback.page | 22 +++++--- .../Regress.foo_init.page | 10 ++-- .../Regress.foo_method_external_references.page | 28 ++++++---- .../Regress.foo_not_a_constructor_new.page | 10 ++-- .../Regress.foo_test_array.page | 10 ++-- .../Regress.foo_test_const_char_param.page | 10 ++-- .../Regress.foo_test_const_char_retval.page | 10 ++-- .../Regress.foo_test_const_struct_param.page | 10 ++-- .../Regress.foo_test_const_struct_retval.page | 10 ++-- .../Regress.foo_test_string_array.page | 10 ++-- .../Regress.foo_test_string_array_with_g.page | 10 ++-- .../Regress.foo_test_unsigned_qualifier.page | 10 ++-- .../Regress.foo_test_unsigned_type.page | 10 ++-- .../Regress.func_obj_null_in.page | 10 ++-- .../Regress.global_get_flags_out.page | 10 ++-- .../Regress.has_parameter_named_attrs.page | 16 ++++-- .../Regress.introspectable_via_alias.page | 10 ++-- .../Regress.set_abort_on_error.page | 10 ++-- .../Regress.test_array_callback.page | 16 ++++-- .../Regress.test_array_fixed_out_objects.page | 10 ++-- .../Regress.test_array_fixed_size_int_in.page | 16 ++++-- .../Regress.test_array_fixed_size_int_out.page | 10 ++-- .../Regress.test_array_fixed_size_int_return.page | 10 ++-- .../Regress.test_array_gint16_in.page | 22 +++++--- .../Regress.test_array_gint32_in.page | 22 +++++--- .../Regress.test_array_gint64_in.page | 22 +++++--- .../Regress.test_array_gint8_in.page | 22 +++++--- .../Regress.test_array_gtype_in.page | 22 +++++--- .../Regress.test_array_int_full_out.page | 16 ++++-- .../Regress.test_array_int_in.page | 22 +++++--- .../Regress.test_array_int_inout.page | 16 ++++-- .../Regress.test_array_int_none_out.page | 16 ++++-- .../Regress.test_array_int_null_in.page | 16 ++++-- .../Regress.test_array_int_null_out.page | 16 ++++-- .../Regress.test_array_int_out.page | 16 ++++-- .../Regress.test_async_ready_callback.page | 10 ++-- .../Regress.test_boolean.page | 16 ++++-- .../Regress.test_boolean_false.page | 16 ++++-- .../Regress.test_boolean_true.page | 16 ++++-- .../Regress.test_cairo_context_full_return.page | 10 ++-- .../Regress.test_cairo_context_none_in.page | 10 ++-- .../Regress.test_cairo_surface_full_out.page | 10 ++-- .../Regress.test_cairo_surface_full_return.page | 10 ++-- .../Regress.test_cairo_surface_none_in.page | 10 ++-- .../Regress.test_cairo_surface_none_return.page | 10 ++-- .../Regress.test_callback.page | 16 ++++-- .../Regress.test_callback_async.page | 16 ++++-- .../Regress.test_callback_destroy_notify.page | 28 ++++++---- ....test_callback_destroy_notify_no_user_data.page | 22 +++++--- .../Regress.test_callback_thaw_async.page | 10 ++-- .../Regress.test_callback_thaw_notifications.page | 10 ++-- .../Regress.test_callback_user_data.page | 22 +++++--- .../Regress.test_closure.page | 16 ++++-- .../Regress.test_closure_one_arg.page | 22 +++++--- .../Regress.test_closure_variant.page | 22 +++++--- .../Regress.test_date_in_gvalue.page | 10 ++-- .../Regress.test_def_error_quark.page | 10 ++-- .../Regress.test_double.page | 16 ++++-- .../Regress.test_filename_return.page | 10 ++-- .../Regress.test_float.page | 16 ++++-- .../Regress.test_garray_container_return.page | 10 ++-- .../Regress.test_garray_full_return.page | 10 ++-- .../Regress.test_gerror_callback.page | 10 ++-- .../Regress.test_ghash_container_return.page | 10 ++-- .../Regress.test_ghash_everything_return.page | 10 ++-- .../Regress.test_ghash_gvalue_in.page | 10 ++-- .../Regress.test_ghash_gvalue_return.page | 10 ++-- ...egress.test_ghash_nested_everything_return.page | 10 ++-- ...gress.test_ghash_nested_everything_return2.page | 10 ++-- .../Regress.test_ghash_nothing_in.page | 10 ++-- .../Regress.test_ghash_nothing_in2.page | 10 ++-- .../Regress.test_ghash_nothing_return.page | 10 ++-- .../Regress.test_ghash_nothing_return2.page | 10 ++-- .../Regress.test_ghash_null_in.page | 10 ++-- .../Regress.test_ghash_null_out.page | 10 ++-- .../Regress.test_ghash_null_return.page | 10 ++-- .../Regress.test_glist_container_return.page | 10 ++-- .../Regress.test_glist_everything_return.page | 10 ++-- .../Regress.test_glist_nothing_in.page | 10 ++-- .../Regress.test_glist_nothing_in2.page | 10 ++-- .../Regress.test_glist_nothing_return.page | 10 ++-- .../Regress.test_glist_nothing_return2.page | 10 ++-- .../Regress.test_glist_null_in.page | 10 ++-- .../Regress.test_glist_null_out.page | 10 ++-- .../Regress.test_gslist_container_return.page | 10 ++-- .../Regress.test_gslist_everything_return.page | 10 ++-- .../Regress.test_gslist_nothing_in.page | 10 ++-- .../Regress.test_gslist_nothing_in2.page | 10 ++-- .../Regress.test_gslist_nothing_return.page | 10 ++-- .../Regress.test_gslist_nothing_return2.page | 10 ++-- .../Regress.test_gslist_null_in.page | 10 ++-- .../Regress.test_gslist_null_out.page | 10 ++-- .../Regress.test_gtype.page | 16 ++++-- .../Regress.test_gvariant_as.page | 10 ++-- .../Regress.test_gvariant_asv.page | 10 ++-- .../Regress.test_gvariant_i.page | 10 ++-- .../Regress.test_gvariant_s.page | 10 ++-- .../Regress.test_gvariant_v.page | 10 ++-- .../Regress.test_hash_table_callback.page | 16 ++++-- .../Regress.test_int.page | 16 ++++-- .../Regress.test_int16.page | 16 ++++-- .../Regress.test_int32.page | 16 ++++-- .../Regress.test_int64.page | 16 ++++-- .../Regress.test_int8.page | 16 ++++-- .../Regress.test_int_out_utf8.page | 16 ++++-- .../Regress.test_int_value_arg.page | 16 ++++-- .../Regress.test_long.page | 16 ++++-- .../Regress.test_multi_callback.page | 16 ++++-- .../Regress.test_multi_double_args.page | 22 +++++--- .../Regress.test_multiline_doc_comments.page | 4 +- .../Regress.test_nested_parameter.page | 10 ++-- .../Regress.test_null_gerror_callback.page | 10 ++-- .../Regress.test_owned_gerror_callback.page | 10 ++-- .../Regress.test_short.page | 16 ++++-- .../Regress.test_simple_callback.page | 10 ++-- .../Regress.test_size.page | 16 ++++-- .../Regress.test_ssize.page | 16 ++++-- .../Regress.test_strv_in.page | 16 ++++-- .../Regress.test_strv_in_gvalue.page | 10 ++-- .../Regress.test_strv_out.page | 10 ++-- .../Regress.test_strv_out_c.page | 10 ++-- .../Regress.test_strv_out_container.page | 10 ++-- .../Regress.test_strv_outarg.page | 10 ++-- .../Regress.test_timet.page | 16 ++++-- .../Regress.test_torture_signature_0.page | 40 +++++++++----- .../Regress.test_torture_signature_1.page | 46 ++++++++++------ .../Regress.test_torture_signature_2.page | 58 +++++++++++++------- .../Regress.test_uint.page | 16 ++++-- .../Regress.test_uint16.page | 16 ++++-- .../Regress.test_uint32.page | 16 ++++-- .../Regress.test_uint64.page | 16 ++++-- .../Regress.test_uint8.page | 16 ++++-- .../Regress.test_ulong.page | 16 ++++-- .../Regress.test_unichar.page | 16 ++++-- .../Regress.test_unsigned_enum_param.page | 16 ++++-- .../Regress.test_ushort.page | 16 ++++-- .../Regress.test_utf8_const_in.page | 10 ++-- .../Regress.test_utf8_const_return.page | 10 ++-- .../Regress.test_utf8_inout.page | 10 ++-- .../Regress.test_utf8_nonconst_return.page | 10 ++-- .../Regress.test_utf8_null_in.page | 10 ++-- .../Regress.test_utf8_null_out.page | 10 ++-- .../Regress.test_utf8_out.page | 10 ++-- .../Regress.test_utf8_out_nonconst_return.page | 16 ++++-- .../Regress.test_utf8_out_out.page | 16 ++++-- .../Regress.test_value_return.page | 16 ++++-- .../Regress.test_versioning.page | 4 +- 961 files changed, 9586 insertions(+), 5775 deletions(-) diff --git a/giscanner/doctemplates/C/function.tmpl b/giscanner/doctemplates/C/function.tmpl index c551bc2e..c2d393b9 100644 --- a/giscanner/doctemplates/C/function.tmpl +++ b/giscanner/doctemplates/C/function.tmpl @@ -47,15 +47,19 @@ ${formatter.format_type(arg.type) | x} ${arg.argname}\ <%block name="details"> % if formatter.get_parameters(node) or node.retval: -
+ % for arg in formatter.get_parameters(node): -

${arg.argname} :

-
${formatter.format(node, arg.doc)}
+ +<code>${arg.argname}</code> +${formatter.format(node, arg.doc)} + % endfor % if node.retval: -

Returns :

-
${formatter.format(node, node.retval.doc)}
+ +<code>Returns</code> +${formatter.format(node, node.retval.doc)} + % endif -
+ % endif diff --git a/giscanner/doctemplates/Gjs/enum.tmpl b/giscanner/doctemplates/Gjs/enum.tmpl index 2624c425..35cdd439 100644 --- a/giscanner/doctemplates/Gjs/enum.tmpl +++ b/giscanner/doctemplates/Gjs/enum.tmpl @@ -1,11 +1,13 @@ <%inherit file="/base.tmpl"/> <%block name="details"> % if node.members: -
+ % for member in node.members: -

${node.name}.${member.name.upper()} :

-
${formatter.format(node, member.doc)}
+ +<code>${node.name}.${member.name.upper()}</code> +${formatter.format(node, member.doc)} + % endfor -
+ % endif diff --git a/giscanner/doctemplates/Gjs/function.tmpl b/giscanner/doctemplates/Gjs/function.tmpl index db2c8ae3..46c46271 100644 --- a/giscanner/doctemplates/Gjs/function.tmpl +++ b/giscanner/doctemplates/Gjs/function.tmpl @@ -34,15 +34,19 @@ ${', '.join('%s:%s' % (arg.argname, formatter.format_type(arg.type)) for arg in <%block name="details"> % if formatter.get_parameters(node) or node.retval: -
+ % for arg in formatter.get_parameters(node): -

${arg.argname} :

-
${formatter.format(node, arg.doc)}
+ +<code>${arg.argname}</code> +${formatter.format(node, arg.doc)} + % endfor % if node.retval and node.retval.type.ctype != 'void': -

Returns :

-
${formatter.format(node, node.retval.doc)}
+ +<code>Returns</code> +${formatter.format(node, node.retval.doc)} + % endif -
+ % endif diff --git a/giscanner/doctemplates/Gjs/signal.tmpl b/giscanner/doctemplates/Gjs/signal.tmpl index 83264804..994392ce 100644 --- a/giscanner/doctemplates/Gjs/signal.tmpl +++ b/giscanner/doctemplates/Gjs/signal.tmpl @@ -13,23 +13,33 @@ user_param1, ...):${formatter.format_type(node.retval.type)}; <%block name="details"> -
-

${formatter.to_underscores(node.parent.name).lower()} :

-

instance of ${namespace.name}.${node.parent.name} that is emitting the signal

+ + +<code>${formatter.to_underscores(node.parent.name).lower()}</code> +

instance of ${namespace.name}.${node.parent.name} that is emitting the signal

+ % for arg in formatter.get_parameters(node): -

${arg.argname} :

-
${formatter.format(node, arg.doc)}
+ +<code>${arg.argname}</code> +${formatter.format(node, arg.doc)} + % endfor -

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

+ +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ + +<code>...</code> +

additional user parameters (if any)

+ % if node.retval and \ node.retval.type.ctype != 'void' and \ node.retval.type.ctype is not None: -

Returns :

-
${node.retval.type.ctype} ${formatter.format(node, node.retval.doc)}
+ +<code>Returns</code> +

${node.retval.type.ctype} ${formatter.format(node, node.retval.doc)}

+ % endif -
+ diff --git a/giscanner/doctemplates/Gjs/vfunc.tmpl b/giscanner/doctemplates/Gjs/vfunc.tmpl index 1d132c78..1cbe511c 100644 --- a/giscanner/doctemplates/Gjs/vfunc.tmpl +++ b/giscanner/doctemplates/Gjs/vfunc.tmpl @@ -9,15 +9,19 @@ ${', '.join('%s:%s' % (arg.argname, formatter.format_type(arg.type)) for arg in <%block name="details"> % if formatter.get_parameters(node) or node.retval: -
+ % for arg in formatter.get_parameters(node): -

${arg.argname} :

-
${formatter.format(node, arg.doc)}
+ +<code>${arg.argname}</code> +${formatter.format(node, arg.doc)} + % endfor % if node.retval and node.retval.type.ctype != 'void': -

Returns :

-
${formatter.format(node, node.retval.doc)}
+ +<code>Returns</code> +${formatter.format(node, node.retval.doc)} + % endif -
+ % endif diff --git a/giscanner/doctemplates/Python/enum.tmpl b/giscanner/doctemplates/Python/enum.tmpl index 2624c425..35cdd439 100644 --- a/giscanner/doctemplates/Python/enum.tmpl +++ b/giscanner/doctemplates/Python/enum.tmpl @@ -1,11 +1,13 @@ <%inherit file="/base.tmpl"/> <%block name="details"> % if node.members: -
+ % for member in node.members: -

${node.name}.${member.name.upper()} :

-
${formatter.format(node, member.doc)}
+ +<code>${node.name}.${member.name.upper()}</code> +${formatter.format(node, member.doc)} + % endfor -
+ % endif diff --git a/giscanner/doctemplates/Python/function.tmpl b/giscanner/doctemplates/Python/function.tmpl index 356619c3..d1b57f4e 100644 --- a/giscanner/doctemplates/Python/function.tmpl +++ b/giscanner/doctemplates/Python/function.tmpl @@ -39,15 +39,19 @@ ${', '.join((formatter.format_parameter_name(node, arg) for arg in formatter.get <%block name="details"> % if formatter.get_parameters(node) or node.retval: -
+ % for ix, arg in enumerate(formatter.get_parameters(node)): -

${formatter.format_parameter_name(node, arg)} :

-
${formatter.format(node, arg.doc)}
+ +<code>${formatter.format_parameter_name(node, arg)}</code> +${formatter.format(node, arg.doc)} + % endfor % if node.retval and node.retval.type.ctype != 'void': -

Returns :

-
${formatter.format(node, node.retval.doc)}
+ +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + % endif -
+ % endif diff --git a/giscanner/doctemplates/Python/signal.tmpl b/giscanner/doctemplates/Python/signal.tmpl index 0df13f64..fa850418 100644 --- a/giscanner/doctemplates/Python/signal.tmpl +++ b/giscanner/doctemplates/Python/signal.tmpl @@ -13,23 +13,30 @@ user_param1, ...) <%block name="details"> -
-

${formatter.to_underscores(node.parent.name).lower()} :

-

instance of ${namespace.name}.${node.parent.name} that is emitting the signal

+ + +<code>${formatter.to_underscores(node.parent.name).lower()}</code> +

instance of ${namespace.name}.${node.parent.name} that is emitting the signal

+ % for arg in formatter.get_parameters(node): -

${arg.argname} :

-
${formatter.format(node, arg.doc)}
+ +<code>${arg.argname}</code> +${formatter.format(node, arg.doc)} + % endfor -

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

+<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ % if node.retval and \ node.retval.type.ctype != 'void' and \ node.retval.type.ctype is not None: -

Returns :

-
${node.retval.type.ctype} ${formatter.format(node, node.retval.doc)}
+ +<code>Returns</code> +

${node.retval.type.ctype} ${formatter.format(node, node.retval.doc)}

+ % endif -
+ - diff --git a/giscanner/doctemplates/Python/vfunc.tmpl b/giscanner/doctemplates/Python/vfunc.tmpl index c4716a5e..98a30932 100644 --- a/giscanner/doctemplates/Python/vfunc.tmpl +++ b/giscanner/doctemplates/Python/vfunc.tmpl @@ -15,15 +15,19 @@ ${', '.join((arg.argname for arg in formatter.get_parameters(node)))}\ <%block name="details"> % if formatter.get_parameters(node) or node.retval: -
+ % for arg in formatter.get_parameters(node): -

${arg.argname} :

-
${formatter.format(node, arg.doc)}
+ +<code>${arg.argname}</code> +${formatter.format(node, arg.doc)} + % endfor % if node.retval and node.retval.type.ctype != 'void': -

Returns :

-
${formatter.format(node, node.retval.doc)}
+ +<code>Returns</code> +${formatter.format(node, node.retval.doc)} + % endif -
+ % endif diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page index 2e30a44e..188ff224 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page @@ -24,14 +24,20 @@ gchar* attribute-signal (gchar* arg1, -
-

arg1 :

-

a value

-

arg2 :

-

another value

-

Returns :

-

the return value

-
+ + +<code>arg1</code> +

a value

+ + +<code>arg2</code> +

another value

+ + +<code>Returns</code> +

the return value

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page index 8f7a9de4..bc1d5305 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page @@ -23,12 +23,16 @@ void doc-empty-arg-parsing (gpointer arg1); -
-

arg1 :

-
-

Returns :

-
-
+ + +<code>arg1</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page index f4e8868f..cfd13031 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page @@ -24,12 +24,16 @@ known by GObject as it's only marked as G_TYPE_POINTER

-
-

list :

-

a list of strings

-

Returns :

-
-
+ + +<code>list</code> +

a list of strings

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page index 71dbe0c4..d875e1c9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page @@ -25,12 +25,16 @@ it says it's pointer but it's actually a string.

Since 1.0

-
-

string :

-

a string

-

Returns :

-
-
+ + +<code>string</code> +

a string

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page index ea33c695..9d7e12e8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page @@ -37,14 +37,20 @@ GObject* regress_annotation_object_allow_none (RegressAnnotationObject* object, -
-

object :

-

a

-

somearg :

-
-

Returns :

-

NULL always

-
+ + +<code>object</code> +

a

+ + +<code>somearg</code> + + + +<code>Returns</code> +

NULL always

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page index 27b6b8ac..3db342e8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page @@ -37,14 +37,20 @@ gint regress_annotation_object_calleeowns (RegressAnnotationObject* object, -
-

object :

-

a

-

toown :

-

a

-

Returns :

-

an int

-
+ + +<code>object</code> +

a

+ + +<code>toown</code> +

a

+ + +<code>Returns</code> +

an int

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page index 72e2e62b..fb6d9887 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page @@ -42,16 +42,24 @@ gint regress_annotation_object_calleesowns (RegressAnnotationObject* object, -
-

object :

-

a

-

toown1 :

-

a

-

toown2 :

-

a

-

Returns :

-

an int

-
+ + +<code>object</code> +

a

+ + +<code>toown1</code> +

a

+ + +<code>toown2</code> +

a

+ + +<code>Returns</code> +

an int

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page index 825b4493..2f18ea27 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page @@ -37,14 +37,20 @@ void regress_annotation_object_compute_sum (RegressAnnotationObject* object, -
-

object :

-

a

-

nums :

-

Sequence of numbers

-

Returns :

-
-
+ + +<code>object</code> +

a

+ + +<code>nums</code> +

Sequence of numbers

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page index 11333b5f..be0ab854 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page @@ -42,16 +42,24 @@ void regress_annotation_object_compute_sum_n (RegressAnnotationObject* object, -
-

object :

-

a

-

nums :

-

Sequence of numbers that are zero-terminated

-

n_nums :

-

Length of number array

-

Returns :

-
-
+ + +<code>object</code> +

a

+ + +<code>nums</code> +

Sequence of numbers that are zero-terminated

+ + +<code>n_nums</code> +

Length of number array

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page index 7017be8e..29209f55 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page @@ -42,16 +42,24 @@ void regress_annotation_object_compute_sum_nz (RegressAnnotationObject* object, -
-

object :

-

a

-

nums :

-

Sequence of numbers that are zero-terminated

-

n_nums :

-

Length of number array

-

Returns :

-
-
+ + +<code>object</code> +

a

+ + +<code>nums</code> +

Sequence of numbers that are zero-terminated

+ + +<code>n_nums</code> +

Length of number array

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page index cde56f8e..43f4ee6c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page @@ -32,12 +32,16 @@ GObject* regress_annotation_object_create_object (RegressAnnotationObject* objec -
-

object :

-

a

-

Returns :

-

The object

-
+ + +<code>object</code> +

a

+ + +<code>Returns</code> +

The object

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page index 2c5eaad9..7b160ab2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page @@ -32,12 +32,16 @@ GObject* regress_annotation_object_do_not_use (RegressAnnotationObject* object); -
-

object :

-

a

-

Returns :

-

NULL always

-
+ + +<code>object</code> +

a

+ + +<code>Returns</code> +

NULL always

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page index b1aa7aaa..61c6403a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page @@ -32,12 +32,16 @@ void regress_annotation_object_extra_annos (RegressAnnotationObject* object); -
-

object :

-
-

Returns :

-
-
+ + +<code>object</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page index ba91139a..18d5b1ee 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page @@ -42,16 +42,24 @@ void regress_annotation_object_foreach (RegressAnnotationObject* object, -
-

object :

-

a

-

func :

-

Callback to invoke

-

user_data :

-

Callback user data

-

Returns :

-
-
+ + +<code>object</code> +

a

+ + +<code>func</code> +

Callback to invoke

+ + +<code>user_data</code> +

Callback user data

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page index 5a06e842..0560fa43 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page @@ -33,12 +33,16 @@ objects.

-
-

object :

-

a

-

Returns :

-

hash table

-
+ + +<code>object</code> +

a

+ + +<code>Returns</code> +

hash table

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page index 2e36a384..3585b2b0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page @@ -34,12 +34,16 @@ intentionally similar example to gtk_container_get_children

-
-

object :

-

a

-

Returns :

-

list of objects

-
+ + +<code>object</code> +

a

+ + +<code>Returns</code> +

list of objects

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page index be29a584..498157b3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page @@ -33,12 +33,16 @@ each string needs to be freed.

-
-

object :

-

a

-

Returns :

-

list of strings

-
+ + +<code>object</code> +

a

+ + +<code>Returns</code> +

list of strings

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page index 8218f23d..f3d3a4a9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page @@ -32,12 +32,16 @@ void regress_annotation_object_hidden_self (gpointer object); -
-

object :

-

A

-

Returns :

-
-
+ + +<code>object</code> +

A

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page index 2795957d..568cd897 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page @@ -37,14 +37,20 @@ gint regress_annotation_object_in (RegressAnnotationObject* object, -
-

object :

-

a

-

inarg :

-

This is an argument test

-

Returns :

-

an int

-
+ + +<code>object</code> +

a

+ + +<code>inarg</code> +

This is an argument test

+ + +<code>Returns</code> +

an int

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page index 09bc20da..eaaa27b2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page @@ -37,14 +37,20 @@ gint regress_annotation_object_inout (RegressAnnotationObject* object, -
-

object :

-

a

-

inoutarg :

-

This is an argument test

-

Returns :

-

an int

-
+ + +<code>object</code> +

a

+ + +<code>inoutarg</code> +

This is an argument test

+ + +<code>Returns</code> +

an int

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page index 4a95ff09..94674e2b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page @@ -37,14 +37,20 @@ gint regress_annotation_object_inout2 (RegressAnnotationObject* object, -
-

object :

-

a

-

inoutarg :

-

This is an argument test

-

Returns :

-

an int

-
+ + +<code>object</code> +

a

+ + +<code>inoutarg</code> +

This is an argument test

+ + +<code>Returns</code> +

an int

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page index 1af81705..c693c951 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page @@ -37,14 +37,20 @@ gint regress_annotation_object_inout3 (RegressAnnotationObject* object, -
-

object :

-

a

-

inoutarg :

-

This is an argument test

-

Returns :

-

an int

-
+ + +<code>object</code> +

a

+ + +<code>inoutarg</code> +

This is an argument test

+ + +<code>Returns</code> +

an int

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page index 793cf370..f5f98d4a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page @@ -32,12 +32,16 @@ gint regress_annotation_object_method (RegressAnnotationObject* object); -
-

object :

-

a

-

Returns :

-

an int

-
+ + +<code>object</code> +

a

+ + +<code>Returns</code> +

an int

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page index c8ba72cd..ca0b307e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page @@ -32,12 +32,16 @@ GObject* regress_annotation_object_notrans (RegressAnnotationObject* object); -
-

object :

-

a

-

Returns :

-

An object, not referenced

-
+ + +<code>object</code> +

a

+ + +<code>Returns</code> +

An object, not referenced

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page index ec90d82b..c229c0e1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page @@ -37,14 +37,20 @@ gint regress_annotation_object_out (RegressAnnotationObject* object, -
-

object :

-

a

-

outarg :

-

This is an argument test

-

Returns :

-

an int

-
+ + +<code>object</code> +

a

+ + +<code>outarg</code> +

This is an argument test

+ + +<code>Returns</code> +

an int

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page index 5282ab5d..7934ae67 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page @@ -42,16 +42,24 @@ void regress_annotation_object_parse_args (RegressAnnotationObject* object, -
-

object :

-

a

-

argc :

-

Length of the argument vector

-

argv :

-

Argument vector

-

Returns :

-
-
+ + +<code>object</code> +

a

+ + +<code>argc</code> +

Length of the argument vector

+ + +<code>argv</code> +

Argument vector

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page index a52f0cc3..6f5cf70b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page @@ -42,16 +42,24 @@ void regress_annotation_object_set_data (RegressAnnotationObject* object, -
-

object :

-

a

-

data :

-

The data

-

length :

-

Length of the data

-

Returns :

-
-
+ + +<code>object</code> +

a

+ + +<code>data</code> +

The data

+ + +<code>length</code> +

Length of the data

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page index 8c2be283..7e6f2edf 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page @@ -42,16 +42,24 @@ void regress_annotation_object_set_data2 (RegressAnnotationObject* object, -
-

object :

-

a

-

data :

-

The data

-

length :

-

Length of the data

-

Returns :

-
-
+ + +<code>object</code> +

a

+ + +<code>data</code> +

The data

+ + +<code>length</code> +

Length of the data

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page index 989bb1da..d0a8761a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page @@ -43,16 +43,24 @@ type.

-
-

object :

-

a

-

data :

-

The data

-

length :

-

Length of the data

-

Returns :

-
-
+ + +<code>object</code> +

a

+ + +<code>data</code> +

The data

+ + +<code>length</code> +

Length of the data

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page index 8195d4aa..81a5b07b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page @@ -37,14 +37,20 @@ gboolean regress_annotation_object_string_out (RegressAnnotationObject* object, -
-

object :

-

a

-

str_out :

-

string return value

-

Returns :

-

some boolean

-
+ + +<code>object</code> +

a

+ + +<code>str_out</code> +

string return value

+ + +<code>Returns</code> +

some boolean

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page index 8a8094ba..06a2690c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page @@ -37,14 +37,20 @@ void regress_annotation_object_use_buffer (RegressAnnotationObject* object, -
-

object :

-

a

-

bytes :

-
-

Returns :

-
-
+ + +<code>object</code> +

a

+ + +<code>bytes</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page index c669d91a..b92ea0e2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page @@ -43,16 +43,24 @@ void regress_annotation_object_watch (RegressAnnotationObject* object, -
-

object :

-

A

-

func :

-

The callback

-

user_data :

-

The callback data

-

Returns :

-
-
+ + +<code>object</code> +

A

+ + +<code>func</code> +

The callback

+ + +<code>user_data</code> +

The callback data

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page index 90500ccb..0ce3a59f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page @@ -47,18 +47,28 @@ void regress_annotation_object_watch_full (RegressAnnotationObject* object, -
-

object :

-

A

-

func :

-

The callback

-

user_data :

-

The callback data

-

destroy :

-

Destroy notification

-

Returns :

-
-
+ + +<code>object</code> +

A

+ + +<code>func</code> +

The callback

+ + +<code>user_data</code> +

The callback data

+ + +<code>destroy</code> +

Destroy notification

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page index 287a0d22..27f467ea 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page @@ -37,14 +37,20 @@ void regress_annotation_object_with_voidp (RegressAnnotationObject* object, -
-

object :

-
-

data :

-

Opaque pointer handle

-

Returns :

-
-
+ + +<code>object</code> + + + +<code>data</code> +

Opaque pointer handle

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page index b518be03..8a291406 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page @@ -37,14 +37,20 @@ void regress_foo_brect_add (RegressFooBRect* b1, -
-

b1 :

-
-

b2 :

-
-

Returns :

-
-
+ + +<code>b1</code> + + + +<code>b2</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page index 6b1b2834..53d8a799 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page @@ -37,14 +37,20 @@ RegressFooBRect* regress_foo_brect_new (double x, -
-

x :

-
-

y :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>y</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page index 565e9669..dc736908 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page @@ -32,12 +32,16 @@ void regress_foo_boxed_method (RegressFooBoxed* boxed); -
-

boxed :

-
-

Returns :

-
-
+ + +<code>boxed</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page index bfaaeb81..d745c1e8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page @@ -28,10 +28,12 @@ RegressFooBoxed* regress_foo_boxed_new (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page index 937b6795..19a29468 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page @@ -32,12 +32,16 @@ void regress_foo_buffer_some_method (RegressFooBuffer* buffer); -
-

buffer :

-
-

Returns :

-
-
+ + +<code>buffer</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page index 1324acb0..4b5177cf 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page @@ -32,12 +32,16 @@ void regress_foo_dbus_data_method (RegressFooDBusData* dbusdata); -
-

dbusdata :

-
-

Returns :

-
-
+ + +<code>dbusdata</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page index 836cfe85..b6ecbf78 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page @@ -32,12 +32,16 @@ RegressFooForeignStruct* regress_foo_foreign_struct_copy (RegressFooForeignStruc -
-

original :

-
-

Returns :

-
-
+ + +<code>original</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page index 710c5ef0..ef6cd403 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page @@ -28,10 +28,12 @@ RegressFooForeignStruct* regress_foo_foreign_struct_new (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page index 3a16ebc1..29f95e91 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page @@ -23,14 +23,20 @@ void do_regress_foo (RegressFooInterface* self, -
-

self :

-
-

x :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>x</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page index f655d167..bfe78037 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page @@ -37,14 +37,20 @@ void regress_foo_interface_do_regress_foo (RegressFooInterface* iface, -
-

iface :

-
-

x :

-
-

Returns :

-
-
+ + +<code>iface</code> + + + +<code>x</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page index 009383fa..a4270fe2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page @@ -32,12 +32,16 @@ void regress_foo_interface_static_method (int x); -
-

x :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page index 8efc5f1c..b6d543d9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page @@ -24,16 +24,24 @@ void read_fn (RegressFooObject* object, -
-

object :

-
-

offset :

-

offset

-

length :

-

length

-

Returns :

-
-
+ + +<code>object</code> + + + +<code>offset</code> +

offset

+ + +<code>length</code> +

length

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page index d7453603..cbcb93f1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page @@ -24,14 +24,20 @@ gchar* signal (GObject object, -
-

object :

-
-

p0 :

-
-

Returns :

-
-
+ + +<code>object</code> + + + +<code>p0</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page index 8dc89fd5..12837f48 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page @@ -23,14 +23,20 @@ gboolean virtual_method (RegressFooObject* object, -
-

object :

-
-

first_param :

-
-

Returns :

-
-
+ + +<code>object</code> + + + +<code>first_param</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page index 2f4e1b5b..b63ba802 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page @@ -32,12 +32,16 @@ void regress_foo_object_a_global_method (UtilityObject* obj); -
-

obj :

-
-

Returns :

-
-
+ + +<code>obj</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page index fb0c6582..606729c9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page @@ -37,14 +37,20 @@ RegressFooOtherObject* regress_foo_object_append_new_stack_layer (RegressFooObje -
-

obj :

-
-

x :

-
-

Returns :

-
-
+ + +<code>obj</code> + + + +<code>x</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page index 3e0a8aaf..373841ed 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page @@ -32,12 +32,16 @@ char* regress_foo_object_dup_name (RegressFooObject* object); -
-

object :

-
-

Returns :

-
-
+ + +<code>object</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page index 3d9138ee..2937dbdb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page @@ -32,12 +32,16 @@ UtilityObject* regress_foo_object_external_type (RegressFooObject* object); -
-

object :

-

a

-

Returns :

-

NULL always

-
+ + +<code>object</code> +

a

+ + +<code>Returns</code> +

NULL always

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page index 201db735..d2010a4e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page @@ -29,10 +29,12 @@ uses a C sugar return type.

-
-

Returns :

-

The global

-
+ + +<code>Returns</code> +

The global

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page index d48725b3..d94cdbfe 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page @@ -32,12 +32,16 @@ const char* regress_foo_object_get_name (RegressFooObject* object); -
-

object :

-
-

Returns :

-
-
+ + +<code>object</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page index 19f19fa1..696748f7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page @@ -37,14 +37,20 @@ void regress_foo_object_handle_glyph (RegressFooObject* object, -
-

object :

-
-

glyph :

-
-

Returns :

-
-
+ + +<code>object</code> + + + +<code>glyph</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page index 6aa3e829..b1f225e8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page @@ -37,14 +37,20 @@ void regress_foo_object_is_it_time_yet (RegressFooObject* object, -
-

object :

-
-

time :

-
-

Returns :

-
-
+ + +<code>object</code> + + + +<code>time</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page index b1d8ccba..99810f8c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page @@ -28,10 +28,12 @@ RegressFooObject* regress_foo_object_new (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page index 7ab6a246..8c89bd5a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page @@ -28,10 +28,12 @@ GObject* regress_foo_object_new_as_super (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page index 5d4766a9..83b9b8fc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page @@ -37,14 +37,20 @@ RegressFooObjectCookie regress_foo_object_new_cookie (RegressFooObject* object, -
-

object :

-
-

target :

-
-

Returns :

-
-
+ + +<code>object</code> + + + +<code>target</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page index cff77113..df2703a8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page @@ -42,16 +42,24 @@ void regress_foo_object_read (RegressFooObject* object, -
-

object :

-

obj

-

offset :

-

offset

-

length :

-

length

-

Returns :

-
-
+ + +<code>object</code> +

obj

+ + +<code>offset</code> +

offset

+ + +<code>length</code> +

length

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page index f82a16b0..9aff026a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page @@ -32,12 +32,16 @@ void regress_foo_object_skipped_method (RegressFooObject* object); -
-

object :

-

obj

-

Returns :

-
-
+ + +<code>object</code> +

obj

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page index 13e2427d..5988a07e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page @@ -28,10 +28,12 @@ int regress_foo_object_static_meth (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page index 3d842cf6..bfd7d1c7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page @@ -39,16 +39,24 @@ void regress_foo_object_take_all (RegressFooObject* object, -
-

object :

-
-

x :

-
-

None :

-
-

Returns :

-
-
+ + +<code>object</code> + + + +<code>x</code> + + + +<code>None</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page index 82d3c189..9c9e4b53 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page @@ -42,16 +42,24 @@ void regress_foo_object_various (RegressFooObject* object, -
-

object :

-
-

data :

-
-

some_type :

-
-

Returns :

-
-
+ + +<code>object</code> + + + +<code>data</code> + + + +<code>some_type</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page index 29a2c8cc..a342c3a9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page @@ -37,14 +37,20 @@ gboolean regress_foo_object_virtual_method (RegressFooObject* object, -
-

object :

-
-

first_param :

-
-

Returns :

-
-
+ + +<code>object</code> + + + +<code>first_param</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page index 483e04f4..137f94c6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page @@ -37,14 +37,20 @@ void regress_foo_rectangle_add (RegressFooRectangle* r1, -
-

r1 :

-

add to this rect

-

r2 :

-

source rectangle

-

Returns :

-
-
+ + +<code>r1</code> +

add to this rect

+ + +<code>r2</code> +

source rectangle

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page index 43d831e2..11a38ea2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page @@ -48,18 +48,28 @@ it because it's not a boxed type.

-
-

x :

-
-

y :

-
-

width :

-
-

height :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>y</code> + + + +<code>width</code> + + + +<code>height</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page index 131747d7..8ad16c8d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page @@ -23,10 +23,12 @@ void destroy-event (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page index 2995ee80..64855ff8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page @@ -22,12 +22,16 @@ void destroy_event (RegressFooSubInterface* self); -
-

self :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page index aa72dd19..beb98d1c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page @@ -22,12 +22,16 @@ void do_bar (RegressFooSubInterface* self); -
-

self :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page index 777e47b1..1b1dc309 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page @@ -24,16 +24,24 @@ void do_baz (RegressFooSubInterface* self, -
-

self :

-
-

callback :

-
-

user_data :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>callback</code> + + + +<code>user_data</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page index f5d7541d..22d4ef2b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page @@ -32,12 +32,16 @@ void regress_foo_sub_interface_do_bar (RegressFooSubInterface* self); -
-

self :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page index d3fbac44..25178469 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page @@ -42,16 +42,24 @@ void regress_foo_sub_interface_do_baz (RegressFooSubInterface* self, -
-

self :

-
-

callback :

-
-

user_data :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>callback</code> + + + +<code>user_data</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page index 86364052..2b995329 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page @@ -28,10 +28,12 @@ RegressFooSubobject* regress_foo_subobject_new (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page index 5bd06bb3..660dc890 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page @@ -32,12 +32,16 @@ RegressTestBoxed* regress_test_boxed_copy (RegressTestBoxed* boxed); -
-

boxed :

-
-

Returns :

-
-
+ + +<code>boxed</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page index 073b44ba..9759b503 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page @@ -37,14 +37,20 @@ gboolean regress_test_boxed_equals (RegressTestBoxed* boxed, -
-

boxed :

-
-

other :

-
-

Returns :

-
-
+ + +<code>boxed</code> + + + +<code>other</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page index ce4f17bc..e2550d61 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page @@ -28,10 +28,12 @@ RegressTestBoxed* regress_test_boxed_new (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page index 7d4292aa..3f6df8ab 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page @@ -32,12 +32,16 @@ RegressTestBoxed* regress_test_boxed_new_alternative_constructor1 (int i); -
-

i :

-
-

Returns :

-
-
+ + +<code>i</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page index 5ec33ccd..603792e7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page @@ -37,14 +37,20 @@ RegressTestBoxed* regress_test_boxed_new_alternative_constructor2 (int i, -
-

i :

-
-

j :

-
-

Returns :

-
-
+ + +<code>i</code> + + + +<code>j</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page index 56b516ea..a7f7b655 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page @@ -32,12 +32,16 @@ RegressTestBoxed* regress_test_boxed_new_alternative_constructor3 (char* s); -
-

s :

-
-

Returns :

-
-
+ + +<code>s</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page index 99651128..c2b907bb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page @@ -32,12 +32,16 @@ RegressTestBoxedB* regress_test_boxed_b_copy (RegressTestBoxedB* boxed); -
-

boxed :

-
-

Returns :

-
-
+ + +<code>boxed</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page index 5266692c..72e4cb04 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page @@ -37,14 +37,20 @@ RegressTestBoxedB* regress_test_boxed_b_new (gint8 some_int8, -
-

some_int8 :

-
-

some_long :

-
-

Returns :

-
-
+ + +<code>some_int8</code> + + + +<code>some_long</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page index 52ed3482..cc9a47dc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page @@ -28,10 +28,12 @@ RegressTestBoxedC* regress_test_boxed_c_new (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page index fd21b483..c73df3c0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page @@ -32,12 +32,16 @@ RegressTestBoxedD* regress_test_boxed_d_copy (RegressTestBoxedD* boxed); -
-

boxed :

-
-

Returns :

-
-
+ + +<code>boxed</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page index c98b5f7a..110ec05c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page @@ -32,12 +32,16 @@ void regress_test_boxed_d_free (RegressTestBoxedD* boxed); -
-

boxed :

-
-

Returns :

-
-
+ + +<code>boxed</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page index 240ad4fc..832b77ce 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page @@ -32,12 +32,16 @@ int regress_test_boxed_d_get_magic (RegressTestBoxedD* boxed); -
-

boxed :

-
-

Returns :

-
-
+ + +<code>boxed</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page index 26ec2bbc..d92e39a5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page @@ -37,14 +37,20 @@ RegressTestBoxedD* regress_test_boxed_d_new (const char* a_string, -
-

a_string :

-
-

a_int :

-
-

Returns :

-
-
+ + +<code>a_string</code> + + + +<code>a_int</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page index 14316be4..911873de 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page @@ -28,10 +28,12 @@ RegressTestFloating* regress_test_floating_new (void); -
-

Returns :

-

A new floating

-
+ + +<code>Returns</code> +

A new floating

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page index c4b6afa9..71c06963 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page @@ -32,12 +32,16 @@ RegressTestFundamentalObject* regress_test_fundamental_object_ref (RegressTestFu -
-

fundamental_object :

-
-

Returns :

-

A new

-
+ + +<code>fundamental_object</code> + + + +<code>Returns</code> +

A new

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page index 776c6f65..7bdf0d8d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page @@ -32,12 +32,16 @@ void regress_test_fundamental_object_unref (RegressTestFundamentalObject* fundam -
-

fundamental_object :

-
-

Returns :

-
-
+ + +<code>fundamental_object</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page index 26af86a6..0c9085e1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page @@ -32,12 +32,16 @@ RegressTestFundamentalSubObject* regress_test_fundamental_sub_object_new (const -
-

data :

-
-

Returns :

-
-
+ + +<code>data</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page index 35caeed4..b2f85d44 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page @@ -37,14 +37,20 @@ void regress_test_inherit_drawable_do_foo (RegressTestInheritDrawable* drawable, -
-

drawable :

-
-

x :

-
-

Returns :

-
-
+ + +<code>drawable</code> + + + +<code>x</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page index cdd27325..e737f0f0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page @@ -37,14 +37,20 @@ void regress_test_inherit_drawable_do_foo_maybe_throw (RegressTestInheritDrawabl -
-

drawable :

-
-

x :

-
-

Returns :

-
-
+ + +<code>drawable</code> + + + +<code>x</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page index 11f36004..364f2a49 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page @@ -42,16 +42,24 @@ void regress_test_inherit_drawable_get_origin (RegressTestInheritDrawable* drawa -
-

drawable :

-
-

x :

-
-

y :

-
-

Returns :

-
-
+ + +<code>drawable</code> + + + +<code>x</code> + + + +<code>y</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page index c3061a97..616dc661 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page @@ -42,16 +42,24 @@ void regress_test_inherit_drawable_get_size (RegressTestInheritDrawable* drawabl -
-

drawable :

-
-

width :

-
-

height :

-
-

Returns :

-
-
+ + +<code>drawable</code> + + + +<code>width</code> + + + +<code>height</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page index 01b45609..7526a98b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page @@ -23,10 +23,12 @@ void all (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page index ad9d6c82..37c69f9b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page @@ -23,14 +23,20 @@ void allow_none_vfunc (RegressTestObj* obj, -
-

obj :

-
-

two :

-

Another object

-

Returns :

-
-
+ + +<code>obj</code> + + + +<code>two</code> +

Another object

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page index ecb33c42..0dc4c380 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page @@ -23,10 +23,12 @@ void cleanup (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page index ccdfb640..94c36590 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page @@ -23,10 +23,12 @@ void first (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page index b17c04dd..fc86d851 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page @@ -25,14 +25,20 @@ case.

-
-

obj :

-
-

somestr :

-

Meaningless string

-

Returns :

-
-
+ + +<code>obj</code> + + + +<code>somestr</code> +

Meaningless string

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page index a9356cb3..dd9c0674 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page @@ -24,12 +24,16 @@ void sig-with-array-prop (guint* arr); -
-

arr :

-

numbers

-

Returns :

-
-
+ + +<code>arr</code> +

numbers

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page index afe8466c..d4ef4645 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page @@ -23,12 +23,16 @@ void sig-with-foreign-struct (cairo_t cr); -
-

cr :

-

A cairo context.

-

Returns :

-
-
+ + +<code>cr</code> +

A cairo context.

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page index 2c7e3f90..9e7233f7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page @@ -24,12 +24,16 @@ void sig-with-hash-prop (<map> hash); -
-

hash :

-
-

Returns :

-
-
+ + +<code>hash</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page index 6a771a14..34b59f1a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page @@ -24,12 +24,16 @@ the introspection client langage.

-
-

i :

-

an integer

-

Returns :

-
-
+ + +<code>i</code> +

an integer

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page index 135d052d..c8ffee3a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page @@ -23,12 +23,16 @@ None sig-with-intarray-ret (gint i); -
-

i :

-

an integer

-

Returns :

-
-
+ + +<code>i</code> +

an integer

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page index 5aee822f..94dfedb4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page @@ -24,12 +24,16 @@ Use with regress_test_obj_emit_sig_with_obj

-
-

obj :

-

A newly created RegressTestObj

-

Returns :

-
-
+ + +<code>obj</code> +

A newly created RegressTestObj

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page index c5fd2dd7..66c7ec1e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page @@ -23,12 +23,16 @@ void sig-with-strv (utf8* strs); -
-

strs :

-

strings

-

Returns :

-
-
+ + +<code>strs</code> +

strings

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page index 25d6d5e7..35ed4a63 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -24,12 +24,16 @@ the introspection client langage.

-
-

i :

-

an integer

-

Returns :

-
-
+ + +<code>i</code> +

an integer

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page index f0df5f3c..3febc0c7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page @@ -23,12 +23,16 @@ void test-with-static-scope-arg (RegressTestSimpleBoxedA object); -
-

object :

-
-

Returns :

-
-
+ + +<code>object</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page index 29321412..be5c6ad8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page @@ -23,10 +23,12 @@ void test (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page index 5cdc38db..0674eb75 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page @@ -28,10 +28,12 @@ RegressTestObj* regress_constructor (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page index b54d35ad..45a57e65 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page @@ -39,14 +39,20 @@ case.

-
-

obj :

-

A

-

somestr :

-

Meaningless string

-

Returns :

-
-
+ + +<code>obj</code> +

A

+ + +<code>somestr</code> +

Meaningless string

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page index 677f1fc1..d0036460 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page @@ -32,12 +32,16 @@ void regress_test_obj_emit_sig_with_foreign_struct (RegressTestObj* obj); -
-

obj :

-
-

Returns :

-
-
+ + +<code>obj</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page index 2dc8a1b7..5ea844a5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page @@ -32,12 +32,16 @@ void regress_test_obj_emit_sig_with_int64 (RegressTestObj* obj); -
-

obj :

-
-

Returns :

-
-
+ + +<code>obj</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page index 9d598f9c..693df710 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page @@ -32,12 +32,16 @@ void regress_test_obj_emit_sig_with_obj (RegressTestObj* obj); -
-

obj :

-
-

Returns :

-
-
+ + +<code>obj</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page index a3a89c18..4ce7bab8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page @@ -32,12 +32,16 @@ void regress_test_obj_emit_sig_with_uint64 (RegressTestObj* obj); -
-

obj :

-
-

Returns :

-
-
+ + +<code>obj</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page index 28fc6916..09328dd2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page @@ -32,12 +32,16 @@ void regress_forced_method (RegressTestObj* obj); -
-

obj :

-

A

-

Returns :

-
-
+ + +<code>obj</code> +

A

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page index 2121ada1..3b83028e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page @@ -32,12 +32,16 @@ int regress_test_obj_instance_method (RegressTestObj* obj); -
-

obj :

-
-

Returns :

-
-
+ + +<code>obj</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page index 7ea17662..e4c2bd42 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page @@ -37,14 +37,20 @@ void regress_test_obj_instance_method_callback (RegressTestObj* obj, -
-

obj :

-
-

callback :

-
-

Returns :

-
-
+ + +<code>obj</code> + + + +<code>callback</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page index 1f5ca6d8..a8fd4f07 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page @@ -32,12 +32,16 @@ RegressTestObj* regress_test_obj_new (RegressTestObj* obj); -
-

obj :

-

A

-

Returns :

-
-
+ + +<code>obj</code> +

A

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page index 44f469db..07e52ef1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page @@ -42,16 +42,24 @@ RegressTestObj* regress_test_obj_new_callback (RegressTestCallbackUserData callb -
-

callback :

-
-

user_data :

-
-

notify :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>user_data</code> + + + +<code>notify</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page index 49f9c1f0..bcfd0487 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page @@ -32,12 +32,16 @@ RegressTestObj* regress_test_obj_new_from_file (const char* x); -
-

x :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page index bd78434c..637585b5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page @@ -32,12 +32,16 @@ void regress_test_obj_null_out (RegressTestObj** obj); -
-

obj :

-

A

-

Returns :

-
-
+ + +<code>obj</code> +

A

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page index f1e9a131..47802642 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page @@ -37,14 +37,20 @@ void regress_test_obj_set_bare (RegressTestObj* obj, -
-

obj :

-
-

bare :

-
-

Returns :

-
-
+ + +<code>obj</code> + + + +<code>bare</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page index f46ec162..bc2a21e0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page @@ -67,26 +67,44 @@ gboolean regress_test_obj_skip_inout_param (RegressTestObj* obj, -
-

obj :

-

A .

-

a :

-

Parameter.

-

out_b :

-

Return value.

-

c :

-

Other parameter.

-

inout_d :

-

Will be incremented.

-

out_sum :

-

Return value.

-

num1 :

-

Number.

-

num2 :

-

Number.

-

Returns :

-

TRUE if the call succeeds, FALSE if @error is set.

-
+ + +<code>obj</code> +

A .

+ + +<code>a</code> +

Parameter.

+ + +<code>out_b</code> +

Return value.

+ + +<code>c</code> +

Other parameter.

+ + +<code>inout_d</code> +

Will be incremented.

+ + +<code>out_sum</code> +

Return value.

+ + +<code>num1</code> +

Number.

+ + +<code>num2</code> +

Number.

+ + +<code>Returns</code> +

TRUE if the call succeeds, FALSE if @error is set.

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page index 77e1de3b..933af002 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page @@ -67,26 +67,44 @@ gboolean regress_test_obj_skip_out_param (RegressTestObj* obj, -
-

obj :

-

A .

-

a :

-

Parameter.

-

out_b :

-

Return value.

-

c :

-

Other parameter.

-

inout_d :

-

Will be incremented.

-

out_sum :

-

Return value.

-

num1 :

-

Number.

-

num2 :

-

Number.

-

Returns :

-

TRUE if the call succeeds, FALSE if @error is set.

-
+ + +<code>obj</code> +

A .

+ + +<code>a</code> +

Parameter.

+ + +<code>out_b</code> +

Return value.

+ + +<code>c</code> +

Other parameter.

+ + +<code>inout_d</code> +

Will be incremented.

+ + +<code>out_sum</code> +

Return value.

+ + +<code>num1</code> +

Number.

+ + +<code>num2</code> +

Number.

+ + +<code>Returns</code> +

TRUE if the call succeeds, FALSE if @error is set.

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page index ef5893c3..a0e4b32d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page @@ -67,26 +67,44 @@ gboolean regress_test_obj_skip_param (RegressTestObj* obj, -
-

obj :

-

A .

-

a :

-

Parameter.

-

out_b :

-

Return value.

-

c :

-

Other parameter.

-

inout_d :

-

Will be incremented.

-

out_sum :

-

Return value.

-

num1 :

-

Number.

-

num2 :

-

Number.

-

Returns :

-

TRUE if the call succeeds, FALSE if @error is set.

-
+ + +<code>obj</code> +

A .

+ + +<code>a</code> +

Parameter.

+ + +<code>out_b</code> +

Return value.

+ + +<code>c</code> +

Other parameter.

+ + +<code>inout_d</code> +

Will be incremented.

+ + +<code>out_sum</code> +

Return value.

+ + +<code>num1</code> +

Number.

+ + +<code>num2</code> +

Number.

+ + +<code>Returns</code> +

TRUE if the call succeeds, FALSE if @error is set.

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page index a463fe77..4347f1ba 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page @@ -67,26 +67,44 @@ gboolean regress_test_obj_skip_return_val (RegressTestObj* obj, -
-

obj :

-

a

-

a :

-

Parameter.

-

out_b :

-

A return value.

-

c :

-

Other parameter.

-

inout_d :

-

Will be incremented.

-

out_sum :

-

Return value.

-

num1 :

-

Number.

-

num2 :

-

Number.

-

Returns :

-

TRUE if the call succeeds, FALSE if @error is set.

-
+ + +<code>obj</code> +

a

+ + +<code>a</code> +

Parameter.

+ + +<code>out_b</code> +

A return value.

+ + +<code>c</code> +

Other parameter.

+ + +<code>inout_d</code> +

Will be incremented.

+ + +<code>out_sum</code> +

Return value.

+ + +<code>num1</code> +

Number.

+ + +<code>num2</code> +

Number.

+ + +<code>Returns</code> +

TRUE if the call succeeds, FALSE if @error is set.

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page index 5ebe0f1a..e931ab92 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page @@ -38,14 +38,20 @@ raise an error.

-
-

obj :

-

a

-

a :

-

Parameter.

-

Returns :

-

TRUE if the call succeeds, FALSE if @error is set.

-
+ + +<code>obj</code> +

a

+ + +<code>a</code> +

Parameter.

+ + +<code>Returns</code> +

TRUE if the call succeeds, FALSE if @error is set.

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page index c27d88bf..7885b725 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page @@ -32,12 +32,16 @@ double regress_test_obj_static_method (int x); -
-

x :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page index 74583ad6..552dc229 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page @@ -32,12 +32,16 @@ void regress_test_obj_static_method_callback (RegressTestCallback callback); -
-

callback :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page index 2ace5e18..748621b0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page @@ -62,24 +62,40 @@ void regress_test_obj_torture_signature_0 (RegressTestObj* obj, -
-

obj :

-

A

-

x :

-
-

y :

-
-

z :

-
-

foo :

-
-

q :

-
-

m :

-
-

Returns :

-
-
+ + +<code>obj</code> +

A

+ + +<code>x</code> + + + +<code>y</code> + + + +<code>z</code> + + + +<code>foo</code> + + + +<code>q</code> + + + +<code>m</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page index aa31fb34..0cfc66d3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page @@ -62,24 +62,40 @@ gboolean regress_test_obj_torture_signature_1 (RegressTestObj* obj, -
-

obj :

-

A

-

x :

-
-

y :

-
-

z :

-
-

foo :

-
-

q :

-
-

m :

-
-

Returns :

-
-
+ + +<code>obj</code> +

A

+ + +<code>x</code> + + + +<code>y</code> + + + +<code>z</code> + + + +<code>foo</code> + + + +<code>q</code> + + + +<code>m</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page index 39a3877b..fda625da 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page @@ -28,10 +28,12 @@ const RegressTestSimpleBoxedA* regress_test_simple_boxed_a_const_return (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page index 827e39ff..b91fe94a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page @@ -32,12 +32,16 @@ RegressTestSimpleBoxedA* regress_test_simple_boxed_a_copy (RegressTestSimpleBoxe -
-

a :

-
-

Returns :

-
-
+ + +<code>a</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page index 4108bf91..7e7c16ef 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page @@ -37,14 +37,20 @@ gboolean regress_test_simple_boxed_a_equals (RegressTestSimpleBoxedA* a, -
-

a :

-
-

other_a :

-
-

Returns :

-
-
+ + +<code>a</code> + + + +<code>other_a</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page index 0846cbe7..995aef68 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page @@ -32,12 +32,16 @@ RegressTestSimpleBoxedB* regress_test_simple_boxed_b_copy (RegressTestSimpleBoxe -
-

b :

-
-

Returns :

-
-
+ + +<code>b</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page index 61f94308..e23b1feb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page @@ -37,14 +37,20 @@ void regress_test_struct_a_clone (RegressTestStructA* a, -
-

a :

-

the structure

-

a_out :

-

the cloned structure

-

Returns :

-
-
+ + +<code>a</code> +

the structure

+ + +<code>a_out</code> +

the cloned structure

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page index ef54d110..53adcbff 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page @@ -37,14 +37,20 @@ void regress_test_struct_a_parse (RegressTestStructA* a_out, -
-

a_out :

-

the structure that is to be filled

-

string :

-

ignored

-

Returns :

-
-
+ + +<code>a_out</code> +

the structure that is to be filled

+ + +<code>string</code> +

ignored

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page index 4adde2a0..03888f00 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page @@ -37,14 +37,20 @@ void regress_test_struct_b_clone (RegressTestStructB* b, -
-

b :

-

the structure

-

b_out :

-

the cloned structure

-

Returns :

-
-
+ + +<code>b</code> +

the structure

+ + +<code>b_out</code> +

the cloned structure

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page index e3fb7736..cb46a63f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page @@ -32,12 +32,16 @@ void regress_test_struct_fixed_array_frob (RegressTestStructFixedArray* str); -
-

str :

-
-

Returns :

-
-
+ + +<code>str</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page index d32c0de2..30b5642c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page @@ -32,12 +32,16 @@ int regress_test_sub_obj_instance_method (RegressTestSubObj* obj); -
-

obj :

-
-

Returns :

-
-
+ + +<code>obj</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page index f8ca0d46..3b96a334 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page @@ -28,10 +28,12 @@ RegressTestObj* regress_test_sub_obj_new (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page index a34a25c3..ca95f176 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page @@ -32,12 +32,16 @@ void regress_test_sub_obj_unset_bare (RegressTestSubObj* obj); -
-

obj :

-
-

Returns :

-
-
+ + +<code>obj</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page index d54ed689..052090c4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page @@ -32,12 +32,16 @@ gboolean regress_test_wi_802_1x_get_testbool (RegressTestWi8021x* obj); -
-

obj :

-
-

Returns :

-
-
+ + +<code>obj</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page index 2c47b288..b6b025d7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page @@ -28,10 +28,12 @@ RegressTestWi8021x* regress_test_wi_802_1x_new (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page index a32a70ab..8196f979 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page @@ -37,14 +37,20 @@ void regress_test_wi_802_1x_set_testbool (RegressTestWi8021x* obj, -
-

obj :

-
-

v :

-
-

Returns :

-
-
+ + +<code>obj</code> + + + +<code>v</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page index cabdd48a..6a423897 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page @@ -32,12 +32,16 @@ int regress_test_wi_802_1x_static_method (int x); -
-

x :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page b/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page index 5f8b1ff3..8d362677 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page @@ -32,12 +32,16 @@ void regress_aliased_caller_alloc (RegressAliasedTestBoxed* boxed); -
-

boxed :

-
-

Returns :

-
-
+ + +<code>boxed</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page index 05102820..ffc80220 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page @@ -37,14 +37,20 @@ gint regress_annotation_attribute_func (RegressAnnotationObject* object, -
-

object :

-

A .

-

data :

-

Some data.

-

Returns :

-

The return value.

-
+ + +<code>object</code> +

A .

+ + +<code>data</code> +

Some data.

+ + +<code>Returns</code> +

The return value.

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page index 337b2073..65730437 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page @@ -43,16 +43,24 @@ detection, and fixing it via regress_annotations.

-
-

callback :

-

Destroy notification

-

destroy :

-
-

data :

-
-

Returns :

-
-
+ + +<code>callback</code> +

Destroy notification

+ + +<code>destroy</code> + + + +<code>data</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page index 6a1c7234..0424e3c9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page @@ -28,10 +28,12 @@ char* regress_annotation_get_source_file (void); -
-

Returns :

-

Source file

-
+ + +<code>Returns</code> +

Source file

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page index 4b471607..cffa65b6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page @@ -37,14 +37,20 @@ void regress_annotation_init (int* argc, -
-

argc :

-

The number of args.

-

argv :

-

The arguments.

-

Returns :

-
-
+ + +<code>argc</code> +

The number of args.

+ + +<code>argv</code> +

The arguments.

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page index 4c485eac..1c2256fa 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page @@ -32,12 +32,16 @@ void regress_annotation_invalid_regress_annotation (int foo); -
-

foo :

-

some text (e.g. example) or else

-

Returns :

-
-
+ + +<code>foo</code> +

some text (e.g. example) or else

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page index 496fcc5a..79a3ab25 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page @@ -32,12 +32,16 @@ void regress_annotation_ptr_array (GValue* array); -
-

array :

-

the array

-

Returns :

-
-
+ + +<code>array</code> +

the array

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page index 1a345a50..6e8b015b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page @@ -32,12 +32,16 @@ char** regress_annotation_return_array (int* length); -
-

length :

-

Number of return values

-

Returns :

-

The return value

-
+ + +<code>length</code> +

Number of return values

+ + +<code>Returns</code> +

The return value

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page index 968cfe17..d835b520 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page @@ -28,10 +28,12 @@ gchar* regress_annotation_return_filename (void); -
-

Returns :

-

An annotated filename

-
+ + +<code>Returns</code> +

An annotated filename

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page index 663fd9db..ac54d220 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page @@ -32,12 +32,16 @@ void regress_annotation_set_source_file (char* fname); -
-

fname :

-

Source file

-

Returns :

-
-
+ + +<code>fname</code> +

Source file

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page index a4d11d2e..8238d38c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page @@ -28,10 +28,12 @@ void regress_annotation_space_after_comment_bug631690 (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page index 520b473a..89bc37e8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page @@ -37,14 +37,20 @@ void regress_annotation_string_array_length (guint n_properties, -
-

n_properties :

-
-

properties :

-
-

Returns :

-
-
+ + +<code>n_properties</code> + + + +<code>properties</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page index e90fa512..9ab21d3b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page @@ -28,10 +28,12 @@ char** regress_annotation_string_zero_terminated (void); -
-

Returns :

-

The return value

-
+ + +<code>Returns</code> +

The return value

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page index 34293f00..540e2252 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page @@ -32,12 +32,16 @@ void regress_annotation_string_zero_terminated_out (char*** out); -
-

out :

-
-

Returns :

-
-
+ + +<code>out</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page index 71013718..368f7403 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page @@ -28,10 +28,12 @@ GObject* regress_annotation_test_parsing_bug630862 (void); -
-

Returns :

-

An object, note the colon:in here

-
+ + +<code>Returns</code> +

An object, note the colon:in here

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page index 1607c630..a9b12703 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page @@ -28,10 +28,12 @@ GObject* regress_annotation_transfer_floating (void); -
-

Returns :

-

A floating object

-
+ + +<code>Returns</code> +

A floating object

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page index a3a0fb71..c50ca7b9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page @@ -29,10 +29,12 @@ void regress_annotation_versioned (void);

Since 0.6

-
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page index c5b4cb6e..49c84ee0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page @@ -28,10 +28,12 @@ GQuark regress_atest_error_quark (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page index f5ce6975..be027cca 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page @@ -42,16 +42,24 @@ void regress_foo_async_ready_callback (GCancellable* cancellable, -
-

cancellable :

-
-

callback :

-
-

user_data :

-
-

Returns :

-
-
+ + +<code>cancellable</code> + + + +<code>callback</code> + + + +<code>user_data</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page index 6158bf25..ff381f0d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page @@ -42,16 +42,24 @@ void regress_foo_destroy_notify_callback (RegressFooCallback callback, -
-

callback :

-
-

data :

-
-

destroy :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>data</code> + + + +<code>destroy</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page index c3ed369c..81903785 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page @@ -28,10 +28,12 @@ gint regress_foo_init (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page index 07c9c6d1..de8797c9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page @@ -47,18 +47,28 @@ void regress_foo_method_external_references (UtilityObject* object, -
-

object :

-
-

e :

-
-

f :

-
-

s :

-
-

Returns :

-
-
+ + +<code>object</code> + + + +<code>e</code> + + + +<code>f</code> + + + +<code>s</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page index d65bfa1a..acbfa5e7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page @@ -29,10 +29,12 @@ a "Can't find matching type for constructor" warning.

-
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page index 8fb9d102..914e971d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page @@ -33,12 +33,16 @@ exposed to language bindings.

-
-

fs :

-

a

-

Returns :

-
-
+ + +<code>fs</code> +

a

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page index 0ed4e2f4..d4a6fc3a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page @@ -37,14 +37,20 @@ void regress_foo_some_variant (guint x, -
-

x :

-
-

args :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>args</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page index 3755024d..461c8778 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page @@ -37,14 +37,20 @@ void regress_foo_some_variant_ptr (guint x, -
-

x :

-
-

args :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>args</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page index cf127cb0..f6fcc316 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page @@ -28,10 +28,12 @@ GArray* regress_foo_test_array (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page index 79c50cf2..f98deeb1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page @@ -32,12 +32,16 @@ void regress_foo_test_const_char_param (const char* param); -
-

param :

-
-

Returns :

-
-
+ + +<code>param</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page index cb286e62..7d1f5950 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page @@ -28,10 +28,12 @@ const char* regress_foo_test_const_char_retval (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page index be33c5ad..f72c8c14 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page @@ -32,12 +32,16 @@ void regress_foo_test_const_struct_param (const RegressFooStruct* param); -
-

param :

-
-

Returns :

-
-
+ + +<code>param</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page index 783b248a..ee95d72e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page @@ -28,10 +28,12 @@ const RegressFooStruct* regress_foo_test_const_struct_retval (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page index 83881f67..a342b016 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page @@ -32,12 +32,16 @@ void regress_foo_test_string_array (char** array); -
-

array :

-
-

Returns :

-
-
+ + +<code>array</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page index c3c45b12..f5e81e34 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page @@ -32,12 +32,16 @@ void regress_foo_test_string_array_with_g (gchar** array); -
-

array :

-
-

Returns :

-
-
+ + +<code>array</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page index b3ded918..e797629d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page @@ -32,12 +32,16 @@ void regress_foo_test_unsigned_qualifier (unsigned int unsigned_param); -
-

unsigned_param :

-
-

Returns :

-
-
+ + +<code>unsigned_param</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page index 06100021..adcf6bcd 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page @@ -32,12 +32,16 @@ void regress_foo_test_unsigned_type (unsigned unsigned_param); -
-

unsigned_param :

-
-

Returns :

-
-
+ + +<code>unsigned_param</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page index 9024a14d..b3a9c3d4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page @@ -37,14 +37,20 @@ void regress_foo_test_varargs_callback (gint i, -
-

i :

-
-

callback :

-
-

Returns :

-
-
+ + +<code>i</code> + + + +<code>callback</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page index f89f5474..19cfec14 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page @@ -32,12 +32,16 @@ void regress_foo_test_varargs_callback2 (RegressFooVarargsCallback callback); -
-

callback :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page index e34cfc75..f04a2064 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page @@ -37,14 +37,20 @@ void regress_foo_test_varargs_callback3 (RegressFooVarargsCallback callback, -
-

callback :

-
-

callback2 :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>callback2</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page index ebc6a7f1..50691f38 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page @@ -32,12 +32,16 @@ void regress_func_obj_null_in (RegressTestObj* obj); -
-

obj :

-

A

-

Returns :

-
-
+ + +<code>obj</code> +

A

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page index 407cb269..078b47c1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page @@ -32,12 +32,16 @@ void regress_global_get_flags_out (RegressTestFlags* v); -
-

v :

-

A flags value

-

Returns :

-
-
+ + +<code>v</code> +

A flags value

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page b/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page index 802f00f9..725aed08 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page @@ -38,14 +38,20 @@ libgnome-keyring.

-
-

foo :

-

some int

-

attributes :

-

list of attributes

-

Returns :

-
-
+ + +<code>foo</code> +

some int

+ + +<code>attributes</code> +

list of attributes

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page b/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page index d769d5bc..8b28b1f4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page @@ -32,12 +32,16 @@ void regress_introspectable_via_alias (RegressPtrArrayAlias* data); -
-

data :

-
-

Returns :

-
-
+ + +<code>data</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page b/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page index 263f7c8b..afafef26 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page @@ -32,12 +32,16 @@ void regress_not_introspectable_via_alias (RegressVaListAlias ok); -
-

ok :

-
-

Returns :

-
-
+ + +<code>ok</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page b/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page index 78ba1bcb..8898215a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page @@ -42,16 +42,24 @@ void regress_random_function_with_skipped_structure (int x, -
-

x :

-
-

foo :

-
-

v :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>foo</code> + + + +<code>v</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page b/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page index 7ced7958..08950c1f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page @@ -32,12 +32,16 @@ void regress_set_abort_on_error (gboolean abort_on_error); -
-

abort_on_error :

-
-

Returns :

-
-
+ + +<code>abort_on_error</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page index c7a2b4a7..3ed1fdec 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page @@ -32,12 +32,16 @@ int regress_test_array_callback (RegressTestCallbackArray callback); -
-

callback :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page index 016a967b..f084a5cc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page @@ -32,12 +32,16 @@ void regress_test_array_fixed_out_objects (RegressTestObj*** objs); -
-

objs :

-

An array of

-

Returns :

-
-
+ + +<code>objs</code> +

An array of

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page index 7b756725..a4b23fb1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page @@ -32,12 +32,16 @@ int regress_test_array_fixed_size_int_in (int* ints); -
-

ints :

-

a list of 5 integers

-

Returns :

-

the sum of the items in ints

-
+ + +<code>ints</code> +

a list of 5 integers

+ + +<code>Returns</code> +

the sum of the items in ints

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page index 8d8dda52..9785207d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page @@ -32,12 +32,16 @@ void regress_test_array_fixed_size_int_out (int** ints); -
-

ints :

-

a list of 5 integers ranging from 0 to 4

-

Returns :

-
-
+ + +<code>ints</code> +

a list of 5 integers ranging from 0 to 4

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page index 6a67355e..245e6f34 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page @@ -28,10 +28,12 @@ int* regress_test_array_fixed_size_int_return (void); -
-

Returns :

-

a list of 5 integers ranging from 0 to 4

-
+ + +<code>Returns</code> +

a list of 5 integers ranging from 0 to 4

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page index 087ea636..1c1392df 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page @@ -37,14 +37,20 @@ int regress_test_array_gint16_in (int n_ints, -
-

n_ints :

-
-

ints :

-

List of ints

-

Returns :

-
-
+ + +<code>n_ints</code> + + + +<code>ints</code> +

List of ints

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page index 88ef582f..6a6ae2e5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page @@ -37,14 +37,20 @@ gint32 regress_test_array_gint32_in (int n_ints, -
-

n_ints :

-
-

ints :

-

List of ints

-

Returns :

-
-
+ + +<code>n_ints</code> + + + +<code>ints</code> +

List of ints

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page index 0dd47fcc..553a9199 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page @@ -37,14 +37,20 @@ gint64 regress_test_array_gint64_in (int n_ints, -
-

n_ints :

-
-

ints :

-

List of ints

-

Returns :

-
-
+ + +<code>n_ints</code> + + + +<code>ints</code> +

List of ints

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page index 32a5cb76..f705ba22 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page @@ -37,14 +37,20 @@ int regress_test_array_gint8_in (int n_ints, -
-

n_ints :

-
-

ints :

-

List of ints

-

Returns :

-
-
+ + +<code>n_ints</code> + + + +<code>ints</code> +

List of ints

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page index 178ccda4..5695d386 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page @@ -37,14 +37,20 @@ char* regress_test_array_gtype_in (int n_types, -
-

n_types :

-
-

types :

-

List of types

-

Returns :

-

string representation of provided types

-
+ + +<code>n_types</code> + + + +<code>types</code> +

List of types

+ + +<code>Returns</code> +

string representation of provided types

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page index 37413f21..18b06cb3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page @@ -32,12 +32,16 @@ int* regress_test_array_int_full_out (int* len); -
-

len :

-

length of the returned array.

-

Returns :

-

a new array of integers.

-
+ + +<code>len</code> +

length of the returned array.

+ + +<code>Returns</code> +

a new array of integers.

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page index f9ba58cf..f7629d15 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page @@ -37,14 +37,20 @@ int regress_test_array_int_in (int n_ints, -
-

n_ints :

-
-

ints :

-

List of ints

-

Returns :

-
-
+ + +<code>n_ints</code> + + + +<code>ints</code> +

List of ints

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page index b970df76..6aee8b1f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page @@ -37,14 +37,20 @@ void regress_test_array_int_inout (int* n_ints, -
-

n_ints :

-

the length of ints

-

ints :

-

a list of integers whose items will be increased by 1, except the first that will be dropped

-

Returns :

-
-
+ + +<code>n_ints</code> +

the length of ints

+ + +<code>ints</code> +

a list of integers whose items will be increased by 1, except the first that will be dropped

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page index e341b8cc..18c92f39 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page @@ -32,12 +32,16 @@ int* regress_test_array_int_none_out (int* len); -
-

len :

-

length of the returned array.

-

Returns :

-

a static array of integers.

-
+ + +<code>len</code> +

length of the returned array.

+ + +<code>Returns</code> +

a static array of integers.

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page index 9afb1ff1..17582dd2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page @@ -37,14 +37,20 @@ void regress_test_array_int_null_in (int* arr, -
-

arr :

-
-

len :

-

length

-

Returns :

-
-
+ + +<code>arr</code> + + + +<code>len</code> +

length

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page index 45ef84f1..2494cab6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page @@ -37,14 +37,20 @@ void regress_test_array_int_null_out (int** arr, -
-

arr :

-
-

len :

-

length

-

Returns :

-
-
+ + +<code>arr</code> + + + +<code>len</code> +

length

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page index be18643d..071f730d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page @@ -37,14 +37,20 @@ void regress_test_array_int_out (int* n_ints, -
-

n_ints :

-

the length of ints

-

ints :

-

a list of 5 integers, from 0 to 4 in consecutive order

-

Returns :

-
-
+ + +<code>n_ints</code> +

the length of ints

+ + +<code>ints</code> +

a list of 5 integers, from 0 to 4 in consecutive order

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page index 6e3421ac..f7c097dd 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page @@ -32,12 +32,16 @@ void regress_test_async_ready_callback (GAsyncReadyCallback callback); -
-

callback :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page index aada509b..64bd1ff1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page @@ -32,12 +32,16 @@ gboolean regress_test_boolean (gboolean in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page index 2c84d1c8..3cf8dec3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page @@ -32,12 +32,16 @@ gboolean regress_test_boolean_false (gboolean in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page index 7d1a9490..6fd9edc2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page @@ -32,12 +32,16 @@ gboolean regress_test_boolean_true (gboolean in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page index dfbc29a1..2ce86566 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page @@ -28,10 +28,12 @@ cairo_t* regress_test_cairo_context_full_return (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page index 63105798..69284e7e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page @@ -32,12 +32,16 @@ void regress_test_cairo_context_none_in (cairo_t* context); -
-

context :

-
-

Returns :

-
-
+ + +<code>context</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page index 4ea5516d..86cfa298 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page @@ -32,12 +32,16 @@ void regress_test_cairo_surface_full_out (cairo_surface_t** surface); -
-

surface :

-
-

Returns :

-
-
+ + +<code>surface</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page index 0b15ce02..f04fa4e2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page @@ -28,10 +28,12 @@ cairo_surface_t* regress_test_cairo_surface_full_return (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page index a1903ce2..f69202f8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page @@ -32,12 +32,16 @@ void regress_test_cairo_surface_none_in (cairo_surface_t* surface); -
-

surface :

-
-

Returns :

-
-
+ + +<code>surface</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page index e99ecb4b..f583a470 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page @@ -28,10 +28,12 @@ cairo_surface_t* regress_test_cairo_surface_none_return (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page index 99a668ef..c9f0cad5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page @@ -32,12 +32,16 @@ int regress_test_callback (RegressTestCallback callback); -
-

callback :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page index f2891eda..f0ee48c4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page @@ -37,14 +37,20 @@ void regress_test_callback_async (RegressTestCallbackUserData callback, -
-

callback :

-
-

user_data :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>user_data</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page index 6a365139..31e48e9a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page @@ -43,16 +43,24 @@ is invoked.

-
-

callback :

-
-

user_data :

-
-

notify :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>user_data</code> + + + +<code>notify</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page index 148fc315..367b51fc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page @@ -38,14 +38,20 @@ condition in bindings which needs to be tested.

-
-

callback :

-
-

notify :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>notify</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page index a666a332..37d6ed59 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page @@ -28,10 +28,12 @@ int regress_test_callback_thaw_async (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page index 0a4ce3d0..d9a30c75 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page @@ -30,10 +30,12 @@ corresponding destroy notfications.

-
-

Returns :

-

Sum of the return values of the invoked callbacks.

-
+ + +<code>Returns</code> +

Sum of the return values of the invoked callbacks.

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page index f577a5eb..05f84820 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page @@ -38,14 +38,20 @@ call and can be released on return.

-
-

callback :

-
-

user_data :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>user_data</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page index 41b5d509..0218d542 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page @@ -32,12 +32,16 @@ int regress_test_closure (GClosure* closure); -
-

closure :

-
-

Returns :

-
-
+ + +<code>closure</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page index 971f21e2..221eab66 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page @@ -37,14 +37,20 @@ int regress_test_closure_one_arg (GClosure* closure, -
-

closure :

-
-

arg :

-
-

Returns :

-
-
+ + +<code>closure</code> + + + +<code>arg</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page index 1f5a56a6..64791461 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page @@ -37,14 +37,20 @@ GVariant* regress_test_closure_variant (GClosure* closure, -
-

closure :

-

GClosure which takes one GVariant and returns a GVariant

-

arg :

-

a GVariant passed as argument to closure

-

Returns :

-

the return value of closure

-
+ + +<code>closure</code> +

GClosure which takes one GVariant and returns a GVariant

+ + +<code>arg</code> +

a GVariant passed as argument to closure

+ + +<code>Returns</code> +

the return value of closure

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page index e606febe..f2a5ec04 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page @@ -28,10 +28,12 @@ GValue* regress_test_date_in_gvalue (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page index 1fb55bed..fbad9386 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page @@ -28,10 +28,12 @@ GQuark regress_test_def_error_quark (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page index 7384ecd6..a5e55239 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page @@ -32,12 +32,16 @@ gdouble regress_test_double (gdouble in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page index e490ac3e..a5906fc9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page @@ -28,10 +28,12 @@ GSList* regress_test_filename_return (void); -
-

Returns :

-

list of strings

-
+ + +<code>Returns</code> +

list of strings

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page index f50930da..c6a1942f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page @@ -32,12 +32,16 @@ gfloat regress_test_float (gfloat in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page index 23639759..63324874 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page @@ -28,10 +28,12 @@ GPtrArray* regress_test_garray_container_return (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page index a433bfaa..2faa31bf 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page @@ -28,10 +28,12 @@ GPtrArray* regress_test_garray_full_return (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page index 4aa5615e..cbfdcb56 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page @@ -32,12 +32,16 @@ void regress_test_gerror_callback (RegressTestCallbackGError callback); -
-

callback :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page index fd291224..9e59ef14 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page @@ -28,10 +28,12 @@ GHashTable* regress_test_ghash_container_return (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page index 4ad5cb53..0d608f82 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page @@ -28,10 +28,12 @@ GHashTable* regress_test_ghash_everything_return (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page index 8708d8d1..eb8ce9d2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page @@ -32,12 +32,16 @@ void regress_test_ghash_gvalue_in (GHashTable* hash); -
-

hash :

-

the hash table returned by .

-

Returns :

-
-
+ + +<code>hash</code> +

the hash table returned by .

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page index 98682591..e4a57328 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page @@ -28,10 +28,12 @@ GHashTable* regress_test_ghash_gvalue_return (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page index 8af4cbd7..39eb096b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page @@ -28,10 +28,12 @@ GHashTable* regress_test_ghash_nested_everything_return (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page index 8612e665..cb3b6aa8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page @@ -29,10 +29,12 @@ element-type annotation.

-
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page index 8a21bbf2..d6589608 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page @@ -32,12 +32,16 @@ void regress_test_ghash_nothing_in (const GHashTable* in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page index 83f5c6e1..97700020 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page @@ -32,12 +32,16 @@ void regress_test_ghash_nothing_in2 (GHashTable* in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page index a0af756d..c224824b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page @@ -28,10 +28,12 @@ const GHashTable* regress_test_ghash_nothing_return (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page index 8a5c7b35..078906a4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page @@ -28,10 +28,12 @@ GHashTable* regress_test_ghash_nothing_return2 (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page index fa7c04e9..303e6ee3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page @@ -32,12 +32,16 @@ void regress_test_ghash_null_in (const GHashTable* in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page index 666fdf0c..7d191f0e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page @@ -32,12 +32,16 @@ void regress_test_ghash_null_out (const GHashTable** out); -
-

out :

-
-

Returns :

-
-
+ + +<code>out</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page index d5c91540..3cb45a8c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page @@ -28,10 +28,12 @@ const GHashTable* regress_test_ghash_null_return (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page index 053fbd81..59449088 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page @@ -28,10 +28,12 @@ GList* regress_test_glist_container_return (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page index 05efc259..773cf551 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page @@ -28,10 +28,12 @@ GList* regress_test_glist_everything_return (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page index cab2d96f..66126de8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page @@ -32,12 +32,16 @@ void regress_test_glist_nothing_in (const GList* in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page index ec306580..a2c0ae15 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page @@ -32,12 +32,16 @@ void regress_test_glist_nothing_in2 (GList* in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page index a5d436fe..f571415b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page @@ -28,10 +28,12 @@ const GList* regress_test_glist_nothing_return (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page index 1af8f86f..43697617 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page @@ -28,10 +28,12 @@ GList* regress_test_glist_nothing_return2 (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page index c691426c..f90b1274 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page @@ -32,12 +32,16 @@ void regress_test_glist_null_in (GSList* in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page index 11ae56f7..44d6abaa 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page @@ -32,12 +32,16 @@ void regress_test_glist_null_out (GSList** out_list); -
-

out_list :

-
-

Returns :

-
-
+ + +<code>out_list</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page index 3f238141..ebead8c0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page @@ -28,10 +28,12 @@ GSList* regress_test_gslist_container_return (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page index 8f9319ce..c303cb19 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page @@ -28,10 +28,12 @@ GSList* regress_test_gslist_everything_return (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page index 22b3230b..651e4f3a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page @@ -32,12 +32,16 @@ void regress_test_gslist_nothing_in (const GSList* in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page index f4f3bfc2..9e652735 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page @@ -32,12 +32,16 @@ void regress_test_gslist_nothing_in2 (GSList* in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page index 8c68039a..066e3473 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page @@ -28,10 +28,12 @@ const GSList* regress_test_gslist_nothing_return (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page index 38abfcf0..8f7e343e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page @@ -28,10 +28,12 @@ GSList* regress_test_gslist_nothing_return2 (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page index 00bd6702..52f6d6ae 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page @@ -32,12 +32,16 @@ void regress_test_gslist_null_in (GSList* in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page index efa4df62..fe931a83 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page @@ -32,12 +32,16 @@ void regress_test_gslist_null_out (GSList** out_list); -
-

out_list :

-
-

Returns :

-
-
+ + +<code>out_list</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page index c99a531a..fc75886a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page @@ -32,12 +32,16 @@ GType regress_test_gtype (GType in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page index f884014f..e2be67d2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page @@ -28,10 +28,12 @@ GVariant* regress_test_gvariant_as (void); -
-

Returns :

-

New variant

-
+ + +<code>Returns</code> +

New variant

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page index c39a003c..9d8e6b6b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page @@ -28,10 +28,12 @@ GVariant* regress_test_gvariant_asv (void); -
-

Returns :

-

New variant

-
+ + +<code>Returns</code> +

New variant

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page index 58f1b970..6a2b2339 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page @@ -28,10 +28,12 @@ GVariant* regress_test_gvariant_i (void); -
-

Returns :

-

New variant

-
+ + +<code>Returns</code> +

New variant

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page index 051a307c..a98c717a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page @@ -28,10 +28,12 @@ GVariant* regress_test_gvariant_s (void); -
-

Returns :

-

New variant

-
+ + +<code>Returns</code> +

New variant

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page index f1e8f7bd..698f10f3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page @@ -28,10 +28,12 @@ GVariant* regress_test_gvariant_v (void); -
-

Returns :

-

New variant

-
+ + +<code>Returns</code> +

New variant

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page index abbdbbb8..b86e3601 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page @@ -37,14 +37,20 @@ void regress_test_hash_table_callback (GHashTable* data, -
-

data :

-

GHashTable that gets passed to callback

-

callback :

-
-

Returns :

-
-
+ + +<code>data</code> +

GHashTable that gets passed to callback

+ + +<code>callback</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page index 2e271a52..ff1ed37f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page @@ -32,12 +32,16 @@ gint regress_test_int (gint in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page index 6ee0059c..770d8fb8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page @@ -32,12 +32,16 @@ gint16 regress_test_int16 (gint16 in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page index 58ef340f..c0f00611 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page @@ -32,12 +32,16 @@ gint32 regress_test_int32 (gint32 in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page index bfe12d60..50029547 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page @@ -32,12 +32,16 @@ gint64 regress_test_int64 (gint64 in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page index 0b4b43ab..03275b12 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page @@ -32,12 +32,16 @@ gint8 regress_test_int8 (gint8 in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page index ae8ecfcd..400ff595 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page @@ -37,14 +37,20 @@ void regress_test_int_out_utf8 (int* length, -
-

length :

-
-

in :

-
-

Returns :

-
-
+ + +<code>length</code> + + + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page index 4fb211e0..69f223c6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page @@ -32,12 +32,16 @@ int regress_test_int_value_arg (const GValue* v); -
-

v :

-
-

Returns :

-
-
+ + +<code>v</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page index 638f066f..83828394 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page @@ -32,12 +32,16 @@ glong regress_test_long (glong in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page index b0b16c5e..68c571d4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page @@ -32,12 +32,16 @@ int regress_test_multi_callback (RegressTestCallback callback); -
-

callback :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page index 5dc68cb0..33112e84 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page @@ -42,16 +42,24 @@ void regress_test_multi_double_args (gdouble in, -
-

in :

-
-

one :

-
-

two :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>one</code> + + + +<code>two</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page index 439f66a7..b8755fb4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page @@ -28,10 +28,12 @@ void regress_test_multiline_doc_comments (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page index 30d6e07a..d5c0f7a3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page @@ -57,12 +57,16 @@ rgb(20%, 30%, 0%)</literallayout></entry> -
-

a :

-

An integer

-

Returns :

-
-
+ + +<code>a</code> +

An integer

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page index 995b82b5..8f105517 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page @@ -32,12 +32,16 @@ void regress_test_null_gerror_callback (RegressTestCallbackGError callback); -
-

callback :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page index 0bb38c93..668ead07 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page @@ -32,12 +32,16 @@ void regress_test_owned_gerror_callback (RegressTestCallbackOwnedGError callback -
-

callback :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page index 135cd706..9fd725e3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page @@ -32,12 +32,16 @@ gshort regress_test_short (gshort in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page index 8e844050..cc8cceb6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page @@ -32,12 +32,16 @@ void regress_test_simple_callback (RegressTestSimpleCallback callback); -
-

callback :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page index cf24fbe9..cf00a65d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page @@ -32,12 +32,16 @@ gsize regress_test_size (gsize in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page index 9764aa94..b6698036 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page @@ -33,12 +33,16 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399

-
-

callback :

-

No annotation here

-

Returns :

-
-
+ + +<code>callback</code> +

No annotation here

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page index 232f21dd..41c27644 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page @@ -32,12 +32,16 @@ gssize regress_test_ssize (gssize in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page index c1d6ce40..07ad58fb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page @@ -32,12 +32,16 @@ gboolean regress_test_strv_in (char** arr); -
-

arr :

-
-

Returns :

-
-
+ + +<code>arr</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page index 0609b669..23447c01 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page @@ -28,10 +28,12 @@ GValue* regress_test_strv_in_gvalue (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page index dba053f4..081c3644 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page @@ -28,10 +28,12 @@ char** regress_test_strv_out (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page index 01e1c371..dd726a66 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page @@ -28,10 +28,12 @@ const char* const* regress_test_strv_out_c (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page index 71b89c37..f0fc23c4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page @@ -28,10 +28,12 @@ char** regress_test_strv_out_container (void); -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page index aea2dace..d6e9db38 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page @@ -32,12 +32,16 @@ void regress_test_strv_outarg (char*** retp); -
-

retp :

-
-

Returns :

-
-
+ + +<code>retp</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page index 2c31dccc..e8127d39 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page @@ -32,12 +32,16 @@ time_t regress_test_timet (time_t in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page index bcdbd35b..298e4cac 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page @@ -57,22 +57,36 @@ void regress_test_torture_signature_0 (int x, -
-

x :

-
-

y :

-
-

z :

-
-

foo :

-
-

q :

-
-

m :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>y</code> + + + +<code>z</code> + + + +<code>foo</code> + + + +<code>q</code> + + + +<code>m</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page index af54f3f6..beb59992 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page @@ -57,22 +57,36 @@ gboolean regress_test_torture_signature_1 (int x, -
-

x :

-
-

y :

-
-

z :

-
-

foo :

-
-

q :

-
-

m :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>y</code> + + + +<code>z</code> + + + +<code>foo</code> + + + +<code>q</code> + + + +<code>m</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page index 145c44f3..bb742fec 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page @@ -72,28 +72,48 @@ void regress_test_torture_signature_2 (int x, -
-

x :

-
-

callback :

-
-

user_data :

-
-

notify :

-
-

y :

-
-

z :

-
-

foo :

-
-

q :

-
-

m :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>callback</code> + + + +<code>user_data</code> + + + +<code>notify</code> + + + +<code>y</code> + + + +<code>z</code> + + + +<code>foo</code> + + + +<code>q</code> + + + +<code>m</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page index aeed54f2..48901ccd 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page @@ -32,12 +32,16 @@ guint regress_test_uint (guint in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page index 280a15f5..ecb31622 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page @@ -32,12 +32,16 @@ guint16 regress_test_uint16 (guint16 in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page index dd0ef86f..bfaf042c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page @@ -32,12 +32,16 @@ guint32 regress_test_uint32 (guint32 in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page index b4a8d643..e7587cb8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page @@ -32,12 +32,16 @@ guint64 regress_test_uint64 (guint64 in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page index f482eb7f..fc13715b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page @@ -32,12 +32,16 @@ guint8 regress_test_uint8 (guint8 in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page index 479ebe0b..32b331ed 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page @@ -32,12 +32,16 @@ gulong regress_test_ulong (gulong in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page index ecafbe69..dc735306 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page @@ -32,12 +32,16 @@ gunichar regress_test_unichar (gunichar in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page index e5d5cb2a..5fbc9aa4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page @@ -32,12 +32,16 @@ const gchar* regress_test_unsigned_enum_param (RegressTestEnumUnsigned e); -
-

e :

-
-

Returns :

-
-
+ + +<code>e</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page index 0e04b87d..31ee2722 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page @@ -32,12 +32,16 @@ gushort regress_test_ushort (gushort in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page index b4c5090c..c21ee5b0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page @@ -32,12 +32,16 @@ void regress_test_utf8_const_in (const char* in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page index 77ef0826..8e46b6c5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page @@ -28,10 +28,12 @@ const char* regress_test_utf8_const_return (void); -
-

Returns :

-

UTF-8 string

-
+ + +<code>Returns</code> +

UTF-8 string

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page index 259e2323..5c51995d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page @@ -32,12 +32,16 @@ void regress_test_utf8_inout (char** inout); -
-

inout :

-
-

Returns :

-
-
+ + +<code>inout</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page index 3b1ae5d1..bacd87b7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page @@ -28,10 +28,12 @@ char* regress_test_utf8_nonconst_return (void); -
-

Returns :

-

UTF-8 string

-
+ + +<code>Returns</code> +

UTF-8 string

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page index a864ae1d..db9a526b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page @@ -32,12 +32,16 @@ void regress_test_utf8_null_in (char* in); -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page index ffd3147c..14906be8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page @@ -32,12 +32,16 @@ void regress_test_utf8_null_out (char** char_out); -
-

char_out :

-
-

Returns :

-
-
+ + +<code>char_out</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page index d2743eaf..75c69f53 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page @@ -32,12 +32,16 @@ void regress_test_utf8_out (char** out); -
-

out :

-
-

Returns :

-
-
+ + +<code>out</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page index f8356aff..4aa425f4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page @@ -32,12 +32,16 @@ char* regress_test_utf8_out_nonconst_return (char** out); -
-

out :

-

a copy of "second"

-

Returns :

-

a copy of "first"

-
+ + +<code>out</code> +

a copy of "second"

+ + +<code>Returns</code> +

a copy of "first"

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page index 87ce92f8..d02e94c5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page @@ -37,14 +37,20 @@ void regress_test_utf8_out_out (char** out0, -
-

out0 :

-

a copy of "first"

-

out1 :

-

a copy of "second"

-

Returns :

-
-
+ + +<code>out0</code> +

a copy of "first"

+ + +<code>out1</code> +

a copy of "second"

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page index ec758d86..139a202f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page @@ -32,12 +32,16 @@ RegressTestFundamentalObject* regress_test_value_get_fundamental_object (const G -
-

value :

-
-

Returns :

-
-
+ + +<code>value</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page index bcdbed57..e33e73d9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page @@ -32,12 +32,16 @@ const GValue* regress_test_value_return (int i); -
-

i :

-

an int

-

Returns :

-

the int wrapped in a GValue.

-
+ + +<code>i</code> +

an int

+ + +<code>Returns</code> +

the int wrapped in a GValue.

+ + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page index 101443ed..6740c444 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page @@ -37,14 +37,20 @@ void regress_test_value_set_fundamental_object (GValue* value, -
-

value :

-
-

fundamental_object :

-
-

Returns :

-
-
+ + +<code>value</code> + + + +<code>fundamental_object</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page index d426f0a4..33e10ac0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page @@ -29,10 +29,12 @@ void regress_test_versioning (void);

Since 1.32.1

-
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page index dff139fd..119860d2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page @@ -19,14 +19,20 @@ -
-

ATestError.CODE0 :

-
-

ATestError.CODE1 :

-
-

ATestError.CODE2 :

-
-
+ + +<code>ATestError.CODE0</code> + + + +<code>ATestError.CODE1</code> + + + +<code>ATestError.CODE2</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page index 73f9cde8..713f2fa9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page @@ -23,20 +23,32 @@ function callback(annotation_object, arg1:String, arg2:String, user_param1, ...) -
-

annotation_object :

-

instance of Regress.AnnotationObject that is emitting the signal

-

arg1 :

-

a value

-

arg2 :

-

another value

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-

Returns :

-
gchar*

the return value

-
+ + +<code>annotation_object</code> +

instance of Regress.AnnotationObject that is emitting the signal

+ + +<code>arg1</code> +

a value

+ + +<code>arg2</code> +

another value

+ + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ + +<code>...</code> +

additional user parameters (if any)

+ + +<code>Returns</code> +

gchar*

the return value

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page index 178ce23c..68a6b8f5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page @@ -23,16 +23,24 @@ function callback(annotation_object, arg1:gpointer, user_param1, ...):void; -
-

annotation_object :

-

instance of Regress.AnnotationObject that is emitting the signal

-

arg1 :

-
-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>annotation_object</code> +

instance of Regress.AnnotationObject that is emitting the signal

+ + +<code>arg1</code> + + + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ + +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page index b29e2a6a..3464bf78 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page @@ -24,16 +24,24 @@ known by GObject as it's only marked as G_TYPE_POINTER

-
-

annotation_object :

-

instance of Regress.AnnotationObject that is emitting the signal

-

list :

-

a list of strings

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>annotation_object</code> +

instance of Regress.AnnotationObject that is emitting the signal

+ + +<code>list</code> +

a list of strings

+ + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ + +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page index d8e9f6a8..53124914 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page @@ -25,16 +25,24 @@ it says it's pointer but it's actually a string.

Since 1.0

-
-

annotation_object :

-

instance of Regress.AnnotationObject that is emitting the signal

-

string :

-

a string

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>annotation_object</code> +

instance of Regress.AnnotationObject that is emitting the signal

+ + +<code>string</code> +

a string

+ + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ + +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page index c54f0c3e..d94ad834 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page @@ -34,12 +34,16 @@ function allow_none(somearg:String):GObject.Object { -
-

somearg :

-
-

Returns :

-

null always

-
+ + +<code>somearg</code> + + + +<code>Returns</code> +

null always

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page index a11fd19c..d964b9c7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page @@ -30,10 +30,12 @@ function calleeowns():Number { -
-

Returns :

-

an int

-
+ + +<code>Returns</code> +

an int

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page index df95d103..bcc26d8f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page @@ -30,10 +30,12 @@ function calleesowns():Number { -
-

Returns :

-

an int

-
+ + +<code>Returns</code> +

an int

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page index 5f930137..0dc19bcf 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page @@ -34,10 +34,12 @@ function compute_sum(nums:[Number]):void { -
-

nums :

-

Sequence of numbers

-
+ + +<code>nums</code> +

Sequence of numbers

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page index 24e2a802..a6870013 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page @@ -34,10 +34,12 @@ function compute_sum_n(nums:[Number]):void { -
-

nums :

-

Sequence of numbers that are zero-terminated

-
+ + +<code>nums</code> +

Sequence of numbers that are zero-terminated

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page index 02c501d9..ed909ac8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page @@ -34,10 +34,12 @@ function compute_sum_nz(nums:[Number]):void { -
-

nums :

-

Sequence of numbers that are zero-terminated

-
+ + +<code>nums</code> +

Sequence of numbers that are zero-terminated

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page index 4b2d104f..6098722c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page @@ -30,10 +30,12 @@ function create_object():GObject.Object { -
-

Returns :

-

The object

-
+ + +<code>Returns</code> +

The object

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page index 87249cf9..61915f41 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page @@ -30,10 +30,12 @@ function do_not_use():GObject.Object { -
-

Returns :

-

null always

-
+ + +<code>Returns</code> +

null always

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page index ba06aea4..58bf5ff4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page @@ -30,8 +30,8 @@ function extra_annos():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page index 965297e8..5d5c79d7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page @@ -34,10 +34,12 @@ function foreach(func:Regress.AnnotationForeachFunc):void { -
-

func :

-

Callback to invoke

-
+ + +<code>func</code> +

Callback to invoke

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page index dbff0ad3..ff2aef1d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page @@ -31,10 +31,12 @@ objects.

-
-

Returns :

-

hash table

-
+ + +<code>Returns</code> +

hash table

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page index 7245a0b6..e339e088 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page @@ -32,10 +32,12 @@ intentionally similar example to gtk_container_get_children

-
-

Returns :

-

list of objects

-
+ + +<code>Returns</code> +

list of objects

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page index 2b9dde17..9a3db5d0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page @@ -31,10 +31,12 @@ each string needs to be freed.

-
-

Returns :

-

list of strings

-
+ + +<code>Returns</code> +

list of strings

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page index a59a446f..1abc4010 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page @@ -30,8 +30,8 @@ function hidden_self():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page index f9c8caef..b5f2d65f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page @@ -34,12 +34,16 @@ function in(inarg:Number):Number { -
-

inarg :

-

This is an argument test

-

Returns :

-

an int

-
+ + +<code>inarg</code> +

This is an argument test

+ + +<code>Returns</code> +

an int

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page index d2064f22..9b615360 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page @@ -34,12 +34,16 @@ function inout(inoutarg:Number):Number { -
-

inoutarg :

-

This is an argument test

-

Returns :

-

an int

-
+ + +<code>inoutarg</code> +

This is an argument test

+ + +<code>Returns</code> +

an int

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page index a79e4d06..58cab9ad 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page @@ -34,12 +34,16 @@ function inout2(inoutarg:Number):Number { -
-

inoutarg :

-

This is an argument test

-

Returns :

-

an int

-
+ + +<code>inoutarg</code> +

This is an argument test

+ + +<code>Returns</code> +

an int

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page index d421cbbb..e21a9c62 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page @@ -34,12 +34,16 @@ function inout3(inoutarg:Number):Number { -
-

inoutarg :

-

This is an argument test

-

Returns :

-

an int

-
+ + +<code>inoutarg</code> +

This is an argument test

+ + +<code>Returns</code> +

an int

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page index 93015f3c..c771d769 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page @@ -30,10 +30,12 @@ function method():Number { -
-

Returns :

-

an int

-
+ + +<code>Returns</code> +

an int

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page index 94f5173d..606e2b1b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page @@ -30,10 +30,12 @@ function notrans():GObject.Object { -
-

Returns :

-

An object, not referenced

-
+ + +<code>Returns</code> +

An object, not referenced

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page index 227eacc4..d4bf6b19 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page @@ -30,10 +30,12 @@ function out():Number { -
-

Returns :

-

an int

-
+ + +<code>Returns</code> +

an int

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page index 6940eca1..d1e428d4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page @@ -34,10 +34,12 @@ function parse_args(argv:[String]):void { -
-

argv :

-

Argument vector

-
+ + +<code>argv</code> +

Argument vector

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page index 6912c993..b1e4129a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page @@ -34,10 +34,12 @@ function set_data(data:[guint8]):void { -
-

data :

-

The data

-
+ + +<code>data</code> +

The data

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page index 68185d5e..402b1622 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page @@ -34,10 +34,12 @@ function set_data2(data:[gint8]):void { -
-

data :

-

The data

-
+ + +<code>data</code> +

The data

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page index 62dcf839..8c54d3b8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page @@ -35,10 +35,12 @@ type.

-
-

data :

-

The data

-
+ + +<code>data</code> +

The data

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page index 91f12525..59321295 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page @@ -30,10 +30,12 @@ function string_out():Boolean { -
-

Returns :

-

some boolean

-
+ + +<code>Returns</code> +

some boolean

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page index 1d61e1de..36a1815c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page @@ -34,10 +34,12 @@ function use_buffer(bytes:guint8):void { -
-

bytes :

-
-
+ + +<code>bytes</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page index 3fa6debd..c9904095 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page @@ -34,10 +34,12 @@ function watch_full(func:Regress.AnnotationForeachFunc):void { -
-

func :

-

The callback

-
+ + +<code>func</code> +

The callback

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page index 5b0e46a9..8a77746f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page @@ -34,10 +34,12 @@ function with_voidp(data:gpointer):void { -
-

data :

-

Opaque pointer handle

-
+ + +<code>data</code> +

Opaque pointer handle

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page index 34f1ed7c..b59e7634 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page @@ -19,10 +19,12 @@ -
-

FooASingle.FOO_SOME_SINGLE_ENUM :

-
-
+ + +<code>FooASingle.FOO_SOME_SINGLE_ENUM</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page index 2dafde03..e3f52935 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page @@ -19,14 +19,20 @@ -
-

FooAddressType.INVALID :

-
-

FooAddressType.IPV4 :

-
-

FooAddressType.IPV6 :

-
-
+ + +<code>FooAddressType.INVALID</code> + + + +<code>FooAddressType.IPV4</code> + + + +<code>FooAddressType.IPV6</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page index f46e101a..975d5123 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page @@ -34,10 +34,12 @@ function add(b2:Regress.FooBRect):void { -
-

b2 :

-
-
+ + +<code>b2</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page index 66972b02..9476671b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page @@ -38,14 +38,20 @@ function new(x:Number, y:Number):Regress.FooBRect { -
-

x :

-
-

y :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>y</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page index 447c9913..270c8093 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page @@ -30,8 +30,8 @@ function method():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page index edad8cdf..8d86995c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page @@ -30,10 +30,12 @@ function new():Regress.FooBoxed { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page index 2a25e79a..5903a764 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page @@ -30,8 +30,8 @@ function some_method():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page index bbcd055b..0ba67e71 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page @@ -30,8 +30,8 @@ function method():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page index a46070da..443f25ea 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page @@ -19,14 +19,20 @@ -
-

FooEnumFullname.ONE :

-
-

FooEnumFullname.TWO :

-
-

FooEnumFullname.THREE :

-
-
+ + +<code>FooEnumFullname.ONE</code> + + + +<code>FooEnumFullname.TWO</code> + + + +<code>FooEnumFullname.THREE</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page index 2313192d..5957904b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page @@ -19,16 +19,24 @@ -
-

FooEnumNoType.UN :

-
-

FooEnumNoType.DEUX :

-
-

FooEnumNoType.TROIS :

-
-

FooEnumNoType.NEUF :

-
-
+ + +<code>FooEnumNoType.UN</code> + + + +<code>FooEnumNoType.DEUX</code> + + + +<code>FooEnumNoType.TROIS</code> + + + +<code>FooEnumNoType.NEUF</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page index 37510f5c..d052d4f5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page @@ -19,14 +19,20 @@ -
-

FooEnumType.ALPHA :

-
-

FooEnumType.BETA :

-
-

FooEnumType.DELTA :

-
-
+ + +<code>FooEnumType.ALPHA</code> + + + +<code>FooEnumType.BETA</code> + + + +<code>FooEnumType.DELTA</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page index 0877e7c8..5577eebe 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page @@ -19,14 +19,20 @@ -
-

FooError.GOOD :

-
-

FooError.BAD :

-
-

FooError.UGLY :

-
-
+ + +<code>FooError.GOOD</code> + + + +<code>FooError.BAD</code> + + + +<code>FooError.UGLY</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page index 9a3af8c0..97aff9ae 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page @@ -30,10 +30,12 @@ function copy():Regress.FooForeignStruct { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page index 3f9478af..7753c4ad 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page @@ -30,10 +30,12 @@ function new():Regress.FooForeignStruct { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page index 0148788f..b39c41f1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page @@ -23,10 +23,12 @@ function vfunc_do_regress_foo(x:Number):void { -
-

x :

-
-
+ + +<code>x</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page index 96cbe499..f992fca8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page @@ -34,10 +34,12 @@ function do_regress_foo(x:Number):void { -
-

x :

-
-
+ + +<code>x</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page index ff890981..e79716c7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page @@ -34,10 +34,12 @@ function static_method(x:Number):void { -
-

x :

-
-
+ + +<code>x</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page index 9c7b8ee5..72ee34e5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page @@ -23,12 +23,16 @@ function vfunc_read_fn(offset:Number, length:Number):void { -
-

offset :

-

offset

-

length :

-

length

-
+ + +<code>offset</code> +

offset

+ + +<code>length</code> +

length

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page index 96617abc..d41290f6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page @@ -23,20 +23,32 @@ function callback(foo_object, object:GObject.Object, p0:gpointer, user_param1, . -
-

foo_object :

-

instance of Regress.FooObject that is emitting the signal

-

object :

-
-

p0 :

-
-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-

Returns :

-
gchar*
-
+ + +<code>foo_object</code> +

instance of Regress.FooObject that is emitting the signal

+ + +<code>object</code> + + + +<code>p0</code> + + + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ + +<code>...</code> +

additional user parameters (if any)

+ + +<code>Returns</code> +

gchar*

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page index 0608ce16..aaf6bfa3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page @@ -23,12 +23,16 @@ function vfunc_virtual_method(first_param:Number):Boolean { -
-

first_param :

-
-

Returns :

-
-
+ + +<code>first_param</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page index ddc25bcc..5241c4f3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page @@ -34,10 +34,12 @@ function a_global_method(obj:Utility.Object):void { -
-

obj :

-
-
+ + +<code>obj</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page index 6929812e..8c700359 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page @@ -34,12 +34,16 @@ function append_new_stack_layer(x:Number):Regress.FooOtherObject { -
-

x :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page index 078402a5..baf2386c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page @@ -30,10 +30,12 @@ function dup_name():String { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page index 9b037def..71276178 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page @@ -30,10 +30,12 @@ function external_type():Utility.Object { -
-

Returns :

-

null always

-
+ + +<code>Returns</code> +

null always

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page index 733048bf..63027a5e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page @@ -31,10 +31,12 @@ uses a C sugar return type.

-
-

Returns :

-

The global

-
+ + +<code>Returns</code> +

The global

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page index 175cfd1b..54b6f10c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page @@ -30,10 +30,12 @@ function get_name():String { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page index ecc5f33c..4de3f713 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page @@ -34,10 +34,12 @@ function handle_glyph(glyph:Utility.Glyph):void { -
-

glyph :

-
-
+ + +<code>glyph</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page index cf8374c8..5586b96b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page @@ -34,10 +34,12 @@ function is_it_time_yet(time:Number):void { -
-

time :

-
-
+ + +<code>time</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page index ed357619..0cc61551 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page @@ -30,10 +30,12 @@ function new():Regress.FooObject { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page index 295cb68b..1245175f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page @@ -30,10 +30,12 @@ function new_as_super():GObject.Object { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page index a348b662..526a4fb7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page @@ -38,12 +38,16 @@ function read(offset:Number, length:Number):void { -
-

offset :

-

offset

-

length :

-

length

-
+ + +<code>offset</code> +

offset

+ + +<code>length</code> +

length

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page index b9c4f204..3bec5bb4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page @@ -30,10 +30,12 @@ function static_meth():Number { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page index cbe37447..6f861c78 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page @@ -38,12 +38,16 @@ function various(data:gpointer, some_type:GType):void { -
-

data :

-
-

some_type :

-
-
+ + +<code>data</code> + + + +<code>some_type</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page index fede11b4..980d4ef3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page @@ -34,12 +34,16 @@ function virtual_method(first_param:Number):Boolean { -
-

first_param :

-
-

Returns :

-
-
+ + +<code>first_param</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page index 1fcc81b6..18646a84 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page @@ -34,10 +34,12 @@ function add(r2:Regress.FooRectangle):void { -
-

r2 :

-

source rectangle

-
+ + +<code>r2</code> +

source rectangle

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page index 83ca6a12..bd7a445b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page @@ -19,26 +19,44 @@ -
-

FooStackLayer.DESKTOP :

-
-

FooStackLayer.BOTTOM :

-
-

FooStackLayer.NORMAL :

-
-

FooStackLayer.TOP :

-
-

FooStackLayer.DOCK :

-
-

FooStackLayer.FULLSCREEN :

-
-

FooStackLayer.FOCUSED_WINDOW :

-
-

FooStackLayer.OVERRIDE_REDIRECT :

-
-

FooStackLayer.LAST :

-
-
+ + +<code>FooStackLayer.DESKTOP</code> + + + +<code>FooStackLayer.BOTTOM</code> + + + +<code>FooStackLayer.NORMAL</code> + + + +<code>FooStackLayer.TOP</code> + + + +<code>FooStackLayer.DOCK</code> + + + +<code>FooStackLayer.FULLSCREEN</code> + + + +<code>FooStackLayer.FOCUSED_WINDOW</code> + + + +<code>FooStackLayer.OVERRIDE_REDIRECT</code> + + + +<code>FooStackLayer.LAST</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page index f73adeb5..a444574e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page @@ -23,14 +23,20 @@ function callback(foo_sub_interface, user_param1, ...):void; -
-

foo_sub_interface :

-

instance of Regress.FooSubInterface that is emitting the signal

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>foo_sub_interface</code> +

instance of Regress.FooSubInterface that is emitting the signal

+ + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ + +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page index caa25fe1..8df59ff4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page @@ -23,8 +23,8 @@ function vfunc_destroy_event():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page index f3dbed54..04a55514 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page @@ -23,8 +23,8 @@ function vfunc_do_bar():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page index 59e09b4a..b3e4bd7e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page @@ -23,10 +23,12 @@ function vfunc_do_baz(callback:GObject.Callback):void { -
-

callback :

-
-
+ + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page index e31cf574..7db9c6b5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page @@ -30,8 +30,8 @@ function do_bar():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page index e0751860..00fc1255 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page @@ -34,10 +34,12 @@ function do_baz(callback:GObject.Callback):void { -
-

callback :

-
-
+ + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page index a2a244f6..b9991b85 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page @@ -30,10 +30,12 @@ function new():Regress.FooSubobject { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page index fea8d58e..6a044d79 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page @@ -19,14 +19,20 @@ -
-

TestABCError.CODE1 :

-
-

TestABCError.CODE2 :

-
-

TestABCError.CODE3 :

-
-
+ + +<code>TestABCError.CODE1</code> + + + +<code>TestABCError.CODE2</code> + + + +<code>TestABCError.CODE3</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page index 59c0701f..d7fe0888 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page @@ -30,10 +30,12 @@ function copy():Regress.TestBoxed { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page index 4a4f394e..82819c87 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page @@ -34,12 +34,16 @@ function equals(other:Regress.TestBoxed):Boolean { -
-

other :

-
-

Returns :

-
-
+ + +<code>other</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page index 72921e74..9377348b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page @@ -30,10 +30,12 @@ function new():Regress.TestBoxed { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page index 72c866f3..915a79bf 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page @@ -34,12 +34,16 @@ function new_alternative_constructor1(i:Number):Regress.TestBoxed { -
-

i :

-
-

Returns :

-
-
+ + +<code>i</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page index e8e3cf91..7cdfd4f4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page @@ -38,14 +38,20 @@ function new_alternative_constructor2(i:Number, j:Number):Regress.TestBoxed { -
-

i :

-
-

j :

-
-

Returns :

-
-
+ + +<code>i</code> + + + +<code>j</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page index 1f516125..03623419 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page @@ -34,12 +34,16 @@ function new_alternative_constructor3(s:String):Regress.TestBoxed { -
-

s :

-
-

Returns :

-
-
+ + +<code>s</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page index 6fb2b3b0..c79a4d24 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page @@ -30,10 +30,12 @@ function copy():Regress.TestBoxedB { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page index dcf0105f..687c90d0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page @@ -38,14 +38,20 @@ function new(some_int8:gint8, some_long:Number):Regress.TestBoxedB { -
-

some_int8 :

-
-

some_long :

-
-

Returns :

-
-
+ + +<code>some_int8</code> + + + +<code>some_long</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page index 2475baed..25dd557a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page @@ -30,10 +30,12 @@ function new():Regress.TestBoxedC { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page index 9b9e0cac..f30d4724 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page @@ -30,10 +30,12 @@ function copy():Regress.TestBoxedD { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page index 1b96fd20..c6affa24 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page @@ -30,8 +30,8 @@ function free():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page index 8b7bf9a5..62465644 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page @@ -30,10 +30,12 @@ function get_magic():Number { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page index 0568050d..781cd994 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page @@ -38,14 +38,20 @@ function new(a_string:String, a_int:Number):Regress.TestBoxedD { -
-

a_string :

-
-

a_int :

-
-

Returns :

-
-
+ + +<code>a_string</code> + + + +<code>a_int</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page index b6f0eb88..6a92ba9a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page @@ -19,14 +19,20 @@ -
-

TestDEFError.CODE0 :

-
-

TestDEFError.CODE1 :

-
-

TestDEFError.CODE2 :

-
-
+ + +<code>TestDEFError.CODE0</code> + + + +<code>TestDEFError.CODE1</code> + + + +<code>TestDEFError.CODE2</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page index 3de1bbf6..9009dcda 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page @@ -19,16 +19,24 @@ -
-

TestEnum.VALUE1 :

-

value 1

-

TestEnum.VALUE2 :

-

value 2

-

TestEnum.VALUE3 :

-
-

TestEnum.VALUE4 :

-
-
+ + +<code>TestEnum.VALUE1</code> +

value 1

+ + +<code>TestEnum.VALUE2</code> +

value 2

+ + +<code>TestEnum.VALUE3</code> + + + +<code>TestEnum.VALUE4</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page index 625c8703..a0cd98cc 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page @@ -19,14 +19,20 @@ -
-

TestEnumNoGEnum.EVALUE1 :

-
-

TestEnumNoGEnum.EVALUE2 :

-
-

TestEnumNoGEnum.EVALUE3 :

-
-
+ + +<code>TestEnumNoGEnum.EVALUE1</code> + + + +<code>TestEnumNoGEnum.EVALUE2</code> + + + +<code>TestEnumNoGEnum.EVALUE3</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page index 3069d8e3..327cacc5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page @@ -19,12 +19,16 @@ -
-

TestEnumUnsigned.VALUE1 :

-
-

TestEnumUnsigned.VALUE2 :

-
-
+ + +<code>TestEnumUnsigned.VALUE1</code> + + + +<code>TestEnumUnsigned.VALUE2</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page index 57a21163..c635d0e0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page @@ -19,14 +19,20 @@ -
-

TestError.CODE1 :

-
-

TestError.CODE2 :

-
-

TestError.CODE3 :

-
-
+ + +<code>TestError.CODE1</code> + + + +<code>TestError.CODE2</code> + + + +<code>TestError.CODE3</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page index 889f5d1f..9ca5d060 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page @@ -30,10 +30,12 @@ function new():Regress.TestFloating { -
-

Returns :

-

A new floating

-
+ + +<code>Returns</code> +

A new floating

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page index c2c23f29..d887b198 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page @@ -30,10 +30,12 @@ function ref():Regress.TestFundamentalObject { -
-

Returns :

-

A new

-
+ + +<code>Returns</code> +

A new

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page index efeb0c3b..2e0932b6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page @@ -30,8 +30,8 @@ function unref():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page index d9b958aa..e879a7de 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page @@ -34,12 +34,16 @@ function new(data:String):Regress.TestFundamentalSubObject { -
-

data :

-
-

Returns :

-
-
+ + +<code>data</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page index 11c87305..9c1af712 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page @@ -34,10 +34,12 @@ function do_foo(x:Number):void { -
-

x :

-
-
+ + +<code>x</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page index 05917260..176b164d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page @@ -34,10 +34,12 @@ function do_foo_maybe_throw(x:Number):void { -
-

x :

-
-
+ + +<code>x</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page index 0c87efc9..17020c62 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page @@ -30,8 +30,8 @@ function get_origin():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page index 0fb936cc..e2444c69 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page @@ -30,8 +30,8 @@ function get_size():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page index 32565ee3..f8d71322 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page @@ -23,14 +23,20 @@ function callback(test_obj, user_param1, ...):void; -
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ + +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page index f16bc29d..874928d9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page @@ -23,10 +23,12 @@ function vfunc_allow_none_vfunc(two:Regress.TestObj):void { -
-

two :

-

Another object

-
+ + +<code>two</code> +

Another object

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page index b9938f6a..085c6987 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page @@ -23,14 +23,20 @@ function callback(test_obj, user_param1, ...):void; -
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ + +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page index ff33157e..1a521f97 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page @@ -23,14 +23,20 @@ function callback(test_obj, user_param1, ...):void; -
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ + +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page index 4133baa8..7b81f903 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page @@ -25,12 +25,16 @@ case.

-
-

somestr :

-

Meaningless string

-

Returns :

-
-
+ + +<code>somestr</code> +

Meaningless string

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page index d966ae2c..afc914fa 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page @@ -24,16 +24,24 @@ function callback(test_obj, arr:[Number], user_param1, ...):void; -
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

arr :

-

numbers

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>arr</code> +

numbers

+ + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ + +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page index 8ffd0af2..d79c6f78 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page @@ -23,16 +23,24 @@ function callback(test_obj, cr:cairo.Context, user_param1, ...):void; -
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

cr :

-

A cairo context.

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>cr</code> +

A cairo context.

+ + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ + +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page index 154181c4..ec5e4e1e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page @@ -24,16 +24,24 @@ function callback(test_obj, hash:{String: GObject.Value}, user_param1, ...):void -
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

hash :

-
-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>hash</code> + + + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ + +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page index beebb08a..28d4cf96 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page @@ -24,18 +24,28 @@ the introspection client langage.

-
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

i :

-

an integer

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-

Returns :

-
gint64
-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>i</code> +

an integer

+ + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ + +<code>...</code> +

additional user parameters (if any)

+ + +<code>Returns</code> +

gint64

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page index cad30933..ef623d9f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page @@ -23,16 +23,24 @@ function callback(test_obj, i:Number, user_param1, ...):[Number]; -
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

i :

-

an integer

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>i</code> +

an integer

+ + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ + +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page index c56e7933..470fe4d6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page @@ -24,16 +24,24 @@ Use with regress_test_obj_emit_sig_with_obj

-
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

obj :

-

A newly created RegressTestObj

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>obj</code> +

A newly created RegressTestObj

+ + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ + +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page index 9f4461dd..812891cc 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page @@ -23,16 +23,24 @@ function callback(test_obj, strs:[String], user_param1, ...):void; -
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

strs :

-

strings

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>strs</code> +

strings

+ + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ + +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page index 870aefa5..80e75635 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -24,18 +24,28 @@ the introspection client langage.

-
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

i :

-

an integer

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-

Returns :

-
guint64
-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>i</code> +

an integer

+ + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ + +<code>...</code> +

additional user parameters (if any)

+ + +<code>Returns</code> +

guint64

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page index ee0ed943..ec06fff0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page @@ -23,16 +23,24 @@ function callback(test_obj, object:Regress.TestSimpleBoxedA, user_param1, ...):v -
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

object :

-
-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>object</code> + + + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ + +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page index 6180999b..604283d6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page @@ -23,14 +23,20 @@ function callback(test_obj, user_param1, ...):void; -
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ + +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page index b22362d6..e41bb1dd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page @@ -30,10 +30,12 @@ function constructor():Regress.TestObj { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page index 1d35e44b..aa1e5f3d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page @@ -36,12 +36,16 @@ case.

-
-

somestr :

-

Meaningless string

-

Returns :

-
-
+ + +<code>somestr</code> +

Meaningless string

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page index da6e8b22..00967896 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page @@ -30,8 +30,8 @@ function emit_sig_with_foreign_struct():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page index 4f54523f..029b8847 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page @@ -30,8 +30,8 @@ function emit_sig_with_int64():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page index 1bdcd9c3..49974155 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page @@ -30,8 +30,8 @@ function emit_sig_with_obj():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page index 06b4bf52..491828af 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page @@ -30,8 +30,8 @@ function emit_sig_with_uint64():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page index abb6c63c..f70bfbe9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page @@ -30,8 +30,8 @@ function forced_method():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page index aa903206..636d2167 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page @@ -30,10 +30,12 @@ function instance_method():Number { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page index bd5ceaf3..9fc14087 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page @@ -34,10 +34,12 @@ function instance_method_callback(callback:Regress.TestCallback):void { -
-

callback :

-
-
+ + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page index a9df4838..23910861 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page @@ -34,12 +34,16 @@ function new(obj:Regress.TestObj):Regress.TestObj { -
-

obj :

-

A

-

Returns :

-
-
+ + +<code>obj</code> +

A

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page index 1af95263..49cdd8e4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page @@ -34,12 +34,16 @@ function new_callback(callback:Regress.TestCallbackUserData):Regress.TestObj { -
-

callback :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page index c12559a9..ae4dd140 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page @@ -34,12 +34,16 @@ function new_from_file(x:String):Regress.TestObj { -
-

x :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page index f194391a..fed5b0a3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page @@ -30,8 +30,8 @@ function null_out():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page index 3a963cad..b4da15e4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page @@ -34,10 +34,12 @@ function set_bare(bare:GObject.Object):void { -
-

bare :

-
-
+ + +<code>bare</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page index 200835be..14cc9da4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page @@ -50,20 +50,32 @@ function skip_inout_param(a:Number, c:Number, inout_d:Number, num1:Number, num2: -
-

a :

-

Parameter.

-

c :

-

Other parameter.

-

inout_d :

-

Will be incremented.

-

num1 :

-

Number.

-

num2 :

-

Number.

-

Returns :

-

true if the call succeeds, false if @error is set.

-
+ + +<code>a</code> +

Parameter.

+ + +<code>c</code> +

Other parameter.

+ + +<code>inout_d</code> +

Will be incremented.

+ + +<code>num1</code> +

Number.

+ + +<code>num2</code> +

Number.

+ + +<code>Returns</code> +

true if the call succeeds, false if @error is set.

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page index 7ee261d9..3a447770 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page @@ -50,20 +50,32 @@ function skip_out_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Nu -
-

a :

-

Parameter.

-

c :

-

Other parameter.

-

inout_d :

-

Will be incremented.

-

num1 :

-

Number.

-

num2 :

-

Number.

-

Returns :

-

true if the call succeeds, false if @error is set.

-
+ + +<code>a</code> +

Parameter.

+ + +<code>c</code> +

Other parameter.

+ + +<code>inout_d</code> +

Will be incremented.

+ + +<code>num1</code> +

Number.

+ + +<code>num2</code> +

Number.

+ + +<code>Returns</code> +

true if the call succeeds, false if @error is set.

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page index 8b5a6a76..e6e4535b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page @@ -50,20 +50,32 @@ function skip_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number -
-

a :

-

Parameter.

-

c :

-

Other parameter.

-

inout_d :

-

Will be incremented.

-

num1 :

-

Number.

-

num2 :

-

Number.

-

Returns :

-

true if the call succeeds, false if @error is set.

-
+ + +<code>a</code> +

Parameter.

+ + +<code>c</code> +

Other parameter.

+ + +<code>inout_d</code> +

Will be incremented.

+ + +<code>num1</code> +

Number.

+ + +<code>num2</code> +

Number.

+ + +<code>Returns</code> +

true if the call succeeds, false if @error is set.

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page index e8aa83c8..7323da2b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page @@ -50,20 +50,32 @@ function skip_return_val(a:Number, c:Number, inout_d:Number, num1:Number, num2:N -
-

a :

-

Parameter.

-

c :

-

Other parameter.

-

inout_d :

-

Will be incremented.

-

num1 :

-

Number.

-

num2 :

-

Number.

-

Returns :

-

true if the call succeeds, false if @error is set.

-
+ + +<code>a</code> +

Parameter.

+ + +<code>c</code> +

Other parameter.

+ + +<code>inout_d</code> +

Will be incremented.

+ + +<code>num1</code> +

Number.

+ + +<code>num2</code> +

Number.

+ + +<code>Returns</code> +

true if the call succeeds, false if @error is set.

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page index 875164b9..84807b3b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page @@ -35,12 +35,16 @@ raise an error.

-
-

a :

-

Parameter.

-

Returns :

-

true if the call succeeds, false if @error is set.

-
+ + +<code>a</code> +

Parameter.

+ + +<code>Returns</code> +

true if the call succeeds, false if @error is set.

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page index 53cbdd2e..4744d5fc 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page @@ -34,12 +34,16 @@ function static_method(x:Number):Number { -
-

x :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page index a2b3868d..d4281868 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page @@ -34,10 +34,12 @@ function static_method_callback(callback:Regress.TestCallback):void { -
-

callback :

-
-
+ + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page index 01f97d61..fa7d17be 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page @@ -42,14 +42,20 @@ function torture_signature_0(x:Number, foo:String, m:Number):void { -
-

x :

-
-

foo :

-
-

m :

-
-
+ + +<code>x</code> + + + +<code>foo</code> + + + +<code>m</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page index 205b1a31..20946935 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page @@ -42,16 +42,24 @@ function torture_signature_1(x:Number, foo:String, m:Number):Boolean { -
-

x :

-
-

foo :

-
-

m :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>foo</code> + + + +<code>m</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page index 1d907d24..d1887d5e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page @@ -19,14 +19,20 @@ -
-

TestOtherError.CODE1 :

-
-

TestOtherError.CODE2 :

-
-

TestOtherError.CODE3 :

-
-
+ + +<code>TestOtherError.CODE1</code> + + + +<code>TestOtherError.CODE2</code> + + + +<code>TestOtherError.CODE3</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page index ab33fce3..81a0049d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page @@ -30,10 +30,12 @@ function const_return():Regress.TestSimpleBoxedA { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page index c4559527..e7d1c811 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page @@ -30,10 +30,12 @@ function copy():Regress.TestSimpleBoxedA { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page index de4ade80..91197290 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page @@ -34,12 +34,16 @@ function equals(other_a:Regress.TestSimpleBoxedA):Boolean { -
-

other_a :

-
-

Returns :

-
-
+ + +<code>other_a</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page index 695bed63..0db8a8da 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page @@ -30,10 +30,12 @@ function copy():Regress.TestSimpleBoxedB { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page index 8e50284e..f023cfe7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page @@ -30,8 +30,8 @@ function clone():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page index 3577ad78..22038bad 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page @@ -34,10 +34,12 @@ function parse(string:String):void { -
-

string :

-

ignored

-
+ + +<code>string</code> +

ignored

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page index ce72cfd1..692f8997 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page @@ -30,8 +30,8 @@ function clone():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page index a72301a2..b3cdcd78 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page @@ -30,8 +30,8 @@ function frob():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page index d537cb6e..e55a1c37 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page @@ -30,10 +30,12 @@ function instance_method():Number { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page index 86fcd533..91236d2a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page @@ -30,10 +30,12 @@ function new():Regress.TestObj { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page index 391f291d..e297b4dc 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page @@ -30,8 +30,8 @@ function unset_bare():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page index e6bf3d37..f38ab9cd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page @@ -30,10 +30,12 @@ function get_testbool():Boolean { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page index 11f813db..9bcbcc11 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page @@ -30,10 +30,12 @@ function new():Regress.TestWi8021x { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page index 67356504..764aa43e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page @@ -34,10 +34,12 @@ function set_testbool(v:Boolean):void { -
-

v :

-
-
+ + +<code>v</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page index 632758a6..685c3110 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page @@ -34,12 +34,16 @@ function static_method(x:Number):Number { -
-

x :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page index fb7c16d0..5c57a1b4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page @@ -30,8 +30,8 @@ function aliased_caller_alloc():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page index 1547d02c..981fc543 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page @@ -38,14 +38,20 @@ function annotation_attribute_func(object:Regress.AnnotationObject, data:String) -
-

object :

-

A .

-

data :

-

Some data.

-

Returns :

-

The return value.

-
+ + +<code>object</code> +

A .

+ + +<code>data</code> +

Some data.

+ + +<code>Returns</code> +

The return value.

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page index 5c9042cc..a975754e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page @@ -35,10 +35,12 @@ detection, and fixing it via regress_annotations.

-
-

callback :

-

Destroy notification

-
+ + +<code>callback</code> +

Destroy notification

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page index cb782e6a..a227f73d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page @@ -30,10 +30,12 @@ function annotation_get_source_file():filename { -
-

Returns :

-

Source file

-
+ + +<code>Returns</code> +

Source file

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page index 753a719d..ae10b7ea 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page @@ -34,10 +34,12 @@ function annotation_init(argv:[String]):void { -
-

argv :

-

The arguments.

-
+ + +<code>argv</code> +

The arguments.

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page index 1d532dfb..a32b80fd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page @@ -34,10 +34,12 @@ function annotation_invalid_regress_annotation(foo:Number):void { -
-

foo :

-

some text (e.g. example) or else

-
+ + +<code>foo</code> +

some text (e.g. example) or else

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page index 8c1805fd..dd6de2a4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page @@ -34,10 +34,12 @@ function annotation_ptr_array(array:[GObject.Value]):void { -
-

array :

-

the array

-
+ + +<code>array</code> +

the array

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page index 842bd600..a400582a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page @@ -30,10 +30,12 @@ function annotation_return_array():[String] { -
-

Returns :

-

The return value

-
+ + +<code>Returns</code> +

The return value

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page index 6790d9ff..c590aecf 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page @@ -30,10 +30,12 @@ function annotation_return_filename():filename { -
-

Returns :

-

An annotated filename

-
+ + +<code>Returns</code> +

An annotated filename

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page index 151e84f6..46014527 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page @@ -34,10 +34,12 @@ function annotation_set_source_file(fname:filename):void { -
-

fname :

-

Source file

-
+ + +<code>fname</code> +

Source file

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page index de11fc5a..e8891e36 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page @@ -30,8 +30,8 @@ function annotation_space_after_comment_bug631690():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page index f1bbd9c4..bdb02611 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page @@ -34,10 +34,12 @@ function annotation_string_array_length(properties:[String]):void { -
-

properties :

-
-
+ + +<code>properties</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page index 00af2f16..05578955 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page @@ -30,10 +30,12 @@ function annotation_string_zero_terminated():[String] { -
-

Returns :

-

The return value

-
+ + +<code>Returns</code> +

The return value

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page index cf823b72..dce9addd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page @@ -34,10 +34,12 @@ function annotation_string_zero_terminated_out(out:[String]):void { -
-

out :

-
-
+ + +<code>out</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page index 8d954edd..b9f8a5c0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page @@ -30,10 +30,12 @@ function annotation_test_parsing_bug630862():GObject.Object { -
-

Returns :

-

An object, note the colon:in here

-
+ + +<code>Returns</code> +

An object, note the colon:in here

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page index e2466681..33bd9f40 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page @@ -30,10 +30,12 @@ function annotation_transfer_floating():GObject.Object { -
-

Returns :

-

A floating object

-
+ + +<code>Returns</code> +

A floating object

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page index f5aafc26..6693eb11 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page @@ -31,8 +31,8 @@ function annotation_versioned():void {

Since 0.6

-
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page index e72ee9b1..26b35573 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page @@ -30,10 +30,12 @@ function atest_error_quark():GLib.Quark { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page index c3db813e..4a3e9114 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page @@ -38,12 +38,16 @@ function foo_async_ready_callback(cancellable:Gio.Cancellable, callback:Gio.Asyn -
-

cancellable :

-
-

callback :

-
-
+ + +<code>cancellable</code> + + + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page index ac1b97d2..83a83544 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page @@ -34,10 +34,12 @@ function foo_destroy_notify_callback(callback:Regress.FooCallback):void { -
-

callback :

-
-
+ + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page index 242c00de..81fae432 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page @@ -30,10 +30,12 @@ function foo_init():Number { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page index e7f1c4f0..0e5168ed 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page @@ -46,16 +46,24 @@ function foo_method_external_references(object:Utility.Object, e:Utility.EnumTyp -
-

object :

-
-

e :

-
-

f :

-
-

s :

-
-
+ + +<code>object</code> + + + +<code>e</code> + + + +<code>f</code> + + + +<code>s</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page index 7efaffcf..38264daf 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page @@ -31,10 +31,12 @@ a "Can't find matching type for constructor" warning.

-
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page index c77f18a5..24d4000a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page @@ -30,10 +30,12 @@ function foo_test_array():[String] { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page index c46680c2..3cb9d8e9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page @@ -34,10 +34,12 @@ function foo_test_const_char_param(param:String):void { -
-

param :

-
-
+ + +<code>param</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page index f42f0a27..e4784320 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page @@ -30,10 +30,12 @@ function foo_test_const_char_retval():String { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page index 9a104a7e..b52e7d3c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page @@ -34,10 +34,12 @@ function foo_test_const_struct_param(param:Regress.FooStruct):void { -
-

param :

-
-
+ + +<code>param</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page index 7a3295d9..55213864 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page @@ -30,10 +30,12 @@ function foo_test_const_struct_retval():Regress.FooStruct { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page index 96239704..24dfaacb 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page @@ -34,10 +34,12 @@ function foo_test_string_array(array:[String]):void { -
-

array :

-
-
+ + +<code>array</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page index 872ed05f..b34cf4f5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page @@ -34,10 +34,12 @@ function foo_test_string_array_with_g(array:[String]):void { -
-

array :

-
-
+ + +<code>array</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page index 8545e846..ebd9a0f6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page @@ -34,10 +34,12 @@ function foo_test_unsigned_qualifier(unsigned_param:Number):void { -
-

unsigned_param :

-
-
+ + +<code>unsigned_param</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page index 25bfbd94..f62023ed 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page @@ -34,10 +34,12 @@ function foo_test_unsigned_type(unsigned_param:Number):void { -
-

unsigned_param :

-
-
+ + +<code>unsigned_param</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page index 1b8cab1b..79a12aae 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page @@ -34,10 +34,12 @@ function func_obj_null_in(obj:Regress.TestObj):void { -
-

obj :

-

A

-
+ + +<code>obj</code> +

A

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page index df39d486..741a3536 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page @@ -30,8 +30,8 @@ function global_get_flags_out():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page index 39013096..f147b84c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page @@ -39,12 +39,16 @@ libgnome-keyring.

-
-

foo :

-

some int

-

attributes :

-

list of attributes

-
+ + +<code>foo</code> +

some int

+ + +<code>attributes</code> +

list of attributes

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page index 9d7f75de..f1388183 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page @@ -34,10 +34,12 @@ function introspectable_via_alias(data:Regress.PtrArrayAlias):void { -
-

data :

-
-
+ + +<code>data</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page index 8d85040f..cfddc655 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page @@ -34,10 +34,12 @@ function set_abort_on_error(abort_on_error:Boolean):void { -
-

abort_on_error :

-
-
+ + +<code>abort_on_error</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page index bf026dbb..d5d324c3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page @@ -34,12 +34,16 @@ function test_array_callback(callback:Regress.TestCallbackArray):Number { -
-

callback :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page index c560c5af..0eab51d3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page @@ -30,8 +30,8 @@ function test_array_fixed_out_objects():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page index 9670d04e..1f570f33 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page @@ -34,12 +34,16 @@ function test_array_fixed_size_int_in(ints:[Number]):Number { -
-

ints :

-

a list of 5 integers

-

Returns :

-

the sum of the items in ints

-
+ + +<code>ints</code> +

a list of 5 integers

+ + +<code>Returns</code> +

the sum of the items in ints

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page index e3519249..e10c883f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page @@ -30,8 +30,8 @@ function test_array_fixed_size_int_out():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page index 7773cf28..18179bf9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page @@ -30,10 +30,12 @@ function test_array_fixed_size_int_return():[Number] { -
-

Returns :

-

a list of 5 integers ranging from 0 to 4

-
+ + +<code>Returns</code> +

a list of 5 integers ranging from 0 to 4

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page index 20a8fb15..b15076fa 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page @@ -34,12 +34,16 @@ function test_array_gint16_in(ints:[gint16]):Number { -
-

ints :

-

List of ints

-

Returns :

-
-
+ + +<code>ints</code> +

List of ints

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page index 121a81f9..f92ad910 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page @@ -34,12 +34,16 @@ function test_array_gint32_in(ints:[gint32]):gint32 { -
-

ints :

-

List of ints

-

Returns :

-
-
+ + +<code>ints</code> +

List of ints

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page index 82652a5f..98a57d55 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page @@ -34,12 +34,16 @@ function test_array_gint64_in(ints:[Number]):Number { -
-

ints :

-

List of ints

-

Returns :

-
-
+ + +<code>ints</code> +

List of ints

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page index 0ed3479c..fbaae440 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page @@ -34,12 +34,16 @@ function test_array_gint8_in(ints:[gint8]):Number { -
-

ints :

-

List of ints

-

Returns :

-
-
+ + +<code>ints</code> +

List of ints

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page index e7acd2b9..04889436 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page @@ -34,12 +34,16 @@ function test_array_gtype_in(types:[GType]):String { -
-

types :

-

List of types

-

Returns :

-

string representation of provided types

-
+ + +<code>types</code> +

List of types

+ + +<code>Returns</code> +

string representation of provided types

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page index c7f8ddd6..d2b0ab8f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page @@ -30,10 +30,12 @@ function test_array_int_full_out():[Number] { -
-

Returns :

-

a new array of integers.

-
+ + +<code>Returns</code> +

a new array of integers.

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page index 9339276a..c3b26b24 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page @@ -34,12 +34,16 @@ function test_array_int_in(ints:[Number]):Number { -
-

ints :

-

List of ints

-

Returns :

-
-
+ + +<code>ints</code> +

List of ints

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page index 4f1fc06d..118056fd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page @@ -34,10 +34,12 @@ function test_array_int_inout(ints:[Number]):void { -
-

ints :

-

a list of integers whose items will be increased by 1, except the first that will be dropped

-
+ + +<code>ints</code> +

a list of integers whose items will be increased by 1, except the first that will be dropped

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page index 1c47a95a..a841e04f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page @@ -30,10 +30,12 @@ function test_array_int_none_out():[Number] { -
-

Returns :

-

a static array of integers.

-
+ + +<code>Returns</code> +

a static array of integers.

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page index b37cb539..eadf5908 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page @@ -34,10 +34,12 @@ function test_array_int_null_in(arr:[Number]):void { -
-

arr :

-
-
+ + +<code>arr</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page index bdc8eabb..c50b6202 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page @@ -30,8 +30,8 @@ function test_array_int_null_out():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page index 987667f7..ba2b3497 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page @@ -30,8 +30,8 @@ function test_array_int_out():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page index c6ccd906..c7cd25e8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page @@ -34,10 +34,12 @@ function test_async_ready_callback(callback:Gio.AsyncReadyCallback):void { -
-

callback :

-
-
+ + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page index 9e505ac4..15f8a674 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page @@ -34,12 +34,16 @@ function test_boolean(in:Boolean):Boolean { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page index 3d3aec15..2c35db30 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page @@ -34,12 +34,16 @@ function test_boolean_false(in:Boolean):Boolean { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page index a25d7048..0206b085 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page @@ -34,12 +34,16 @@ function test_boolean_true(in:Boolean):Boolean { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page index d51550e7..d78865d2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page @@ -30,10 +30,12 @@ function test_cairo_context_full_return():cairo.Context { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page index b0f4f9b2..9abd2d19 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page @@ -34,10 +34,12 @@ function test_cairo_context_none_in(context:cairo.Context):void { -
-

context :

-
-
+ + +<code>context</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page index be96339d..c0d66757 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page @@ -30,8 +30,8 @@ function test_cairo_surface_full_out():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page index be1ca3f1..eee51f17 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page @@ -30,10 +30,12 @@ function test_cairo_surface_full_return():cairo.Surface { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page index e875ab1d..ef6d4cc3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page @@ -34,10 +34,12 @@ function test_cairo_surface_none_in(surface:cairo.Surface):void { -
-

surface :

-
-
+ + +<code>surface</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page index cbfd688e..cec71274 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page @@ -30,10 +30,12 @@ function test_cairo_surface_none_return():cairo.Surface { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page index a9db3a5a..57970867 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page @@ -34,12 +34,16 @@ function test_callback(callback:Regress.TestCallback):Number { -
-

callback :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page index f9db1242..b281ca74 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page @@ -34,10 +34,12 @@ function test_callback_async(callback:Regress.TestCallbackUserData):void { -
-

callback :

-
-
+ + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page index 3e0c93e3..18496d52 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page @@ -35,12 +35,16 @@ is invoked.

-
-

callback :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page index a009729e..6679446f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page @@ -35,12 +35,16 @@ condition in bindings which needs to be tested.

-
-

callback :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page index 10d2088b..592d8e07 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page @@ -30,10 +30,12 @@ function test_callback_thaw_async():Number { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page index 49c482ca..24e0e24a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page @@ -32,10 +32,12 @@ corresponding destroy notfications.

-
-

Returns :

-

Sum of the return values of the invoked callbacks.

-
+ + +<code>Returns</code> +

Sum of the return values of the invoked callbacks.

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page index c17015a1..5e824a94 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page @@ -35,12 +35,16 @@ call and can be released on return.

-
-

callback :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page index 23347814..ee8f0253 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page @@ -34,12 +34,16 @@ function test_closure(closure:GObject.Closure):Number { -
-

closure :

-
-

Returns :

-
-
+ + +<code>closure</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page index 71d015b6..3df43b83 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page @@ -38,14 +38,20 @@ function test_closure_one_arg(closure:GObject.Closure, arg:Number):Number { -
-

closure :

-
-

arg :

-
-

Returns :

-
-
+ + +<code>closure</code> + + + +<code>arg</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page index f0d84088..e54fd5ae 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page @@ -38,14 +38,20 @@ function test_closure_variant(closure:GObject.Closure, arg:GLib.Variant):GLib.Va -
-

closure :

-

GClosure which takes one GVariant and returns a GVariant

-

arg :

-

a GVariant passed as argument to closure

-

Returns :

-

the return value of closure

-
+ + +<code>closure</code> +

GClosure which takes one GVariant and returns a GVariant

+ + +<code>arg</code> +

a GVariant passed as argument to closure

+ + +<code>Returns</code> +

the return value of closure

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page index 1bbead66..c6a75d7f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page @@ -30,10 +30,12 @@ function test_date_in_gvalue():GObject.Value { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page index c93ebefd..46d62afc 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page @@ -30,10 +30,12 @@ function test_def_error_quark():GLib.Quark { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page index 3074d369..7be3ebd4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page @@ -34,12 +34,16 @@ function test_double(in:Number):Number { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page index 7922381c..e4c935f7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page @@ -30,10 +30,12 @@ function test_filename_return():[filename] { -
-

Returns :

-

list of strings

-
+ + +<code>Returns</code> +

list of strings

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page index e255ede8..27952a27 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page @@ -34,12 +34,16 @@ function test_float(in:Number):Number { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page index 996d9d1c..5dad9446 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page @@ -30,10 +30,12 @@ function test_garray_container_return():[String] { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page index 9b9bfbe4..35b90f87 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page @@ -30,10 +30,12 @@ function test_garray_full_return():[String] { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page index f34a4220..4d7bc884 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page @@ -34,10 +34,12 @@ function test_gerror_callback(callback:Regress.TestCallbackGError):void { -
-

callback :

-
-
+ + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page index 46f1663d..e15eb13b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page @@ -30,10 +30,12 @@ function test_ghash_container_return():{String: String} { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page index 863d3a6e..0b0d347e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page @@ -30,10 +30,12 @@ function test_ghash_everything_return():{String: String} { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page index 629039dc..2556237f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page @@ -34,10 +34,12 @@ function test_ghash_gvalue_in(hash:{String: GObject.Value}):void { -
-

hash :

-

the hash table returned by .

-
+ + +<code>hash</code> +

the hash table returned by .

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page index 881fc772..8a9fe982 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page @@ -30,10 +30,12 @@ function test_ghash_gvalue_return():{String: GObject.Value} { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page index a7503357..c2701df3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page @@ -30,10 +30,12 @@ function test_ghash_nested_everything_return():{String: {String: String}} { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page index ec6d7128..896e346d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page @@ -31,10 +31,12 @@ element-type annotation.

-
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page index d54a6594..438f5abe 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page @@ -34,10 +34,12 @@ function test_ghash_nothing_in(in:{String: String}):void { -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page index a6d376e1..2dc3aa8d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page @@ -34,10 +34,12 @@ function test_ghash_nothing_in2(in:{String: String}):void { -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page index 5e18e086..4ee392e8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page @@ -30,10 +30,12 @@ function test_ghash_nothing_return():{String: String} { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page index fe99a700..492f6536 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page @@ -30,10 +30,12 @@ function test_ghash_nothing_return2():{String: String} { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page index f984cc68..52dd2654 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page @@ -34,10 +34,12 @@ function test_ghash_null_in(in:{String: String}):void { -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page index e4c1583d..09d222d9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page @@ -30,8 +30,8 @@ function test_ghash_null_out():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page index 60c23f56..dac341f7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page @@ -30,10 +30,12 @@ function test_ghash_null_return():{String: String} { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page index d35f72b9..0e6cc956 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page @@ -30,10 +30,12 @@ function test_glist_container_return():[String] { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page index 4989dd86..a58d9261 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page @@ -30,10 +30,12 @@ function test_glist_everything_return():[String] { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page index 9b13e1b3..3e144833 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page @@ -34,10 +34,12 @@ function test_glist_nothing_in(in:[String]):void { -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page index 84037606..b22fd185 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page @@ -34,10 +34,12 @@ function test_glist_nothing_in2(in:[String]):void { -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page index 9ae9a958..ec649721 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page @@ -30,10 +30,12 @@ function test_glist_nothing_return():[String] { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page index 069f5b0b..b31d98ff 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page @@ -30,10 +30,12 @@ function test_glist_nothing_return2():[String] { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page index 8426bbff..6add7cec 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page @@ -34,10 +34,12 @@ function test_glist_null_in(in:[String]):void { -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page index 5b82c2e4..b13cc9a0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page @@ -30,8 +30,8 @@ function test_glist_null_out():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page index 7dd60e37..19f70911 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page @@ -30,10 +30,12 @@ function test_gslist_container_return():[String] { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page index c65a3490..53936460 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page @@ -30,10 +30,12 @@ function test_gslist_everything_return():[String] { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page index 3c09413a..e011db60 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page @@ -34,10 +34,12 @@ function test_gslist_nothing_in(in:[String]):void { -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page index 5eb3aa3f..0e718211 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page @@ -34,10 +34,12 @@ function test_gslist_nothing_in2(in:[String]):void { -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page index 80f6f7e2..dc11a421 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page @@ -30,10 +30,12 @@ function test_gslist_nothing_return():[String] { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page index 3119bf03..5e1c5646 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page @@ -30,10 +30,12 @@ function test_gslist_nothing_return2():[String] { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page index 3cc8d428..e6987019 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page @@ -34,10 +34,12 @@ function test_gslist_null_in(in:[String]):void { -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page index a25e08e9..5c25956d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page @@ -30,8 +30,8 @@ function test_gslist_null_out():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page index 9adb3fad..d2a438d4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page @@ -34,12 +34,16 @@ function test_gtype(in:GType):GType { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page index 8558a6bd..0d301a9e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page @@ -30,10 +30,12 @@ function test_gvariant_as():GLib.Variant { -
-

Returns :

-

New variant

-
+ + +<code>Returns</code> +

New variant

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page index 2671f72e..fa477da4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page @@ -30,10 +30,12 @@ function test_gvariant_asv():GLib.Variant { -
-

Returns :

-

New variant

-
+ + +<code>Returns</code> +

New variant

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page index e54e6221..7af092f2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page @@ -30,10 +30,12 @@ function test_gvariant_i():GLib.Variant { -
-

Returns :

-

New variant

-
+ + +<code>Returns</code> +

New variant

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page index 61cf1e7c..b98b64d1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page @@ -30,10 +30,12 @@ function test_gvariant_s():GLib.Variant { -
-

Returns :

-

New variant

-
+ + +<code>Returns</code> +

New variant

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page index 3cecce56..49874551 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page @@ -30,10 +30,12 @@ function test_gvariant_v():GLib.Variant { -
-

Returns :

-

New variant

-
+ + +<code>Returns</code> +

New variant

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page index 67790100..9f215d76 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page @@ -38,12 +38,16 @@ function test_hash_table_callback(data:{String: Number}, callback:Regress.TestCa -
-

data :

-

GHashTable that gets passed to callback

-

callback :

-
-
+ + +<code>data</code> +

GHashTable that gets passed to callback

+ + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page index 5007da2f..31b8b674 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page @@ -34,12 +34,16 @@ function test_int(in:Number):Number { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page index 16a4a0b2..f2f39024 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page @@ -34,12 +34,16 @@ function test_int16(in:gint16):gint16 { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page index e8ecc278..c254ed41 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page @@ -34,12 +34,16 @@ function test_int32(in:gint32):gint32 { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page index 16851bbd..a30895ea 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page @@ -34,12 +34,16 @@ function test_int64(in:Number):Number { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page index c4f86698..ba53b828 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page @@ -34,12 +34,16 @@ function test_int8(in:gint8):gint8 { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page index 3f1aac0d..971e6580 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page @@ -34,10 +34,12 @@ function test_int_out_utf8(in:String):void { -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page index a7fc7317..866be0d2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page @@ -34,12 +34,16 @@ function test_int_value_arg(v:GObject.Value):Number { -
-

v :

-
-

Returns :

-
-
+ + +<code>v</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page index fb7aa3f4..9eeddeaa 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page @@ -34,12 +34,16 @@ function test_long(in:Number):Number { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page index 56fc3228..519ce43a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page @@ -34,12 +34,16 @@ function test_multi_callback(callback:Regress.TestCallback):Number { -
-

callback :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page index 5a699956..70d56ced 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page @@ -34,10 +34,12 @@ function test_multi_double_args(in:Number):void { -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page index 21e97a2f..75e42218 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page @@ -30,8 +30,8 @@ function test_multiline_doc_comments():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page index 087a2482..3ee62390 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page @@ -59,10 +59,12 @@ rgb(20%, 30%, 0%)</literallayout></entry> -
-

a :

-

An integer

-
+ + +<code>a</code> +

An integer

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page index 632be614..710af513 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page @@ -34,10 +34,12 @@ function test_null_gerror_callback(callback:Regress.TestCallbackGError):void { -
-

callback :

-
-
+ + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page index 5266607c..e966fe86 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page @@ -34,10 +34,12 @@ function test_owned_gerror_callback(callback:Regress.TestCallbackOwnedGError):vo -
-

callback :

-
-
+ + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page index ade0d1ec..1c53e163 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page @@ -34,12 +34,16 @@ function test_short(in:gshort):gshort { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page index 1c44d090..d6e596c9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page @@ -34,10 +34,12 @@ function test_simple_callback(callback:Regress.TestSimpleCallback):void { -
-

callback :

-
-
+ + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page index eead974e..fe3f5b42 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page @@ -34,12 +34,16 @@ function test_size(in:gsize):gsize { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page index 53c93808..77bc9cd9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page @@ -34,12 +34,16 @@ function test_ssize(in:gssize):gssize { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page index ab2afcab..880f489d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page @@ -34,12 +34,16 @@ function test_strv_in(arr:[String]):Boolean { -
-

arr :

-
-

Returns :

-
-
+ + +<code>arr</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page index 8a025d32..04444570 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page @@ -30,10 +30,12 @@ function test_strv_in_gvalue():GObject.Value { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page index b9273dd9..b475f63b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page @@ -30,10 +30,12 @@ function test_strv_out():[String] { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page index b7854212..69239d57 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page @@ -30,10 +30,12 @@ function test_strv_out_c():[String] { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page index dcf19318..17b55812 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page @@ -30,10 +30,12 @@ function test_strv_out_container():[String] { -
-

Returns :

-
-
+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page index a465b61d..63bde333 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page @@ -30,8 +30,8 @@ function test_strv_outarg():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page index f75c9ad9..be54bccd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page @@ -34,12 +34,16 @@ function test_timet(in:Number):Number { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page index 269f16ac..af5810f1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page @@ -42,14 +42,20 @@ function test_torture_signature_0(x:Number, foo:String, m:Number):void { -
-

x :

-
-

foo :

-
-

m :

-
-
+ + +<code>x</code> + + + +<code>foo</code> + + + +<code>m</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page index 7951588f..915fdfe7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page @@ -42,16 +42,24 @@ function test_torture_signature_1(x:Number, foo:String, m:Number):Boolean { -
-

x :

-
-

foo :

-
-

m :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>foo</code> + + + +<code>m</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page index 4504cf42..ac694000 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page @@ -46,16 +46,24 @@ function test_torture_signature_2(x:Number, callback:Regress.TestCallbackUserDat -
-

x :

-
-

callback :

-
-

foo :

-
-

m :

-
-
+ + +<code>x</code> + + + +<code>callback</code> + + + +<code>foo</code> + + + +<code>m</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page index 0c514f34..deb1e900 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page @@ -34,12 +34,16 @@ function test_uint(in:Number):Number { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page index dc0601f8..357dcc5b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page @@ -34,12 +34,16 @@ function test_uint16(in:guint16):guint16 { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page index 282967df..445dbffb 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page @@ -34,12 +34,16 @@ function test_uint32(in:guint32):guint32 { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page index ec408e66..f77993c6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page @@ -34,12 +34,16 @@ function test_uint64(in:Number):Number { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page index 77ac3334..4f099b7b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page @@ -34,12 +34,16 @@ function test_uint8(in:guint8):guint8 { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page index 4eb5f81d..5ad91424 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page @@ -34,12 +34,16 @@ function test_ulong(in:Number):Number { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page index 23a78300..2a10fb32 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page @@ -34,12 +34,16 @@ function test_unichar(in:String):String { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page index 0bbc1735..9da74e6f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page @@ -34,12 +34,16 @@ function test_unsigned_enum_param(e:Regress.TestEnumUnsigned):String { -
-

e :

-
-

Returns :

-
-
+ + +<code>e</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page index 3a7b2607..9dd5ddc0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page @@ -34,12 +34,16 @@ function test_ushort(in:gushort):gushort { -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page index 9bfb3fd9..7b1f74d9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page @@ -34,10 +34,12 @@ function test_utf8_const_in(in:String):void { -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page index d8c76555..514a5654 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page @@ -30,10 +30,12 @@ function test_utf8_const_return():String { -
-

Returns :

-

UTF-8 string

-
+ + +<code>Returns</code> +

UTF-8 string

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page index df85d8a8..cf5ce4ac 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page @@ -34,10 +34,12 @@ function test_utf8_inout(inout:String):void { -
-

inout :

-
-
+ + +<code>inout</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page index d4a00847..3b0e3c85 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page @@ -30,10 +30,12 @@ function test_utf8_nonconst_return():String { -
-

Returns :

-

UTF-8 string

-
+ + +<code>Returns</code> +

UTF-8 string

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page index 15c583bd..ba9f2509 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page @@ -34,10 +34,12 @@ function test_utf8_null_in(in:String):void { -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page index af8db3af..36e00220 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page @@ -30,8 +30,8 @@ function test_utf8_null_out():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page index 9692dc6b..0889a573 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page @@ -30,8 +30,8 @@ function test_utf8_out():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page index 4e2cf0ed..2feadbff 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page @@ -30,10 +30,12 @@ function test_utf8_out_nonconst_return():String { -
-

Returns :

-

a copy of "first"

-
+ + +<code>Returns</code> +

a copy of "first"

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page index 43e35d1c..39037cb1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page @@ -30,8 +30,8 @@ function test_utf8_out_out():void { -
-
+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page index 542af0ba..a554bf19 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page @@ -34,12 +34,16 @@ function test_value_return(i:Number):GObject.Value { -
-

i :

-

an int

-

Returns :

-

the int wrapped in a GValue.

-
+ + +<code>i</code> +

an int

+ + +<code>Returns</code> +

the int wrapped in a GValue.

+ + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page index d3cfc1d4..bfef4942 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page @@ -31,8 +31,8 @@ function test_versioning():void {

Since 1.32.1

-
-
+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page index dff139fd..119860d2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page @@ -19,14 +19,20 @@ -
-

ATestError.CODE0 :

-
-

ATestError.CODE1 :

-
-

ATestError.CODE2 :

-
-
+ + +<code>ATestError.CODE0</code> + + + +<code>ATestError.CODE1</code> + + + +<code>ATestError.CODE2</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page index 221c269a..f01e3bf8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page @@ -23,20 +23,30 @@ def callback(annotation_object, arg1, arg2, user_param1, ...) -
-

annotation_object :

-

instance of Regress.AnnotationObject that is emitting the signal

-

arg1 :

-

a value

-

arg2 :

-

another value

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-

Returns :

-
gchar*

the return value

-
+ + +<code>annotation_object</code> +

instance of Regress.AnnotationObject that is emitting the signal

+ + +<code>arg1</code> +

a value

+ + +<code>arg2</code> +

another value

+ +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ + +<code>Returns</code> +

gchar*

the return value

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page index 03b488b2..64994913 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page @@ -23,16 +23,22 @@ def callback(annotation_object, arg1, user_param1, ...) -
-

annotation_object :

-

instance of Regress.AnnotationObject that is emitting the signal

-

arg1 :

-
-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>annotation_object</code> +

instance of Regress.AnnotationObject that is emitting the signal

+ + +<code>arg1</code> + + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page index d0da8d63..250aca08 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page @@ -24,16 +24,22 @@ known by GObject as it's only marked as G_TYPE_POINTER

-
-

annotation_object :

-

instance of Regress.AnnotationObject that is emitting the signal

-

list :

-

a list of strings

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>annotation_object</code> +

instance of Regress.AnnotationObject that is emitting the signal

+ + +<code>list</code> +

a list of strings

+ +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page index 66e2ee60..4aaf7e83 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page @@ -25,16 +25,22 @@ it says it's pointer but it's actually a string.

Since 1.0

-
-

annotation_object :

-

instance of Regress.AnnotationObject that is emitting the signal

-

string :

-

a string

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>annotation_object</code> +

instance of Regress.AnnotationObject that is emitting the signal

+ + +<code>string</code> +

a string

+ +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page index 7d94a776..0fe1c050 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page @@ -39,14 +39,20 @@ def allow_none(self, somearg): -
-

self :

-

a

-

somearg :

-
-

Returns :

-

None always

-
+ + +<code>self</code> +

a

+ + +<code>somearg</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page index 157739d7..3f2107e5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page @@ -39,14 +39,20 @@ def calleeowns(self, toown): -
-

self :

-

a

-

toown :

-

a

-

Returns :

-

an int

-
+ + +<code>self</code> +

a

+ + +<code>toown</code> +

a

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page index e9436824..cd2c7d9c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page @@ -43,16 +43,24 @@ def calleesowns(self, toown1, toown2): -
-

self :

-

a

-

toown1 :

-

a

-

toown2 :

-

a

-

Returns :

-

an int

-
+ + +<code>self</code> +

a

+ + +<code>toown1</code> +

a

+ + +<code>toown2</code> +

a

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page index 31c8d37e..fcc89102 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page @@ -39,12 +39,16 @@ def compute_sum(self, nums): -
-

self :

-

a

-

nums :

-

Sequence of numbers

-
+ + +<code>self</code> +

a

+ + +<code>nums</code> +

Sequence of numbers

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page index f017eb3a..d929218f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page @@ -43,14 +43,20 @@ def compute_sum_n(self, nums, n_nums): -
-

self :

-

a

-

nums :

-

Sequence of numbers that are zero-terminated

-

n_nums :

-

Length of number array

-
+ + +<code>self</code> +

a

+ + +<code>nums</code> +

Sequence of numbers that are zero-terminated

+ + +<code>n_nums</code> +

Length of number array

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page index c7ae439f..053a368d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page @@ -43,14 +43,20 @@ def compute_sum_nz(self, nums, n_nums): -
-

self :

-

a

-

nums :

-

Sequence of numbers that are zero-terminated

-

n_nums :

-

Length of number array

-
+ + +<code>self</code> +

a

+ + +<code>nums</code> +

Sequence of numbers that are zero-terminated

+ + +<code>n_nums</code> +

Length of number array

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page index 66b74067..4ee8088c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page @@ -35,12 +35,16 @@ def create_object(self): -
-

self :

-

a

-

Returns :

-

The object

-
+ + +<code>self</code> +

a

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page index 648dc52b..4e79b26b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page @@ -35,12 +35,16 @@ def do_not_use(self): -
-

self :

-

a

-

Returns :

-

None always

-
+ + +<code>self</code> +

a

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page index b3fa22dd..5ddadfc6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page @@ -35,10 +35,12 @@ def extra_annos(self): -
-

self :

-
-
+ + +<code>self</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page index be20587c..0d34439f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page @@ -43,14 +43,20 @@ def foreach(self, func, user_data): -
-

self :

-

a

-

func :

-

Callback to invoke

-

user_data :

-

Callback user data

-
+ + +<code>self</code> +

a

+ + +<code>func</code> +

Callback to invoke

+ + +<code>user_data</code> +

Callback user data

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page index 66d4b85c..87cfede3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page @@ -36,12 +36,16 @@ objects.

-
-

self :

-

a

-

Returns :

-

hash table

-
+ + +<code>self</code> +

a

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page index d2883854..bd174a4d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page @@ -37,12 +37,16 @@ intentionally similar example to gtk_container_get_children

-
-

self :

-

a

-

Returns :

-

list of objects

-
+ + +<code>self</code> +

a

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page index 6b5f4391..698180b7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page @@ -36,12 +36,16 @@ each string needs to be freed.

-
-

self :

-

a

-

Returns :

-

list of strings

-
+ + +<code>self</code> +

a

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page index 328a7bac..5dd1e2b9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page @@ -35,10 +35,12 @@ def hidden_self(self): -
-

self :

-

A

-
+ + +<code>self</code> +

A

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page index 71a0aef1..569587ea 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page @@ -39,14 +39,20 @@ def in(self, inarg): -
-

self :

-

a

-

inarg :

-

This is an argument test

-

Returns :

-

an int

-
+ + +<code>self</code> +

a

+ + +<code>inarg</code> +

This is an argument test

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page index 7ddf3a7e..84ac74a0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page @@ -39,14 +39,20 @@ def inout(self, inoutarg): -
-

self :

-

a

-

inoutarg :

-

This is an argument test

-

Returns :

-

an int

-
+ + +<code>self</code> +

a

+ + +<code>inoutarg</code> +

This is an argument test

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page index 82056c3b..b6205805 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page @@ -39,14 +39,20 @@ def inout2(self, inoutarg): -
-

self :

-

a

-

inoutarg :

-

This is an argument test

-

Returns :

-

an int

-
+ + +<code>self</code> +

a

+ + +<code>inoutarg</code> +

This is an argument test

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page index 45b89591..ca64eaa3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page @@ -39,14 +39,20 @@ def inout3(self, inoutarg): -
-

self :

-

a

-

inoutarg :

-

This is an argument test

-

Returns :

-

an int

-
+ + +<code>self</code> +

a

+ + +<code>inoutarg</code> +

This is an argument test

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page index bb23ba15..f2800882 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page @@ -35,12 +35,16 @@ def method(self): -
-

self :

-

a

-

Returns :

-

an int

-
+ + +<code>self</code> +

a

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page index 73731e73..8e7786ad 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page @@ -35,12 +35,16 @@ def notrans(self): -
-

self :

-

a

-

Returns :

-

An object, not referenced

-
+ + +<code>self</code> +

a

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page index ba69737f..a8718795 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page @@ -39,14 +39,20 @@ def out(self, outarg): -
-

self :

-

a

-

outarg :

-

This is an argument test

-

Returns :

-

an int

-
+ + +<code>self</code> +

a

+ + +<code>outarg</code> +

This is an argument test

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page index ac28c6fb..c76bb940 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page @@ -43,14 +43,20 @@ def parse_args(self, argc, argv): -
-

self :

-

a

-

argc :

-

Length of the argument vector

-

argv :

-

Argument vector

-
+ + +<code>self</code> +

a

+ + +<code>argc</code> +

Length of the argument vector

+ + +<code>argv</code> +

Argument vector

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page index 8f949161..beaebab8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page @@ -43,14 +43,20 @@ def set_data(self, data, length): -
-

self :

-

a

-

data :

-

The data

-

length :

-

Length of the data

-
+ + +<code>self</code> +

a

+ + +<code>data</code> +

The data

+ + +<code>length</code> +

Length of the data

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page index 70c3e62a..b9fc65f6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page @@ -43,14 +43,20 @@ def set_data2(self, data, length): -
-

self :

-

a

-

data :

-

The data

-

length :

-

Length of the data

-
+ + +<code>self</code> +

a

+ + +<code>data</code> +

The data

+ + +<code>length</code> +

Length of the data

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page index 1a5bb115..ccabb841 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page @@ -44,14 +44,20 @@ type.

-
-

self :

-

a

-

data :

-

The data

-

length :

-

Length of the data

-
+ + +<code>self</code> +

a

+ + +<code>data</code> +

The data

+ + +<code>length</code> +

Length of the data

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page index 5c02dbdb..9d12f393 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page @@ -39,14 +39,20 @@ def string_out(self, str_out): -
-

self :

-

a

-

str_out :

-

string return value

-

Returns :

-

some boolean

-
+ + +<code>self</code> +

a

+ + +<code>str_out</code> +

string return value

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page index 2e5bba23..6c5d72c4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page @@ -39,12 +39,16 @@ def use_buffer(self, bytes): -
-

self :

-

a

-

bytes :

-
-
+ + +<code>self</code> +

a

+ + +<code>bytes</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page index ced0ddcd..ebb7aa0c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page @@ -47,16 +47,24 @@ def watch_full(self, func, user_data, destroy): -
-

self :

-

A

-

func :

-

The callback

-

user_data :

-

The callback data

-

destroy :

-

Destroy notification

-
+ + +<code>self</code> +

A

+ + +<code>func</code> +

The callback

+ + +<code>user_data</code> +

The callback data

+ + +<code>destroy</code> +

Destroy notification

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page index 086223d7..b4ceb23e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page @@ -39,12 +39,16 @@ def with_voidp(self, data): -
-

self :

-
-

data :

-

Opaque pointer handle

-
+ + +<code>self</code> + + + +<code>data</code> +

Opaque pointer handle

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page index 34f1ed7c..b59e7634 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page @@ -19,10 +19,12 @@ -
-

FooASingle.FOO_SOME_SINGLE_ENUM :

-
-
+ + +<code>FooASingle.FOO_SOME_SINGLE_ENUM</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page index 2dafde03..e3f52935 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page @@ -19,14 +19,20 @@ -
-

FooAddressType.INVALID :

-
-

FooAddressType.IPV4 :

-
-

FooAddressType.IPV6 :

-
-
+ + +<code>FooAddressType.INVALID</code> + + + +<code>FooAddressType.IPV4</code> + + + +<code>FooAddressType.IPV6</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page index 8654fb42..fd700d29 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page @@ -39,12 +39,16 @@ def add(self, b2): -
-

self :

-
-

b2 :

-
-
+ + +<code>self</code> + + + +<code>b2</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page index b357ea2f..9cfe9318 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page @@ -35,10 +35,12 @@ def method(self): -
-

self :

-
-
+ + +<code>self</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page index 472d16b7..8b65f138 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page @@ -35,10 +35,12 @@ def some_method(self): -
-

self :

-
-
+ + +<code>self</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page index db6a6b05..2d19be62 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page @@ -35,10 +35,12 @@ def method(self): -
-

self :

-
-
+ + +<code>self</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page index a46070da..443f25ea 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page @@ -19,14 +19,20 @@ -
-

FooEnumFullname.ONE :

-
-

FooEnumFullname.TWO :

-
-

FooEnumFullname.THREE :

-
-
+ + +<code>FooEnumFullname.ONE</code> + + + +<code>FooEnumFullname.TWO</code> + + + +<code>FooEnumFullname.THREE</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page index 2313192d..5957904b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page @@ -19,16 +19,24 @@ -
-

FooEnumNoType.UN :

-
-

FooEnumNoType.DEUX :

-
-

FooEnumNoType.TROIS :

-
-

FooEnumNoType.NEUF :

-
-
+ + +<code>FooEnumNoType.UN</code> + + + +<code>FooEnumNoType.DEUX</code> + + + +<code>FooEnumNoType.TROIS</code> + + + +<code>FooEnumNoType.NEUF</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page index 37510f5c..d052d4f5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page @@ -19,14 +19,20 @@ -
-

FooEnumType.ALPHA :

-
-

FooEnumType.BETA :

-
-

FooEnumType.DELTA :

-
-
+ + +<code>FooEnumType.ALPHA</code> + + + +<code>FooEnumType.BETA</code> + + + +<code>FooEnumType.DELTA</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page index 0877e7c8..5577eebe 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page @@ -19,14 +19,20 @@ -
-

FooError.GOOD :

-
-

FooError.BAD :

-
-

FooError.UGLY :

-
-
+ + +<code>FooError.GOOD</code> + + + +<code>FooError.BAD</code> + + + +<code>FooError.UGLY</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page index 8b7835fc..86bdfa3e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page @@ -35,12 +35,16 @@ def copy(self): -
-

self :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page index b942b553..6cb6433e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page @@ -24,12 +24,16 @@ def do_do_regress_foo(self, x): -
-

self :

-
-

x :

-
-
+ + +<code>self</code> + + + +<code>x</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page index 60af8445..465f9130 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page @@ -39,12 +39,16 @@ def do_regress_foo(self, x): -
-

self :

-
-

x :

-
-
+ + +<code>self</code> + + + +<code>x</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page index 947a5e97..7da66ea3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page @@ -35,10 +35,12 @@ def static_method(x): -
-

x :

-
-
+ + +<code>x</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page index a634e4e2..e5189c14 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page @@ -24,14 +24,20 @@ def do_read_fn(object, offset, length): -
-

object :

-
-

offset :

-

offset

-

length :

-

length

-
+ + +<code>object</code> + + + +<code>offset</code> +

offset

+ + +<code>length</code> +

length

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page index c663823d..7a353a2b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page @@ -23,20 +23,30 @@ def callback(foo_object, object, p0, user_param1, ...) -
-

foo_object :

-

instance of Regress.FooObject that is emitting the signal

-

object :

-
-

p0 :

-
-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-

Returns :

-
gchar*
-
+ + +<code>foo_object</code> +

instance of Regress.FooObject that is emitting the signal

+ + +<code>object</code> + + + +<code>p0</code> + + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ + +<code>Returns</code> +

gchar*

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page index 1ad7512f..e4579001 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page @@ -24,14 +24,20 @@ def do_virtual_method(object, first_param): -
-

object :

-
-

first_param :

-
-

Returns :

-
-
+ + +<code>object</code> + + + +<code>first_param</code> + + + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page index 6cb51386..e291ab64 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page @@ -35,10 +35,12 @@ def a_global_method(obj): -
-

obj :

-
-
+ + +<code>obj</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page index a3e39f1c..7fa2ea7d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page @@ -39,14 +39,20 @@ def append_new_stack_layer(self, x): -
-

self :

-
-

x :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>x</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page index a0237951..3d329fb5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page @@ -35,12 +35,16 @@ def dup_name(self): -
-

self :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page index 48d5e591..09481e92 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page @@ -35,12 +35,16 @@ def external_type(self): -
-

self :

-

a

-

Returns :

-

None always

-
+ + +<code>self</code> +

a

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page index b1208bdc..3b7c8722 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page @@ -31,10 +31,12 @@ uses a C sugar return type.

-
-

Returns :

-

The global

-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page index fc87e4a9..52a90560 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page @@ -35,12 +35,16 @@ def get_name(self): -
-

self :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page index 20fea248..5671a1cd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page @@ -39,12 +39,16 @@ def handle_glyph(self, glyph): -
-

self :

-
-

glyph :

-
-
+ + +<code>self</code> + + + +<code>glyph</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page index 3ee60dd2..633c32fb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page @@ -39,12 +39,16 @@ def is_it_time_yet(self, time): -
-

self :

-
-

time :

-
-
+ + +<code>self</code> + + + +<code>time</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page index d3ec000f..787081f0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page @@ -43,14 +43,20 @@ def read(self, offset, length): -
-

self :

-

obj

-

offset :

-

offset

-

length :

-

length

-
+ + +<code>self</code> +

obj

+ + +<code>offset</code> +

offset

+ + +<code>length</code> +

length

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page index 2212da02..4c825d80 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page @@ -30,10 +30,12 @@ def static_meth(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page index 702a6e85..15227cd8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page @@ -43,14 +43,20 @@ def various(self, data, some_type): -
-

self :

-
-

data :

-
-

some_type :

-
-
+ + +<code>self</code> + + + +<code>data</code> + + + +<code>some_type</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page index 68a94097..3e05ffae 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page @@ -39,14 +39,20 @@ def virtual_method(self, first_param): -
-

self :

-
-

first_param :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>first_param</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page index ea8bf20c..e2f8bbeb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page @@ -39,12 +39,16 @@ def add(self, r2): -
-

self :

-

add to this rect

-

r2 :

-

source rectangle

-
+ + +<code>self</code> +

add to this rect

+ + +<code>r2</code> +

source rectangle

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page index 83ca6a12..bd7a445b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page @@ -19,26 +19,44 @@ -
-

FooStackLayer.DESKTOP :

-
-

FooStackLayer.BOTTOM :

-
-

FooStackLayer.NORMAL :

-
-

FooStackLayer.TOP :

-
-

FooStackLayer.DOCK :

-
-

FooStackLayer.FULLSCREEN :

-
-

FooStackLayer.FOCUSED_WINDOW :

-
-

FooStackLayer.OVERRIDE_REDIRECT :

-
-

FooStackLayer.LAST :

-
-
+ + +<code>FooStackLayer.DESKTOP</code> + + + +<code>FooStackLayer.BOTTOM</code> + + + +<code>FooStackLayer.NORMAL</code> + + + +<code>FooStackLayer.TOP</code> + + + +<code>FooStackLayer.DOCK</code> + + + +<code>FooStackLayer.FULLSCREEN</code> + + + +<code>FooStackLayer.FOCUSED_WINDOW</code> + + + +<code>FooStackLayer.OVERRIDE_REDIRECT</code> + + + +<code>FooStackLayer.LAST</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page index bb146abf..3c43a772 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page @@ -23,14 +23,18 @@ def callback(foo_sub_interface, user_param1, ...) -
-

foo_sub_interface :

-

instance of Regress.FooSubInterface that is emitting the signal

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>foo_sub_interface</code> +

instance of Regress.FooSubInterface that is emitting the signal

+ +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page index 5f014dfa..4b925a9f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page @@ -24,10 +24,12 @@ def do_destroy_event(self): -
-

self :

-
-
+ + +<code>self</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page index fd55d897..d07cadc9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page @@ -24,10 +24,12 @@ def do_do_bar(self): -
-

self :

-
-
+ + +<code>self</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page index 1078dfca..723cea8e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page @@ -24,14 +24,20 @@ def do_do_baz(self, callback, user_data): -
-

self :

-
-

callback :

-
-

user_data :

-
-
+ + +<code>self</code> + + + +<code>callback</code> + + + +<code>user_data</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page index 6be01ab8..45137e84 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page @@ -35,10 +35,12 @@ def do_bar(self): -
-

self :

-
-
+ + +<code>self</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page index af759a15..e95447c4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page @@ -43,14 +43,20 @@ def do_baz(self, callback, user_data): -
-

self :

-
-

callback :

-
-

user_data :

-
-
+ + +<code>self</code> + + + +<code>callback</code> + + + +<code>user_data</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page index fea8d58e..6a044d79 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page @@ -19,14 +19,20 @@ -
-

TestABCError.CODE1 :

-
-

TestABCError.CODE2 :

-
-

TestABCError.CODE3 :

-
-
+ + +<code>TestABCError.CODE1</code> + + + +<code>TestABCError.CODE2</code> + + + +<code>TestABCError.CODE3</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page index 489f3ffa..fa810dd4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page @@ -35,12 +35,16 @@ def copy(self): -
-

self :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page index 68a19e07..e03d1f0a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page @@ -39,14 +39,20 @@ def equals(self, other): -
-

self :

-
-

other :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>other</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page index f770ecfe..30b45992 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page @@ -35,12 +35,16 @@ def copy(self): -
-

self :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page index 84a66e51..6923488a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page @@ -35,12 +35,16 @@ def copy(self): -
-

self :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page index 5c37368c..366fb2d2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page @@ -35,10 +35,12 @@ def free(self): -
-

self :

-
-
+ + +<code>self</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page index af75b8f6..551c6173 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page @@ -35,12 +35,16 @@ def get_magic(self): -
-

self :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page index b6f0eb88..6a92ba9a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page @@ -19,14 +19,20 @@ -
-

TestDEFError.CODE0 :

-
-

TestDEFError.CODE1 :

-
-

TestDEFError.CODE2 :

-
-
+ + +<code>TestDEFError.CODE0</code> + + + +<code>TestDEFError.CODE1</code> + + + +<code>TestDEFError.CODE2</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page index 3de1bbf6..9009dcda 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page @@ -19,16 +19,24 @@ -
-

TestEnum.VALUE1 :

-

value 1

-

TestEnum.VALUE2 :

-

value 2

-

TestEnum.VALUE3 :

-
-

TestEnum.VALUE4 :

-
-
+ + +<code>TestEnum.VALUE1</code> +

value 1

+ + +<code>TestEnum.VALUE2</code> +

value 2

+ + +<code>TestEnum.VALUE3</code> + + + +<code>TestEnum.VALUE4</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page index 625c8703..a0cd98cc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page @@ -19,14 +19,20 @@ -
-

TestEnumNoGEnum.EVALUE1 :

-
-

TestEnumNoGEnum.EVALUE2 :

-
-

TestEnumNoGEnum.EVALUE3 :

-
-
+ + +<code>TestEnumNoGEnum.EVALUE1</code> + + + +<code>TestEnumNoGEnum.EVALUE2</code> + + + +<code>TestEnumNoGEnum.EVALUE3</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page index 3069d8e3..327cacc5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page @@ -19,12 +19,16 @@ -
-

TestEnumUnsigned.VALUE1 :

-
-

TestEnumUnsigned.VALUE2 :

-
-
+ + +<code>TestEnumUnsigned.VALUE1</code> + + + +<code>TestEnumUnsigned.VALUE2</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page index 57a21163..c635d0e0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page @@ -19,14 +19,20 @@ -
-

TestError.CODE1 :

-
-

TestError.CODE2 :

-
-

TestError.CODE3 :

-
-
+ + +<code>TestError.CODE1</code> + + + +<code>TestError.CODE2</code> + + + +<code>TestError.CODE3</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page index 243e8fdb..23164e09 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page @@ -35,12 +35,16 @@ def ref(self): -
-

self :

-
-

Returns :

-

A new

-
+ + +<code>self</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page index eec1dbf7..18f57651 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page @@ -35,10 +35,12 @@ def unref(self): -
-

self :

-
-
+ + +<code>self</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page index 5c97095e..2aff243a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page @@ -39,12 +39,16 @@ def do_foo(self, x): -
-

self :

-
-

x :

-
-
+ + +<code>self</code> + + + +<code>x</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page index 1e3d0419..4f7d8e61 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page @@ -39,12 +39,16 @@ def do_foo_maybe_throw(self, x): -
-

self :

-
-

x :

-
-
+ + +<code>self</code> + + + +<code>x</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page index 908bdec2..ccd73b1b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page @@ -43,14 +43,20 @@ def get_origin(self, x, y): -
-

self :

-
-

x :

-
-

y :

-
-
+ + +<code>self</code> + + + +<code>x</code> + + + +<code>y</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page index f6bb0368..39d7bcca 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page @@ -43,14 +43,20 @@ def get_size(self, width, height): -
-

self :

-
-

width :

-
-

height :

-
-
+ + +<code>self</code> + + + +<code>width</code> + + + +<code>height</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page index 1a1be536..f4c2acb9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page @@ -23,14 +23,18 @@ def callback(test_obj, user_param1, ...) -
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page index 3f72a491..aaea25a4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page @@ -24,12 +24,16 @@ def do_allow_none_vfunc(obj, two): -
-

obj :

-
-

two :

-

Another object

-
+ + +<code>obj</code> + + + +<code>two</code> +

Another object

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page index 6c3bca29..292ae894 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page @@ -23,14 +23,18 @@ def callback(test_obj, user_param1, ...) -
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page index 8a05f090..959a7118 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page @@ -23,14 +23,18 @@ def callback(test_obj, user_param1, ...) -
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page index b41a4072..a1f1fd98 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page @@ -26,14 +26,20 @@ case.

-
-

obj :

-
-

somestr :

-

Meaningless string

-

Returns :

-
-
+ + +<code>obj</code> + + + +<code>somestr</code> +

Meaningless string

+ + +<code>Returns</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page index d326c878..9441214f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page @@ -24,16 +24,22 @@ def callback(test_obj, arr, user_param1, ...) -
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

arr :

-

numbers

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>arr</code> +

numbers

+ +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page index 38e632a0..8734cde6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page @@ -23,16 +23,22 @@ def callback(test_obj, cr, user_param1, ...) -
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

cr :

-

A cairo context.

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>cr</code> +

A cairo context.

+ +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page index 467f995f..40a3c1e9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page @@ -24,16 +24,22 @@ def callback(test_obj, hash, user_param1, ...) -
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

hash :

-
-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>hash</code> + + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page index 357847ba..5b077e15 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page @@ -24,18 +24,26 @@ the introspection client langage.

-
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

i :

-

an integer

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-

Returns :

-
gint64
-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>i</code> +

an integer

+ +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ + +<code>Returns</code> +

gint64

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page index 7f2bd5c6..4f28c6f7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page @@ -23,16 +23,22 @@ def callback(test_obj, i, user_param1, ...) -
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

i :

-

an integer

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>i</code> +

an integer

+ +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page index a4106050..e749b702 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page @@ -24,16 +24,22 @@ Use with regress_test_obj_emit_sig_with_obj

-
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

obj :

-

A newly created RegressTestObj

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>obj</code> +

A newly created RegressTestObj

+ +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page index b6b5b25c..d70bbbc3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page @@ -23,16 +23,22 @@ def callback(test_obj, strs, user_param1, ...) -
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

strs :

-

strings

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>strs</code> +

strings

+ +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page index 5617c5c7..35ccde6b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -24,18 +24,26 @@ the introspection client langage.

-
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

i :

-

an integer

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-

Returns :

-
guint64
-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>i</code> +

an integer

+ +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ + +<code>Returns</code> +

guint64

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page index bdd3b3eb..3bfeb1d4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page @@ -23,16 +23,22 @@ def callback(test_obj, object, user_param1, ...) -
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

object :

-
-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ + +<code>object</code> + + +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page index 74a74548..2ec8ca2e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page @@ -23,14 +23,18 @@ def callback(test_obj, user_param1, ...) -
-

test_obj :

-

instance of Regress.TestObj that is emitting the signal

-

user_param1 :

-

first user parameter (if any) specified with the connect() method

-

... :

-

additional user parameters (if any)

-
+ + +<code>test_obj</code> +

instance of Regress.TestObj that is emitting the signal

+ +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page index a7140188..f7d905b8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page @@ -41,14 +41,20 @@ case.

-
-

self :

-

A

-

somestr :

-

Meaningless string

-

Returns :

-
-
+ + +<code>self</code> +

A

+ + +<code>somestr</code> +

Meaningless string

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page index b0eafb02..4da0acf0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page @@ -35,10 +35,12 @@ def emit_sig_with_foreign_struct(self): -
-

self :

-
-
+ + +<code>self</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page index 86c6b93d..a90da8dc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page @@ -35,10 +35,12 @@ def emit_sig_with_int64(self): -
-

self :

-
-
+ + +<code>self</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page index ccd5ad82..2f02db89 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page @@ -35,10 +35,12 @@ def emit_sig_with_obj(self): -
-

self :

-
-
+ + +<code>self</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page index e2f98768..fede0a67 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page @@ -35,10 +35,12 @@ def emit_sig_with_uint64(self): -
-

self :

-
-
+ + +<code>self</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page index 8cb577f9..33a7507b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page @@ -35,10 +35,12 @@ def forced_method(self): -
-

self :

-

A

-
+ + +<code>self</code> +

A

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page index 165c467e..6f0dab49 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page @@ -35,12 +35,16 @@ def instance_method(self): -
-

self :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page index e57bcb6d..34b74974 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page @@ -39,12 +39,16 @@ def instance_method_callback(self, callback): -
-

self :

-
-

callback :

-
-
+ + +<code>self</code> + + + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page index 24c015c8..f654e7e4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page @@ -35,10 +35,12 @@ def null_out(obj): -
-

obj :

-

A

-
+ + +<code>obj</code> +

A

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page index b4681739..52013d55 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page @@ -39,12 +39,16 @@ def set_bare(self, bare): -
-

self :

-
-

bare :

-
-
+ + +<code>self</code> + + + +<code>bare</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page index 21f9418f..609e8b30 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page @@ -63,26 +63,44 @@ def skip_inout_param(self, a, out_b, c, inout_d, out_sum, num1, num2): -
-

self :

-

A .

-

a :

-

Parameter.

-

out_b :

-

Return value.

-

c :

-

Other parameter.

-

inout_d :

-

Will be incremented.

-

out_sum :

-

Return value.

-

num1 :

-

Number.

-

num2 :

-

Number.

-

Returns :

-

True if the call succeeds, False if @error is set.

-
+ + +<code>self</code> +

A .

+ + +<code>a</code> +

Parameter.

+ + +<code>out_b</code> +

Return value.

+ + +<code>c</code> +

Other parameter.

+ + +<code>inout_d</code> +

Will be incremented.

+ + +<code>out_sum</code> +

Return value.

+ + +<code>num1</code> +

Number.

+ + +<code>num2</code> +

Number.

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page index b8eab28e..b956db95 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page @@ -63,26 +63,44 @@ def skip_out_param(self, a, out_b, c, inout_d, out_sum, num1, num2): -
-

self :

-

A .

-

a :

-

Parameter.

-

out_b :

-

Return value.

-

c :

-

Other parameter.

-

inout_d :

-

Will be incremented.

-

out_sum :

-

Return value.

-

num1 :

-

Number.

-

num2 :

-

Number.

-

Returns :

-

True if the call succeeds, False if @error is set.

-
+ + +<code>self</code> +

A .

+ + +<code>a</code> +

Parameter.

+ + +<code>out_b</code> +

Return value.

+ + +<code>c</code> +

Other parameter.

+ + +<code>inout_d</code> +

Will be incremented.

+ + +<code>out_sum</code> +

Return value.

+ + +<code>num1</code> +

Number.

+ + +<code>num2</code> +

Number.

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page index 57f91672..9104649c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page @@ -63,26 +63,44 @@ def skip_param(self, a, out_b, c, inout_d, out_sum, num1, num2): -
-

self :

-

A .

-

a :

-

Parameter.

-

out_b :

-

Return value.

-

c :

-

Other parameter.

-

inout_d :

-

Will be incremented.

-

out_sum :

-

Return value.

-

num1 :

-

Number.

-

num2 :

-

Number.

-

Returns :

-

True if the call succeeds, False if @error is set.

-
+ + +<code>self</code> +

A .

+ + +<code>a</code> +

Parameter.

+ + +<code>out_b</code> +

Return value.

+ + +<code>c</code> +

Other parameter.

+ + +<code>inout_d</code> +

Will be incremented.

+ + +<code>out_sum</code> +

Return value.

+ + +<code>num1</code> +

Number.

+ + +<code>num2</code> +

Number.

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page index 92d58ebd..4b1e9bbe 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page @@ -63,26 +63,44 @@ def skip_return_val(self, a, out_b, c, inout_d, out_sum, num1, num2): -
-

self :

-

a

-

a :

-

Parameter.

-

out_b :

-

A return value.

-

c :

-

Other parameter.

-

inout_d :

-

Will be incremented.

-

out_sum :

-

Return value.

-

num1 :

-

Number.

-

num2 :

-

Number.

-

Returns :

-

True if the call succeeds, False if @error is set.

-
+ + +<code>self</code> +

a

+ + +<code>a</code> +

Parameter.

+ + +<code>out_b</code> +

A return value.

+ + +<code>c</code> +

Other parameter.

+ + +<code>inout_d</code> +

Will be incremented.

+ + +<code>out_sum</code> +

Return value.

+ + +<code>num1</code> +

Number.

+ + +<code>num2</code> +

Number.

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page index 5feb3153..dd5ca45c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page @@ -40,14 +40,20 @@ raise an error.

-
-

self :

-

a

-

a :

-

Parameter.

-

Returns :

-

True if the call succeeds, False if @error is set.

-
+ + +<code>self</code> +

a

+ + +<code>a</code> +

Parameter.

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page index 1294c2ad..df4963e3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page @@ -35,12 +35,16 @@ def static_method(x): -
-

x :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page index 3d7d2645..08e44411 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page @@ -35,10 +35,12 @@ def static_method_callback(callback): -
-

callback :

-
-
+ + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page index c4e4e774..c5d8c9f6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page @@ -59,22 +59,36 @@ def torture_signature_0(self, x, y, z, foo, q, m): -
-

self :

-

A

-

x :

-
-

y :

-
-

z :

-
-

foo :

-
-

q :

-
-

m :

-
-
+ + +<code>self</code> +

A

+ + +<code>x</code> + + + +<code>y</code> + + + +<code>z</code> + + + +<code>foo</code> + + + +<code>q</code> + + + +<code>m</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page index 787a5c35..99540568 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page @@ -59,24 +59,40 @@ def torture_signature_1(self, x, y, z, foo, q, m): -
-

self :

-

A

-

x :

-
-

y :

-
-

z :

-
-

foo :

-
-

q :

-
-

m :

-
-

Returns :

-
-
+ + +<code>self</code> +

A

+ + +<code>x</code> + + + +<code>y</code> + + + +<code>z</code> + + + +<code>foo</code> + + + +<code>q</code> + + + +<code>m</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page index 1d907d24..d1887d5e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page @@ -19,14 +19,20 @@ -
-

TestOtherError.CODE1 :

-
-

TestOtherError.CODE2 :

-
-

TestOtherError.CODE3 :

-
-
+ + +<code>TestOtherError.CODE1</code> + + + +<code>TestOtherError.CODE2</code> + + + +<code>TestOtherError.CODE3</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page index b4444d2e..6b7b9ebe 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page @@ -30,10 +30,12 @@ def const_return(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page index 4976e9ac..22a55259 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page @@ -35,12 +35,16 @@ def copy(self): -
-

self :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page index a9f6577e..9616ddd9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page @@ -39,14 +39,20 @@ def equals(self, other_a): -
-

self :

-
-

other_a :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>other_a</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page index c04d3cda..405778a8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page @@ -35,12 +35,16 @@ def copy(self): -
-

self :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page index 2b609bb4..cbc5b426 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page @@ -39,12 +39,16 @@ def clone(self, a_out): -
-

self :

-

the structure

-

a_out :

-

the cloned structure

-
+ + +<code>self</code> +

the structure

+ + +<code>a_out</code> +

the cloned structure

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page index d18fcf7b..d8bdaaeb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page @@ -39,12 +39,16 @@ def parse(a_out, string): -
-

a_out :

-

the structure that is to be filled

-

string :

-

ignored

-
+ + +<code>a_out</code> +

the structure that is to be filled

+ + +<code>string</code> +

ignored

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page index 2a95a23d..cebaa169 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page @@ -39,12 +39,16 @@ def clone(self, b_out): -
-

self :

-

the structure

-

b_out :

-

the cloned structure

-
+ + +<code>self</code> +

the structure

+ + +<code>b_out</code> +

the cloned structure

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page index ffd3fae0..0db49624 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page @@ -35,10 +35,12 @@ def frob(self): -
-

self :

-
-
+ + +<code>self</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page index bc854f46..417ba337 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page @@ -35,12 +35,16 @@ def instance_method(self): -
-

self :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page index fa4dcc1a..bb2ad606 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page @@ -35,10 +35,12 @@ def unset_bare(self): -
-

self :

-
-
+ + +<code>self</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page index c0bffe8a..4b9de5a1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page @@ -35,12 +35,16 @@ def get_testbool(self): -
-

self :

-
-

Returns :

-
-
+ + +<code>self</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page index ae043639..22346642 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page @@ -39,12 +39,16 @@ def set_testbool(self, v): -
-

self :

-
-

v :

-
-
+ + +<code>self</code> + + + +<code>v</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page index 3c04ae74..1fecc3af 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page @@ -35,12 +35,16 @@ def static_method(x): -
-

x :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page index f0476b84..377dcbd1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page @@ -35,10 +35,12 @@ def aliased_caller_alloc(boxed): -
-

boxed :

-
-
+ + +<code>boxed</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page index f48f724e..023e993a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page @@ -39,14 +39,20 @@ def annotation_attribute_func(object, data): -
-

object :

-

A .

-

data :

-

Some data.

-

Returns :

-

The return value.

-
+ + +<code>object</code> +

A .

+ + +<code>data</code> +

Some data.

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page index 439bd57f..d98c2b82 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page @@ -44,14 +44,20 @@ detection, and fixing it via regress_annotations.

-
-

callback :

-

Destroy notification

-

destroy :

-
-

data :

-
-
+ + +<code>callback</code> +

Destroy notification

+ + +<code>destroy</code> + + + +<code>data</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page index 339ad90b..73e35557 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page @@ -30,10 +30,12 @@ def annotation_get_source_file(): -
-

Returns :

-

Source file

-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page index 0fc0f5c4..09ee5b10 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page @@ -39,12 +39,16 @@ def annotation_init(argc, argv): -
-

argc :

-

The number of args.

-

argv :

-

The arguments.

-
+ + +<code>argc</code> +

The number of args.

+ + +<code>argv</code> +

The arguments.

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page index d173a8f2..eec7b20e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page @@ -35,10 +35,12 @@ def annotation_invalid_regress_annotation(foo): -
-

foo :

-

some text (e.g. example) or else

-
+ + +<code>foo</code> +

some text (e.g. example) or else

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page index 774a0181..12752bbc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page @@ -35,10 +35,12 @@ def annotation_ptr_array(array): -
-

array :

-

the array

-
+ + +<code>array</code> +

the array

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page index 5902fd07..5b6e6bcf 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page @@ -35,12 +35,16 @@ def annotation_return_array(length): -
-

length :

-

Number of return values

-

Returns :

-

The return value

-
+ + +<code>length</code> +

Number of return values

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page index 961a4030..c1e8e635 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page @@ -30,10 +30,12 @@ def annotation_return_filename(): -
-

Returns :

-

An annotated filename

-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page index 67ab7414..504ef282 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page @@ -35,10 +35,12 @@ def annotation_set_source_file(fname): -
-

fname :

-

Source file

-
+ + +<code>fname</code> +

Source file

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page index 4f718065..0307bd23 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page @@ -30,8 +30,8 @@ def annotation_space_after_comment_bug631690(): -
-
+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page index a1f859a3..e42b140e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page @@ -39,12 +39,16 @@ def annotation_string_array_length(n_properties, properties): -
-

n_properties :

-
-

properties :

-
-
+ + +<code>n_properties</code> + + + +<code>properties</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page index 7aff5099..8cafc09a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page @@ -30,10 +30,12 @@ def annotation_string_zero_terminated(): -
-

Returns :

-

The return value

-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page index d7401ed5..2c396ac0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page @@ -35,10 +35,12 @@ def annotation_string_zero_terminated_out(out): -
-

out :

-
-
+ + +<code>out</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page index 60210394..402a6ff1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page @@ -30,10 +30,12 @@ def annotation_test_parsing_bug630862(): -
-

Returns :

-

An object, note the colon:in here

-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page index 321cd92d..956465ca 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page @@ -30,10 +30,12 @@ def annotation_transfer_floating(): -
-

Returns :

-

A floating object

-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page index 046fa115..a387a595 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page @@ -31,8 +31,8 @@ def annotation_versioned():

Since 0.6

-
-
+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page index dcaa8148..36401553 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page @@ -30,10 +30,12 @@ def atest_error_quark(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page index ef1f6142..d9e9994b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page @@ -43,14 +43,20 @@ def foo_async_ready_callback(cancellable, callback, user_data): -
-

cancellable :

-
-

callback :

-
-

user_data :

-
-
+ + +<code>cancellable</code> + + + +<code>callback</code> + + + +<code>user_data</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page index dad0e224..1f758a64 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page @@ -43,14 +43,20 @@ def foo_destroy_notify_callback(callback, data, destroy): -
-

callback :

-
-

data :

-
-

destroy :

-
-
+ + +<code>callback</code> + + + +<code>data</code> + + + +<code>destroy</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page index f7b916ef..4ee838b5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page @@ -30,10 +30,12 @@ def foo_init(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page index ce521acb..77a94c40 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page @@ -47,16 +47,24 @@ def foo_method_external_references(object, e, f, s): -
-

object :

-
-

e :

-
-

f :

-
-

s :

-
-
+ + +<code>object</code> + + + +<code>e</code> + + + +<code>f</code> + + + +<code>s</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page index d70d3375..0f58aaa3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page @@ -31,10 +31,12 @@ a "Can't find matching type for constructor" warning.

-
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page index c1c46521..2680f708 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page @@ -30,10 +30,12 @@ def foo_test_array(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page index 61b2a569..6be54b8e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page @@ -35,10 +35,12 @@ def foo_test_const_char_param(param): -
-

param :

-
-
+ + +<code>param</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page index d3079e2e..4eb0d3a7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page @@ -30,10 +30,12 @@ def foo_test_const_char_retval(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page index 9c757d41..31532fc3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page @@ -35,10 +35,12 @@ def foo_test_const_struct_param(param): -
-

param :

-
-
+ + +<code>param</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page index 870cca02..140bbbb9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page @@ -30,10 +30,12 @@ def foo_test_const_struct_retval(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page index f5c7798f..1f9d3ccc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page @@ -35,10 +35,12 @@ def foo_test_string_array(array): -
-

array :

-
-
+ + +<code>array</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page index 4d46cef6..bf4b9a76 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page @@ -35,10 +35,12 @@ def foo_test_string_array_with_g(array): -
-

array :

-
-
+ + +<code>array</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page index 8d795167..3c57204b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page @@ -35,10 +35,12 @@ def foo_test_unsigned_qualifier(unsigned_param): -
-

unsigned_param :

-
-
+ + +<code>unsigned_param</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page index 97672a0d..d869c4ea 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page @@ -35,10 +35,12 @@ def foo_test_unsigned_type(unsigned_param): -
-

unsigned_param :

-
-
+ + +<code>unsigned_param</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page index 681f45b2..0c0d372e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page @@ -35,10 +35,12 @@ def func_obj_null_in(obj): -
-

obj :

-

A

-
+ + +<code>obj</code> +

A

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page index 816a722f..bc3fffe8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page @@ -35,10 +35,12 @@ def global_get_flags_out(v): -
-

v :

-

A flags value

-
+ + +<code>v</code> +

A flags value

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page b/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page index ed405229..8010d9b5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page @@ -40,12 +40,16 @@ libgnome-keyring.

-
-

foo :

-

some int

-

attributes :

-

list of attributes

-
+ + +<code>foo</code> +

some int

+ + +<code>attributes</code> +

list of attributes

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page b/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page index 63ef956e..230882fb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page @@ -35,10 +35,12 @@ def introspectable_via_alias(data): -
-

data :

-
-
+ + +<code>data</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page b/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page index aa725200..3eda9cde 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page @@ -35,10 +35,12 @@ def set_abort_on_error(abort_on_error): -
-

abort_on_error :

-
-
+ + +<code>abort_on_error</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page index 9a170d7d..cf5c11ad 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page @@ -35,12 +35,16 @@ def test_array_callback(callback): -
-

callback :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page index a5cb3976..2fe68c95 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page @@ -35,10 +35,12 @@ def test_array_fixed_out_objects(objs): -
-

objs :

-

An array of

-
+ + +<code>objs</code> +

An array of

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page index de526c40..ed44e366 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page @@ -35,12 +35,16 @@ def test_array_fixed_size_int_in(ints): -
-

ints :

-

a list of 5 integers

-

Returns :

-

the sum of the items in ints

-
+ + +<code>ints</code> +

a list of 5 integers

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page index 9d7ec741..30cebc41 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page @@ -35,10 +35,12 @@ def test_array_fixed_size_int_out(ints): -
-

ints :

-

a list of 5 integers ranging from 0 to 4

-
+ + +<code>ints</code> +

a list of 5 integers ranging from 0 to 4

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page index bc33d6df..d38e4f9f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page @@ -30,10 +30,12 @@ def test_array_fixed_size_int_return(): -
-

Returns :

-

a list of 5 integers ranging from 0 to 4

-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page index 98f1e19e..db9e9044 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page @@ -39,14 +39,20 @@ def test_array_gint16_in(n_ints, ints): -
-

n_ints :

-
-

ints :

-

List of ints

-

Returns :

-
-
+ + +<code>n_ints</code> + + + +<code>ints</code> +

List of ints

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page index 74fb671f..21e09024 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page @@ -39,14 +39,20 @@ def test_array_gint32_in(n_ints, ints): -
-

n_ints :

-
-

ints :

-

List of ints

-

Returns :

-
-
+ + +<code>n_ints</code> + + + +<code>ints</code> +

List of ints

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page index 0f2ad40b..68b1158d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page @@ -39,14 +39,20 @@ def test_array_gint64_in(n_ints, ints): -
-

n_ints :

-
-

ints :

-

List of ints

-

Returns :

-
-
+ + +<code>n_ints</code> + + + +<code>ints</code> +

List of ints

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page index 4ad4fc7c..4c961947 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page @@ -39,14 +39,20 @@ def test_array_gint8_in(n_ints, ints): -
-

n_ints :

-
-

ints :

-

List of ints

-

Returns :

-
-
+ + +<code>n_ints</code> + + + +<code>ints</code> +

List of ints

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page index bc9057b0..42f73723 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page @@ -39,14 +39,20 @@ def test_array_gtype_in(n_types, types): -
-

n_types :

-
-

types :

-

List of types

-

Returns :

-

string representation of provided types

-
+ + +<code>n_types</code> + + + +<code>types</code> +

List of types

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page index 088ccfa2..b0d38636 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page @@ -35,12 +35,16 @@ def test_array_int_full_out(len): -
-

len :

-

length of the returned array.

-

Returns :

-

a new array of integers.

-
+ + +<code>len</code> +

length of the returned array.

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page index 8bc291b1..59a4be03 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page @@ -39,14 +39,20 @@ def test_array_int_in(n_ints, ints): -
-

n_ints :

-
-

ints :

-

List of ints

-

Returns :

-
-
+ + +<code>n_ints</code> + + + +<code>ints</code> +

List of ints

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page index 881cc86e..48fc0ac5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page @@ -39,12 +39,16 @@ def test_array_int_inout(n_ints, ints): -
-

n_ints :

-

the length of ints

-

ints :

-

a list of integers whose items will be increased by 1, except the first that will be dropped

-
+ + +<code>n_ints</code> +

the length of ints

+ + +<code>ints</code> +

a list of integers whose items will be increased by 1, except the first that will be dropped

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page index 39542be1..3c113930 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page @@ -35,12 +35,16 @@ def test_array_int_none_out(len): -
-

len :

-

length of the returned array.

-

Returns :

-

a static array of integers.

-
+ + +<code>len</code> +

length of the returned array.

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page index 1e8007f7..a2f7ba98 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page @@ -39,12 +39,16 @@ def test_array_int_null_in(arr, len): -
-

arr :

-
-

len :

-

length

-
+ + +<code>arr</code> + + + +<code>len</code> +

length

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page index 894a37e3..dd2aa751 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page @@ -39,12 +39,16 @@ def test_array_int_null_out(arr, len): -
-

arr :

-
-

len :

-

length

-
+ + +<code>arr</code> + + + +<code>len</code> +

length

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page index 3bfad946..15e62e1c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page @@ -39,12 +39,16 @@ def test_array_int_out(n_ints, ints): -
-

n_ints :

-

the length of ints

-

ints :

-

a list of 5 integers, from 0 to 4 in consecutive order

-
+ + +<code>n_ints</code> +

the length of ints

+ + +<code>ints</code> +

a list of 5 integers, from 0 to 4 in consecutive order

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page index 39a24a23..1486cc4e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page @@ -35,10 +35,12 @@ def test_async_ready_callback(callback): -
-

callback :

-
-
+ + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page index e7217be4..8c196987 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page @@ -35,12 +35,16 @@ def test_boolean(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page index 0f7783ab..7212f687 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page @@ -35,12 +35,16 @@ def test_boolean_false(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page index 65fec5ed..13c90c2c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page @@ -35,12 +35,16 @@ def test_boolean_true(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page index dfebfd05..f927cf5f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page @@ -30,10 +30,12 @@ def test_cairo_context_full_return(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page index 922330df..d9cd2301 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page @@ -35,10 +35,12 @@ def test_cairo_context_none_in(context): -
-

context :

-
-
+ + +<code>context</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page index 1b32629a..ec8da6f3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page @@ -35,10 +35,12 @@ def test_cairo_surface_full_out(surface): -
-

surface :

-
-
+ + +<code>surface</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page index 1cfa1513..ac776954 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page @@ -30,10 +30,12 @@ def test_cairo_surface_full_return(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page index ad456c10..c2daf5f4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page @@ -35,10 +35,12 @@ def test_cairo_surface_none_in(surface): -
-

surface :

-
-
+ + +<code>surface</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page index 4e5dd409..4eda436c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page @@ -30,10 +30,12 @@ def test_cairo_surface_none_return(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page index 5da4505b..a5e52b55 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page @@ -35,12 +35,16 @@ def test_callback(callback): -
-

callback :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page index 8ffd9661..471926a0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page @@ -39,12 +39,16 @@ def test_callback_async(callback, user_data): -
-

callback :

-
-

user_data :

-
-
+ + +<code>callback</code> + + + +<code>user_data</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page index fed66313..26a0c31d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page @@ -44,16 +44,24 @@ is invoked.

-
-

callback :

-
-

user_data :

-
-

notify :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>user_data</code> + + + +<code>notify</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page index a343923a..7df745a1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page @@ -40,14 +40,20 @@ condition in bindings which needs to be tested.

-
-

callback :

-
-

notify :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>notify</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page index 459bd47d..a94e6617 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page @@ -30,10 +30,12 @@ def test_callback_thaw_async(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page index 24c45e90..03158abe 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page @@ -32,10 +32,12 @@ corresponding destroy notfications.

-
-

Returns :

-

Sum of the return values of the invoked callbacks.

-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page index 2b03a8fd..d4a9578f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page @@ -40,14 +40,20 @@ call and can be released on return.

-
-

callback :

-
-

user_data :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>user_data</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page index a3290e54..cdbf8bb0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page @@ -35,12 +35,16 @@ def test_closure(closure): -
-

closure :

-
-

Returns :

-
-
+ + +<code>closure</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page index c766153c..b19753a4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page @@ -39,14 +39,20 @@ def test_closure_one_arg(closure, arg): -
-

closure :

-
-

arg :

-
-

Returns :

-
-
+ + +<code>closure</code> + + + +<code>arg</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page index 2151555c..6be06f3b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page @@ -39,14 +39,20 @@ def test_closure_variant(closure, arg): -
-

closure :

-

GClosure which takes one GVariant and returns a GVariant

-

arg :

-

a GVariant passed as argument to closure

-

Returns :

-

the return value of closure

-
+ + +<code>closure</code> +

GClosure which takes one GVariant and returns a GVariant

+ + +<code>arg</code> +

a GVariant passed as argument to closure

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page index 7e9400e4..bcdb8edd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page @@ -30,10 +30,12 @@ def test_date_in_gvalue(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page index dc3c910a..89a1b503 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page @@ -30,10 +30,12 @@ def test_def_error_quark(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page index 986f57a5..efea2d69 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page @@ -35,12 +35,16 @@ def test_double(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page index ccf1af1d..80eebb18 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page @@ -30,10 +30,12 @@ def test_filename_return(): -
-

Returns :

-

list of strings

-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page index 5b5bdb81..50f89930 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page @@ -35,12 +35,16 @@ def test_float(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page index 132de1fa..1d0ef3e5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page @@ -30,10 +30,12 @@ def test_garray_container_return(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page index e7c1b0fc..ef2bcfd7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page @@ -30,10 +30,12 @@ def test_garray_full_return(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page index 52ef85d3..f4f94659 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page @@ -35,10 +35,12 @@ def test_gerror_callback(callback): -
-

callback :

-
-
+ + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page index 676e6652..9a297dbe 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page @@ -30,10 +30,12 @@ def test_ghash_container_return(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page index 0cca64bc..3040336d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page @@ -30,10 +30,12 @@ def test_ghash_everything_return(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page index 39c476b5..7028c8b0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page @@ -35,10 +35,12 @@ def test_ghash_gvalue_in(hash): -
-

hash :

-

the hash table returned by .

-
+ + +<code>hash</code> +

the hash table returned by .

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page index 9a94e398..b24a3bdc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page @@ -30,10 +30,12 @@ def test_ghash_gvalue_return(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page index 6d0a2a7a..2039ab45 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page @@ -30,10 +30,12 @@ def test_ghash_nested_everything_return(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page index a6837dad..adac865e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page @@ -31,10 +31,12 @@ element-type annotation.

-
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page index 623aee60..264d31a1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page @@ -35,10 +35,12 @@ def test_ghash_nothing_in(in): -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page index 72e7c669..ac786a45 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page @@ -35,10 +35,12 @@ def test_ghash_nothing_in2(in): -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page index 64438430..1e3851f7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page @@ -30,10 +30,12 @@ def test_ghash_nothing_return(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page index 5748c38a..66aa7060 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page @@ -30,10 +30,12 @@ def test_ghash_nothing_return2(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page index 5eff48f8..9b77e122 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page @@ -35,10 +35,12 @@ def test_ghash_null_in(in): -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page index a1c9b5bf..07d7e151 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page @@ -35,10 +35,12 @@ def test_ghash_null_out(out): -
-

out :

-
-
+ + +<code>out</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page index 0683dbed..71867408 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page @@ -30,10 +30,12 @@ def test_ghash_null_return(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page index 16ae13ab..28be892d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page @@ -30,10 +30,12 @@ def test_glist_container_return(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page index 44f09fdd..2d449a4d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page @@ -30,10 +30,12 @@ def test_glist_everything_return(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page index 1950b99a..8f2d8851 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page @@ -35,10 +35,12 @@ def test_glist_nothing_in(in): -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page index 3a5d966d..a9307604 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page @@ -35,10 +35,12 @@ def test_glist_nothing_in2(in): -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page index 13854024..1230c517 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page @@ -30,10 +30,12 @@ def test_glist_nothing_return(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page index 3a78443f..4d120ea0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page @@ -30,10 +30,12 @@ def test_glist_nothing_return2(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page index 6f1ce10d..619f9414 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page @@ -35,10 +35,12 @@ def test_glist_null_in(in): -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page index 1bc2c2de..9ed9114f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page @@ -35,10 +35,12 @@ def test_glist_null_out(out_list): -
-

out_list :

-
-
+ + +<code>out_list</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page index b328b0f0..89574e27 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page @@ -30,10 +30,12 @@ def test_gslist_container_return(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page index 749adc28..d0eafc0d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page @@ -30,10 +30,12 @@ def test_gslist_everything_return(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page index 86e240eb..ab61b072 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page @@ -35,10 +35,12 @@ def test_gslist_nothing_in(in): -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page index 8edd87e2..df5af0ff 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page @@ -35,10 +35,12 @@ def test_gslist_nothing_in2(in): -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page index a6af8a2a..71813808 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page @@ -30,10 +30,12 @@ def test_gslist_nothing_return(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page index 146643c6..60a28160 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page @@ -30,10 +30,12 @@ def test_gslist_nothing_return2(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page index b3117c01..6bf4307f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page @@ -35,10 +35,12 @@ def test_gslist_null_in(in): -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page index 3a0fa92e..b9ce49ed 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page @@ -35,10 +35,12 @@ def test_gslist_null_out(out_list): -
-

out_list :

-
-
+ + +<code>out_list</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page index f98195ac..798d219a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page @@ -35,12 +35,16 @@ def test_gtype(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page index edd0a830..c6fabf62 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page @@ -30,10 +30,12 @@ def test_gvariant_as(): -
-

Returns :

-

New variant

-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page index 2e9eeeb7..a99d4022 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page @@ -30,10 +30,12 @@ def test_gvariant_asv(): -
-

Returns :

-

New variant

-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page index c47377b5..891ae8ba 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page @@ -30,10 +30,12 @@ def test_gvariant_i(): -
-

Returns :

-

New variant

-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page index dfd123f8..cfabe8ba 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page @@ -30,10 +30,12 @@ def test_gvariant_s(): -
-

Returns :

-

New variant

-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page index 1f5d309e..325e136c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page @@ -30,10 +30,12 @@ def test_gvariant_v(): -
-

Returns :

-

New variant

-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page index 6429848b..94b02d40 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page @@ -39,12 +39,16 @@ def test_hash_table_callback(data, callback): -
-

data :

-

GHashTable that gets passed to callback

-

callback :

-
-
+ + +<code>data</code> +

GHashTable that gets passed to callback

+ + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page index 22c435f5..538f8ce5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page @@ -35,12 +35,16 @@ def test_int(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page index 6f0945af..b749c85d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page @@ -35,12 +35,16 @@ def test_int16(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page index 8070a644..29fd74ab 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page @@ -35,12 +35,16 @@ def test_int32(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page index c9456ad6..52413c05 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page @@ -35,12 +35,16 @@ def test_int64(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page index 73c17498..50bfa635 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page @@ -35,12 +35,16 @@ def test_int8(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page index 9b5b728e..bf066219 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page @@ -39,12 +39,16 @@ def test_int_out_utf8(length, in): -
-

length :

-
-

in :

-
-
+ + +<code>length</code> + + + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page index 2d6d569b..cb034ddf 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page @@ -35,12 +35,16 @@ def test_int_value_arg(v): -
-

v :

-
-

Returns :

-
-
+ + +<code>v</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page index 3b56821e..eb13e4f8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page @@ -35,12 +35,16 @@ def test_long(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page index ed15aba2..530f763e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page @@ -35,12 +35,16 @@ def test_multi_callback(callback): -
-

callback :

-
-

Returns :

-
-
+ + +<code>callback</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page index b781e796..df6a9f85 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page @@ -43,14 +43,20 @@ def test_multi_double_args(in, one, two): -
-

in :

-
-

one :

-
-

two :

-
-
+ + +<code>in</code> + + + +<code>one</code> + + + +<code>two</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page index 6cfdbcd6..9b8ae8cd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page @@ -30,8 +30,8 @@ def test_multiline_doc_comments(): -
-
+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page index 571dd0a5..6ee8fc23 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page @@ -60,10 +60,12 @@ rgb(20%, 30%, 0%)</literallayout></entry> -
-

a :

-

An integer

-
+ + +<code>a</code> +

An integer

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page index ce50e43e..05b872e2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page @@ -35,10 +35,12 @@ def test_null_gerror_callback(callback): -
-

callback :

-
-
+ + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page index 93cd72fc..b2d23902 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page @@ -35,10 +35,12 @@ def test_owned_gerror_callback(callback): -
-

callback :

-
-
+ + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page index 77ddd585..40364efe 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page @@ -35,12 +35,16 @@ def test_short(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page index 241d0a86..fc87b44e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page @@ -35,10 +35,12 @@ def test_simple_callback(callback): -
-

callback :

-
-
+ + +<code>callback</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page index 3496e370..24432094 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page @@ -35,12 +35,16 @@ def test_size(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page index 6e61bc83..bcfe773a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page @@ -35,12 +35,16 @@ def test_ssize(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page index dee44c02..fca58f0a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page @@ -35,12 +35,16 @@ def test_strv_in(arr): -
-

arr :

-
-

Returns :

-
-
+ + +<code>arr</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page index ab03bda9..1db56a92 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page @@ -30,10 +30,12 @@ def test_strv_in_gvalue(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page index e87d979f..ca99305f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page @@ -30,10 +30,12 @@ def test_strv_out(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page index 8d5a73a7..ad925c4d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page @@ -30,10 +30,12 @@ def test_strv_out_c(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page index feaf8c78..04b8152c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page @@ -30,10 +30,12 @@ def test_strv_out_container(): -
-

Returns :

-
-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page index 7cea6b43..40882d5c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page @@ -35,10 +35,12 @@ def test_strv_outarg(retp): -
-

retp :

-
-
+ + +<code>retp</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page index 3e7637ec..a93fd091 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page @@ -35,12 +35,16 @@ def test_timet(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page index 542dc1f2..2be46bb7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page @@ -55,20 +55,32 @@ def test_torture_signature_0(x, y, z, foo, q, m): -
-

x :

-
-

y :

-
-

z :

-
-

foo :

-
-

q :

-
-

m :

-
-
+ + +<code>x</code> + + + +<code>y</code> + + + +<code>z</code> + + + +<code>foo</code> + + + +<code>q</code> + + + +<code>m</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page index 333d386e..15cfb50f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page @@ -55,22 +55,36 @@ def test_torture_signature_1(x, y, z, foo, q, m): -
-

x :

-
-

y :

-
-

z :

-
-

foo :

-
-

q :

-
-

m :

-
-

Returns :

-
-
+ + +<code>x</code> + + + +<code>y</code> + + + +<code>z</code> + + + +<code>foo</code> + + + +<code>q</code> + + + +<code>m</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page index 449793bb..7ee3809f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page @@ -67,26 +67,44 @@ def test_torture_signature_2(x, callback, user_data, notify, y, z, foo, q, m): -
-

x :

-
-

callback :

-
-

user_data :

-
-

notify :

-
-

y :

-
-

z :

-
-

foo :

-
-

q :

-
-

m :

-
-
+ + +<code>x</code> + + + +<code>callback</code> + + + +<code>user_data</code> + + + +<code>notify</code> + + + +<code>y</code> + + + +<code>z</code> + + + +<code>foo</code> + + + +<code>q</code> + + + +<code>m</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page index 84f702af..7735c13c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page @@ -35,12 +35,16 @@ def test_uint(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page index b8e444a0..490c11fd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page @@ -35,12 +35,16 @@ def test_uint16(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page index 37da5482..87a20ccd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page @@ -35,12 +35,16 @@ def test_uint32(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page index b11cfbb2..f697e694 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page @@ -35,12 +35,16 @@ def test_uint64(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page index 58f7817a..ae918cba 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page @@ -35,12 +35,16 @@ def test_uint8(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page index f94fff0d..349576c5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page @@ -35,12 +35,16 @@ def test_ulong(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page index 363a5e33..2b705e8e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page @@ -35,12 +35,16 @@ def test_unichar(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page index 4e77143e..31b91662 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page @@ -35,12 +35,16 @@ def test_unsigned_enum_param(e): -
-

e :

-
-

Returns :

-
-
+ + +<code>e</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page index 2b0f0822..68f0aa8a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page @@ -35,12 +35,16 @@ def test_ushort(in): -
-

in :

-
-

Returns :

-
-
+ + +<code>in</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page index 36e992bb..888e6eab 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page @@ -35,10 +35,12 @@ def test_utf8_const_in(in): -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page index 9aef1f17..b704c60d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page @@ -30,10 +30,12 @@ def test_utf8_const_return(): -
-

Returns :

-

UTF-8 string

-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page index c7c32ccc..1839f096 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page @@ -35,10 +35,12 @@ def test_utf8_inout(inout): -
-

inout :

-
-
+ + +<code>inout</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page index fd5de6a9..03049985 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page @@ -30,10 +30,12 @@ def test_utf8_nonconst_return(): -
-

Returns :

-

UTF-8 string

-
+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page index c6aff047..1fda6800 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page @@ -35,10 +35,12 @@ def test_utf8_null_in(in): -
-

in :

-
-
+ + +<code>in</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page index 65b277af..f8d7b6fb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page @@ -35,10 +35,12 @@ def test_utf8_null_out(char_out): -
-

char_out :

-
-
+ + +<code>char_out</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page index 7f73b8d0..acc0a406 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page @@ -35,10 +35,12 @@ def test_utf8_out(out): -
-

out :

-
-
+ + +<code>out</code> + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page index ed43d541..e7efb7b9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page @@ -35,12 +35,16 @@ def test_utf8_out_nonconst_return(out): -
-

out :

-

a copy of "second"

-

Returns :

-

a copy of "first"

-
+ + +<code>out</code> +

a copy of "second"

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page index 763053fa..bde41d8e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page @@ -39,12 +39,16 @@ def test_utf8_out_out(out0, out1): -
-

out0 :

-

a copy of "first"

-

out1 :

-

a copy of "second"

-
+ + +<code>out0</code> +

a copy of "first"

+ + +<code>out1</code> +

a copy of "second"

+ + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page index 54aaaa66..6470babc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page @@ -35,12 +35,16 @@ def test_value_return(i): -
-

i :

-

an int

-

Returns :

-

the int wrapped in a GValue.

-
+ + +<code>i</code> +

an int

+ + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page index 4a5cfd82..cac760a7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page @@ -31,8 +31,8 @@ def test_versioning():

Since 1.32.1

-
-
+ + -- cgit v1.2.1 From 5a890b79fd720a9eec4d3b9eb1c9cdd6d7b24653 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 14 Feb 2013 23:00:51 -0500 Subject: doctool: Gjs doesn't have extra signal parameters --- giscanner/doctemplates/Gjs/signal.tmpl | 10 +--------- .../Regress.AnnotationObject-attribute-signal.page | 10 +--------- .../Regress.AnnotationObject-doc-empty-arg-parsing.page | 10 +--------- .../Regress.AnnotationObject-list-signal.page | 10 +--------- .../Regress.AnnotationObject-string-signal.page | 10 +--------- .../Regress-1.0-Gjs-expected/Regress.FooObject-signal.page | 10 +--------- .../Regress.FooSubInterface-destroy-event.page | 10 +--------- .../scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page | 10 +--------- .../Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page | 10 +--------- .../Regress-1.0-Gjs-expected/Regress.TestObj-first.page | 10 +--------- .../Regress.TestObj-sig-with-array-prop.page | 10 +--------- .../Regress.TestObj-sig-with-foreign-struct.page | 10 +--------- .../Regress.TestObj-sig-with-hash-prop.page | 10 +--------- .../Regress.TestObj-sig-with-int64-prop.page | 10 +--------- .../Regress.TestObj-sig-with-intarray-ret.page | 10 +--------- .../Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page | 10 +--------- .../Regress.TestObj-sig-with-strv.page | 10 +--------- .../Regress.TestObj-sig-with-uint64-prop.page | 10 +--------- .../Regress.TestObj-test-with-static-scope-arg.page | 10 +--------- .../scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page | 10 +--------- 20 files changed, 20 insertions(+), 180 deletions(-) diff --git a/giscanner/doctemplates/Gjs/signal.tmpl b/giscanner/doctemplates/Gjs/signal.tmpl index 994392ce..7d28cad5 100644 --- a/giscanner/doctemplates/Gjs/signal.tmpl +++ b/giscanner/doctemplates/Gjs/signal.tmpl @@ -9,7 +9,7 @@ function callback(${formatter.to_underscores(node.parent.name).lower()}, \ % for arg in formatter.get_parameters(node): ${arg.argname}:${formatter.format_type(arg.type)}, \ % endfor -user_param1, ...):${formatter.format_type(node.retval.type)}; +):${formatter.format_type(node.retval.type)}; <%block name="details"> @@ -24,14 +24,6 @@ user_param1, ...):${formatter.format_type(node.retval.type)}; ${formatter.format(node, arg.doc)} % endfor - -<code>user_param1</code> -

first user parameter (if any) specified with the connect() method

- - -<code>...</code> -

additional user parameters (if any)

- % if node.retval and \ node.retval.type.ctype != 'void' and \ node.retval.type.ctype is not None: diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page index 713f2fa9..f3ab0917 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page @@ -14,7 +14,7 @@ Regress.AnnotationObject::attribute-signal -function callback(annotation_object, arg1:String, arg2:String, user_param1, ...):String; +function callback(annotation_object, arg1:String, arg2:String, ):String; @@ -37,14 +37,6 @@ function callback(annotation_object, arg1:String, arg2:String, user_param1, ...)

another value

-<code>user_param1</code> -

first user parameter (if any) specified with the connect() method

- - -<code>...</code> -

additional user parameters (if any)

- - <code>Returns</code>

gchar*

the return value

 diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page index 68a6b8f5..b6dc19fb 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page @@ -14,7 +14,7 @@ Regress.AnnotationObject::doc-empty-arg-parsing -function callback(annotation_object, arg1:gpointer, user_param1, ...):void; +function callback(annotation_object, arg1:gpointer, ):void; @@ -31,14 +31,6 @@ function callback(annotation_object, arg1:gpointer, user_param1, ...):void; <code>arg1</code> - - -<code>user_param1</code> -

first user parameter (if any) specified with the connect() method

- - -<code>...</code> -

additional user parameters (if any)

 diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page index 3464bf78..d16187b2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page @@ -14,7 +14,7 @@ Regress.AnnotationObject::list-signal -function callback(annotation_object, list:[String], user_param1, ...):void; +function callback(annotation_object, list:[String], ):void; @@ -33,14 +33,6 @@ known by GObject as it's only marked as G_TYPE_POINTER

<code>list</code>

a list of strings

- -<code>user_param1</code> -

first user parameter (if any) specified with the connect() method

- - -<code>...</code> -

additional user parameters (if any)

- diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page index 53124914..a900a0f9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page @@ -14,7 +14,7 @@ Regress.AnnotationObject::string-signal -function callback(annotation_object, string:String, user_param1, ...):void; +function callback(annotation_object, string:String, ):void; @@ -34,14 +34,6 @@ it says it's pointer but it's actually a string.

<code>string</code>

a string

- -<code>user_param1</code> -

first user parameter (if any) specified with the connect() method

- - -<code>...</code> -

additional user parameters (if any)

- diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page index d41290f6..72ffecca 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page @@ -14,7 +14,7 @@ Regress.FooObject::signal -function callback(foo_object, object:GObject.Object, p0:gpointer, user_param1, ...):String; +function callback(foo_object, object:GObject.Object, p0:gpointer, ):String; @@ -35,14 +35,6 @@ function callback(foo_object, object:GObject.Object, p0:gpointer, user_param1, . <code>p0</code> - - -<code>user_param1</code> -

first user parameter (if any) specified with the connect() method

- - -<code>...</code> -

additional user parameters (if any)

 <code>Returns</code> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page index a444574e..74893012 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page @@ -14,7 +14,7 @@ Regress.FooSubInterface::destroy-event -function callback(foo_sub_interface, user_param1, ...):void; +function callback(foo_sub_interface, ):void; @@ -28,14 +28,6 @@ function callback(foo_sub_interface, user_param1, ...):void; <code>foo_sub_interface</code>

instance of Regress.FooSubInterface that is emitting the signal

 - -<code>user_param1</code> -

first user parameter (if any) specified with the connect() method

- - -<code>...</code> -

additional user parameters (if any)

- diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page index f8d71322..7509a6da 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page @@ -14,7 +14,7 @@ Regress.TestObj::all -function callback(test_obj, user_param1, ...):void; +function callback(test_obj, ):void; @@ -28,14 +28,6 @@ function callback(test_obj, user_param1, ...):void; <code>test_obj</code>

instance of Regress.TestObj that is emitting the signal

- -<code>user_param1</code> -

first user parameter (if any) specified with the connect() method

- - -<code>...</code> -

additional user parameters (if any)

- diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page index 085c6987..a9e8b7e0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page @@ -14,7 +14,7 @@ Regress.TestObj::cleanup -function callback(test_obj, user_param1, ...):void; +function callback(test_obj, ):void; @@ -28,14 +28,6 @@ function callback(test_obj, user_param1, ...):void; <code>test_obj</code>

instance of Regress.TestObj that is emitting the signal

- -<code>user_param1</code> -

first user parameter (if any) specified with the connect() method

- - -<code>...</code> -

additional user parameters (if any)

- diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page index 1a521f97..599a26cd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page @@ -14,7 +14,7 @@ Regress.TestObj::first -function callback(test_obj, user_param1, ...):void; +function callback(test_obj, ):void; @@ -28,14 +28,6 @@ function callback(test_obj, user_param1, ...):void; <code>test_obj</code>

instance of Regress.TestObj that is emitting the signal

- -<code>user_param1</code> -

first user parameter (if any) specified with the connect() method

- - -<code>...</code> -

additional user parameters (if any)

- diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page index afc914fa..9dd0dae1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page @@ -14,7 +14,7 @@ Regress.TestObj::sig-with-array-prop -function callback(test_obj, arr:[Number], user_param1, ...):void; +function callback(test_obj, arr:[Number], ):void; @@ -33,14 +33,6 @@ function callback(test_obj, arr:[Number], user_param1, ...):void; <code>arr</code>

numbers

- -<code>user_param1</code> -

first user parameter (if any) specified with the connect() method

- - -<code>...</code> -

additional user parameters (if any)

- diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page index d79c6f78..7618f96d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page @@ -14,7 +14,7 @@ Regress.TestObj::sig-with-foreign-struct -function callback(test_obj, cr:cairo.Context, user_param1, ...):void; +function callback(test_obj, cr:cairo.Context, ):void; @@ -32,14 +32,6 @@ function callback(test_obj, cr:cairo.Context, user_param1, ...):void; <code>cr</code>

A cairo context.

- -<code>user_param1</code> -

first user parameter (if any) specified with the connect() method

- - -<code>...</code> -

additional user parameters (if any)

- diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page index ec5e4e1e..b6dbdf1a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page @@ -14,7 +14,7 @@ Regress.TestObj::sig-with-hash-prop -function callback(test_obj, hash:{String: GObject.Value}, user_param1, ...):void; +function callback(test_obj, hash:{String: GObject.Value}, ):void; @@ -32,14 +32,6 @@ function callback(test_obj, hash:{String: GObject.Value}, user_param1, ...):void <code>hash</code> - - -<code>user_param1</code> -

first user parameter (if any) specified with the connect() method

- - -<code>...</code> -

additional user parameters (if any)

 diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page index 28d4cf96..f0e99bf4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page @@ -14,7 +14,7 @@ Regress.TestObj::sig-with-int64-prop -function callback(test_obj, i:Number, user_param1, ...):Number; +function callback(test_obj, i:Number, ):Number; @@ -34,14 +34,6 @@ the introspection client langage.

an integer

-<code>user_param1</code> -

first user parameter (if any) specified with the connect() method

- - -<code>...</code> -

additional user parameters (if any)

- - <code>Returns</code>

gint64

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page index ef623d9f..bce2b0b1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page @@ -14,7 +14,7 @@ Regress.TestObj::sig-with-intarray-ret -function callback(test_obj, i:Number, user_param1, ...):[Number]; +function callback(test_obj, i:Number, ):[Number]; @@ -32,14 +32,6 @@ function callback(test_obj, i:Number, user_param1, ...):[Number]; <code>i</code>

an integer

- -<code>user_param1</code> -

first user parameter (if any) specified with the connect() method

- - -<code>...</code> -

additional user parameters (if any)

- diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page index 470fe4d6..bb43e004 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page @@ -14,7 +14,7 @@ Regress.TestObj::sig-with-obj -function callback(test_obj, obj:GObject.Object, user_param1, ...):void; +function callback(test_obj, obj:GObject.Object, ):void; @@ -33,14 +33,6 @@ Use with regress_test_obj_emit_sig_with_obj

<code>obj</code>

A newly created RegressTestObj

- -<code>user_param1</code> -

first user parameter (if any) specified with the connect() method

- - -<code>...</code> -

additional user parameters (if any)

- diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page index 812891cc..9ef0cc27 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page @@ -14,7 +14,7 @@ Regress.TestObj::sig-with-strv -function callback(test_obj, strs:[String], user_param1, ...):void; +function callback(test_obj, strs:[String], ):void; @@ -32,14 +32,6 @@ function callback(test_obj, strs:[String], user_param1, ...):void; <code>strs</code>

strings

- -<code>user_param1</code> -

first user parameter (if any) specified with the connect() method

- - -<code>...</code> -

additional user parameters (if any)

- diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page index 80e75635..d87cbb56 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -14,7 +14,7 @@ Regress.TestObj::sig-with-uint64-prop -function callback(test_obj, i:Number, user_param1, ...):Number; +function callback(test_obj, i:Number, ):Number; @@ -34,14 +34,6 @@ the introspection client langage.

an integer

-<code>user_param1</code> -

first user parameter (if any) specified with the connect() method

- - -<code>...</code> -

additional user parameters (if any)

- - <code>Returns</code>

guint64

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page index ec06fff0..733de72d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page @@ -14,7 +14,7 @@ Regress.TestObj::test-with-static-scope-arg -function callback(test_obj, object:Regress.TestSimpleBoxedA, user_param1, ...):void; +function callback(test_obj, object:Regress.TestSimpleBoxedA, ):void; @@ -31,14 +31,6 @@ function callback(test_obj, object:Regress.TestSimpleBoxedA, user_param1, ...):v <code>object</code> - - -<code>user_param1</code> -

first user parameter (if any) specified with the connect() method

- - -<code>...</code> -

additional user parameters (if any)

 diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page index 604283d6..a5448f68 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page @@ -14,7 +14,7 @@ Regress.TestObj::test -function callback(test_obj, user_param1, ...):void; +function callback(test_obj, ):void; @@ -28,14 +28,6 @@ function callback(test_obj, user_param1, ...):void; <code>test_obj</code>

instance of Regress.TestObj that is emitting the signal

- -<code>user_param1</code> -

first user parameter (if any) specified with the connect() method

- - -<code>...</code> -

additional user parameters (if any)

- -- cgit v1.2.1 From 71a1705667f297c122b8637556924c9d16e36801 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 14 Feb 2013 23:04:41 -0500 Subject: doctool: Fix Gjs class signature --- giscanner/doctemplates/Gjs/class.tmpl | 11 ++++------- .../Regress.AnnotationObject.page | 9 +++++++-- .../Regress-1.0-Gjs-expected/Regress.FooBuffer.page | 6 ++++-- .../Regress-1.0-Gjs-expected/Regress.FooInterface.page | 6 ++++-- .../Regress-1.0-Gjs-expected/Regress.FooObject.page | 8 ++++++-- .../Regress.FooOtherObject.page | 6 ++++-- .../Regress.FooSubInterface.page | 6 ++++-- .../Regress-1.0-Gjs-expected/Regress.FooSubobject.page | 6 ++++-- .../Regress-1.0-Gjs-expected/Regress.TestFloating.page | 6 ++++-- .../Regress.TestFundamentalObject.page | 6 ++++-- .../Regress.TestFundamentalSubObject.page | 6 ++++-- .../Regress.TestInheritDrawable.page | 6 ++++-- .../Regress-1.0-Gjs-expected/Regress.TestInterface.page | 6 ++++-- .../Regress-1.0-Gjs-expected/Regress.TestObj.page | 17 +++++++++++++++-- .../Regress-1.0-Gjs-expected/Regress.TestSubObj.page | 6 ++++-- .../Regress-1.0-Gjs-expected/Regress.TestWi8021x.page | 7 +++++-- 16 files changed, 81 insertions(+), 37 deletions(-) diff --git a/giscanner/doctemplates/Gjs/class.tmpl b/giscanner/doctemplates/Gjs/class.tmpl index 435b31a5..5882d9fa 100644 --- a/giscanner/doctemplates/Gjs/class.tmpl +++ b/giscanner/doctemplates/Gjs/class.tmpl @@ -1,17 +1,14 @@ <%inherit file="/class.tmpl"/> <%block name="synopsis"> -from gi.repository import ${namespace.name} +const ${namespace.name} = imports.gi.${namespace.name}; -${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}(\ +let ${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}({ % for ix, property_ in enumerate(node.properties): % if property_.construct or property_.construct_only or property_.writable: -${property_.name.replace('-', '_')}=value\ -% if ix != len(node.properties) - 1: -, \ -% endif + ${property_.name.replace('-', '_')}: value, % endif % endfor -)\ +}); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page index 8bcae31c..e104633a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page @@ -13,9 +13,14 @@ Regress.AnnotationObject -from gi.repository import Regress +const Regress = imports.gi.Regress; -annotation_object = Regress.AnnotationObject(function_property=value, string_property=value, tab_property=value) +let annotation_object = Regress.AnnotationObject({ + function_property: value, + string_property: value, + tab_property: value, +}); +

This is an object used to test regress_annotations.

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page index a3b5101c..1220e811 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page @@ -13,9 +13,11 @@ Regress.FooBuffer -from gi.repository import Regress +const Regress = imports.gi.Regress; -foo_buffer = Regress.FooBuffer() +let foo_buffer = Regress.FooBuffer({ +}); + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page index a195bb89..8e182705 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page @@ -13,9 +13,11 @@ Regress.FooInterface -from gi.repository import Regress +const Regress = imports.gi.Regress; -foo_interface = Regress.FooInterface() +let foo_interface = Regress.FooInterface({ +}); + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page index 6a0810ef..9f2290b4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page @@ -13,9 +13,13 @@ Regress.FooObject -from gi.repository import Regress +const Regress = imports.gi.Regress; -foo_object = Regress.FooObject(hidden=value, string=value) +let foo_object = Regress.FooObject({ + hidden: value, + string: value, +}); + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page index 56e0fcbe..b007600f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page @@ -13,9 +13,11 @@ Regress.FooOtherObject -from gi.repository import Regress +const Regress = imports.gi.Regress; -foo_other_object = Regress.FooOtherObject() +let foo_other_object = Regress.FooOtherObject({ +}); + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page index 3b093726..de032148 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page @@ -13,9 +13,11 @@ Regress.FooSubInterface -from gi.repository import Regress +const Regress = imports.gi.Regress; -foo_sub_interface = Regress.FooSubInterface() +let foo_sub_interface = Regress.FooSubInterface({ +}); + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page index f3a8b6d7..244f994d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page @@ -13,9 +13,11 @@ Regress.FooSubobject -from gi.repository import Regress +const Regress = imports.gi.Regress; -foo_subobject = Regress.FooSubobject() +let foo_subobject = Regress.FooSubobject({ +}); + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page index 4f1c3233..1d78cd77 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page @@ -13,9 +13,11 @@ Regress.TestFloating -from gi.repository import Regress +const Regress = imports.gi.Regress; -test_floating = Regress.TestFloating() +let test_floating = Regress.TestFloating({ +}); + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page index ee5ea928..73312d2c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page @@ -13,9 +13,11 @@ Regress.TestFundamentalObject -from gi.repository import Regress +const Regress = imports.gi.Regress; -test_fundamental_object = Regress.TestFundamentalObject() +let test_fundamental_object = Regress.TestFundamentalObject({ +}); + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page index 1418f6f7..93d6152c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page @@ -13,9 +13,11 @@ Regress.TestFundamentalSubObject -from gi.repository import Regress +const Regress = imports.gi.Regress; -test_fundamental_sub_object = Regress.TestFundamentalSubObject() +let test_fundamental_sub_object = Regress.TestFundamentalSubObject({ +}); + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page index e5622894..d7ac0c5a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page @@ -13,9 +13,11 @@ Regress.TestInheritDrawable -from gi.repository import Regress +const Regress = imports.gi.Regress; -test_inherit_drawable = Regress.TestInheritDrawable() +let test_inherit_drawable = Regress.TestInheritDrawable({ +}); + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page index 09c9898a..de64aad9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page @@ -13,9 +13,11 @@ Regress.TestInterface -from gi.repository import Regress +const Regress = imports.gi.Regress; -test_interface = Regress.TestInterface() +let test_interface = Regress.TestInterface({ +}); + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page index 7ee950e7..9b4dd9ce 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page @@ -13,9 +13,22 @@ Regress.TestObj -from gi.repository import Regress +const Regress = imports.gi.Regress; -test_obj = Regress.TestObj(bare=value, boxed=value, double=value, float=value, gtype=value, hash_table=value, hash_table_old=value, int=value, list=value, list_old=value, string=value) +let test_obj = Regress.TestObj({ + bare: value, + boxed: value, + double: value, + float: value, + gtype: value, + hash_table: value, + hash_table_old: value, + int: value, + list: value, + list_old: value, + string: value, +}); + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page index fe84d57f..9e0566e1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page @@ -13,9 +13,11 @@ Regress.TestSubObj -from gi.repository import Regress +const Regress = imports.gi.Regress; -test_sub_obj = Regress.TestSubObj() +let test_sub_obj = Regress.TestSubObj({ +}); + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page index 2ea9c575..dc09718e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page @@ -13,9 +13,12 @@ Regress.TestWi8021x -from gi.repository import Regress +const Regress = imports.gi.Regress; -test_wi8021x = Regress.TestWi8021x(testbool=value) +let test_wi8021x = Regress.TestWi8021x({ + testbool: value, +}); + -- cgit v1.2.1 From 29c381b0a1f077ddf3f8ce9fc2f7ab11b4f3628e Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 14 Feb 2013 23:14:02 -0500 Subject: doctool: Add an link for signal methods --- giscanner/doctemplates/Gjs/signal.tmpl | 2 +- giscanner/doctemplates/Python/signal.tmpl | 2 +- .../Regress.AnnotationObject-attribute-signal.page | 2 +- .../Regress.AnnotationObject-doc-empty-arg-parsing.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page | 2 +- .../Regress.AnnotationObject-string-signal.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page | 2 +- .../Regress.TestObj-sig-with-foreign-struct.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page | 2 +- .../Regress.TestObj-test-with-static-scope-arg.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page | 2 +- .../Regress.AnnotationObject-attribute-signal.page | 2 +- .../Regress.AnnotationObject-doc-empty-arg-parsing.page | 2 +- .../Regress.AnnotationObject-list-signal.page | 2 +- .../Regress.AnnotationObject-string-signal.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page | 2 +- .../Regress.FooSubInterface-destroy-event.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page | 2 +- .../Regress.TestObj-sig-with-array-prop.page | 2 +- .../Regress.TestObj-sig-with-foreign-struct.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page | 2 +- .../Regress.TestObj-sig-with-int64-prop.page | 2 +- .../Regress.TestObj-sig-with-intarray-ret.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page | 2 +- .../Regress.TestObj-sig-with-uint64-prop.page | 2 +- .../Regress.TestObj-test-with-static-scope-arg.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/giscanner/doctemplates/Gjs/signal.tmpl b/giscanner/doctemplates/Gjs/signal.tmpl index 7d28cad5..6903017f 100644 --- a/giscanner/doctemplates/Gjs/signal.tmpl +++ b/giscanner/doctemplates/Gjs/signal.tmpl @@ -16,7 +16,7 @@ ${arg.argname}:${formatter.format_type(arg.type)}, \ <code>${formatter.to_underscores(node.parent.name).lower()}</code> -

instance of ${namespace.name}.${node.parent.name} that is emitting the signal

+

instance of ${formatter.format_xref(node.parent)} that is emitting the signal

 % for arg in formatter.get_parameters(node): diff --git a/giscanner/doctemplates/Python/signal.tmpl b/giscanner/doctemplates/Python/signal.tmpl index fa850418..c474b055 100644 --- a/giscanner/doctemplates/Python/signal.tmpl +++ b/giscanner/doctemplates/Python/signal.tmpl @@ -16,7 +16,7 @@ user_param1, ...) <code>${formatter.to_underscores(node.parent.name).lower()}</code> -

instance of ${namespace.name}.${node.parent.name} that is emitting the signal

+

instance of ${formatter.format_xref(node.parent)} that is emitting the signal

 % for arg in formatter.get_parameters(node): diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page index f3ab0917..e4c0ca5c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page @@ -26,7 +26,7 @@ function callback(annotation_object, arg1:String, arg2:String, ):String; <code>annotation_object</code> -

instance of Regress.AnnotationObject that is emitting the signal

+

instance of that is emitting the signal

 <code>arg1</code> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page index b6dc19fb..2e71c465 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page @@ -26,7 +26,7 @@ function callback(annotation_object, arg1:gpointer, ):void; <code>annotation_object</code> -

instance of Regress.AnnotationObject that is emitting the signal

+

instance of that is emitting the signal

 <code>arg1</code> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page index d16187b2..c9e35a9d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page @@ -27,7 +27,7 @@ known by GObject as it's only marked as G_TYPE_POINTER

<code>annotation_object</code> -

instance of Regress.AnnotationObject that is emitting the signal

+

instance of that is emitting the signal

 <code>list</code> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page index a900a0f9..4597130f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page @@ -28,7 +28,7 @@ it says it's pointer but it's actually a string.

<code>annotation_object</code> -

instance of Regress.AnnotationObject that is emitting the signal

+

instance of that is emitting the signal

 <code>string</code> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page index 72ffecca..2a54cb3a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page @@ -26,7 +26,7 @@ function callback(foo_object, object:GObject.Object, p0:gpointer, ):String; <code>foo_object</code> -

instance of Regress.FooObject that is emitting the signal

+

instance of that is emitting the signal

 <code>object</code> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page index 74893012..5a297708 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page @@ -26,7 +26,7 @@ function callback(foo_sub_interface, ):void; <code>foo_sub_interface</code> -

instance of Regress.FooSubInterface that is emitting the signal

+

instance of that is emitting the signal

 diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page index 7509a6da..1094566b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page @@ -26,7 +26,7 @@ function callback(test_obj, ):void; <code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page index a9e8b7e0..0bff84e5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page @@ -26,7 +26,7 @@ function callback(test_obj, ):void; <code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page index 599a26cd..34d6f7c3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page @@ -26,7 +26,7 @@ function callback(test_obj, ):void; <code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page index 9dd0dae1..2e2d2fbd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page @@ -27,7 +27,7 @@ function callback(test_obj, arr:[Number], ):void; <code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>arr</code> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page index 7618f96d..1f4d53d0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page @@ -26,7 +26,7 @@ function callback(test_obj, cr:cairo.Context, ):void; <code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>cr</code> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page index b6dbdf1a..58d03932 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page @@ -27,7 +27,7 @@ function callback(test_obj, hash:{String: GObject.Value}, ):void; <code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>hash</code> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page index f0e99bf4..b1953738 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page @@ -27,7 +27,7 @@ the introspection client langage.

<code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>i</code> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page index bce2b0b1..2a1f980c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page @@ -26,7 +26,7 @@ function callback(test_obj, i:Number, ):[Number]; <code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>i</code> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page index bb43e004..9f3e81f1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page @@ -27,7 +27,7 @@ Use with regress_test_obj_emit_sig_with_obj

<code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>obj</code> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page index 9ef0cc27..ae851a3b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page @@ -26,7 +26,7 @@ function callback(test_obj, strs:[String], ):void; <code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>strs</code> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page index d87cbb56..3598d57d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -27,7 +27,7 @@ the introspection client langage.

<code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>i</code> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page index 733de72d..6c2fced5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page @@ -26,7 +26,7 @@ function callback(test_obj, object:Regress.TestSimpleBoxedA, ):void; <code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>object</code> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page index a5448f68..ebec470e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page @@ -26,7 +26,7 @@ function callback(test_obj, ):void; <code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page index f01e3bf8..d1177bfa 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page @@ -26,7 +26,7 @@ def callback(annotation_object, arg1, arg2, user_param1, ...) <code>annotation_object</code> -

instance of Regress.AnnotationObject that is emitting the signal

+

instance of that is emitting the signal

 <code>arg1</code> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page index 64994913..9d8641d4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page @@ -26,7 +26,7 @@ def callback(annotation_object, arg1, user_param1, ...) <code>annotation_object</code> -

instance of Regress.AnnotationObject that is emitting the signal

+

instance of that is emitting the signal

 <code>arg1</code> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page index 250aca08..d4a27322 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page @@ -27,7 +27,7 @@ known by GObject as it's only marked as G_TYPE_POINTER

<code>annotation_object</code> -

instance of Regress.AnnotationObject that is emitting the signal

+

instance of that is emitting the signal

 <code>list</code> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page index 4aaf7e83..95bd3d29 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page @@ -28,7 +28,7 @@ it says it's pointer but it's actually a string.

<code>annotation_object</code> -

instance of Regress.AnnotationObject that is emitting the signal

+

instance of that is emitting the signal

 <code>string</code> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page index 7a353a2b..3db988a3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page @@ -26,7 +26,7 @@ def callback(foo_object, object, p0, user_param1, ...) <code>foo_object</code> -

instance of Regress.FooObject that is emitting the signal

+

instance of that is emitting the signal

 <code>object</code> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page index 3c43a772..675a861d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page @@ -26,7 +26,7 @@ def callback(foo_sub_interface, user_param1, ...) <code>foo_sub_interface</code> -

instance of Regress.FooSubInterface that is emitting the signal

+

instance of that is emitting the signal

 <code>user_param1</code>

first user parameter (if any) specified with the connect() method

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page index f4c2acb9..2870e2bd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page @@ -26,7 +26,7 @@ def callback(test_obj, user_param1, ...) <code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>user_param1</code>

first user parameter (if any) specified with the connect() method

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page index 292ae894..1e341964 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page @@ -26,7 +26,7 @@ def callback(test_obj, user_param1, ...) <code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>user_param1</code>

first user parameter (if any) specified with the connect() method

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page index 959a7118..f35e30d7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page @@ -26,7 +26,7 @@ def callback(test_obj, user_param1, ...) <code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>user_param1</code>

first user parameter (if any) specified with the connect() method

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page index 9441214f..cccc0903 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page @@ -27,7 +27,7 @@ def callback(test_obj, arr, user_param1, ...) <code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>arr</code> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page index 8734cde6..0dfd9d8c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page @@ -26,7 +26,7 @@ def callback(test_obj, cr, user_param1, ...) <code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>cr</code> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page index 40a3c1e9..ef6ded31 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page @@ -27,7 +27,7 @@ def callback(test_obj, hash, user_param1, ...) <code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>hash</code> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page index 5b077e15..cba5cb3f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page @@ -27,7 +27,7 @@ the introspection client langage.

<code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>i</code> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page index 4f28c6f7..134a1bb4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page @@ -26,7 +26,7 @@ def callback(test_obj, i, user_param1, ...) <code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>i</code> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page index e749b702..f99b27f5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page @@ -27,7 +27,7 @@ Use with regress_test_obj_emit_sig_with_obj

<code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>obj</code> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page index d70bbbc3..a92fe03f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page @@ -26,7 +26,7 @@ def callback(test_obj, strs, user_param1, ...) <code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>strs</code> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page index 35ccde6b..7d6a8d04 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -27,7 +27,7 @@ the introspection client langage.

<code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>i</code> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page index 3bfeb1d4..674df4a2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page @@ -26,7 +26,7 @@ def callback(test_obj, object, user_param1, ...) <code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>object</code> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page index 2ec8ca2e..e7ea1607 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page @@ -26,7 +26,7 @@ def callback(test_obj, user_param1, ...) <code>test_obj</code> -

instance of Regress.TestObj that is emitting the signal

+

instance of that is emitting the signal

 <code>user_param1</code>

first user parameter (if any) specified with the connect() method

-- cgit v1.2.1 From 31b6b6cb2630b19c7fb554e0e6eeda4eb2c323c7 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 14 Feb 2013 23:14:56 -0500 Subject: doctool: Remove the ctype from the signal return value WTF was this here for? --- giscanner/doctemplates/Gjs/signal.tmpl | 2 +- giscanner/doctemplates/Python/signal.tmpl | 2 +- .../Regress.AnnotationObject-attribute-signal.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page | 2 +- .../Regress.AnnotationObject-attribute-signal.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page | 2 +- .../Regress.TestObj-sig-with-int64-prop.page | 2 +- .../Regress.TestObj-sig-with-uint64-prop.page | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/giscanner/doctemplates/Gjs/signal.tmpl b/giscanner/doctemplates/Gjs/signal.tmpl index 6903017f..bfbfe16b 100644 --- a/giscanner/doctemplates/Gjs/signal.tmpl +++ b/giscanner/doctemplates/Gjs/signal.tmpl @@ -29,7 +29,7 @@ ${formatter.format(node, arg.doc)} node.retval.type.ctype is not None: <code>Returns</code> -

${node.retval.type.ctype} ${formatter.format(node, node.retval.doc)}

+

${formatter.format(node, node.retval.doc)}

 % endif diff --git a/giscanner/doctemplates/Python/signal.tmpl b/giscanner/doctemplates/Python/signal.tmpl index c474b055..9953eb53 100644 --- a/giscanner/doctemplates/Python/signal.tmpl +++ b/giscanner/doctemplates/Python/signal.tmpl @@ -35,7 +35,7 @@ ${formatter.format(node, arg.doc)} node.retval.type.ctype is not None: <code>Returns</code> -

${node.retval.type.ctype} ${formatter.format(node, node.retval.doc)}

+

${formatter.format(node, node.retval.doc)}

 % endif diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page index e4c0ca5c..5ba5b290 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page @@ -38,7 +38,7 @@ function callback(annotation_object, arg1:String, arg2:String, ):String; <code>Returns</code> -

gchar*

the return value

+

the return value

 diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page index 2a54cb3a..6e96d2dc 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page @@ -38,7 +38,7 @@ function callback(foo_object, object:GObject.Object, p0:gpointer, ):String; <code>Returns</code> -

gchar*

+

 diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page index b1953738..db4e3eee 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page @@ -35,7 +35,7 @@ the introspection client langage.

 <code>Returns</code> -

gint64

+

 diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page index 3598d57d..66c3aaeb 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -35,7 +35,7 @@ the introspection client langage.

 <code>Returns</code> -

guint64

+

 diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page index d1177bfa..3ad988dc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page @@ -44,7 +44,7 @@ def callback(annotation_object, arg1, arg2, user_param1, ...) <code>Returns</code> -

gchar*

the return value

+

the return value

 diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page index 3db988a3..aa653b64 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page @@ -44,7 +44,7 @@ def callback(foo_object, object, p0, user_param1, ...) <code>Returns</code> -

gchar*

+

 diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page index cba5cb3f..c67c12ae 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page @@ -41,7 +41,7 @@ the introspection client langage.

 <code>Returns</code> -

gint64

+

 diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page index 7d6a8d04..83dfe6f5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -41,7 +41,7 @@ the introspection client langage.

 <code>Returns</code> -

guint64

+

 -- cgit v1.2.1 From 24f611882216321b3645cac18f28496394913ca1 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Fri, 15 Feb 2013 08:27:52 +0100 Subject: Update annotations from glib git --- gir/gio-2.0.c | 220 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 214 insertions(+), 6 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 46532435..67581370 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -1896,6 +1896,15 @@ */ +/** + * GProxyAddressEnumerator:proxy-resolver: + * + * The proxy resolver to use. + * + * Since: 2.36 + */ + + /** * GRemoteActionGroupInterface: * @activate_action_full: the virtual function pointer for g_remote_action_group_activate_action_full() @@ -2212,6 +2221,75 @@ */ +/** + * GSimpleProxyResolver:default-proxy: + * + * The default proxy URI that will be used for any URI that doesn't + * match #GSimpleProxyResolver:ignore-hosts, and doesn't match any + * of the schemes set with g_simple_proxy_resolver_set_uri_proxy(). + * + * Note that as a special case, if this URI starts with + * "socks://", #GSimpleProxyResolver will treat + * it as referring to all three of the socks5, + * socks4a, and socks4 proxy + * types. + */ + + +/** + * GSimpleProxyResolver:ignore-hosts: + * + * A list of hostnames and IP addresses that the resolver should + * allow direct connections to. + * + * Entries can be in one of 4 formats: + * + * + * + * A hostname, such as "example.com", + * ".example.com", or + * "*.example.com", any of which match + * "example.com" or any subdomain of it. + * + * + * An IPv4 or IPv6 address, such as + * "192.168.1.1", which matches only + * that address. + * + * + * A hostname or IP address followed by a port, such as + * "example.com:80", which matches whatever + * the hostname or IP address would match, but only for URLs + * with the (explicitly) indicated port. In the case of an IPv6 + * address, the address part must appear in brackets: + * "[::1]:443" + * + * + * An IP address range, given by a base address and prefix length, + * such as "fe80::/10", which matches any + * address in that range. + * + * + * + * Note that when dealing with Unicode hostnames, the matching is + * done against the ASCII form of the name. + * + * Also note that hostname exclusions apply only to connections made + * to hosts identified by name, and IP address exclusions apply only + * to connections made to hosts identified by address. That is, if + * example.com has an address of + * 192.168.1.1, and the :ignore-hosts list + * contains only "192.168.1.1", then a connection + * to "example.com" (eg, via a #GNetworkAddress) + * will use the proxy, and a connection to + * "192.168.1.1" (eg, via a #GInetSocketAddress) + * will not. + * + * These rules match the "ignore-hosts"/"noproxy" rules most + * commonly used by other applications. + */ + + /** * GSocket:broadcast: * @@ -2365,6 +2443,15 @@ */ +/** + * GSocketClient:proxy-resolver: + * + * The proxy resolver to use + * + * Since: 2.36 + */ + + /** * GSocketService::incoming: * @service: the #GSocketService @@ -4766,7 +4853,7 @@ * File attributes in GIO consist of a list of key-value pairs. * * Keys are strings that contain a key namespace and a key name, separated - * by a colon, e.g. "namespace:keyname". Namespaces are included to sort + * by a colon, e.g. "namespace::keyname". Namespaces are included to sort * key-value pairs by namespaces for relevance. Keys can be retrived * using wildcards, e.g. "standard::*" will return all of the keys in the * "standard" namespace. @@ -4860,7 +4947,7 @@ * * GFileAttributes Built-in Keys and Value Types * - * Enum ValueNamespace:KeyValue Type + * Enum ValueNamespace::KeyValue Type * * %G_FILE_ATTRIBUTE_STANDARD_TYPEstandard::typeuint32 (#GFileType) * %G_FILE_ATTRIBUTE_STANDARD_IS_HIDDENstandard::is-hiddenboolean @@ -6469,6 +6556,25 @@ */ +/** + * SECTION:gsimpleproxyresolver + * @short_description: Simple proxy resolver implementation + * @include: gio/gio.h + * @see_also: g_socket_client_set_proxy_resolver() + * + * #GSimpleProxyResolver is a simple #GProxyResolver implementation + * that handles a single default proxy, multiple URI-scheme-specific + * proxies, and a list of hosts that proxies should not be used for. + * + * #GSimpleProxyResolver is never the default proxy resolver, but it + * can be used as the base class for another proxy resolver + * implementation, or it can be created and used manually, such as + * with g_socket_client_set_proxy_resolver(). + * + * Since: 2.36 + */ + + /** * SECTION:gsocket * @short_description: Low-level socket object @@ -11127,7 +11233,7 @@ * Finishes the async construction for the various g_async_initable_new * calls, returning the created object or %NULL on error. * - * Returns: (transfer full): a newly created #GObject, or %NULL on error. Free with g_object_unref(). + * Returns: (type GObject.Object) (transfer full): a newly created #GObject, or %NULL on error. Free with g_object_unref(). * Since: 2.22 */ @@ -13054,6 +13160,23 @@ */ +/** + * g_dbus_address_escape_value: + * @string: an unescaped string to be included in a D-Bus address as the value in a key-value pair + * + * Escape @string so it can appear in a D-Bus address as the value + * part of a key-value pair. + * + * For instance, if @string is /run/bus-for-:0, + * this function would return /run/bus-for-%3A0, + * which could be used in a D-Bus address like + * unix:nonce-tcp:host=127.0.0.1,port=42,noncefile=/run/bus-for-%3A0. + * + * Returns: (transfer full): a copy of @string with all non-optionally-escaped bytes escaped + * Since: 2.36 + */ + + /** * g_dbus_address_get_for_bus_sync: * @bus_type: A #GBusType. @@ -22123,7 +22246,7 @@ * similar to g_object_new() but also initializes the object * and returns %NULL, setting an error on failure. * - * Returns: (transfer full): a newly allocated #GObject, or %NULL on error + * Returns: (type GObject.Object) (transfer full): a newly allocated #GObject, or %NULL on error * Since: 2.22 */ @@ -22140,7 +22263,7 @@ * similar to g_object_new_valist() but also initializes the object * and returns %NULL, setting an error on failure. * - * Returns: (transfer full): a newly allocated #GObject, or %NULL on error + * Returns: (type GObject.Object) (transfer full): a newly allocated #GObject, or %NULL on error * Since: 2.22 */ @@ -22157,7 +22280,7 @@ * similar to g_object_newv() but also initializes the object * and returns %NULL, setting an error on failure. * - * Returns: (transfer full): a newly allocated #GObject, or %NULL on error + * Returns: (type GObject.Object) (transfer full): a newly allocated #GObject, or %NULL on error * Since: 2.22 */ @@ -28693,6 +28816,59 @@ */ +/** + * g_simple_proxy_resolver_new: + * @default_proxy: (allow-none): the default proxy to use, eg "socks://192.168.1.1" + * @ignore_hosts: (allow-none): an optional list of hosts/IP addresses to not use a proxy for. + * + * Creates a new #GSimpleProxyResolver. See + * #GSimpleProxyResolver:default-proxy and + * #GSimpleProxyResolver:ignore-hosts for more details on how the + * arguments are interpreted. + * + * Returns: a new #GSimpleProxyResolver + * Since: 2.36 + */ + + +/** + * g_simple_proxy_resolver_set_default_proxy: + * @resolver: a #GSimpleProxyResolver + * @default_proxy: the default proxy to use + * + * Sets the default proxy on @resolver, to be used for any URIs that + * don't match #GSimpleProxyResolver:ignore-hosts or a proxy set + * via g_simple_proxy_resolver_set_uri_proxy(). + * + * If @default_proxy starts with "socks://", + * #GSimpleProxyResolver will treat it as referring to all three of + * the socks5, socks4a, and + * socks4 proxy types. + * + * Since: 2.36 + */ + + +/** + * g_simple_proxy_resolver_set_uri_proxy: + * @resolver: a #GSimpleProxyResolver + * @uri_scheme: the URI scheme to add a proxy for + * @proxy: the proxy to use for @uri_scheme + * + * Adds a URI-scheme-specific proxy to @resolver; URIs whose scheme + * matches @uri_scheme (and which don't match + * #GSimpleProxyResolver:ignore-hosts) will be proxied via @proxy. + * + * As with #GSimpleProxyResolver:default-proxy, if @proxy starts with + * "socks://", #GSimpleProxyResolver will treat it + * as referring to all three of the socks5, + * socks4a, and socks4 proxy + * types. + * + * Since: 2.36 + */ + + /** * g_socket_accept: * @socket: a #GSocket. @@ -29206,6 +29382,19 @@ */ +/** + * g_socket_client_get_proxy_resolver: + * @client: a #GSocketClient. + * + * Gets the #GProxyResolver being used by @client. Normally, this will + * be the resolver returned by g_proxy_resolver_get_default(), but you + * can override it with g_socket_client_set_proxy_resolver(). + * + * Returns: (transfer none): The #GProxyResolver being used by @client. + * Since: 2.36 + */ + + /** * g_socket_client_get_socket_type: * @client: a #GSocketClient. @@ -29276,6 +29465,8 @@ * #GProxyResolver to determine if a proxy protocol such as SOCKS is * needed, and automatically do the necessary proxy negotiation. * + * See also g_socket_client_set_proxy_resolver(). + * * Since: 2.26 */ @@ -29331,6 +29522,23 @@ */ +/** + * g_socket_client_set_proxy_resolver: + * @client: a #GSocketClient. + * @proxy_resolver: (allow-none): a #GProxyResolver, or %NULL for the default. + * + * Overrides the #GProxyResolver used by @client. You can call this if + * you want to use specific proxies, rather than using the system + * default proxy settings. + * + * Note that whether or not the proxy resolver is actually used + * depends on the setting of #GSocketClient:enable-proxy, which is not + * changed by this function (but which is %TRUE by default) + * + * Since: 2.36 + */ + + /** * g_socket_client_set_socket_type: * @client: a #GSocketClient. -- cgit v1.2.1 From eab4582f2e3a90840d102f32e46d1d9b0645316a Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 15 Feb 2013 05:29:16 -0500 Subject: doctool: Remove an extra

in the signals --- giscanner/doctemplates/Gjs/signal.tmpl | 2 +- giscanner/doctemplates/Python/signal.tmpl | 2 +- .../Regress.AnnotationObject-attribute-signal.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page | 2 +- .../Regress.AnnotationObject-attribute-signal.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page | 2 +- .../Regress.TestObj-sig-with-int64-prop.page | 2 +- .../Regress.TestObj-sig-with-uint64-prop.page | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/giscanner/doctemplates/Gjs/signal.tmpl b/giscanner/doctemplates/Gjs/signal.tmpl index bfbfe16b..a8e900ff 100644 --- a/giscanner/doctemplates/Gjs/signal.tmpl +++ b/giscanner/doctemplates/Gjs/signal.tmpl @@ -29,7 +29,7 @@ ${formatter.format(node, arg.doc)} node.retval.type.ctype is not None: <code>Returns</code> -

${formatter.format(node, node.retval.doc)}

+${formatter.format(node, node.retval.doc)} % endif diff --git a/giscanner/doctemplates/Python/signal.tmpl b/giscanner/doctemplates/Python/signal.tmpl index 9953eb53..a2d7b0be 100644 --- a/giscanner/doctemplates/Python/signal.tmpl +++ b/giscanner/doctemplates/Python/signal.tmpl @@ -35,7 +35,7 @@ ${formatter.format(node, arg.doc)} node.retval.type.ctype is not None: <code>Returns</code> -

${formatter.format(node, node.retval.doc)}

+${formatter.format(node, node.retval.doc)} % endif diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page index 5ba5b290..713c6d67 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page @@ -38,7 +38,7 @@ function callback(annotation_object, arg1:String, arg2:String, ):String; <code>Returns</code> -

the return value

+

the return value

 diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page index 6e96d2dc..f5066231 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page @@ -38,7 +38,7 @@ function callback(foo_object, object:GObject.Object, p0:gpointer, ):String; <code>Returns</code> -

+ diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page index db4e3eee..28d0b7e8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page @@ -35,7 +35,7 @@ the introspection client langage.

<code>Returns</code> -

+ diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page index 66c3aaeb..17a54d1c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -35,7 +35,7 @@ the introspection client langage.

<code>Returns</code> -

+ diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page index 3ad988dc..b52cf90c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page @@ -44,7 +44,7 @@ def callback(annotation_object, arg1, arg2, user_param1, ...) <code>Returns</code> -

the return value

+

the return value

 diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page index aa653b64..691f7aed 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page @@ -44,7 +44,7 @@ def callback(foo_object, object, p0, user_param1, ...) <code>Returns</code> -

+ diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page index c67c12ae..9bfe4b9e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page @@ -41,7 +41,7 @@ the introspection client langage.

<code>Returns</code> -

+ diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page index 83dfe6f5..3c220f07 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -41,7 +41,7 @@ the introspection client langage.

<code>Returns</code> -

+ -- cgit v1.2.1 From c53e5f29befc6b9e8d71746caf79e53821a4db4f Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 15 Feb 2013 05:45:27 -0500 Subject: docwriter: Don't render constants for now Clutter has thousands of keysym constants, and until we get them all on one page, this is just tons of tiny files that are just noise. --- giscanner/docwriter.py | 5 ++++- .../Regress.ANNOTATION_CALCULATED_DEFINE.page | 25 --------------------- .../Regress.ANNOTATION_CALCULATED_LARGE.page | 26 ---------------------- .../Regress.ANNOTATION_CALCULATED_LARGE_DIV.page | 25 --------------------- .../Regress.DOUBLE_CONSTANT.page | 25 --------------------- .../Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page | 25 --------------------- .../Regress.FOO_PIE_IS_TASTY.page | 25 --------------------- .../Regress.FOO_SUCCESS_INT.page | 25 --------------------- .../Regress.GUINT64_CONSTANT.page | 25 --------------------- .../Regress.GUINT64_CONSTANTA.page | 25 --------------------- .../Regress.G_GINT64_CONSTANT.page | 25 --------------------- .../Regress.INT_CONSTANT.page | 25 --------------------- .../Regress.LONG_STRING_CONSTANT.page | 25 --------------------- .../Regress-1.0-C-expected/Regress.MAXUINT64.page | 25 --------------------- .../Regress-1.0-C-expected/Regress.MININT64.page | 25 --------------------- .../Regress.Mixed_Case_Constant.page | 25 --------------------- .../Regress.NEGATIVE_INT_CONSTANT.page | 25 --------------------- .../Regress.STRING_CONSTANT.page | 25 --------------------- .../Regress.UTF8_CONSTANT.page | 25 --------------------- .../Regress.ANNOTATION_CALCULATED_DEFINE.page | 25 --------------------- .../Regress.ANNOTATION_CALCULATED_LARGE.page | 26 ---------------------- .../Regress.ANNOTATION_CALCULATED_LARGE_DIV.page | 25 --------------------- .../Regress.DOUBLE_CONSTANT.page | 25 --------------------- .../Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page | 25 --------------------- .../Regress.FOO_PIE_IS_TASTY.page | 25 --------------------- .../Regress.FOO_SUCCESS_INT.page | 25 --------------------- .../Regress.GUINT64_CONSTANT.page | 25 --------------------- .../Regress.GUINT64_CONSTANTA.page | 25 --------------------- .../Regress.G_GINT64_CONSTANT.page | 25 --------------------- .../Regress.INT_CONSTANT.page | 25 --------------------- .../Regress.LONG_STRING_CONSTANT.page | 25 --------------------- .../Regress.MAXUINT64.page | 25 --------------------- .../Regress-1.0-Gjs-expected/Regress.MININT64.page | 25 --------------------- .../Regress.Mixed_Case_Constant.page | 25 --------------------- .../Regress.NEGATIVE_INT_CONSTANT.page | 25 --------------------- .../Regress.STRING_CONSTANT.page | 25 --------------------- .../Regress.UTF8_CONSTANT.page | 25 --------------------- .../Regress.ANNOTATION_CALCULATED_DEFINE.page | 25 --------------------- .../Regress.ANNOTATION_CALCULATED_LARGE.page | 26 ---------------------- .../Regress.ANNOTATION_CALCULATED_LARGE_DIV.page | 25 --------------------- .../Regress.DOUBLE_CONSTANT.page | 25 --------------------- .../Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page | 25 --------------------- .../Regress.FOO_PIE_IS_TASTY.page | 25 --------------------- .../Regress.FOO_SUCCESS_INT.page | 25 --------------------- .../Regress.GUINT64_CONSTANT.page | 25 --------------------- .../Regress.GUINT64_CONSTANTA.page | 25 --------------------- .../Regress.G_GINT64_CONSTANT.page | 25 --------------------- .../Regress.INT_CONSTANT.page | 25 --------------------- .../Regress.LONG_STRING_CONSTANT.page | 25 --------------------- .../Regress.MAXUINT64.page | 25 --------------------- .../Regress.MININT64.page | 25 --------------------- .../Regress.Mixed_Case_Constant.page | 25 --------------------- .../Regress.NEGATIVE_INT_CONSTANT.page | 25 --------------------- .../Regress.STRING_CONSTANT.page | 25 --------------------- .../Regress.UTF8_CONSTANT.page | 25 --------------------- 55 files changed, 4 insertions(+), 1354 deletions(-) delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE.page delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.DOUBLE_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FOO_PIE_IS_TASTY.page delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FOO_SUCCESS_INT.page delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANTA.page delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.G_GINT64_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.INT_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.LONG_STRING_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.MAXUINT64.page delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.MININT64.page delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.Mixed_Case_Constant.page delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.NEGATIVE_INT_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.STRING_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.UTF8_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.DOUBLE_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_PIE_IS_TASTY.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_SUCCESS_INT.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANTA.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.G_GINT64_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.INT_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.LONG_STRING_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.MAXUINT64.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.MININT64.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.Mixed_Case_Constant.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.NEGATIVE_INT_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.STRING_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.UTF8_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.DOUBLE_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FOO_PIE_IS_TASTY.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FOO_SUCCESS_INT.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANTA.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.G_GINT64_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.INT_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.LONG_STRING_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.MAXUINT64.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.MININT64.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.Mixed_Case_Constant.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.NEGATIVE_INT_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.STRING_CONSTANT.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.UTF8_CONSTANT.page diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py index bf0ca20d..85f3b16d 100644 --- a/giscanner/docwriter.py +++ b/giscanner/docwriter.py @@ -170,6 +170,9 @@ class DocFormatter(object): return saxutils.escape(text) def should_render_node(self, node): + if isinstance(node, ast.Constant): + return False + return True def format(self, node, doc): @@ -394,7 +397,7 @@ class DocFormatterIntrospectableBase(DocFormatter): if not getattr(node, "introspectable", True): return False - return True + return super(DocFormatterIntrospectableBase, self).should_render_node(node) class DocFormatterPython(DocFormatterIntrospectableBase): language = "Python" diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page deleted file mode 100644 index ebe71b0d..00000000 --- a/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.ANNOTATION_CALCULATED_DEFINE - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE.page b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE.page deleted file mode 100644 index 4b38cc01..00000000 --- a/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE.page +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - Regress.ANNOTATION_CALCULATED_LARGE - - - -

Constant to define a calculated large value

- - -

Since 1.4

- - - - - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page b/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page deleted file mode 100644 index d6c8e76a..00000000 --- a/tests/scanner/Regress-1.0-C-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.ANNOTATION_CALCULATED_LARGE_DIV - - - -

Constant to define a calculated large value

- - - - - - - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.DOUBLE_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.DOUBLE_CONSTANT.page deleted file mode 100644 index b1aa32d8..00000000 --- a/tests/scanner/Regress-1.0-C-expected/Regress.DOUBLE_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.DOUBLE_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page deleted file mode 100644 index 357665de..00000000 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.FOO_DEFINE_SHOULD_BE_EXPOSED - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FOO_PIE_IS_TASTY.page b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_PIE_IS_TASTY.page deleted file mode 100644 index 7dc308a1..00000000 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FOO_PIE_IS_TASTY.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.FOO_PIE_IS_TASTY - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FOO_SUCCESS_INT.page b/tests/scanner/Regress-1.0-C-expected/Regress.FOO_SUCCESS_INT.page deleted file mode 100644 index f20f426f..00000000 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FOO_SUCCESS_INT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.FOO_SUCCESS_INT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANT.page deleted file mode 100644 index 9a0cd162..00000000 --- a/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.GUINT64_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANTA.page b/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANTA.page deleted file mode 100644 index 4faf765f..00000000 --- a/tests/scanner/Regress-1.0-C-expected/Regress.GUINT64_CONSTANTA.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.GUINT64_CONSTANTA - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.G_GINT64_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.G_GINT64_CONSTANT.page deleted file mode 100644 index b4a66f69..00000000 --- a/tests/scanner/Regress-1.0-C-expected/Regress.G_GINT64_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.G_GINT64_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.INT_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.INT_CONSTANT.page deleted file mode 100644 index e4df9a1e..00000000 --- a/tests/scanner/Regress-1.0-C-expected/Regress.INT_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.INT_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LONG_STRING_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.LONG_STRING_CONSTANT.page deleted file mode 100644 index 3c0409a7..00000000 --- a/tests/scanner/Regress-1.0-C-expected/Regress.LONG_STRING_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.LONG_STRING_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.MAXUINT64.page b/tests/scanner/Regress-1.0-C-expected/Regress.MAXUINT64.page deleted file mode 100644 index be1afd19..00000000 --- a/tests/scanner/Regress-1.0-C-expected/Regress.MAXUINT64.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.MAXUINT64 - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.MININT64.page b/tests/scanner/Regress-1.0-C-expected/Regress.MININT64.page deleted file mode 100644 index 35c3e584..00000000 --- a/tests/scanner/Regress-1.0-C-expected/Regress.MININT64.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.MININT64 - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.Mixed_Case_Constant.page b/tests/scanner/Regress-1.0-C-expected/Regress.Mixed_Case_Constant.page deleted file mode 100644 index 5ea8d9b0..00000000 --- a/tests/scanner/Regress-1.0-C-expected/Regress.Mixed_Case_Constant.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.Mixed_Case_Constant - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.NEGATIVE_INT_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.NEGATIVE_INT_CONSTANT.page deleted file mode 100644 index 576c690f..00000000 --- a/tests/scanner/Regress-1.0-C-expected/Regress.NEGATIVE_INT_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.NEGATIVE_INT_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.STRING_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.STRING_CONSTANT.page deleted file mode 100644 index 945ba986..00000000 --- a/tests/scanner/Regress-1.0-C-expected/Regress.STRING_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.STRING_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.UTF8_CONSTANT.page b/tests/scanner/Regress-1.0-C-expected/Regress.UTF8_CONSTANT.page deleted file mode 100644 index 8f3f5324..00000000 --- a/tests/scanner/Regress-1.0-C-expected/Regress.UTF8_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.UTF8_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page deleted file mode 100644 index ebe71b0d..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.ANNOTATION_CALCULATED_DEFINE - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE.page deleted file mode 100644 index 4b38cc01..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE.page +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - Regress.ANNOTATION_CALCULATED_LARGE - - - -

Constant to define a calculated large value

- - -

Since 1.4

- - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page deleted file mode 100644 index d6c8e76a..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.ANNOTATION_CALCULATED_LARGE_DIV - - - -

Constant to define a calculated large value

- - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.DOUBLE_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.DOUBLE_CONSTANT.page deleted file mode 100644 index b1aa32d8..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.DOUBLE_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.DOUBLE_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page deleted file mode 100644 index 357665de..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.FOO_DEFINE_SHOULD_BE_EXPOSED - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_PIE_IS_TASTY.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_PIE_IS_TASTY.page deleted file mode 100644 index 7dc308a1..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_PIE_IS_TASTY.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.FOO_PIE_IS_TASTY - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_SUCCESS_INT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_SUCCESS_INT.page deleted file mode 100644 index f20f426f..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FOO_SUCCESS_INT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.FOO_SUCCESS_INT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANT.page deleted file mode 100644 index 9a0cd162..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.GUINT64_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANTA.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANTA.page deleted file mode 100644 index 4faf765f..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.GUINT64_CONSTANTA.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.GUINT64_CONSTANTA - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.G_GINT64_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.G_GINT64_CONSTANT.page deleted file mode 100644 index b4a66f69..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.G_GINT64_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.G_GINT64_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.INT_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.INT_CONSTANT.page deleted file mode 100644 index e4df9a1e..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.INT_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.INT_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LONG_STRING_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LONG_STRING_CONSTANT.page deleted file mode 100644 index 3c0409a7..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LONG_STRING_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.LONG_STRING_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.MAXUINT64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.MAXUINT64.page deleted file mode 100644 index be1afd19..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.MAXUINT64.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.MAXUINT64 - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.MININT64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.MININT64.page deleted file mode 100644 index 35c3e584..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.MININT64.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.MININT64 - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.Mixed_Case_Constant.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.Mixed_Case_Constant.page deleted file mode 100644 index 5ea8d9b0..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.Mixed_Case_Constant.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.Mixed_Case_Constant - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.NEGATIVE_INT_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.NEGATIVE_INT_CONSTANT.page deleted file mode 100644 index 576c690f..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.NEGATIVE_INT_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.NEGATIVE_INT_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.STRING_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.STRING_CONSTANT.page deleted file mode 100644 index 945ba986..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.STRING_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.STRING_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.UTF8_CONSTANT.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.UTF8_CONSTANT.page deleted file mode 100644 index 8f3f5324..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.UTF8_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.UTF8_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page deleted file mode 100644 index ebe71b0d..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_DEFINE.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.ANNOTATION_CALCULATED_DEFINE - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE.page deleted file mode 100644 index 4b38cc01..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE.page +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - Regress.ANNOTATION_CALCULATED_LARGE - - - -

Constant to define a calculated large value

- - -

Since 1.4

- - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page deleted file mode 100644 index d6c8e76a..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.ANNOTATION_CALCULATED_LARGE_DIV.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.ANNOTATION_CALCULATED_LARGE_DIV - - - -

Constant to define a calculated large value

- - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.DOUBLE_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.DOUBLE_CONSTANT.page deleted file mode 100644 index b1aa32d8..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.DOUBLE_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.DOUBLE_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page deleted file mode 100644 index 357665de..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_DEFINE_SHOULD_BE_EXPOSED.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.FOO_DEFINE_SHOULD_BE_EXPOSED - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_PIE_IS_TASTY.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_PIE_IS_TASTY.page deleted file mode 100644 index 7dc308a1..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_PIE_IS_TASTY.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.FOO_PIE_IS_TASTY - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_SUCCESS_INT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_SUCCESS_INT.page deleted file mode 100644 index f20f426f..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FOO_SUCCESS_INT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.FOO_SUCCESS_INT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANT.page deleted file mode 100644 index 9a0cd162..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.GUINT64_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANTA.page b/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANTA.page deleted file mode 100644 index 4faf765f..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.GUINT64_CONSTANTA.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.GUINT64_CONSTANTA - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.G_GINT64_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.G_GINT64_CONSTANT.page deleted file mode 100644 index b4a66f69..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.G_GINT64_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.G_GINT64_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.INT_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.INT_CONSTANT.page deleted file mode 100644 index e4df9a1e..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.INT_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.INT_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LONG_STRING_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LONG_STRING_CONSTANT.page deleted file mode 100644 index 3c0409a7..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.LONG_STRING_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.LONG_STRING_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.MAXUINT64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.MAXUINT64.page deleted file mode 100644 index be1afd19..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.MAXUINT64.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.MAXUINT64 - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.MININT64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.MININT64.page deleted file mode 100644 index 35c3e584..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.MININT64.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.MININT64 - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.Mixed_Case_Constant.page b/tests/scanner/Regress-1.0-Python-expected/Regress.Mixed_Case_Constant.page deleted file mode 100644 index 5ea8d9b0..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.Mixed_Case_Constant.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.Mixed_Case_Constant - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.NEGATIVE_INT_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.NEGATIVE_INT_CONSTANT.page deleted file mode 100644 index 576c690f..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.NEGATIVE_INT_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.NEGATIVE_INT_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.STRING_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.STRING_CONSTANT.page deleted file mode 100644 index 945ba986..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.STRING_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.STRING_CONSTANT - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.UTF8_CONSTANT.page b/tests/scanner/Regress-1.0-Python-expected/Regress.UTF8_CONSTANT.page deleted file mode 100644 index 8f3f5324..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.UTF8_CONSTANT.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.UTF8_CONSTANT - - - - - - - - - - - - -- cgit v1.2.1 From 6ba948c1647ad19e91576520e6f506235a585bb2 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 15 Feb 2013 05:49:55 -0500 Subject: docmain: Create the output dir for us if it doesn't exist --- giscanner/docmain.py | 2 -- giscanner/docwriter.py | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/giscanner/docmain.py b/giscanner/docmain.py index cd782fef..fc78ed62 100644 --- a/giscanner/docmain.py +++ b/giscanner/docmain.py @@ -41,8 +41,6 @@ def doc_main(args): options, args = parser.parse_args(args) if not options.output: raise SystemExit("missing output parameter") - if not os.path.isdir(options.output): - raise SystemExit("wrong output parameter: %s" % (options.output, )) if len(args) < 2: raise SystemExit("Need an input GIR filename") diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py index 85f3b16d..d5b1f909 100644 --- a/giscanner/docwriter.py +++ b/giscanner/docwriter.py @@ -593,6 +593,12 @@ class DocWriter(object): output_encoding='utf-8') def write(self, output): + try: + os.makedirs(output) + except OSError: + # directory already made + pass + nodes = [self._transformer.namespace] for node in self._transformer.namespace.itervalues(): if isinstance(node, ast.Function) and node.moved_to is not None: -- cgit v1.2.1 From ca107cbb3c45371142b0f3b8487c68a25e9e1ec7 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 15 Feb 2013 05:58:01 -0500 Subject: tests: Clean up doc generation tests We no longer have to mkdir -p --- tests/scanner/Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index e8781d40..75bdc9f0 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -154,19 +154,16 @@ EXPECTED_MALLARD_DIRS = $(MALLARD_DIRS:=-expected) %-C: %.gir $(AM_V_GEN) - $(AM_V_at)$(MKDIR_P) $*-C $(AM_V_at)rm -f $*-C/*.page $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language C $*.gir -o $*-C/ %-Python: %.gir $(AM_V_GEN) - $(AM_V_at)$(MKDIR_P) $*-Python $(AM_V_at)rm -f $*-Python/*.page $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language Python $*.gir -o $*-Python/ %-Gjs: %.gir $(AM_V_GEN) - $(AM_V_at)$(MKDIR_P) $*-Gjs $(AM_V_at)rm -f $*-Gjs/*.page $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language Gjs $*.gir -o $*-Gjs/ -- cgit v1.2.1 From 9f1b87bb764635eeba7e83bf795844aa49e27d81 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 15 Feb 2013 06:05:31 -0500 Subject: doctool: Rename page_style to page_kind --- giscanner/doctemplates/C/function.tmpl | 4 ++-- giscanner/doctemplates/Gjs/function.tmpl | 4 ++-- giscanner/doctemplates/Python/function.tmpl | 4 ++-- giscanner/doctemplates/base.tmpl | 2 +- giscanner/docwriter.py | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/giscanner/doctemplates/C/function.tmpl b/giscanner/doctemplates/C/function.tmpl index c2d393b9..c788225e 100644 --- a/giscanner/doctemplates/C/function.tmpl +++ b/giscanner/doctemplates/C/function.tmpl @@ -1,9 +1,9 @@ <%inherit file="/base.tmpl"/> <%block name="info"> % if node.parent is not None: - + % else: - + % endif diff --git a/giscanner/doctemplates/Gjs/function.tmpl b/giscanner/doctemplates/Gjs/function.tmpl index 46c46271..6a43ddb3 100644 --- a/giscanner/doctemplates/Gjs/function.tmpl +++ b/giscanner/doctemplates/Gjs/function.tmpl @@ -1,9 +1,9 @@ <%inherit file="/base.tmpl"/> <%block name="info"> % if node.parent is not None: - + % else: - + % endif diff --git a/giscanner/doctemplates/Python/function.tmpl b/giscanner/doctemplates/Python/function.tmpl index d1b57f4e..e1fc5d94 100644 --- a/giscanner/doctemplates/Python/function.tmpl +++ b/giscanner/doctemplates/Python/function.tmpl @@ -1,9 +1,9 @@ <%inherit file="/base.tmpl"/> <%block name="info"> % if node.parent is not None: - + % else: - + % endif diff --git a/giscanner/doctemplates/base.tmpl b/giscanner/doctemplates/base.tmpl index 0fe84651..7fd0fd26 100644 --- a/giscanner/doctemplates/base.tmpl +++ b/giscanner/doctemplates/base.tmpl @@ -2,7 +2,7 @@ diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py index d5b1f909..1a149374 100644 --- a/giscanner/docwriter.py +++ b/giscanner/docwriter.py @@ -620,15 +620,15 @@ class DocWriter(object): def _render_node(self, node, output): namespace = self._transformer.namespace - node_kind = get_node_kind(node) - template_name = '%s/%s.tmpl' % (self._language, node_kind) + page_kind = get_node_kind(node) + template_name = '%s/%s.tmpl' % (self._language, page_kind) page_id = make_page_id(node) template = self._lookup.get_template(template_name) result = template.render(namespace=namespace, node=node, page_id=page_id, - page_style=node_kind, + page_kind=page_kind, formatter=self._formatter) output_file_name = os.path.join(os.path.abspath(output), -- cgit v1.2.1 From 34f697e552c648efa1f0f6350cdbc80cd346a1e4 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 15 Feb 2013 06:12:32 -0500 Subject: doctool: Don't link to the namespace from the namespace page --- giscanner/doctemplates/namespace.tmpl | 2 ++ tests/scanner/Regress-1.0-C-expected/index.page | 3 +-- tests/scanner/Regress-1.0-Gjs-expected/index.page | 3 +-- tests/scanner/Regress-1.0-Python-expected/index.page | 3 +-- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/giscanner/doctemplates/namespace.tmpl b/giscanner/doctemplates/namespace.tmpl index 48ae1d91..bb58bb16 100644 --- a/giscanner/doctemplates/namespace.tmpl +++ b/giscanner/doctemplates/namespace.tmpl @@ -2,6 +2,8 @@ <%inherit file="/base.tmpl"/> <%block name="doc"> +<%block name="info"> + <%block name="links"> Classes diff --git a/tests/scanner/Regress-1.0-C-expected/index.page b/tests/scanner/Regress-1.0-C-expected/index.page index 1d89dedd..a5426d89 100644 --- a/tests/scanner/Regress-1.0-C-expected/index.page +++ b/tests/scanner/Regress-1.0-C-expected/index.page @@ -7,8 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + Index diff --git a/tests/scanner/Regress-1.0-Gjs-expected/index.page b/tests/scanner/Regress-1.0-Gjs-expected/index.page index 1d89dedd..a5426d89 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/index.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/index.page @@ -7,8 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + Index diff --git a/tests/scanner/Regress-1.0-Python-expected/index.page b/tests/scanner/Regress-1.0-Python-expected/index.page index 1d89dedd..a5426d89 100644 --- a/tests/scanner/Regress-1.0-Python-expected/index.page +++ b/tests/scanner/Regress-1.0-Python-expected/index.page @@ -7,8 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - - + Index -- cgit v1.2.1 From 6727ebea5bcd2d823fb05c0df67efff4e77436ea Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 15 Feb 2013 08:16:16 -0500 Subject: doctool: Don't put curly braces around the construct props if there are none --- giscanner/doctemplates/Gjs/class.tmpl | 8 ++++++-- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page | 3 +-- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page | 3 +-- .../scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page | 3 +-- .../scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page | 3 +-- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page | 3 +-- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page | 3 +-- .../Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page | 3 +-- .../Regress.TestFundamentalSubObject.page | 3 +-- .../Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page | 3 +-- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page | 3 +-- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page | 3 +-- 12 files changed, 17 insertions(+), 24 deletions(-) diff --git a/giscanner/doctemplates/Gjs/class.tmpl b/giscanner/doctemplates/Gjs/class.tmpl index 5882d9fa..457361c7 100644 --- a/giscanner/doctemplates/Gjs/class.tmpl +++ b/giscanner/doctemplates/Gjs/class.tmpl @@ -3,12 +3,16 @@ const ${namespace.name} = imports.gi.${namespace.name}; -let ${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}({ +let ${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}(\ +% if len(node.properties) > 0: +{ % for ix, property_ in enumerate(node.properties): % if property_.construct or property_.construct_only or property_.writable: ${property_.name.replace('-', '_')}: value, % endif % endfor -}); +}\ +% endif +); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page index 1220e811..747301b8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page @@ -15,8 +15,7 @@ const Regress = imports.gi.Regress; -let foo_buffer = Regress.FooBuffer({ -}); +let foo_buffer = Regress.FooBuffer(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page index 8e182705..556fe990 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page @@ -15,8 +15,7 @@ const Regress = imports.gi.Regress; -let foo_interface = Regress.FooInterface({ -}); +let foo_interface = Regress.FooInterface(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page index b007600f..deba4902 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page @@ -15,8 +15,7 @@ const Regress = imports.gi.Regress; -let foo_other_object = Regress.FooOtherObject({ -}); +let foo_other_object = Regress.FooOtherObject(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page index de032148..03f6888d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page @@ -15,8 +15,7 @@ const Regress = imports.gi.Regress; -let foo_sub_interface = Regress.FooSubInterface({ -}); +let foo_sub_interface = Regress.FooSubInterface(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page index 244f994d..fa90c907 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page @@ -15,8 +15,7 @@ const Regress = imports.gi.Regress; -let foo_subobject = Regress.FooSubobject({ -}); +let foo_subobject = Regress.FooSubobject(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page index 1d78cd77..4aaa02d2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page @@ -15,8 +15,7 @@ const Regress = imports.gi.Regress; -let test_floating = Regress.TestFloating({ -}); +let test_floating = Regress.TestFloating(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page index 73312d2c..9b06769f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page @@ -15,8 +15,7 @@ const Regress = imports.gi.Regress; -let test_fundamental_object = Regress.TestFundamentalObject({ -}); +let test_fundamental_object = Regress.TestFundamentalObject(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page index 93d6152c..19d0c4b6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page @@ -15,8 +15,7 @@ const Regress = imports.gi.Regress; -let test_fundamental_sub_object = Regress.TestFundamentalSubObject({ -}); +let test_fundamental_sub_object = Regress.TestFundamentalSubObject(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page index d7ac0c5a..f3efc9d8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page @@ -15,8 +15,7 @@ const Regress = imports.gi.Regress; -let test_inherit_drawable = Regress.TestInheritDrawable({ -}); +let test_inherit_drawable = Regress.TestInheritDrawable(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page index de64aad9..a91a5d1d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page @@ -15,8 +15,7 @@ const Regress = imports.gi.Regress; -let test_interface = Regress.TestInterface({ -}); +let test_interface = Regress.TestInterface(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page index 9e0566e1..5aaae32e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page @@ -15,8 +15,7 @@ const Regress = imports.gi.Regress; -let test_sub_obj = Regress.TestSubObj({ -}); +let test_sub_obj = Regress.TestSubObj(); -- cgit v1.2.1 From 80040109a9c82e0f3c756b8742499209700f65ca Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 15 Feb 2013 08:18:06 -0500 Subject: doctool: Make sure to add "new" --- giscanner/doctemplates/Gjs/class.tmpl | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/giscanner/doctemplates/Gjs/class.tmpl b/giscanner/doctemplates/Gjs/class.tmpl index 457361c7..887c646b 100644 --- a/giscanner/doctemplates/Gjs/class.tmpl +++ b/giscanner/doctemplates/Gjs/class.tmpl @@ -3,7 +3,7 @@ const ${namespace.name} = imports.gi.${namespace.name}; -let ${formatter.to_underscores(node.name).lower()} = ${namespace.name}.${node.name}(\ +let ${formatter.to_underscores(node.name).lower()} = new ${namespace.name}.${node.name}(\ % if len(node.properties) > 0: { % for ix, property_ in enumerate(node.properties): diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page index e104633a..20104697 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page @@ -15,7 +15,7 @@ const Regress = imports.gi.Regress; -let annotation_object = Regress.AnnotationObject({ +let annotation_object = new Regress.AnnotationObject({ function_property: value, string_property: value, tab_property: value, diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page index 747301b8..c9cd8be7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page @@ -15,7 +15,7 @@ const Regress = imports.gi.Regress; -let foo_buffer = Regress.FooBuffer(); +let foo_buffer = new Regress.FooBuffer(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page index 556fe990..16d03111 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page @@ -15,7 +15,7 @@ const Regress = imports.gi.Regress; -let foo_interface = Regress.FooInterface(); +let foo_interface = new Regress.FooInterface(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page index 9f2290b4..8d801b70 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page @@ -15,7 +15,7 @@ const Regress = imports.gi.Regress; -let foo_object = Regress.FooObject({ +let foo_object = new Regress.FooObject({ hidden: value, string: value, }); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page index deba4902..5368b928 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page @@ -15,7 +15,7 @@ const Regress = imports.gi.Regress; -let foo_other_object = Regress.FooOtherObject(); +let foo_other_object = new Regress.FooOtherObject(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page index 03f6888d..4ace79fb 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page @@ -15,7 +15,7 @@ const Regress = imports.gi.Regress; -let foo_sub_interface = Regress.FooSubInterface(); +let foo_sub_interface = new Regress.FooSubInterface(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page index fa90c907..da87ffad 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page @@ -15,7 +15,7 @@ const Regress = imports.gi.Regress; -let foo_subobject = Regress.FooSubobject(); +let foo_subobject = new Regress.FooSubobject(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page index 4aaa02d2..481bea28 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page @@ -15,7 +15,7 @@ const Regress = imports.gi.Regress; -let test_floating = Regress.TestFloating(); +let test_floating = new Regress.TestFloating(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page index 9b06769f..d669f549 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page @@ -15,7 +15,7 @@ const Regress = imports.gi.Regress; -let test_fundamental_object = Regress.TestFundamentalObject(); +let test_fundamental_object = new Regress.TestFundamentalObject(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page index 19d0c4b6..4e40b9ce 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page @@ -15,7 +15,7 @@ const Regress = imports.gi.Regress; -let test_fundamental_sub_object = Regress.TestFundamentalSubObject(); +let test_fundamental_sub_object = new Regress.TestFundamentalSubObject(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page index f3efc9d8..05d628f3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page @@ -15,7 +15,7 @@ const Regress = imports.gi.Regress; -let test_inherit_drawable = Regress.TestInheritDrawable(); +let test_inherit_drawable = new Regress.TestInheritDrawable(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page index a91a5d1d..d097d9c9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page @@ -15,7 +15,7 @@ const Regress = imports.gi.Regress; -let test_interface = Regress.TestInterface(); +let test_interface = new Regress.TestInterface(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page index 9b4dd9ce..9c4b902e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page @@ -15,7 +15,7 @@ const Regress = imports.gi.Regress; -let test_obj = Regress.TestObj({ +let test_obj = new Regress.TestObj({ bare: value, boxed: value, double: value, diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page index 5aaae32e..39e755b3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page @@ -15,7 +15,7 @@ const Regress = imports.gi.Regress; -let test_sub_obj = Regress.TestSubObj(); +let test_sub_obj = new Regress.TestSubObj(); diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page index dc09718e..7c9958de 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page @@ -15,7 +15,7 @@ const Regress = imports.gi.Regress; -let test_wi8021x = Regress.TestWi8021x({ +let test_wi8021x = new Regress.TestWi8021x({ testbool: value, }); -- cgit v1.2.1 From dff12f1992255e2e81dfdfb6433d6255667434c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Torsten=20Sch=C3=B6nfeld?= Date: Thu, 14 Feb 2013 20:51:57 +0100 Subject: girepository: Document g_enum_info_get_error_domain https://bugzilla.gnome.org/show_bug.cgi?id=693838 --- girepository/gienuminfo.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/girepository/gienuminfo.c b/girepository/gienuminfo.c index a9b7c1df..400a56d6 100644 --- a/girepository/gienuminfo.c +++ b/girepository/gienuminfo.c @@ -67,6 +67,18 @@ g_enum_info_get_n_values (GIEnumInfo *info) return blob->n_values; } +/** + * g_enum_info_get_error_domain: + * @info: a #GIEnumInfo + * + * Obtain the string form of the quark for the error domain associated with + * this enum, if any. + * + * Returns: (transfer none): the string form of the error domain associated + * with this enum, or %NULL. + * + * Since: 1.29.17 + */ const gchar * g_enum_info_get_error_domain (GIEnumInfo *info) { -- cgit v1.2.1 From df159069ed6ce9f5e0fa720036fc14a498391935 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 15 Feb 2013 06:19:58 -0500 Subject: girparser: Clean up code This makes it only use kwargs https://bugzilla.gnome.org/show_bug.cgi?id=693876 --- giscanner/girparser.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/giscanner/girparser.py b/giscanner/girparser.py index bd259b87..18f41d39 100644 --- a/giscanner/girparser.py +++ b/giscanner/girparser.py @@ -215,9 +215,9 @@ class GIRParser(object): else: parent_type = None - ctor_args = [node.attrib['name'], - parent_type] - ctor_kwargs = {'gtype_name': node.attrib[_glibns('type-name')], + ctor_kwargs = {'name': node.attrib['name'], + 'parent': parent_type, + 'gtype_name': node.attrib[_glibns('type-name')], 'get_type': node.attrib[_glibns('get-type')], 'c_symbol_prefix': node.attrib.get(_cns('symbol-prefix')), 'ctype': node.attrib.get(_cns('type'))} @@ -231,7 +231,7 @@ class GIRParser(object): else: raise AssertionError(node) - obj = klass(*ctor_args, **ctor_kwargs) + obj = klass(**ctor_kwargs) self._parse_generic_attribs(node, obj) type_struct = node.attrib.get(_glibns('type-struct')) if type_struct: -- cgit v1.2.1 From 5ac33d8399b14b631971071f47c9973c9f462d95 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 15 Feb 2013 06:19:00 -0500 Subject: ast: Rename Class.parent to parent_type The eventual model I want to have is that .parent is the "container" of the node. In all the cases where we don't explicitly set the parent, this is the namespace, but having this under one field name would be a big cleanup for the docwriter. https://bugzilla.gnome.org/show_bug.cgi?id=693876 --- giscanner/ast.py | 8 ++++---- giscanner/docwriter.py | 4 ++-- giscanner/girparser.py | 2 +- giscanner/girwriter.py | 4 ++-- giscanner/maintransformer.py | 12 ++++++------ 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/giscanner/ast.py b/giscanner/ast.py index efa39a91..3cf99ddd 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -964,7 +964,7 @@ class Signal(Callable): class Class(Node, Registered): - def __init__(self, name, parent, + def __init__(self, name, parent_type, ctype=None, gtype_name=None, get_type=None, @@ -974,7 +974,7 @@ class Class(Node, Registered): Registered.__init__(self, gtype_name, get_type) self.ctype = ctype self.c_symbol_prefix = c_symbol_prefix - self.parent = parent + self.parent_type = parent_type self.fundamental = False self.unref_func = None self.ref_func = None @@ -1013,7 +1013,7 @@ class Class(Node, Registered): class Interface(Node, Registered): - def __init__(self, name, parent, + def __init__(self, name, parent_type, ctype=None, gtype_name=None, get_type=None, @@ -1022,7 +1022,7 @@ class Interface(Node, Registered): Registered.__init__(self, gtype_name, get_type) self.ctype = ctype self.c_symbol_prefix = c_symbol_prefix - self.parent = parent + self.parent_type = parent_type self.parent_chain = [] self.methods = [] self.signals = [] diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py index 1a149374..763a09d6 100644 --- a/giscanner/docwriter.py +++ b/giscanner/docwriter.py @@ -352,8 +352,8 @@ class DocFormatter(object): def get_class_hierarchy(self, node): parent_chain = [node] - while node.parent: - node = self._transformer.lookup_typenode(node.parent) + while node.parent_type: + node = self._transformer.lookup_typenode(node.parent_type) parent_chain.append(node) parent_chain.reverse() diff --git a/giscanner/girparser.py b/giscanner/girparser.py index 18f41d39..4cba5065 100644 --- a/giscanner/girparser.py +++ b/giscanner/girparser.py @@ -216,7 +216,7 @@ class GIRParser(object): parent_type = None ctor_kwargs = {'name': node.attrib['name'], - 'parent': parent_type, + 'parent_type': parent_type, 'gtype_name': node.attrib[_glibns('type-name')], 'get_type': node.attrib[_glibns('get-type')], 'c_symbol_prefix': node.attrib.get(_cns('symbol-prefix')), diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py index 90f7e1ed..ea9305cd 100644 --- a/giscanner/girwriter.py +++ b/giscanner/girwriter.py @@ -388,9 +388,9 @@ and/or use gtk-doc annotations. ''') self._append_node_generic(node, attrs) if isinstance(node, ast.Class): tag_name = 'class' - if node.parent is not None: + if node.parent_type is not None: attrs.append(('parent', - self._type_to_name(node.parent))) + self._type_to_name(node.parent_type))) if node.is_abstract: attrs.append(('abstract', '1')) else: diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py index 4eaf6401..049ba9ba 100644 --- a/giscanner/maintransformer.py +++ b/giscanner/maintransformer.py @@ -479,8 +479,8 @@ usage is void (*_gtk_reserved1)(void);""" assert supercls if cls is supercls: return True - if cls.parent and cls.parent.target_giname != 'GObject.Object': - return self._is_gi_subclass(cls.parent, supercls_type) + if cls.parent_type and cls.parent_type.target_giname != 'GObject.Object': + return self._is_gi_subclass(cls.parent_type, supercls_type) return False def _get_transfer_default_return(self, parent, node): @@ -898,11 +898,11 @@ the ones that failed to resolve removed.""" continue target = self._transformer.lookup_typenode(parent) if target: - node.parent = parent + node.parent_type = parent break else: if isinstance(node, ast.Interface): - node.parent = ast.Type(target_giname='GObject.Object') + node.parent_type = ast.Type(target_giname='GObject.Object') for prop in node.properties: self._transformer.resolve_type(prop.type) for sig in node.signals: @@ -1197,8 +1197,8 @@ method or constructor of some type.""" while parent and (not parent.gi_name == 'GObject.Object'): if parent == target: break - if parent.parent: - parent = self._transformer.lookup_typenode(parent.parent) + if parent.parent_type: + parent = self._transformer.lookup_typenode(parent.parent_type) else: parent = None if parent is None: -- cgit v1.2.1 From 50e99b62d6b028faeeaf6af3af6c5ef51412f3ec Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 15 Feb 2013 06:31:49 -0500 Subject: ast: Fall back to the namespace for the parent of a Node https://bugzilla.gnome.org/show_bug.cgi?id=693876 --- giscanner/ast.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/giscanner/ast.py b/giscanner/ast.py index 3cf99ddd..d0784c38 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -527,6 +527,17 @@ GIName. It's possible for nodes to contain or point to other nodes.""" self.name = name self.foreign = False self.file_positions = set() + self._parent = None + + def _get_parent(self): + if self._parent is not None: + return self._parent + else: + return self.namespace + + def _set_parent(self, value): + self._parent = value + parent = property(_get_parent, _set_parent) def create_type(self): """Create a Type object referencing this node.""" -- cgit v1.2.1 From f0bdbc7f283c080da5c07aad5becf6b843e9dd2e Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 15 Feb 2013 16:05:24 -0500 Subject: ast: Fix indentation --- giscanner/ast.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giscanner/ast.py b/giscanner/ast.py index d0784c38..c2f89a62 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -639,7 +639,7 @@ class Function(Callable): # Named correctly if not (self.name.endswith('_get_type') or self.name.endswith('_get_gtype')): - return False + return False # Doesn't have any parameters if self.parameters: -- cgit v1.2.1 From a3e9079c7381218e8111f81402ad2e70c9e416d4 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 15 Feb 2013 06:40:20 -0500 Subject: docwriter: Clean up make_page_id Make it use a simple recursive technique similar to format_page_name. --- giscanner/docwriter.py | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py index 763a09d6..affcd2d1 100644 --- a/giscanner/docwriter.py +++ b/giscanner/docwriter.py @@ -31,30 +31,17 @@ from mako.lookup import TemplateLookup from . import ast, xmlwriter from .utils import to_underscores -def make_page_id(node): +def make_page_id(node, recursive=False): if isinstance(node, ast.Namespace): - return 'index' - - namespace = node.namespace - if isinstance(node, (ast.Class, ast.Interface)): - return '%s.%s' % (namespace.name, node.name) - elif isinstance(node, ast.Record): - return '%s.%s' % (namespace.name, node.name) - elif isinstance(node, ast.Function): - if node.parent is not None: - return '%s.%s.%s' % (namespace.name, node.parent.name, node.name) + if recursive: + return node.name else: - return '%s.%s' % (namespace.name, node.name) - elif isinstance(node, ast.Enum): - return '%s.%s' % (namespace.name, node.name) - elif isinstance(node, ast.Property) and node.parent is not None: - return '%s.%s-%s' % (namespace.name, node.parent.name, node.name) - elif isinstance(node, ast.Signal) and node.parent is not None: - return '%s.%s-%s' % (namespace.name, node.parent.name, node.name) - elif isinstance(node, ast.VFunction) and node.parent is not None: - return '%s.%s-%s' % (namespace.name, node.parent.name, node.name) + return 'index' + + if isinstance(node, (ast.Property, ast.Signal, ast.VFunction)): + return '%s-%s' % (make_page_id(node.parent, recursive=True), node.name) else: - return '%s.%s' % (namespace.name, node.name) + return '%s.%s' % (make_page_id(node.parent, recursive=True), node.name) def get_node_kind(node): if isinstance(node, ast.Namespace): -- cgit v1.2.1 From 2ebd527a853638eb3c13d00dedca1353dcffb212 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 15 Feb 2013 06:00:51 -0500 Subject: docwriter: Add support for adding additional attrs to the xref writer --- giscanner/docwriter.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py index affcd2d1..7f337d21 100644 --- a/giscanner/docwriter.py +++ b/giscanner/docwriter.py @@ -313,12 +313,13 @@ class DocFormatter(object): else: return make_page_id(node) - def format_xref(self, node): + def format_xref(self, node, **attrdict): if isinstance(node, ast.Member): # Enum/BitField members are linked to the main enum page. - return self.format_xref(node.parent) + '.' + node.name + return self.format_xref(node.parent, **attrdict) + '.' + node.name else: - return xmlwriter.build_xml_tag('link', [('xref', make_page_id(node))]) + attrs = [('xref', make_page_id(node))] + attrdict.items() + return xmlwriter.build_xml_tag('link', attrs) def format_property_flags(self, property_, construct_only=False): flags = [] -- cgit v1.2.1 From d05e20a61d3e381e46fcb306f806566bbbd76312 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 15 Feb 2013 06:04:11 -0500 Subject: doctool: Use format_xref to format some links to pages We don't do a full 100% conversion for all link tags, yet, because I don't want to break too much here. This may come later. --- giscanner/doctemplates/C/function.tmpl | 6 +----- giscanner/doctemplates/C/property.tmpl | 2 +- giscanner/doctemplates/C/signal.tmpl | 2 +- giscanner/doctemplates/C/vfunc.tmpl | 2 +- giscanner/doctemplates/Gjs/function.tmpl | 6 +----- giscanner/doctemplates/Gjs/property.tmpl | 2 +- giscanner/doctemplates/Gjs/signal.tmpl | 2 +- giscanner/doctemplates/Python/function.tmpl | 6 +----- giscanner/doctemplates/Python/property.tmpl | 2 +- giscanner/doctemplates/Python/signal.tmpl | 2 +- giscanner/doctemplates/base.tmpl | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.ATestError.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.AliasedTestBoxed.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.AnnotationCallback.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationForeachFunc.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationListCallback.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationNotifyFunc.page | 2 +- .../Regress.AnnotationObject-attribute-signal.page | 2 +- .../Regress.AnnotationObject-doc-empty-arg-parsing.page | 2 +- .../Regress.AnnotationObject-function-property.page | 2 +- .../Regress.AnnotationObject-list-signal.page | 2 +- .../Regress.AnnotationObject-string-property.page | 2 +- .../Regress.AnnotationObject-string-signal.page | 2 +- .../Regress.AnnotationObject-tab-property.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page | 2 +- .../Regress.AnnotationObject.calleesowns.page | 2 +- .../Regress.AnnotationObject.compute_sum.page | 2 +- .../Regress.AnnotationObject.compute_sum_n.page | 2 +- .../Regress.AnnotationObject.compute_sum_nz.page | 2 +- .../Regress.AnnotationObject.create_object.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page | 2 +- .../Regress.AnnotationObject.extra_annos.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page | 2 +- .../Regress.AnnotationObject.get_objects.page | 2 +- .../Regress.AnnotationObject.get_strings.page | 2 +- .../Regress.AnnotationObject.hidden_self.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObject.inout.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObject.method.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObject.out.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObject.watch.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page | 2 +- .../Regress-1.0-C-expected/Regress.AnnotationObjectClass.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooASingle.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooAddressType.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.page | 2 +- .../Regress-1.0-C-expected/Regress.FooBuffer.some_method.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooCallback.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooEnumFullname.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooEnumNoType.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooError.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooEvent.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page | 2 +- .../Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page | 2 +- .../Regress-1.0-C-expected/Regress.FooForeignStruct.new.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.page | 2 +- .../Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page | 2 +- .../Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.page | 2 +- .../Regress-1.0-C-expected/Regress.FooInterface.static_method.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooObject-hidden.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooObject-string.page | 2 +- .../Regress-1.0-C-expected/Regress.FooObject-virtual_method.page | 2 +- .../Regress-1.0-C-expected/Regress.FooObject.a_global_method.page | 2 +- .../Regress.FooObject.append_new_stack_layer.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page | 2 +- .../Regress-1.0-C-expected/Regress.FooObject.external_type.page | 2 +- .../Regress-1.0-C-expected/Regress.FooObject.get_default.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page | 2 +- .../Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page | 2 +- .../Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page | 2 +- .../Regress-1.0-C-expected/Regress.FooObject.new_as_super.page | 2 +- .../Regress-1.0-C-expected/Regress.FooObject.new_cookie.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooObject.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page | 2 +- .../Regress-1.0-C-expected/Regress.FooObject.skipped_method.page | 2 +- .../Regress-1.0-C-expected/Regress.FooObject.static_meth.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page | 2 +- .../Regress-1.0-C-expected/Regress.FooObject.virtual_method.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooObjectCookie.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObject.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooSkippable.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooStackLayer.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooStruct.page | 2 +- .../Regress.FooSubInterface-destroy-event.page | 2 +- .../Regress.FooSubInterface-destroy_event.page | 2 +- .../Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page | 2 +- .../Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page | 2 +- .../Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page | 2 +- .../Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.page | 2 +- .../Regress-1.0-C-expected/Regress.FooSubInterfaceIface.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooUnion.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.FooVarargsCallback.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.FooXEvent.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page | 2 +- .../Regress.LikeGnomeKeyringPasswordSchema.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.PtrArrayAlias.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page | 2 +- .../Regress.TestBoxed.new_alternative_constructor1.page | 2 +- .../Regress.TestBoxed.new_alternative_constructor2.page | 2 +- .../Regress.TestBoxed.new_alternative_constructor3.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page | 2 +- .../Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestCallback.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackArray.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackFull.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.TestCallbackGError.page | 2 +- .../Regress-1.0-C-expected/Regress.TestCallbackHashtable.page | 2 +- .../Regress-1.0-C-expected/Regress.TestCallbackOwnedGError.page | 2 +- .../Regress-1.0-C-expected/Regress.TestCallbackUserData.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestDEFError.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestEnumNoGEnum.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestEnumUnsigned.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestError.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass.page | 2 +- .../Regress-1.0-C-expected/Regress.TestFundamentalObject.page | 2 +- .../Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page | 2 +- .../Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page | 2 +- .../Regress-1.0-C-expected/Regress.TestFundamentalObjectClass.page | 2 +- .../Regress.TestFundamentalObjectCopyFunction.page | 2 +- .../Regress.TestFundamentalObjectFinalizeFunction.page | 2 +- .../Regress.TestFundamentalSubObject.new.page | 4 +++- .../Regress-1.0-C-expected/Regress.TestFundamentalSubObject.page | 2 +- .../Regress.TestFundamentalSubObjectClass.page | 2 +- .../Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page | 2 +- .../Regress.TestInheritDrawable.do_foo_maybe_throw.page | 2 +- .../Regress.TestInheritDrawable.get_origin.page | 2 +- .../Regress.TestInheritDrawable.get_size.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.page | 2 +- .../Regress-1.0-C-expected/Regress.TestInheritDrawableClass.page | 2 +- .../Regress.TestInheritPixmapObjectClass.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page | 2 +- .../Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestObj-bare.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestObj-boxed.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestObj-double.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestObj-float.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestObj-gtype.page | 2 +- .../Regress-1.0-C-expected/Regress.TestObj-hash-table-old.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestObj-int.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list-old.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page | 2 +- .../Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page | 2 +- .../Regress.TestObj-sig-with-foreign-struct.page | 2 +- .../Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page | 2 +- .../Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page | 2 +- .../Regress.TestObj-sig-with-intarray-ret.page | 2 +- .../Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page | 2 +- .../Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page | 2 +- .../Regress.TestObj-sig-with-uint64-prop.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestObj-string.page | 2 +- .../Regress.TestObj-test-with-static-scope-arg.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page | 2 +- .../Regress.TestObj.emit_sig_with_foreign_struct.page | 2 +- .../Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page | 2 +- .../Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page | 2 +- .../Regress.TestObj.emit_sig_with_uint64.page | 2 +- .../Regress-1.0-C-expected/Regress.TestObj.forced_method.page | 2 +- .../Regress-1.0-C-expected/Regress.TestObj.instance_method.page | 2 +- .../Regress.TestObj.instance_method_callback.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page | 2 +- .../Regress-1.0-C-expected/Regress.TestObj.new_callback.page | 2 +- .../Regress-1.0-C-expected/Regress.TestObj.new_from_file.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestObj.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page | 2 +- .../Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page | 2 +- .../Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page | 2 +- .../Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page | 2 +- .../Regress.TestObj.skip_return_val_no_out.page | 2 +- .../Regress-1.0-C-expected/Regress.TestObj.static_method.page | 2 +- .../Regress.TestObj.static_method_callback.page | 2 +- .../Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page | 2 +- .../Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct.page | 2 +- .../Regress.TestSimpleBoxedA.const_return.page | 2 +- .../Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page | 2 +- .../Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.page | 2 +- .../Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.TestSimpleCallback.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestStructC.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestStructD.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestStructE.page | 2 +- .../Regress.TestStructE__some_union__union.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestStructF.page | 2 +- .../Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page | 2 +- .../Regress-1.0-C-expected/Regress.TestStructFixedArray.page | 2 +- .../Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.page | 2 +- .../Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestTypeGUInt64.page | 2 +- .../Regress-1.0-C-expected/Regress.TestWi8021x-testbool.page | 2 +- .../Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.page | 2 +- .../Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page | 2 +- .../Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.VaListAlias.page | 2 +- .../Regress-1.0-C-expected/Regress.aliased_caller_alloc.page | 2 +- .../Regress-1.0-C-expected/Regress.annotation_attribute_func.page | 2 +- .../Regress-1.0-C-expected/Regress.annotation_custom_destroy.page | 2 +- .../Regress-1.0-C-expected/Regress.annotation_get_source_file.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page | 2 +- .../Regress.annotation_invalid_regress_annotation.page | 2 +- .../Regress-1.0-C-expected/Regress.annotation_ptr_array.page | 2 +- .../Regress-1.0-C-expected/Regress.annotation_return_array.page | 2 +- .../Regress-1.0-C-expected/Regress.annotation_return_filename.page | 2 +- .../Regress-1.0-C-expected/Regress.annotation_set_source_file.page | 2 +- .../Regress.annotation_space_after_comment_bug631690.page | 2 +- .../Regress.annotation_string_array_length.page | 2 +- .../Regress.annotation_string_zero_terminated.page | 2 +- .../Regress.annotation_string_zero_terminated_out.page | 2 +- .../Regress.annotation_test_parsing_bug630862.page | 2 +- .../Regress.annotation_transfer_floating.page | 2 +- .../Regress-1.0-C-expected/Regress.annotation_versioned.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page | 2 +- .../Regress-1.0-C-expected/Regress.foo_async_ready_callback.page | 2 +- .../Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page | 2 +- .../Regress.foo_method_external_references.page | 2 +- .../Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page | 2 +- .../Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page | 2 +- .../Regress-1.0-C-expected/Regress.foo_test_const_char_param.page | 2 +- .../Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page | 2 +- .../Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page | 2 +- .../Regress.foo_test_const_struct_retval.page | 2 +- .../Regress-1.0-C-expected/Regress.foo_test_string_array.page | 2 +- .../Regress.foo_test_string_array_with_g.page | 2 +- .../Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page | 2 +- .../Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page | 2 +- .../Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page | 2 +- .../Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page | 2 +- .../Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page | 2 +- .../Regress-1.0-C-expected/Regress.global_get_flags_out.page | 2 +- .../Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page | 2 +- .../Regress-1.0-C-expected/Regress.introspectable_via_alias.page | 2 +- .../Regress.not_introspectable_via_alias.page | 2 +- .../Regress.random_function_with_skipped_structure.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.test_array_callback.page | 2 +- .../Regress.test_array_fixed_out_objects.page | 2 +- .../Regress.test_array_fixed_size_int_in.page | 2 +- .../Regress.test_array_fixed_size_int_out.page | 2 +- .../Regress.test_array_fixed_size_int_return.page | 2 +- .../Regress-1.0-C-expected/Regress.test_array_gint16_in.page | 2 +- .../Regress-1.0-C-expected/Regress.test_array_gint32_in.page | 2 +- .../Regress-1.0-C-expected/Regress.test_array_gint64_in.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page | 2 +- .../Regress-1.0-C-expected/Regress.test_array_int_full_out.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page | 2 +- .../Regress-1.0-C-expected/Regress.test_array_int_inout.page | 2 +- .../Regress-1.0-C-expected/Regress.test_array_int_none_out.page | 2 +- .../Regress-1.0-C-expected/Regress.test_array_int_null_in.page | 2 +- .../Regress-1.0-C-expected/Regress.test_array_int_null_out.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page | 2 +- .../Regress-1.0-C-expected/Regress.test_async_ready_callback.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page | 2 +- .../Regress.test_cairo_context_full_return.page | 2 +- .../Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page | 2 +- .../Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page | 2 +- .../Regress.test_cairo_surface_full_return.page | 2 +- .../Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page | 2 +- .../Regress.test_cairo_surface_none_return.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.test_callback_async.page | 2 +- .../Regress.test_callback_destroy_notify.page | 2 +- .../Regress.test_callback_destroy_notify_no_user_data.page | 2 +- .../Regress-1.0-C-expected/Regress.test_callback_thaw_async.page | 2 +- .../Regress.test_callback_thaw_notifications.page | 2 +- .../Regress-1.0-C-expected/Regress.test_callback_user_data.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page | 2 +- .../Regress-1.0-C-expected/Regress.test_closure_one_arg.page | 2 +- .../Regress-1.0-C-expected/Regress.test_closure_variant.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page | 2 +- .../Regress-1.0-C-expected/Regress.test_def_error_quark.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_double.page | 2 +- .../Regress-1.0-C-expected/Regress.test_filename_return.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_float.page | 2 +- .../Regress.test_garray_container_return.page | 2 +- .../Regress-1.0-C-expected/Regress.test_garray_full_return.page | 2 +- .../Regress-1.0-C-expected/Regress.test_gerror_callback.page | 2 +- .../Regress-1.0-C-expected/Regress.test_ghash_container_return.page | 2 +- .../Regress.test_ghash_everything_return.page | 2 +- .../Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page | 2 +- .../Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page | 2 +- .../Regress.test_ghash_nested_everything_return.page | 2 +- .../Regress.test_ghash_nested_everything_return2.page | 2 +- .../Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page | 2 +- .../Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page | 2 +- .../Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page | 2 +- .../Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page | 2 +- .../Regress-1.0-C-expected/Regress.test_ghash_null_return.page | 2 +- .../Regress-1.0-C-expected/Regress.test_glist_container_return.page | 2 +- .../Regress.test_glist_everything_return.page | 2 +- .../Regress-1.0-C-expected/Regress.test_glist_nothing_in.page | 2 +- .../Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page | 2 +- .../Regress-1.0-C-expected/Regress.test_glist_nothing_return.page | 2 +- .../Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page | 2 +- .../Regress.test_gslist_container_return.page | 2 +- .../Regress.test_gslist_everything_return.page | 2 +- .../Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page | 2 +- .../Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page | 2 +- .../Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page | 2 +- .../Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page | 2 +- .../Regress-1.0-C-expected/Regress.test_gslist_null_out.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page | 2 +- .../Regress-1.0-C-expected/Regress.test_hash_table_callback.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_int.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_long.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page | 2 +- .../Regress-1.0-C-expected/Regress.test_multi_double_args.page | 2 +- .../Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page | 2 +- .../Regress-1.0-C-expected/Regress.test_nested_parameter.page | 2 +- .../Regress-1.0-C-expected/Regress.test_null_gerror_callback.page | 2 +- .../Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_short.page | 2 +- .../Regress-1.0-C-expected/Regress.test_simple_callback.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_size.page | 2 +- .../Regress.test_skip_unannotated_callback.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page | 2 +- .../Regress-1.0-C-expected/Regress.test_strv_out_container.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page | 2 +- .../Regress-1.0-C-expected/Regress.test_torture_signature_0.page | 2 +- .../Regress-1.0-C-expected/Regress.test_torture_signature_1.page | 2 +- .../Regress-1.0-C-expected/Regress.test_torture_signature_2.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page | 2 +- .../Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page | 2 +- .../Regress-1.0-C-expected/Regress.test_utf8_const_return.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page | 2 +- .../Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page | 2 +- .../scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page | 2 +- .../Regress.test_utf8_out_nonconst_return.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page | 2 +- .../Regress.test_value_get_fundamental_object.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page | 2 +- .../Regress.test_value_set_fundamental_object.page | 2 +- tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.AliasedTestBoxed.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationForeachFunc.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationNotifyFunc.page | 2 +- .../Regress.AnnotationObject-attribute-signal.page | 2 +- .../Regress.AnnotationObject-doc-empty-arg-parsing.page | 2 +- .../Regress.AnnotationObject-function-property.page | 2 +- .../Regress.AnnotationObject-list-signal.page | 2 +- .../Regress.AnnotationObject-string-property.page | 2 +- .../Regress.AnnotationObject-string-signal.page | 2 +- .../Regress.AnnotationObject-tab-property.page | 2 +- .../Regress.AnnotationObject.allow_none.page | 2 +- .../Regress.AnnotationObject.calleeowns.page | 2 +- .../Regress.AnnotationObject.calleesowns.page | 2 +- .../Regress.AnnotationObject.compute_sum.page | 2 +- .../Regress.AnnotationObject.compute_sum_n.page | 2 +- .../Regress.AnnotationObject.compute_sum_nz.page | 2 +- .../Regress.AnnotationObject.create_object.page | 2 +- .../Regress.AnnotationObject.do_not_use.page | 2 +- .../Regress.AnnotationObject.extra_annos.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page | 2 +- .../Regress.AnnotationObject.get_objects.page | 2 +- .../Regress.AnnotationObject.get_strings.page | 2 +- .../Regress.AnnotationObject.hidden_self.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page | 2 +- .../Regress.AnnotationObject.parse_args.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page | 2 +- .../Regress.AnnotationObject.set_data2.page | 2 +- .../Regress.AnnotationObject.set_data3.page | 2 +- .../Regress.AnnotationObject.string_out.page | 2 +- .../Regress.AnnotationObject.use_buffer.page | 2 +- .../Regress.AnnotationObject.watch_full.page | 2 +- .../Regress.AnnotationObject.with_voidp.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.page | 2 +- .../Regress.FooInterface-do_regress_foo.page | 2 +- .../Regress.FooInterface.do_regress_foo.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page | 2 +- .../Regress.FooInterface.static_method.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.FooObject-string.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page | 2 +- .../Regress.FooObject.append_new_stack_layer.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObjectCookie.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct.page | 2 +- .../Regress.FooSubInterface-destroy-event.page | 2 +- .../Regress.FooSubInterface-destroy_event.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUnion.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooXEvent.page | 2 +- .../Regress.LikeGnomeKeyringPasswordSchema.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.PtrArrayAlias.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page | 2 +- .../Regress.TestBoxed.new_alternative_constructor1.page | 2 +- .../Regress.TestBoxed.new_alternative_constructor2.page | 2 +- .../Regress.TestBoxed.new_alternative_constructor3.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallback.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackArray.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackFull.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestCallbackHashtable.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestCallbackUserData.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page | 2 +- .../Regress.TestFundamentalObject.unref.page | 2 +- .../Regress.TestFundamentalObjectCopyFunction.page | 2 +- .../Regress.TestFundamentalObjectFinalizeFunction.page | 2 +- .../Regress.TestFundamentalSubObject.new.page | 4 +++- .../Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page | 2 +- .../Regress.TestInheritDrawable.do_foo.page | 2 +- .../Regress.TestInheritDrawable.do_foo_maybe_throw.page | 2 +- .../Regress.TestInheritDrawable.get_origin.page | 2 +- .../Regress.TestInheritDrawable.get_size.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page | 2 +- .../Regress.TestInheritPixmapObjectClass.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-boxed.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-double.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-float.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-gtype.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj-hash-table-old.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj-hash-table.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-int.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page | 2 +- .../Regress.TestObj-sig-with-array-prop.page | 2 +- .../Regress.TestObj-sig-with-foreign-struct.page | 2 +- .../Regress.TestObj-sig-with-hash-prop.page | 2 +- .../Regress.TestObj-sig-with-int64-prop.page | 2 +- .../Regress.TestObj-sig-with-intarray-ret.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page | 2 +- .../Regress.TestObj-sig-with-uint64-prop.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-string.page | 2 +- .../Regress.TestObj-test-with-static-scope-arg.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page | 2 +- .../Regress.TestObj.emit_sig_with_foreign_struct.page | 2 +- .../Regress.TestObj.emit_sig_with_int64.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page | 2 +- .../Regress.TestObj.emit_sig_with_uint64.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page | 2 +- .../Regress.TestObj.instance_method_callback.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page | 2 +- .../Regress.TestObj.skip_return_val_no_out.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page | 2 +- .../Regress.TestObj.static_method_callback.page | 2 +- .../Regress.TestObj.torture_signature_0.page | 2 +- .../Regress.TestObj.torture_signature_1.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct.page | 2 +- .../Regress.TestSimpleBoxedA.const_return.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestSimpleCallback.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE.page | 2 +- .../Regress.TestStructE__some_union__union.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.page | 2 +- .../Regress.TestSubObj.instance_method.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestTypeGUInt64.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestWi8021x-testbool.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page | 2 +- .../Regress.annotation_get_source_file.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page | 2 +- .../Regress.annotation_invalid_regress_annotation.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.annotation_return_array.page | 2 +- .../Regress.annotation_return_filename.page | 2 +- .../Regress.annotation_set_source_file.page | 2 +- .../Regress.annotation_space_after_comment_bug631690.page | 2 +- .../Regress.annotation_string_array_length.page | 2 +- .../Regress.annotation_string_zero_terminated.page | 2 +- .../Regress.annotation_string_zero_terminated_out.page | 2 +- .../Regress.annotation_test_parsing_bug630862.page | 2 +- .../Regress.annotation_transfer_floating.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.annotation_versioned.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page | 2 +- .../Regress.foo_destroy_notify_callback.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page | 2 +- .../Regress.foo_method_external_references.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page | 2 +- .../Regress.foo_test_const_char_retval.page | 2 +- .../Regress.foo_test_const_struct_param.page | 2 +- .../Regress.foo_test_const_struct_retval.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page | 2 +- .../Regress.foo_test_string_array_with_g.page | 2 +- .../Regress.foo_test_unsigned_qualifier.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_array_callback.page | 2 +- .../Regress.test_array_fixed_out_objects.page | 2 +- .../Regress.test_array_fixed_size_int_in.page | 2 +- .../Regress.test_array_fixed_size_int_out.page | 2 +- .../Regress.test_array_fixed_size_int_return.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_array_int_out.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_boolean_false.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page | 2 +- .../Regress.test_cairo_context_full_return.page | 2 +- .../Regress.test_cairo_context_none_in.page | 2 +- .../Regress.test_cairo_surface_full_out.page | 2 +- .../Regress.test_cairo_surface_full_return.page | 2 +- .../Regress.test_cairo_surface_none_in.page | 2 +- .../Regress.test_cairo_surface_none_return.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_callback_async.page | 2 +- .../Regress.test_callback_destroy_notify.page | 2 +- .../Regress.test_callback_destroy_notify_no_user_data.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page | 2 +- .../Regress.test_callback_thaw_notifications.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_closure_variant.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_filename_return.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page | 2 +- .../Regress.test_garray_container_return.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page | 2 +- .../Regress.test_ghash_container_return.page | 2 +- .../Regress.test_ghash_everything_return.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page | 2 +- .../Regress.test_ghash_nested_everything_return.page | 2 +- .../Regress.test_ghash_nested_everything_return2.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page | 2 +- .../Regress.test_ghash_nothing_return2.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page | 2 +- .../Regress.test_glist_container_return.page | 2 +- .../Regress.test_glist_everything_return.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page | 2 +- .../Regress.test_glist_nothing_return2.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page | 2 +- .../Regress.test_gslist_container_return.page | 2 +- .../Regress.test_gslist_everything_return.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page | 2 +- .../Regress.test_gslist_nothing_return.page | 2 +- .../Regress.test_gslist_nothing_return2.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_multi_callback.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page | 2 +- .../Regress.test_multiline_doc_comments.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page | 2 +- .../Regress.test_owned_gerror_callback.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_simple_callback.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page | 2 +- .../Regress.test_utf8_out_nonconst_return.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page | 2 +- .../Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page | 2 +- .../Regress-1.0-Python-expected/Regress.AnnotationBitfield.page | 2 +- .../Regress-1.0-Python-expected/Regress.AnnotationCallback.page | 2 +- .../Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page | 2 +- .../Regress-1.0-Python-expected/Regress.AnnotationListCallback.page | 2 +- .../Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page | 2 +- .../Regress.AnnotationObject-attribute-signal.page | 2 +- .../Regress.AnnotationObject-doc-empty-arg-parsing.page | 2 +- .../Regress.AnnotationObject-function-property.page | 2 +- .../Regress.AnnotationObject-list-signal.page | 2 +- .../Regress.AnnotationObject-string-property.page | 2 +- .../Regress.AnnotationObject-string-signal.page | 2 +- .../Regress.AnnotationObject-tab-property.page | 2 +- .../Regress.AnnotationObject.allow_none.page | 2 +- .../Regress.AnnotationObject.calleeowns.page | 2 +- .../Regress.AnnotationObject.calleesowns.page | 2 +- .../Regress.AnnotationObject.compute_sum.page | 2 +- .../Regress.AnnotationObject.compute_sum_n.page | 2 +- .../Regress.AnnotationObject.compute_sum_nz.page | 2 +- .../Regress.AnnotationObject.create_object.page | 2 +- .../Regress.AnnotationObject.do_not_use.page | 2 +- .../Regress.AnnotationObject.extra_annos.page | 2 +- .../Regress.AnnotationObject.foreach.page | 2 +- .../Regress.AnnotationObject.get_hash.page | 2 +- .../Regress.AnnotationObject.get_objects.page | 2 +- .../Regress.AnnotationObject.get_strings.page | 2 +- .../Regress.AnnotationObject.hidden_self.page | 2 +- .../Regress-1.0-Python-expected/Regress.AnnotationObject.in.page | 2 +- .../Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page | 2 +- .../Regress.AnnotationObject.inout2.page | 2 +- .../Regress.AnnotationObject.inout3.page | 2 +- .../Regress.AnnotationObject.method.page | 2 +- .../Regress.AnnotationObject.notrans.page | 2 +- .../Regress-1.0-Python-expected/Regress.AnnotationObject.out.page | 2 +- .../Regress-1.0-Python-expected/Regress.AnnotationObject.page | 2 +- .../Regress.AnnotationObject.parse_args.page | 2 +- .../Regress.AnnotationObject.set_data.page | 2 +- .../Regress.AnnotationObject.set_data2.page | 2 +- .../Regress.AnnotationObject.set_data3.page | 2 +- .../Regress.AnnotationObject.string_out.page | 2 +- .../Regress.AnnotationObject.use_buffer.page | 2 +- .../Regress.AnnotationObject.watch_full.page | 2 +- .../Regress.AnnotationObject.with_voidp.page | 2 +- .../Regress-1.0-Python-expected/Regress.AnnotationStruct.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooBoxed.method.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooCallback.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooDBusData.method.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooEnumFullname.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.FooEventExpose.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooForeignStruct.page | 2 +- .../Regress.FooInterface-do_regress_foo.page | 2 +- .../Regress.FooInterface.do_regress_foo.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.page | 2 +- .../Regress.FooInterface.static_method.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooObject-read_fn.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooObject-signal.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooObject-string.page | 2 +- .../Regress.FooObject-virtual_method.page | 2 +- .../Regress.FooObject.a_global_method.page | 2 +- .../Regress.FooObject.append_new_stack_layer.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooObject.dup_name.page | 2 +- .../Regress.FooObject.external_type.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooObject.get_default.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooObject.get_name.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page | 2 +- .../Regress.FooObject.is_it_time_yet.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooObject.static_meth.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooObject.various.page | 2 +- .../Regress.FooObject.virtual_method.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooObjectCookie.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooRectangle.add.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page | 2 +- .../Regress.FooSubInterface-destroy-event.page | 2 +- .../Regress.FooSubInterface-destroy_event.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooSubInterface.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooThingWithArray.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooUtilityStruct.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page | 2 +- .../Regress.LikeGnomeKeyringPasswordSchema.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestBoxed.equals.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestBoxedD.free.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestCallbackArray.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestCallbackFull.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestCallbackGError.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page | 2 +- .../Regress.TestCallbackOwnedGError.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestCallbackUserData.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestFundamentalObject.page | 2 +- .../Regress.TestFundamentalObject.ref.page | 2 +- .../Regress.TestFundamentalObject.unref.page | 2 +- .../Regress.TestFundamentalObjectCopyFunction.page | 2 +- .../Regress.TestFundamentalObjectFinalizeFunction.page | 2 +- .../Regress.TestFundamentalSubObject.page | 2 +- .../Regress.TestInheritDrawable.do_foo.page | 2 +- .../Regress.TestInheritDrawable.do_foo_maybe_throw.page | 2 +- .../Regress.TestInheritDrawable.get_origin.page | 2 +- .../Regress.TestInheritDrawable.get_size.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestInheritDrawable.page | 2 +- .../Regress.TestInheritPixmapObjectClass.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.TestInterface.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page | 2 +- .../Regress.TestObj-allow_none_vfunc.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj-cleanup.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj-hash-table.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj-list-old.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page | 2 +- .../Regress.TestObj-sig-with-array-prop.page | 2 +- .../Regress.TestObj-sig-with-foreign-struct.page | 2 +- .../Regress.TestObj-sig-with-hash-prop.page | 2 +- .../Regress.TestObj-sig-with-int64-prop.page | 2 +- .../Regress.TestObj-sig-with-intarray-ret.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page | 2 +- .../Regress.TestObj-sig-with-uint64-prop.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page | 2 +- .../Regress.TestObj-test-with-static-scope-arg.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page | 2 +- .../Regress.TestObj.emit_sig_with_foreign_struct.page | 2 +- .../Regress.TestObj.emit_sig_with_int64.page | 2 +- .../Regress.TestObj.emit_sig_with_obj.page | 2 +- .../Regress.TestObj.emit_sig_with_uint64.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj.forced_method.page | 2 +- .../Regress.TestObj.instance_method.page | 2 +- .../Regress.TestObj.instance_method_callback.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj.null_out.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj.set_bare.page | 2 +- .../Regress.TestObj.skip_inout_param.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj.skip_param.page | 2 +- .../Regress.TestObj.skip_return_val.page | 2 +- .../Regress.TestObj.skip_return_val_no_out.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj.static_method.page | 2 +- .../Regress.TestObj.static_method_callback.page | 2 +- .../Regress.TestObj.torture_signature_0.page | 2 +- .../Regress.TestObj.torture_signature_1.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestPrivateEnum.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestPrivateStruct.page | 2 +- .../Regress.TestSimpleBoxedA.const_return.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page | 2 +- .../Regress.TestSimpleBoxedA.equals.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestSimpleCallback.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestStructA.clone.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestStructA.parse.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestStructB.clone.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page | 2 +- .../Regress.TestStructE__some_union__union.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page | 2 +- .../Regress.TestStructFixedArray.frob.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestStructFixedArray.page | 2 +- .../Regress.TestSubObj.instance_method.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page | 2 +- .../Regress.TestWi8021x.get_testbool.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page | 2 +- .../Regress.TestWi8021x.set_testbool.page | 2 +- .../Regress.TestWi8021x.static_method.page | 2 +- .../Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page | 4 ++-- .../Regress.annotation_attribute_func.page | 4 ++-- .../Regress.annotation_custom_destroy.page | 4 ++-- .../Regress.annotation_get_source_file.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.annotation_init.page | 4 ++-- .../Regress.annotation_invalid_regress_annotation.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.annotation_ptr_array.page | 4 ++-- .../Regress.annotation_return_array.page | 4 ++-- .../Regress.annotation_return_filename.page | 4 ++-- .../Regress.annotation_set_source_file.page | 4 ++-- .../Regress.annotation_space_after_comment_bug631690.page | 4 ++-- .../Regress.annotation_string_array_length.page | 4 ++-- .../Regress.annotation_string_zero_terminated.page | 4 ++-- .../Regress.annotation_string_zero_terminated_out.page | 4 ++-- .../Regress.annotation_test_parsing_bug630862.page | 4 ++-- .../Regress.annotation_transfer_floating.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.annotation_versioned.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.atest_error_quark.page | 4 ++-- .../Regress.foo_async_ready_callback.page | 4 ++-- .../Regress.foo_destroy_notify_callback.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page | 4 ++-- .../Regress.foo_method_external_references.page | 4 ++-- .../Regress.foo_not_a_constructor_new.page | 4 ++-- .../scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page | 4 ++-- .../Regress.foo_test_const_char_param.page | 4 ++-- .../Regress.foo_test_const_char_retval.page | 4 ++-- .../Regress.foo_test_const_struct_param.page | 4 ++-- .../Regress.foo_test_const_struct_retval.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.foo_test_string_array.page | 4 ++-- .../Regress.foo_test_string_array_with_g.page | 4 ++-- .../Regress.foo_test_unsigned_qualifier.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.func_obj_null_in.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.global_get_flags_out.page | 4 ++-- .../Regress.has_parameter_named_attrs.page | 4 ++-- .../Regress.introspectable_via_alias.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.set_abort_on_error.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_array_callback.page | 4 ++-- .../Regress.test_array_fixed_out_objects.page | 4 ++-- .../Regress.test_array_fixed_size_int_in.page | 4 ++-- .../Regress.test_array_fixed_size_int_out.page | 4 ++-- .../Regress.test_array_fixed_size_int_return.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_array_gint16_in.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_array_gint32_in.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_array_gint64_in.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_array_gint8_in.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_array_gtype_in.page | 4 ++-- .../Regress.test_array_int_full_out.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_array_int_in.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_array_int_inout.page | 4 ++-- .../Regress.test_array_int_none_out.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_array_int_null_in.page | 4 ++-- .../Regress.test_array_int_null_out.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_array_int_out.page | 4 ++-- .../Regress.test_async_ready_callback.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_boolean_false.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_boolean_true.page | 4 ++-- .../Regress.test_cairo_context_full_return.page | 4 ++-- .../Regress.test_cairo_context_none_in.page | 4 ++-- .../Regress.test_cairo_surface_full_out.page | 4 ++-- .../Regress.test_cairo_surface_full_return.page | 4 ++-- .../Regress.test_cairo_surface_none_in.page | 4 ++-- .../Regress.test_cairo_surface_none_return.page | 4 ++-- .../scanner/Regress-1.0-Python-expected/Regress.test_callback.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_callback_async.page | 4 ++-- .../Regress.test_callback_destroy_notify.page | 4 ++-- .../Regress.test_callback_destroy_notify_no_user_data.page | 4 ++-- .../Regress.test_callback_thaw_async.page | 4 ++-- .../Regress.test_callback_thaw_notifications.page | 4 ++-- .../Regress.test_callback_user_data.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_closure_one_arg.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_closure_variant.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_def_error_quark.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_filename_return.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page | 4 ++-- .../Regress.test_garray_container_return.page | 4 ++-- .../Regress.test_garray_full_return.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_gerror_callback.page | 4 ++-- .../Regress.test_ghash_container_return.page | 4 ++-- .../Regress.test_ghash_everything_return.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page | 4 ++-- .../Regress.test_ghash_gvalue_return.page | 4 ++-- .../Regress.test_ghash_nested_everything_return.page | 4 ++-- .../Regress.test_ghash_nested_everything_return2.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page | 4 ++-- .../Regress.test_ghash_nothing_return.page | 4 ++-- .../Regress.test_ghash_nothing_return2.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_ghash_null_in.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_ghash_null_out.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_ghash_null_return.page | 4 ++-- .../Regress.test_glist_container_return.page | 4 ++-- .../Regress.test_glist_everything_return.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page | 4 ++-- .../Regress.test_glist_nothing_return.page | 4 ++-- .../Regress.test_glist_nothing_return2.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_glist_null_in.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_glist_null_out.page | 4 ++-- .../Regress.test_gslist_container_return.page | 4 ++-- .../Regress.test_gslist_everything_return.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page | 4 ++-- .../Regress.test_gslist_nothing_in2.page | 4 ++-- .../Regress.test_gslist_nothing_return.page | 4 ++-- .../Regress.test_gslist_nothing_return2.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_gslist_null_in.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_gslist_null_out.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_gvariant_as.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_gvariant_asv.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_gvariant_i.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_gvariant_s.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_gvariant_v.page | 4 ++-- .../Regress.test_hash_table_callback.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_int_out_utf8.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_int_value_arg.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_multi_callback.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_multi_double_args.page | 4 ++-- .../Regress.test_multiline_doc_comments.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_nested_parameter.page | 4 ++-- .../Regress.test_null_gerror_callback.page | 4 ++-- .../Regress.test_owned_gerror_callback.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_simple_callback.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page | 4 ++-- .../scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_strv_out_c.page | 4 ++-- .../Regress.test_strv_out_container.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_strv_outarg.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page | 4 ++-- .../Regress.test_torture_signature_0.page | 4 ++-- .../Regress.test_torture_signature_1.page | 4 ++-- .../Regress.test_torture_signature_2.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page | 4 ++-- .../Regress.test_unsigned_enum_param.page | 4 ++-- tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_utf8_const_in.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_utf8_const_return.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_utf8_inout.page | 4 ++-- .../Regress.test_utf8_nonconst_return.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_utf8_null_in.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_utf8_null_out.page | 4 ++-- .../scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page | 4 ++-- .../Regress.test_utf8_out_nonconst_return.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_utf8_out_out.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_value_return.page | 4 ++-- .../Regress-1.0-Python-expected/Regress.test_versioning.page | 4 ++-- 1258 files changed, 1428 insertions(+), 1436 deletions(-) diff --git a/giscanner/doctemplates/C/function.tmpl b/giscanner/doctemplates/C/function.tmpl index c788225e..8d669438 100644 --- a/giscanner/doctemplates/C/function.tmpl +++ b/giscanner/doctemplates/C/function.tmpl @@ -1,10 +1,6 @@ <%inherit file="/base.tmpl"/> <%block name="info"> -% if node.parent is not None: - -% else: - -% endif + ${formatter.format_xref(node.parent, type="guide", group=page_kind)} ${formatter.format_type(node.retval.type) | x} diff --git a/giscanner/doctemplates/C/property.tmpl b/giscanner/doctemplates/C/property.tmpl index e3eb0511..6ec9e8e1 100644 --- a/giscanner/doctemplates/C/property.tmpl +++ b/giscanner/doctemplates/C/property.tmpl @@ -1,5 +1,5 @@ <%inherit file="/base.tmpl"/> <%block name="info"> - + ${formatter.format_xref(node.parent, type="guide", group=page_kind)} ${node.name} diff --git a/giscanner/doctemplates/C/signal.tmpl b/giscanner/doctemplates/C/signal.tmpl index 20e28e18..28c0b740 100644 --- a/giscanner/doctemplates/C/signal.tmpl +++ b/giscanner/doctemplates/C/signal.tmpl @@ -1,5 +1,5 @@ <%inherit file="./function.tmpl"/> <%block name="info"> - + ${formatter.format_xref(node.parent, type="guide", group=page_kind)} ${node.name} diff --git a/giscanner/doctemplates/C/vfunc.tmpl b/giscanner/doctemplates/C/vfunc.tmpl index 85427de8..aa0394f4 100644 --- a/giscanner/doctemplates/C/vfunc.tmpl +++ b/giscanner/doctemplates/C/vfunc.tmpl @@ -1,4 +1,4 @@ <%inherit file="./function.tmpl"/> <%block name="info"> - + ${formatter.format_xref(node.parent, type="guide", group=page_kind)} diff --git a/giscanner/doctemplates/Gjs/function.tmpl b/giscanner/doctemplates/Gjs/function.tmpl index 6a43ddb3..e0fd9612 100644 --- a/giscanner/doctemplates/Gjs/function.tmpl +++ b/giscanner/doctemplates/Gjs/function.tmpl @@ -1,10 +1,6 @@ <%inherit file="/base.tmpl"/> <%block name="info"> -% if node.parent is not None: - -% else: - -% endif + ${formatter.format_xref(node.parent, type="guide", group=page_kind)} ${formatter.format_type(node.retval.type) | x} diff --git a/giscanner/doctemplates/Gjs/property.tmpl b/giscanner/doctemplates/Gjs/property.tmpl index f05bc820..3316a00c 100644 --- a/giscanner/doctemplates/Gjs/property.tmpl +++ b/giscanner/doctemplates/Gjs/property.tmpl @@ -1,6 +1,6 @@ <%inherit file="/base.tmpl"/> <%block name="info"> - + ${formatter.format_xref(node.parent, type="guide", group=page_kind)} ${node.name} <%block name="synopsis"> diff --git a/giscanner/doctemplates/Gjs/signal.tmpl b/giscanner/doctemplates/Gjs/signal.tmpl index a8e900ff..084d9743 100644 --- a/giscanner/doctemplates/Gjs/signal.tmpl +++ b/giscanner/doctemplates/Gjs/signal.tmpl @@ -1,6 +1,6 @@ <%inherit file="/base.tmpl"/> <%block name="info"> - + ${formatter.format_xref(node.parent, type="guide", group=page_kind)} ${node.name} <%block name="synopsis"> diff --git a/giscanner/doctemplates/Python/function.tmpl b/giscanner/doctemplates/Python/function.tmpl index e1fc5d94..072a1185 100644 --- a/giscanner/doctemplates/Python/function.tmpl +++ b/giscanner/doctemplates/Python/function.tmpl @@ -1,10 +1,6 @@ <%inherit file="/base.tmpl"/> <%block name="info"> -% if node.parent is not None: - -% else: - -% endif + ${formatter.format_xref(node.parent, type="guide", group=page_kind)} ${formatter.format_type(node.retval.type) | x} diff --git a/giscanner/doctemplates/Python/property.tmpl b/giscanner/doctemplates/Python/property.tmpl index f05bc820..3316a00c 100644 --- a/giscanner/doctemplates/Python/property.tmpl +++ b/giscanner/doctemplates/Python/property.tmpl @@ -1,6 +1,6 @@ <%inherit file="/base.tmpl"/> <%block name="info"> - + ${formatter.format_xref(node.parent, type="guide", group=page_kind)} ${node.name} <%block name="synopsis"> diff --git a/giscanner/doctemplates/Python/signal.tmpl b/giscanner/doctemplates/Python/signal.tmpl index a2d7b0be..dc931107 100644 --- a/giscanner/doctemplates/Python/signal.tmpl +++ b/giscanner/doctemplates/Python/signal.tmpl @@ -1,6 +1,6 @@ <%inherit file="/base.tmpl"/> <%block name="info"> - + ${formatter.format_xref(node.parent, type="guide", group=page_kind)} ${node.name} <%block name="synopsis"> diff --git a/giscanner/doctemplates/base.tmpl b/giscanner/doctemplates/base.tmpl index 7fd0fd26..78980773 100644 --- a/giscanner/doctemplates/base.tmpl +++ b/giscanner/doctemplates/base.tmpl @@ -8,7 +8,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> <%block name="info"> - + ${formatter.format_xref(node.parent, type="guide", group=page_kind)} <%block name="title">${formatter.format_page_name(node)}</%block> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.ATestError.page b/tests/scanner/Regress-1.0-C-expected/Regress.ATestError.page index a2ab2ef9..e131f6f0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.ATestError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.ATestError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.ATestError diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AliasedTestBoxed.page b/tests/scanner/Regress-1.0-C-expected/Regress.AliasedTestBoxed.page index 2229245a..9490e4a3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AliasedTestBoxed.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AliasedTestBoxed.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AliasedTestBoxed diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page index 8cbc8326..4e19ef92 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationBitfield.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationBitfield diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationCallback.page index 30f950c2..9a652d80 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationCallback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationCallback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationCallback diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationForeachFunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationForeachFunc.page index 506ceffd..db77a117 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationForeachFunc.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationForeachFunc.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationForeachFunc diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationListCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationListCallback.page index 3f9409ed..79844c66 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationListCallback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationListCallback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationListCallback diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationNotifyFunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationNotifyFunc.page index b2dc717c..17c80292 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationNotifyFunc.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationNotifyFunc.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationNotifyFunc diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page index 188ff224..64e30a6c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-attribute-signal.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + attribute-signal diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page index bc1d5305..48acac58 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + doc-empty-arg-parsing diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-function-property.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-function-property.page index 88dae758..bd640b5c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-function-property.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-function-property.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + function-property diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page index cfd13031..29ad5842 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-list-signal.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + list-signal diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-property.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-property.page index bedc1445..70b80ae2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-property.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-property.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + string-property diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page index d875e1c9..e25d2bb1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-string-signal.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + string-signal diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page index 1363f9ed..2366f205 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + tab-property diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page index 9d7e12e8..1d553fd7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page index 3db342e8..fc1758be 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page index fb6d9887..f168030a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page index 2f18ea27..eaf00407 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page index be0ab854..feb7a55e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page index 29209f55..2af59a52 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_nz.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page index 43f4ee6c..6ad744b9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page index 7b160ab2..4d651ca7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page index 61c6403a..809ebd2b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.extra_annos.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page index 18d5b1ee..f74ca97b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.foreach.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page index 0560fa43..6cc123b3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GHashTable* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page index 3585b2b0..3021ce53 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GSList* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page index 498157b3..62087b04 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GList* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page index f3d3a4a9..f1696c03 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.hidden_self.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page index 568cd897..ef1f430a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page index eaaa27b2..0e958294 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page index 94674e2b..cae38e56 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page index c693c951..8ca35f33 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page index f5f98d4a..8f0e1873 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page index ca0b307e..de87deb0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page index c229c0e1..d244433f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page index 145996ec..80e25466 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationObject diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page index 7934ae67..2fa9f09f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.parse_args.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page index 6f5cf70b..a52c0ff0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page index 7e6f2edf..dd724207 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page index d0a8761a..86666ef6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.set_data3.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page index 81a5b07b..a70d4771 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.string_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gboolean diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page index 06a2690c..3228007b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page index b92ea0e2..0f9933de 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page index 0ce3a59f..5de06c0c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page index 27f467ea..ef9436eb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.with_voidp.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass.page index 16e82e3a..28b8a71b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObjectClass.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationObjectClass diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct.page index 67f83e95..341362a9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationStruct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationStruct diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooASingle.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooASingle.page index d4646251..39ebf9cc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooASingle.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooASingle.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooASingle diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooAddressType.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooAddressType.page index b98ce57c..717b5011 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooAddressType.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooAddressType.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooAddressType diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page index 8a291406..38eae39b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.add.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page index 53d8a799..3ca2281d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressFooBRect* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.page index 29268bee..abd6b039 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBRect.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooBRect diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.page index 63831e74..8644d96e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooBUnion diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page index dc736908..7483641f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page index d745c1e8..3e3e4f91 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressFooBoxed* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.page index 11fe2818..e711c3ec 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBoxed.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooBoxed diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.page index 1291cbfd..267ddcba 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooBuffer diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page index 19a29468..6f6469d2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBuffer.some_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooCallback.page index 241296e1..52feda29 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooCallback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooCallback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooCallback diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page index 4b5177cf..8694337d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.page index 34bb11ea..09050e7d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooDBusData.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooDBusData diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumFullname.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumFullname.page index 6e9c360d..80f6c3b1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumFullname.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumFullname.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooEnumFullname diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumNoType.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumNoType.page index bf48cb96..b3c71a6f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumNoType.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumNoType.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooEnumNoType diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.page index 9512104e..6dd3491a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooEnumType diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooError.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooError.page index 09ae5007..79bb9d29 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooError diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent.page index 0b77bcbb..ce368302 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEvent.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooEvent diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny.page index 347c6514..0e3a5555 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventAny.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooEventAny diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose.page index a99a5d19..27c4c4a7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEventExpose.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooEventExpose diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page index d4db757a..53539d49 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsNoType.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooFlagsNoType diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page index e4f3edef..2b4afeb5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooFlagsType.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooFlagsType diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page index b6ecbf78..217a983b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.copy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressFooForeignStruct* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page index ef6cd403..7314c1d3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressFooForeignStruct* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.page index 24082f81..ee3e5e72 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooForeignStruct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooForeignStruct diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page index 29f95e91..b3faca67 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface-do_regress_foo.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooInterface::do_regress_foo diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page index bfe78037..7c44fd47 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.do_regress_foo.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.page index 4682fdd2..7ec29fee 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooInterface diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page index a4270fe2..a3ad69af 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterface.static_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.page index 5a02e944..53b09b41 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooInterfaceIface diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-hidden.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-hidden.page index a0266cd1..ccfbcfa6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-hidden.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-hidden.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + hidden diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page index b6d543d9..a316adb5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-read_fn.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooObject::read_fn diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page index cbcb93f1..3a8c1315 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-signal.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + signal diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-string.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-string.page index 4de4c9e8..b0ed3c72 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-string.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-string.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + string diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page index 12837f48..3e3f04ef 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject-virtual_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooObject::virtual_method diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page index b63ba802..801f59ac 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.a_global_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page index 606729c9..82bbc269 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.append_new_stack_layer.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressFooOtherObject* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page index 373841ed..6419ed73 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.dup_name.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + char* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page index 2937dbdb..77c8dc8f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.external_type.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + UtilityObject* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page index d2010a4e..04c38a20 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_default.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressFooObject* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page index d94cdbfe..68b305bf 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.get_name.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + const char* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page index 696748f7..0cb58ae3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.handle_glyph.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page index b1f225e8..f643665a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.is_it_time_yet.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page index 99810f8c..75b0e074 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressFooObject* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page index 8c89bd5a..069a4213 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_as_super.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page index 83b9b8fc..312e93c6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.new_cookie.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressFooObjectCookie diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.page index c79e0b71..fff026c7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooObject diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page index df2703a8..d6415021 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.read.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page index 9aff026a..aea1afdc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.skipped_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page index 5988a07e..9b157bb0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.static_meth.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page index bfd7d1c7..649824f0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page index 9c9e4b53..eea3c15c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.various.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page index a342c3a9..3f04cb4a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.virtual_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gboolean diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.page index c35a3bc1..9d528385 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooObjectClass diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectCookie.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectCookie.page index 4d9cabc6..44a63ab1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectCookie.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectCookie.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooObjectCookie diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObject.page index 0d080df3..491d0230 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObject.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObject.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooOtherObject diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page index 137f94c6..84a46bb7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.add.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page index 11a38ea2..b9f16eac 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressFooRectangle* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.page index 3ea38d1e..d485de0b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooRectangle.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooRectangle diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSkippable.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSkippable.page index 3746d326..0d50e702 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSkippable.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSkippable.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSkippable diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooStackLayer.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooStackLayer.page index 049d3760..961d19c8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooStackLayer.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooStackLayer.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooStackLayer diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct.page index 291133a8..65b4f265 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooStruct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooStruct diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page index 8ad16c8d..6af09fd2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy-event.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + destroy-event diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page index 64855ff8..eb08ec77 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-destroy_event.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSubInterface::destroy_event diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page index beb98d1c..56bdfed6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_bar.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSubInterface::do_bar diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page index 1b1dc309..ac59643a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface-do_baz.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSubInterface::do_baz diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page index 22d4ef2b..6d7d970c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_bar.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page index 25178469..bab0d68e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.do_baz.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.page index 4147580e..9b25845a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterface.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSubInterface diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.page index fc18c914..f8643cf3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSubInterfaceIface diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page index 2b995329..c4adff6d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressFooSubobject* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.page index 933b39a9..6a70ef71 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobject.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSubobject diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass.page index d0e3e886..499599c8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubobjectClass.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSubobjectClass diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray.page index facdc1c0..6033817f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooThingWithArray.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooThingWithArray diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion.page index 06d2e800..9746f17e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooUnion.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooUnion diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct.page index e6943a07..d281ffb1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooUtilityStruct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooUtilityStruct diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooVarargsCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooVarargsCallback.page index d477638a..a57ea4dd 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooVarargsCallback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooVarargsCallback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooVarargsCallback diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooXEvent.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooXEvent.page index 18122490..c389ef05 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooXEvent.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooXEvent.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooXEvent diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page b/tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page index e285bc28..b8710cf1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.IntSet.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.IntSet diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema.page index f2e64f04..242fad03 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LikeGnomeKeyringPasswordSchema.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.LikeGnomeKeyringPasswordSchema diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.PtrArrayAlias.page b/tests/scanner/Regress-1.0-C-expected/Regress.PtrArrayAlias.page index 9af00b51..f66aee44 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.PtrArrayAlias.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.PtrArrayAlias.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.PtrArrayAlias diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure.page b/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure.page index 2c6993d0..ad13eea6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.SkippedStructure.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.SkippedStructure diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.page index 2848aa31..384ffb87 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestABCError diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page index 660dc890..40273913 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.copy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestBoxed* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page index 9759b503..26206b63 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.equals.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gboolean diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page index e2550d61..5e05794e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestBoxed* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page index 3f6df8ab..2bc81924 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor1.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestBoxed* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page index 603792e7..e43127e7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestBoxed* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page index a7f7b655..ac75d2c2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.new_alternative_constructor3.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestBoxed* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.page index 090ce47c..d6675327 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxed.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxed diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page index c2b907bb..df0da11c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.copy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestBoxedB* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page index 72e4cb04..7a0bc2bc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestBoxedB* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.page index 99160c62..856d7da4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedB.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxedB diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page index cc9a47dc..4657b526 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestBoxedC* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.page index 9a86486e..c890545d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedC.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxedC diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page index c73df3c0..ed99996a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.copy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestBoxedD* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page index 110ec05c..4622fcdc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.free.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page index 832b77ce..bbd78ab2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.get_magic.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page index d92e39a5..50345623 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestBoxedD* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.page index 84781659..b5110c2c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedD.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxedD diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallback.page index 9a219e9e..bed84d50 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallback diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackArray.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackArray.page index 7ceb2e07..7d3f7b83 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackArray.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackArray.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallbackArray diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackFull.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackFull.page index 3de1fbe8..0b8fca1d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackFull.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackFull.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallbackFull diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackGError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackGError.page index 1f6f2bdb..804382f5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackGError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackGError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallbackGError diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackHashtable.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackHashtable.page index 906947c1..06ebb706 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackHashtable.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackHashtable.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallbackHashtable diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackOwnedGError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackOwnedGError.page index e7397a1b..28b21ea4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackOwnedGError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackOwnedGError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallbackOwnedGError diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackUserData.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackUserData.page index f3047cfd..286c830a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackUserData.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestCallbackUserData.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallbackUserData diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestDEFError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestDEFError.page index aa59b415..b485450d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestDEFError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestDEFError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestDEFError diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.page index b48602f7..a672d7ee 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestEnum diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumNoGEnum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumNoGEnum.page index 575270db..cffae730 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumNoGEnum.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumNoGEnum.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestEnumNoGEnum diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumUnsigned.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumUnsigned.page index 20296695..81a9aa9a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumUnsigned.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnumUnsigned.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestEnumUnsigned diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestError.page index 6be3dac2..97f829b2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestError diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page index d5451972..d5bfeeb4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFlags.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFlags diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page index 911873de..5f4a3a5e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestFloating* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.page index f1d98e71..11899127 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloating.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFloating diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass.page index 143325f2..e7d5236c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFloatingClass.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFloatingClass diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.page index 964f6914..473f1afe 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFundamentalObject diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page index 71c06963..3e63b1e6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.ref.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestFundamentalObject* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page index 7bdf0d8d..6f5c16b4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObject.unref.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass.page index daedb670..443ce70f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectClass.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFundamentalObjectClass diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectCopyFunction.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectCopyFunction.page index dfd65cef..73a33285 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectCopyFunction.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectCopyFunction.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFundamentalObjectCopyFunction diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectFinalizeFunction.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectFinalizeFunction.page index 2b9d965c..df0e8fba 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectFinalizeFunction.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalObjectFinalizeFunction.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFundamentalObjectFinalizeFunction diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page index 0c9085e1..a4495401 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.new.page @@ -7,7 +7,9 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestFundamentalSubObject* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.page index c8c1f039..6ed36089 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObject.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFundamentalSubObject diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass.page index 77dd6bcc..79e14d5a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestFundamentalSubObjectClass.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFundamentalSubObjectClass diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page index b2f85d44..24bd9c4a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page index e737f0f0..e90dcd18 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page index 364f2a49..9ab00c6e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_origin.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page index 616dc661..c9c778e8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.get_size.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.page index 9d50d65c..20ef3ff7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawable.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestInheritDrawable diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass.page index 059c991c..2579f564 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritDrawableClass.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestInheritDrawableClass diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass.page index 06e5eed4..3cf69e80 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInheritPixmapObjectClass.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestInheritPixmapObjectClass diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.page index 1f823a24..1c53fd47 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterface.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestInterface diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface.page index 536f0498..a643e5dc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestInterfaceIface.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestInterfaceIface diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page index 7526a98b..37b5dd32 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-all.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + all diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page index 37c69f9b..f3447b5a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-allow_none_vfunc.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestObj::allow_none_vfunc diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-bare.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-bare.page index 103b5bcb..4873a1c5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-bare.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-bare.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + bare diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-boxed.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-boxed.page index c632b210..460104bf 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-boxed.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-boxed.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + boxed diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page index 0dc4c380..bef9537e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-cleanup.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + cleanup diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-double.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-double.page index a80b8041..bb907ab8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-double.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-double.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + double diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page index 94c36590..5600be6f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-first.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + first diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-float.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-float.page index 569b3e87..a981cf86 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-float.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-float.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + float diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-gtype.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-gtype.page index 3956ea6e..2fbf9d93 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-gtype.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-gtype.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gtype diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table-old.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table-old.page index 7012f4eb..003425bb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table-old.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table-old.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + hash-table-old diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table.page index 4a3be638..f11e4657 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-hash-table.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + hash-table diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-int.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-int.page index fdca28fd..95a4902c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-int.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-int.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list-old.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list-old.page index 38b1f7e1..680636d2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list-old.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list-old.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + list-old diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list.page index 17aa89b8..7ea5130b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-list.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + list diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page index fc86d851..4c8247b5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-matrix.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestObj::matrix diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page index dd9c0674..05b911c2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-prop.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-array-prop diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page index d4ef4645..c2cb8822 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-foreign-struct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-foreign-struct diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page index 9e7233f7..9ddd536c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-hash-prop.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-hash-prop diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page index 34b59f1a..d8a90378 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-int64-prop.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-int64-prop diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page index c8ffee3a..7f041e23 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-intarray-ret.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-intarray-ret diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page index 94dfedb4..9d69a6fe 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-obj.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-obj diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page index 66c7ec1e..919d38f6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-strv.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-strv diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page index 35ed4a63..6ee6bda3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-uint64-prop diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-string.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-string.page index 561f2da4..1ae48038 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-string.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-string.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + string diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page index 3febc0c7..1ffe66e4 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test-with-static-scope-arg.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + test-with-static-scope-arg diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page index be5c6ad8..15599c6d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-test.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + test diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page index 0674eb75..8efd1619 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.constructor.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestObj* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page index 45a57e65..bc4e7627 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.do_matrix.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page index d0036460..1ba84366 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_foreign_struct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page index 5ea844a5..24f58265 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_int64.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page index 693df710..e0d123e1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_obj.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page index 4ce7bab8..0c2c68c2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.emit_sig_with_uint64.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page index 09328dd2..92bfa2db 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.forced_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page index 3b83028e..74692389 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page index e4c2bd42..668096a2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.instance_method_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page index a8fd4f07..e931f7da 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestObj* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page index 07e52ef1..d2ec5f63 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestObj* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page index bcfd0487..a77e915a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.new_from_file.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestObj* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page index 637585b5..c86b4b21 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.null_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.page index fc54d988..42f26db1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestObj diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page index 47802642..160b8d2b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.set_bare.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page index bc2a21e0..333d170a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_inout_param.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gboolean diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page index 933af002..1df6c18e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_out_param.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gboolean diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page index a0e4b32d..deca81bd 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_param.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gboolean diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page index 4347f1ba..47402c99 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gboolean diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page index e931ab92..b590de21 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.skip_return_val_no_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gboolean diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page index 7885b725..8e5c9b1e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + double diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page index 552dc229..8058ac01 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.static_method_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page index 748621b0..3e2fb61f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_0.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page index 0cfc66d3..37e1ad21 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj.torture_signature_1.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gboolean diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.page index 93e56e8b..86db7488 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestObjClass diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.page index 1180b98a..7d2d53ba 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestOtherError diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page index 788441ac..66b477d2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateEnum.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestPrivateEnum diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct.page index 8ce8712a..5d55c80e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestPrivateStruct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestPrivateStruct diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page index fda625da..628186a0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.const_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + const RegressTestSimpleBoxedA* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page index b91fe94a..4e7cf0e8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.copy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestSimpleBoxedA* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page index 7e7c16ef..5e5dcbda 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.equals.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gboolean diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.page index 36459d33..08f968fe 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedA.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestSimpleBoxedA diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page index 995aef68..fd593150 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.copy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestSimpleBoxedB* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.page index e3c9fcbf..2ed2304d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleBoxedB.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestSimpleBoxedB diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleCallback.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleCallback.page index 61bafb5f..f8157820 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleCallback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSimpleCallback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestSimpleCallback diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page index e23b1feb..9b4d353b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.clone.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.page index 0093ac8e..22a1e907 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructA diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page index 53adcbff..befbd7ce 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructA.parse.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page index 03888f00..b3a9f993 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.clone.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.page index 55d74f58..4ed2b54c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructB.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructB diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC.page index 08e850eb..f208fcd8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructC.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructC diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD.page index 37c7b2a4..f791d70b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructD.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructD diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE.page index b3688e06..ccc8bbd8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructE diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union.page index 6f77035b..3b81e621 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructE__some_union__union.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructE__some_union__union diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF.page index d75ea66b..74e8483f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructF.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructF diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page index cb46a63f..7d5ed650 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.frob.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.page index a18443c4..f33eed98 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestStructFixedArray.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructFixedArray diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page index 30b5642c..fa401f55 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.instance_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page index 3b96a334..fbff9d9f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestObj* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.page index f6488d83..7c6cb98d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestSubObj diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page index ca95f176..5497c250 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObj.unset_bare.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass.page index 6bbd999a..89543341 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestSubObjClass.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestSubObjClass diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestTypeGUInt64.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestTypeGUInt64.page index d815a3fe..e0a7bc09 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestTypeGUInt64.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestTypeGUInt64.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestTypeGUInt64 diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-testbool.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-testbool.page index d7333b88..47ad7bed 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-testbool.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x-testbool.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + testbool diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page index 052090c4..9153172c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.get_testbool.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gboolean diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page index b6b025d7..7afe8b1b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestWi8021x* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.page index 9b053187..29658734 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestWi8021x diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page index 8196f979..bad3b1d0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.set_testbool.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page index 6a423897..c0e98dfb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021x.static_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass.page index 071d9a6f..59593031 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestWi8021xClass.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestWi8021xClass diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.VaListAlias.page b/tests/scanner/Regress-1.0-C-expected/Regress.VaListAlias.page index bfd52d28..6b7d031c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.VaListAlias.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.VaListAlias.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.VaListAlias diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page b/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page index 8d362677..769da09a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.aliased_caller_alloc.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page index ffc80220..dbf8b828 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_attribute_func.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page index 65730437..8e08a23b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page index 0424e3c9..a76bade1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_get_source_file.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + char* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page index cffa65b6..d2f479a1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_init.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page index 1c2256fa..e0399cd0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_invalid_regress_annotation.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page index 79a3ab25..3b83de9a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_ptr_array.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page index 6e8b015b..d13fee56 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_array.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + utf8* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page index d835b520..2e484581 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_return_filename.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gchar* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page index ac54d220..84c616f9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_set_source_file.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page index 8238d38c..39cd529d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_space_after_comment_bug631690.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page index 89bc37e8..5d3813d7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_array_length.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page index 9ab21d3b..8c685547 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + utf8* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page index 540e2252..13eb1ca1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_string_zero_terminated_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page index 368f7403..6fc0ad4b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_test_parsing_bug630862.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page index a9b12703..4db50ca2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_transfer_floating.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page index c50ca7b9..f12a3cf8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_versioned.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page index 49c84ee0..75bc68c6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.atest_error_quark.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GQuark diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page index be027cca..eadb6136 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_async_ready_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page index ff381f0d..b37a287c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_destroy_notify_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page index 81903785..f035be53 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_init.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page index de8797c9..5eef0df9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_method_external_references.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page index acbfa5e7..63d57662 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_not_a_constructor_new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressFooObject* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page index 914e971d..96773b38 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_skip_me.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page index d4a6fc3a..41e570ff 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page index 461c8778..81483f1a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_some_variant_ptr.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page index f6fcc316..810eba9a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_array.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + utf8* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page index f98deeb1..57ca7b34 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_param.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page index 7d1f5950..839bee2c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_char_retval.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + const char* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page index f72c8c14..00a1e075 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_param.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page index ee95d72e..527b8ea1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_const_struct_retval.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + const RegressFooStruct* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page index a342b016..17bf08a5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page index f5e81e34..91d5824c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_string_array_with_g.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page index e797629d..8e023665 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_qualifier.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page index adcf6bcd..04eec058 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_unsigned_type.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page index b3a9c3d4..210f53ca 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page index 19cfec14..1d49d318 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page index f04a2064..19c19326 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.foo_test_varargs_callback3.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page index 50691f38..40093e2c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.func_obj_null_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page index 078b47c1..a43baa0c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.global_get_flags_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page b/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page index 725aed08..6fd4e6b9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.has_parameter_named_attrs.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page b/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page index 8b28b1f4..4d30ec54 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.introspectable_via_alias.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page b/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page index afafef26..6158db44 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.not_introspectable_via_alias.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page b/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page index 8898215a..33049796 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.random_function_with_skipped_structure.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page b/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page index 08950c1f..2853609a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.set_abort_on_error.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page index 3ed1fdec..ee1afcd3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page index f084a5cc..81109158 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_out_objects.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page index a4b23fb1..21c6d9f3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page index 9785207d..3fa5c4e7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page index 245e6f34..913dc0d6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_fixed_size_int_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page index 1c1392df..7d05b00c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint16_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page index 6a6ae2e5..c5eee2de 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint32_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint32 diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page index 553a9199..7a7701d6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint64_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint64 diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page index f705ba22..8e685793 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gint8_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page index 5695d386..0eab274d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_gtype_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + char* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page index 18b06cb3..5eb26d6b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_full_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page index f7629d15..0caeee19 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page index 6aee8b1f..75d142a0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_inout.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page index 18c92f39..c4698cef 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_none_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page index 17582dd2..bab17416 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page index 2494cab6..cdf6bdaa 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_null_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page index 071f730d..b88feb22 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_array_int_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page index f7c097dd..bd65df08 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_async_ready_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page index 64bd1ff1..a444eb2a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gboolean diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page index 3cf8dec3..c96a2f9d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_false.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gboolean diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page index 6fd9edc2..1fb64c17 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boolean_true.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gboolean diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page index 2ce86566..8ada9d2c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_full_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + cairo_t* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page index 69284e7e..059afd52 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_context_none_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page index 86cfa298..c04a3454 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page index f04fa4e2..7d77ae66 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_full_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + cairo_surface_t* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page index f69202f8..67302474 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page index f583a470..a5ac661c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_cairo_surface_none_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + cairo_surface_t* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page index c9f0cad5..7d2f2c8d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page index f0ee48c4..8c0a62e8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_async.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page index 31e48e9a..f7a5e56c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page index 367b51fc..3b162e28 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_destroy_notify_no_user_data.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page index 37d6ed59..5cc15570 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_async.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page index d9a30c75..bb0ed81a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_thaw_notifications.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page index 05f84820..3a98a475 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_callback_user_data.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page index 0218d542..0fdad912 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page index 221eab66..0708b5c8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_one_arg.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page index 64791461..681b37ae 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_closure_variant.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GVariant* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page index f2a5ec04..adb21f28 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_date_in_gvalue.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GValue* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page index fbad9386..7ad7eb06 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_def_error_quark.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GQuark diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page index a5e55239..f954fe83 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_double.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gdouble diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page index a5906fc9..857e4da0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_filename_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GSList* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page index c6a1942f..c395b048 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_float.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gfloat diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page index 63324874..f17cdd94 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_container_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + utf8* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page index 2faa31bf..b127ed7f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_garray_full_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + utf8* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page index cbfdcb56..1a5f54cc 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gerror_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page index 9e59ef14..d465113e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_container_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GHashTable* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page index 0d608f82..616432ae 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_everything_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GHashTable* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page index eb8ce9d2..b6d2da5f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page index e4a57328..2e739c81 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_gvalue_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GHashTable* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page index 39eb096b..6b53197b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GHashTable* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page index cb3b6aa8..0c780b5e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nested_everything_return2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GHashTable* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page index d6589608..8c457ad2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page index 97700020..a56ad65b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_in2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page index c224824b..c258ee02 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + const GHashTable* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page index 078906a4..d2217447 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_nothing_return2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GHashTable* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page index 303e6ee3..a538b442 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page index 7d191f0e..323469c6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page index 3cb45a8c..03461fd9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ghash_null_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + const GHashTable* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page index 59449088..32a3c3a6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_container_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GList* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page index 773cf551..6de1a9c8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_everything_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GList* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page index 66126de8..d88487f0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page index a2c0ae15..7cba8517 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_in2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page index f571415b..af54aead 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + const GList* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page index 43697617..2901e41d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_nothing_return2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GList* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page index f90b1274..b6ca3ab3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page index 44d6abaa..13e421db 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_glist_null_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page index ebead8c0..05587fcb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_container_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GSList* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page index c303cb19..a03f4d89 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_everything_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GSList* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page index 651e4f3a..61a14b1c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page index 9e652735..0703ec00 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_in2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page index 066e3473..8df79aa5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + const GSList* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page index 8f7e343e..aeb9a672 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_nothing_return2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GSList* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page index 52f6d6ae..21d8d5c1 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page index fe931a83..d7635199 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gslist_null_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page index fc75886a..76e678bd 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gtype.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GType diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page index e2be67d2..df9d988a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_as.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GVariant* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page index 9d8e6b6b..2d64ab24 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_asv.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GVariant* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page index 6a2b2339..2eec9944 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_i.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GVariant* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page index a98c717a..9ef9d9f7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_s.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GVariant* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page index 698f10f3..c07b2ac8 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_gvariant_v.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GVariant* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page index b86e3601..24862b10 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_hash_table_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page index ff1ed37f..430af30e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page index 770d8fb8..d5be61d9 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int16.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint16 diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page index c0f00611..be90ac6d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int32.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint32 diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page index 50029547..d864702f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int64.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint64 diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page index 03275b12..1cfb4319 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int8.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint8 diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page index 400ff595..80276c00 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_out_utf8.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page index 69f223c6..a61c91cd 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_int_value_arg.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page index 83828394..30bf3afb 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_long.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + glong diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page index 68c571d4..152c9166 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page index 33112e84..5135297f 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_multi_double_args.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page index b8755fb4..d660bd83 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_multiline_doc_comments.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page index d5c0f7a3..c28cc8fa 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_nested_parameter.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page index 8f105517..bdcc152d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_null_gerror_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page index 668ead07..49f1b360 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_owned_gerror_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page index 9fd725e3..53d3b1bd 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_short.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gshort diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page index cc8cceb6..514fbfaa 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_simple_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page index cf00a65d..3b67a00a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_size.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gsize diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page index b6698036..321d087a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_skip_unannotated_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page index 41c27644..d11446ef 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ssize.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gssize diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page index 07ad58fb..3f9ca2a6 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gboolean diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page index 23447c01..44b0c6ce 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_in_gvalue.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GValue* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page index 081c3644..207e69fe 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + utf8* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page index dd726a66..582ab10b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_c.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + utf8* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page index f0fc23c4..0515bce7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_out_container.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + utf8* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page index d6e9db38..a105b5b2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_strv_outarg.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page index e8127d39..acada719 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_timet.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + time_t diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page index 298e4cac..3d4c18c2 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_0.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page index beb59992..7568989d 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_1.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gboolean diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page index bb742fec..eb615c39 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_torture_signature_2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page index 48901ccd..1651512e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + guint diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page index ecb31622..2af7ee49 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint16.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + guint16 diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page index bfaf042c..7ccdde70 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint32.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + guint32 diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page index e7587cb8..24a9256a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint64.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + guint64 diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page index fc13715b..7222e742 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_uint8.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + guint8 diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page index 32b331ed..80953700 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ulong.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gulong diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page index dc735306..0349472e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_unichar.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gunichar diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page index 5fbc9aa4..642e75ac 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_unsigned_enum_param.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + const gchar* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page index 31ee2722..2b50e72a 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_ushort.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gushort diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page index c21ee5b0..eaafeae5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page index 8e46b6c5..6bcb7861 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_const_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + const char* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page index 5c51995d..ce0a884b 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_inout.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page index bacd87b7..aa921b00 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_nonconst_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + char* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page index db9a526b..9b196371 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page index 14906be8..6d4c4551 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_null_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page index 75c69f53..5084da31 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page index 4aa425f4..65b2a8a0 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_nonconst_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + char* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page index d02e94c5..e3771997 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_utf8_out_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page index 139a202f..3435610c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_get_fundamental_object.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + RegressTestFundamentalObject* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page index e33e73d9..2edb30a3 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + const GValue* diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page index 6740c444..ba1822ed 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_value_set_fundamental_object.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page index 33e10ac0..a389bda5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_versioning.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page index 119860d2..9ac6820d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.ATestError diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AliasedTestBoxed.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AliasedTestBoxed.page index 2229245a..9490e4a3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AliasedTestBoxed.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AliasedTestBoxed.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AliasedTestBoxed diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page index 8cbc8326..4e19ef92 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationBitfield.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationBitfield diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page index 30f950c2..9a652d80 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationCallback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationCallback diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationForeachFunc.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationForeachFunc.page index 506ceffd..db77a117 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationForeachFunc.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationForeachFunc.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationForeachFunc diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page index 3f9409ed..79844c66 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationListCallback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationListCallback diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationNotifyFunc.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationNotifyFunc.page index b2dc717c..17c80292 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationNotifyFunc.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationNotifyFunc.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationNotifyFunc diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page index 713c6d67..c30c3377 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + attribute-signal diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page index 2e71c465..61025917 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + doc-empty-arg-parsing diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-function-property.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-function-property.page index f526ea9b..d9d8b55a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-function-property.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-function-property.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + function-property diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page index c9e35a9d..4e2044dd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + list-signal diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-property.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-property.page index b570a59c..eba5cef7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-property.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-property.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + string-property diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page index 4597130f..59408b40 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + string-signal diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page index e52a728f..9c797278 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + tab-property diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page index d94ad834..4246c2aa 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject.Object diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page index d964b9c7..b65b1ce6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page index bcc26d8f..221b24c8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page index 0dc19bcf..2aa3f064 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page index a6870013..b769ba6d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page index ed909ac8..b7a834a1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page index 6098722c..b22eaf80 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject.Object diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page index 61915f41..8b7912df 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject.Object diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page index 58bf5ff4..90175931 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page index 5d5c79d7..cdf26c5c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page index ff2aef1d..20ffffdf 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + {String: GObject.Object} diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page index e339e088..6ae6806d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [Regress.AnnotationObject] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page index 9a3db5d0..96134cf3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [String] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page index 1abc4010..2238d903 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page index b5f2d65f..cf669406 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page index 9b615360..b8d5088c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page index 58cab9ad..6c34095a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page index e21a9c62..d7adac12 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page index c771d769..217ae08b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page index 606e2b1b..c9a864f7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject.Object diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page index d4bf6b19..3f845502 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page index 20104697..95675a60 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationObject diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page index d1e428d4..1bc89fbd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page index b1e4129a..6c5d1e7f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page index 402b1622..de78bd3e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page index 8c54d3b8..94c689ed 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page index 59321295..78e1db7e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Boolean diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page index 36a1815c..c2e5f111 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page index c9904095..329c9688 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page index 8a77746f..57eff666 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct.page index edc9fd18..e2100429 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationStruct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationStruct diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page index b59e7634..09cd98fd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooASingle diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page index e3f52935..008a8f36 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooAddressType diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page index 975d5123..48b5bfd6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page index 9476671b..21d810ae 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooBRect diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.page index 57e26525..fd1e9d6e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooBRect diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.page index 63831e74..8644d96e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooBUnion diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page index 270c8093..4f00498d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page index 8d86995c..8cfb6191 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooBoxed diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.page index 962300f3..bca1f99a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooBoxed diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page index c9cd8be7..0b4f9e52 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooBuffer diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page index 5903a764..af7c408e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page index 241296e1..52feda29 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooCallback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooCallback diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page index 0ba67e71..47459952 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.page index 08ad0d2e..b4eaeade 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooDBusData diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page index 443f25ea..00169aaf 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooEnumFullname diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page index 5957904b..d2b41e61 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooEnumNoType diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page index d052d4f5..c3ff89b3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooEnumType diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page index 5577eebe..8c0b6a23 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooError diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent.page index 0b77bcbb..ce368302 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEvent.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooEvent diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny.page index 45cd3a13..562ec03c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventAny.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooEventAny diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose.page index 7e9ca7d4..0000add5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEventExpose.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooEventExpose diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page index d4db757a..53539d49 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsNoType.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooFlagsNoType diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page index e4f3edef..2b4afeb5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooFlagsType.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooFlagsType diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page index 97aff9ae..eb2fc332 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooForeignStruct diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page index 7753c4ad..fdeb3979 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooForeignStruct diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.page index 06c5793f..312994a9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooForeignStruct diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page index b39c41f1..17f6ec94 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface-do_regress_foo.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooInterface::do_regress_foo diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page index f992fca8..b91471d7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page index 16d03111..83ae1d0d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooInterface diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page index e79716c7..d38a4488 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.static_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page index 72ee34e5..4bdaf370 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-read_fn.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooObject::read_fn diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page index f5066231..6e5657d4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + signal diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-string.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-string.page index d86283d8..a738fdd7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-string.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-string.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + string diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page index aaf6bfa3..d2ccd866 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-virtual_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooObject::virtual_method diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page index 5241c4f3..83fec18f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page index 8c700359..d53564b0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooOtherObject diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page index baf2386c..46a61b27 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + String diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page index 71276178..fb2b54c3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Utility.Object diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page index 63027a5e..8ab86544 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_default.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSubobject diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page index 54b6f10c..b06580f3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + String diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page index 4de3f713..746d830c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page index 5586b96b..8f83b375 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page index 0cc61551..32500e14 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooObject diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page index 1245175f..2c85b269 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject.Object diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page index 8d801b70..1cbea89b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooObject diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page index 526a4fb7..b59223c9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page index 3bec5bb4..c4c1045a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.static_meth.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page index 6f861c78..8ed0b6d6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page index 980d4ef3..460c4615 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Boolean diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObjectCookie.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObjectCookie.page index 4d9cabc6..44a63ab1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObjectCookie.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObjectCookie.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooObjectCookie diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page index 5368b928..0916a449 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooOtherObject.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooOtherObject diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page index 18646a84..46d62528 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.page index 521a68bc..0cfef622 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooRectangle diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page index bd7a445b..8a08c9ae 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooStackLayer diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct.page index 4088a6c2..84f5d192 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStruct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooStruct diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page index 5a297708..961a22e6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + destroy-event diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page index 8df59ff4..5abc585f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy_event.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSubInterface::destroy_event diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page index 04a55514..81649248 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_bar.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSubInterface::do_bar diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page index b3e4bd7e..4945c890 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSubInterface::do_baz diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page index 7db9c6b5..8a1fd9e5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page index 00fc1255..10e8020e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page index 4ace79fb..0694e3df 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSubInterface diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page index b9991b85..6e400bb3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSubobject diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page index da87ffad..f9cac644 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSubobject diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray.page index 7ae6ae56..430dce7c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooThingWithArray.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooThingWithArray diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUnion.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUnion.page index 06d2e800..9746f17e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUnion.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUnion.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooUnion diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct.page index 0471b871..2b94f691 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooUtilityStruct diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooXEvent.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooXEvent.page index 18122490..c389ef05 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooXEvent.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooXEvent.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooXEvent diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema.page index 05362e5c..44a946ee 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeGnomeKeyringPasswordSchema.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.LikeGnomeKeyringPasswordSchema diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.PtrArrayAlias.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.PtrArrayAlias.page index 9af00b51..f66aee44 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.PtrArrayAlias.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.PtrArrayAlias.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.PtrArrayAlias diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page index 6a044d79..f31b58ec 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestABCError diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page index d7fe0888..eac21331 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxed diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page index 82819c87..23a6d7d6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Boolean diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page index 9377348b..5fbf83a5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxed diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page index 915a79bf..7d1b27be 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxed diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page index 7cdfd4f4..3a4ef982 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxed diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page index 03623419..da86a8ef 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxed diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.page index c6792c50..baa423f2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxed diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page index c79a4d24..78b81658 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxedB diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page index 687c90d0..b68acc9f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxedB diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.page index 46cf7c15..0e39780b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxedB diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page index 25dd557a..301936bb 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxedC diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.page index 88dd1a4c..18b77d9f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxedC diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page index f30d4724..be4b26aa 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxedD diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page index c6affa24..3198b66e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page index 62465644..fdb9dbff 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page index 781cd994..6ed46e59 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxedD diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page index 17b3c79b..995e80dd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxedD diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallback.page index 9a219e9e..bed84d50 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallback diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackArray.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackArray.page index 7ceb2e07..7d3f7b83 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackArray.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackArray.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallbackArray diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackFull.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackFull.page index 3de1fbe8..0b8fca1d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackFull.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackFull.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallbackFull diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page index 1f6f2bdb..804382f5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallbackGError diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackHashtable.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackHashtable.page index 906947c1..06ebb706 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackHashtable.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackHashtable.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallbackHashtable diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page index e7397a1b..28b21ea4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallbackOwnedGError diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackUserData.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackUserData.page index f3047cfd..286c830a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackUserData.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackUserData.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallbackUserData diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page index 6a92ba9a..589059d5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestDEFError diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page index 9009dcda..814b474b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestEnum diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page index a0cd98cc..5c0c5594 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestEnumNoGEnum diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page index 327cacc5..df3cfa1e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestEnumUnsigned diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page index c635d0e0..d6a6ebb2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestError diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page index d5451972..d5bfeeb4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFlags.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFlags diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page index 9ca5d060..35ea1f41 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFloating diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page index 481bea28..07ef3f21 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFloating diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page index d669f549..a8cb35a0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFundamentalObject diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page index d887b198..7891d88b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFundamentalObject diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page index 2e0932b6..8992abc1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectCopyFunction.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectCopyFunction.page index dfd65cef..73a33285 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectCopyFunction.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectCopyFunction.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFundamentalObjectCopyFunction diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectFinalizeFunction.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectFinalizeFunction.page index 2b9d965c..df0e8fba 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectFinalizeFunction.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObjectFinalizeFunction.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFundamentalObjectFinalizeFunction diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page index e879a7de..109cb52f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page @@ -7,7 +7,9 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFundamentalSubObject diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page index 4e40b9ce..619eb308 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFundamentalSubObject diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page index 9c1af712..eb60f557 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page index 176b164d..f9f05b2f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page index 17020c62..24489cf6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page index e2444c69..f8c06b4f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page index 05d628f3..02fa0649 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestInheritDrawable diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass.page index deaeea50..0df0396b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritPixmapObjectClass.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestInheritPixmapObjectClass diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page index d097d9c9..4f398908 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInterface.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestInterface diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page index 1094566b..c2d87a47 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + all diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page index 874928d9..3febd772 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-allow_none_vfunc.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestObj::allow_none_vfunc diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page index 97c7ee68..f1f1b520 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + bare diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-boxed.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-boxed.page index e8706270..a392a771 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-boxed.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-boxed.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + boxed diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page index 0bff84e5..8e5e2bfe 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + cleanup diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-double.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-double.page index df735051..5e2df6bb 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-double.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-double.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + double diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page index 34d6f7c3..d0294e9e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + first diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-float.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-float.page index ea02ac24..0554ba82 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-float.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-float.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + float diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-gtype.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-gtype.page index b477bed4..6b222e4e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-gtype.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-gtype.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gtype diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table-old.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table-old.page index ca81a39a..1d3c3c22 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table-old.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table-old.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + hash-table-old diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table.page index abd64ea0..f8d3441a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-hash-table.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + hash-table diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-int.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-int.page index 88652345..0c3f4ccb 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-int.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-int.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page index 19331f31..9d8ea917 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list-old.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + list-old diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page index 93252b2b..02638e9e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-list.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + list diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page index 7b81f903..1d832171 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-matrix.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestObj::matrix diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page index 2e2d2fbd..b1919f9b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-array-prop diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page index 1f4d53d0..31b8ca38 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-foreign-struct diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page index 58d03932..137a4130 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-hash-prop diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page index 28d0b7e8..6c528c03 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-int64-prop diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page index 2a1f980c..f724bcbf 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-intarray-ret diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page index 9f3e81f1..d7e15e05 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-obj diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page index ae851a3b..a63e2076 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-strv diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page index 17a54d1c..6fbf7a09 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-uint64-prop diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-string.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-string.page index 13f2b4b1..2e91097a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-string.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-string.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + string diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page index 6c2fced5..b19711f1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + test-with-static-scope-arg diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page index ebec470e..9700cefd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + test diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page index e41bb1dd..14c8ba67 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestObj diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page index aa1e5f3d..2b27fe66 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page index 00967896..a2eb7eaf 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page index 029b8847..b2853ef8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page index 49974155..c0f99504 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page index 491828af..7ff7b0ba 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page index f70bfbe9..771bba8c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page index 636d2167..096b7547 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page index 9fc14087..d0f6009d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page index 23910861..d3210cab 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestObj diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page index 49cdd8e4..44279520 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestObj diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page index ae4dd140..a4f99805 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestObj diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page index fed5b0a3..dfc9ef04 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.null_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page index 9c4b902e..b8428942 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestObj diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page index b4da15e4..d80d786c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page index 14cc9da4..df6625d8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Boolean diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page index 3a447770..f557941c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Boolean diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page index e6e4535b..06c0c624 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Boolean diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page index 7323da2b..9ea28a1f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Boolean diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page index 84807b3b..c61e93e0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Boolean diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page index 4744d5fc..d1f2e59b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page index d4281868..13e917eb 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.static_method_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page index fa7d17be..8053e0bf 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page index 20946935..0ba6cbbe 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Boolean diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page index d1887d5e..858e58a8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestOtherError diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page index 788441ac..66b477d2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateEnum.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestPrivateEnum diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct.page index fa508137..7b1309da 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestPrivateStruct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestPrivateStruct diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page index 81a0049d..7f5dfde3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.const_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestSimpleBoxedA diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page index e7d1c811..2784f146 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestSimpleBoxedA diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page index 91197290..aa9a02e4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Boolean diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.page index 2a8dd629..9117ddb9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestSimpleBoxedA diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page index 0db8a8da..f0ca7210 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestSimpleBoxedB diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.page index b775b867..7ecc623e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestSimpleBoxedB diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleCallback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleCallback.page index 61bafb5f..f8157820 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleCallback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleCallback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestSimpleCallback diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page index f023cfe7..9d23bbd8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.page index 07b1752d..a6a98173 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructA diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page index 22038bad..38406e68 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.parse.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page index 692f8997..ed5f9c06 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.page index b5b2ff3f..21d86261 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructB diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC.page index 1db74ca2..6bd58122 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructC diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD.page index cf224e3e..aa9f131c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructD.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructD diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE.page index 75684f3d..b931c367 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructE diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union.page index 6f77035b..3b81e621 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructE__some_union__union.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructE__some_union__union diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page index fe5e7bc6..cfb434b4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructF.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructF diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page index b3cdcd78..a237385c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.page index b5df5294..db6e7893 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructFixedArray diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page index e55a1c37..4a7427e1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page index 91236d2a..a66646bd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestObj diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page index 39e755b3..7147da12 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestSubObj diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page index e297b4dc..2b720ebf 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestTypeGUInt64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestTypeGUInt64.page index d815a3fe..e0a7bc09 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestTypeGUInt64.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestTypeGUInt64.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestTypeGUInt64 diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x-testbool.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x-testbool.page index 7835ee50..256dbb6d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x-testbool.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x-testbool.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + testbool diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page index f38ab9cd..0c9440b6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Boolean diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page index 9bcbcc11..c79a2f57 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestWi8021x diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page index 7c9958de..d69548f3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestWi8021x diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page index 764aa43e..471c51cd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page index 685c3110..ccfe04c6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.static_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page index 5c57a1b4..de2b93b3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.aliased_caller_alloc.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page index 981fc543..8f00a104 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_attribute_func.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page index a975754e..4cc018c0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page index a227f73d..39f6c148 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_get_source_file.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + filename diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page index ae10b7ea..c75d9c27 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_init.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page index a32b80fd..1997a4db 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_invalid_regress_annotation.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page index dd6de2a4..9bfb1680 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page index a400582a..3f63c9a5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_array.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [String] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page index c590aecf..86419455 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_return_filename.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + filename diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page index 46014527..a5977b87 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_set_source_file.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page index e8891e36..675e00da 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_space_after_comment_bug631690.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page index bdb02611..347eb6d2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_array_length.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page index 05578955..741447ea 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [String] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page index dce9addd..cd4d8bef 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_string_zero_terminated_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page index b9f8a5c0..edade5bb 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject.Object diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page index 33bd9f40..a4fceafb 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject.Object diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page index 6693eb11..f1d57003 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_versioned.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page index 26b35573..3aade3ca 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GLib.Quark diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page index 4a3e9114..980a9302 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page index 83a83544..d5cff2a4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_destroy_notify_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page index 81fae432..20eb206c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_init.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page index 0e5168ed..10876aa8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page index 38264daf..31f881b7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_not_a_constructor_new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooObject diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page index 24d4000a..989084bf 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_array.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [String] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page index 3cb9d8e9..4f095620 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_param.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page index e4784320..3ff92653 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_char_retval.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + String diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page index b52e7d3c..da103fbf 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_param.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page index 55213864..9c7539c3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_const_struct_retval.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooStruct diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page index 24dfaacb..fe3b85ac 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page index b34cf4f5..8b5c9018 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_string_array_with_g.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page index ebd9a0f6..c35d3e99 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_qualifier.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page index f62023ed..9f68b516 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_test_unsigned_type.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page index 79a12aae..446001a0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.func_obj_null_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page index 741a3536..bafa5417 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.global_get_flags_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page index f147b84c..d4f673d8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.has_parameter_named_attrs.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page index f1388183..aa2baa6c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.introspectable_via_alias.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page index cfddc655..9b300e17 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.set_abort_on_error.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page index d5d324c3..112cd23f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page index 0eab51d3..51026b59 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_out_objects.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page index 1f570f33..14a6e66e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page index e10c883f..ce62153d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page index 18179bf9..1e2c6786 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_fixed_size_int_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [Number] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page index b15076fa..e4b957e7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint16_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page index f92ad910..171ad11e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint32_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint32 diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page index 98a57d55..a8b51a6b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint64_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page index fbaae440..16ddc7c5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page index 04889436..61e1d0a4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gtype_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + String diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page index d2b0ab8f..5f580ad7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_full_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [Number] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page index c3b26b24..3d41dca7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page index 118056fd..b4094cd8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_inout.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page index a841e04f..ac105214 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_none_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [Number] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page index eadf5908..33b27a00 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page index c50b6202..1e1a3640 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_null_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page index ba2b3497..78953ec6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_int_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page index c7cd25e8..89d737c7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page index 15f8a674..e165db21 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Boolean diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page index 2c35db30..21e169c0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_false.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Boolean diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page index 0206b085..e525a2f8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boolean_true.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Boolean diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page index d78865d2..1c222c6c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + cairo.Context diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page index 9abd2d19..f710ac0a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page index c0d66757..dcec607e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page index eee51f17..f1b0f96c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + cairo.Surface diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page index ef6d4cc3..783576a0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page index cec71274..72e602ef 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + cairo.Surface diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page index 57970867..869dd98c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page index b281ca74..7b9ef5b6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_async.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page index 18496d52..d147c974 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page index 6679446f..7fa31a30 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_destroy_notify_no_user_data.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page index 592d8e07..66dec18b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_async.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page index 24e0e24a..9a8b57e1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_thaw_notifications.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page index 5e824a94..dd9f5977 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_callback_user_data.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page index ee8f0253..a9545447 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page index 3df43b83..3c37f7ac 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page index e54fd5ae..2bdbfe6d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GLib.Variant diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page index c6a75d7f..acb379e7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject.Value diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page index 46d62afc..5a82a3f5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GLib.Quark diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page index 7be3ebd4..0ed75f62 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_double.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page index e4c935f7..b26b613e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_filename_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [filename] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page index 27952a27..30f2ef76 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_float.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page index 5dad9446..a4196285 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_container_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [String] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page index 35b90f87..86b1b78b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_garray_full_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [String] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page index 4d7bc884..31ab83c2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gerror_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page index e15eb13b..b002deb8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_container_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + {String: String} diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page index 0b0d347e..1c1a0a91 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_everything_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + {String: String} diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page index 2556237f..2c801375 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page index 8a9fe982..08748ea5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + {String: GObject.Value} diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page index c2701df3..4dece432 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + {String: {String: String}} diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page index 896e346d..8aa4da37 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nested_everything_return2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + {String: {String: String}} diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page index 438f5abe..62990fce 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page index 2dc3aa8d..72d774d8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_in2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page index 4ee392e8..e3729a57 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + {String: String} diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page index 492f6536..7777ab42 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_nothing_return2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + {String: String} diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page index 52dd2654..413a75bf 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page index 09d222d9..2c272530 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page index dac341f7..df6d6860 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_null_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + {String: String} diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page index 0e6cc956..c3ac7cb1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_container_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [String] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page index a58d9261..fb31f77e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_everything_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [String] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page index 3e144833..3c85d190 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page index b22fd185..f160d126 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_in2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page index ec649721..e741d906 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [String] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page index b31d98ff..0fccdbbf 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_nothing_return2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [String] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page index 6add7cec..dfedc288 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page index b13cc9a0..a1c7c684 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_glist_null_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page index 19f70911..5133d114 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_container_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [String] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page index 53936460..f82b1ce6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_everything_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [String] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page index e011db60..34096195 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page index 0e718211..05e0b569 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_in2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page index dc11a421..03597fb4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [String] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page index 5e1c5646..0331f922 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_nothing_return2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [String] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page index e6987019..34168c85 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page index 5c25956d..4c9f3ca2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gslist_null_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page index d2a438d4..824689a2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gtype.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GType diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page index 0d301a9e..1eedc344 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GLib.Variant diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page index fa477da4..a5709df4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GLib.Variant diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page index 7af092f2..e1e7dc0d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GLib.Variant diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page index b98b64d1..139e0c61 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GLib.Variant diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page index 49874551..cec12de7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GLib.Variant diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page index 9f215d76..a49c65c1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_hash_table_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page index 31b8b674..6193dd8a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page index f2f39024..d8efb0b3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int16.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint16 diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page index c254ed41..8015b377 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int32.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint32 diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page index a30895ea..24a69e96 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int64.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page index ba53b828..ab573a0d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int8.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint8 diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page index 971e6580..020f9e22 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_out_utf8.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page index 866be0d2..cb84a3c9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page index 9eeddeaa..12bc1aec 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_long.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page index 519ce43a..ea0646f6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page index 70d56ced..378ace73 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multi_double_args.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page index 75e42218..38a75e75 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_multiline_doc_comments.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page index 3ee62390..54bda89f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_nested_parameter.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page index 710af513..5af4d58c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_null_gerror_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page index e966fe86..206ac215 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_owned_gerror_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page index 1c53e163..59381ae1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_short.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gshort diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page index d6e596c9..9d8198f7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_simple_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page index fe3f5b42..bc6896d3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_size.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gsize diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page index 77bc9cd9..ccc011da 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ssize.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gssize diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page index 880f489d..7659a72a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Boolean diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page index 04444570..20617c09 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject.Value diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page index b475f63b..477a46fa 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [String] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page index 69239d57..d393946c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_c.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [String] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page index 17b55812..f9bec391 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_out_container.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [String] diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page index 63bde333..01bcba42 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_outarg.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page index be54bccd..65ccab57 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_timet.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page index af5810f1..16965833 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_0.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page index 915fdfe7..a10b0ab5 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_1.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Boolean diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page index ac694000..3a3eb39a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_torture_signature_2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page index deb1e900..ac1653a1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page index 357dcc5b..93faff4d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint16.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + guint16 diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page index 445dbffb..ebab4d6f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint32.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + guint32 diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page index f77993c6..942d786f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint64.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page index 4f099b7b..f39dcc12 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_uint8.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + guint8 diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page index 5ad91424..76f33101 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ulong.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Number diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page index 2a10fb32..25465b37 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unichar.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + String diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page index 9da74e6f..8b7348e8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_unsigned_enum_param.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + String diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page index 9dd5ddc0..74ada4ba 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ushort.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gushort diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page index 7b1f74d9..63fedb9f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page index 514a5654..a63dc22c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_const_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + String diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page index cf5ce4ac..1f282c2f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_inout.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page index 3b0e3c85..2fec9e8c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_nonconst_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + String diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page index ba9f2509..14f3a550 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page index 36e00220..66632ffd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_null_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page index 0889a573..b1a40622 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page index 2feadbff..e8a097ea 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_nonconst_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + String diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page index 39037cb1..07107ed8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_utf8_out_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page index a554bf19..59f03b78 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject.Value diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page index bfef4942..eb6ce0f2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_versioning.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + void diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page index 119860d2..9ac6820d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.ATestError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.ATestError diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page index 2229245a..9490e4a3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AliasedTestBoxed.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AliasedTestBoxed diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page index 8cbc8326..4e19ef92 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationBitfield.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationBitfield diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page index 30f950c2..9a652d80 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationCallback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationCallback diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page index 506ceffd..db77a117 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationForeachFunc.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationForeachFunc diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page index 3f9409ed..79844c66 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationListCallback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationListCallback diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page index b2dc717c..17c80292 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationNotifyFunc.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationNotifyFunc diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page index b52cf90c..9ed31bc3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-attribute-signal.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + attribute-signal diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page index 9d8641d4..29eedcc1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + doc-empty-arg-parsing diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page index f526ea9b..d9d8b55a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-function-property.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + function-property diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page index d4a27322..fdfa65f7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-list-signal.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + list-signal diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page index 97391bc4..a3cb0456 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-property.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + string-property diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page index 95bd3d29..06e79aa3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-string-signal.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + string-signal diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page index db243c63..ed219fe5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + tab-property diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page index 0fe1c050..5dc0d89c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject.Object diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page index 3f2107e5..e8088523 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page index cd2c7d9c..0b6dd5dc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page index fcc89102..32bdcff6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page index d929218f..cc1c627e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page index 053a368d..eb65fe36 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page index 4ee8088c..bcd4fd5d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject.Object diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page index 4e79b26b..dd7f050d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject.Object diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page index 5ddadfc6..d8729783 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page index 0d34439f..63fedadb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page index 87cfede3..d0dbe7c3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + {unicode: GObject.Object} diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page index bd174a4d..4d378e36 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [Regress.AnnotationObject] diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page index 698180b7..7eb5735f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [unicode] diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page index 5dd1e2b9..717525fa 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page index 569587ea..2f7d526e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page index 84ac74a0..4723d33f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page index b6205805..774f3234 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page index ca64eaa3..806b6e74 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page index f2800882..11a0f0d0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page index 8e7786ad..4e474d0d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject.Object diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page index a8718795..b1e037f5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page index 94313a6f..ec6a11f8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationObject diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page index c76bb940..a69df607 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page index beaebab8..e8a48794 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page index b9fc65f6..63e540d3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page index ccabb841..b01add00 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page index 9d12f393..cd68ab76 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + bool diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page index 6c5d72c4..dddc4d57 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page index ebb7aa0c..3d3c7563 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page index b4ceb23e..a6b653a0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct.page index edc9fd18..e2100429 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationStruct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.AnnotationStruct diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page index b59e7634..09cd98fd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooASingle.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooASingle diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page index e3f52935..008a8f36 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooAddressType.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooAddressType diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page index fd700d29..dca11c35 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.page index 57e26525..fd1e9d6e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooBRect diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.page index 63831e74..8644d96e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooBUnion diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page index 9cfe9318..dfaf746a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.page index 962300f3..bca1f99a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooBoxed diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.page index c93a1f7f..1a515428 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooBuffer diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page index 8b65f138..bee0dd0d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooCallback.page index 241296e1..52feda29 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooCallback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooCallback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooCallback diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page index 2d19be62..744cbf0e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.page index 08ad0d2e..b4eaeade 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooDBusData diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page index 443f25ea..00169aaf 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumFullname.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooEnumFullname diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page index 5957904b..d2b41e61 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumNoType.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooEnumNoType diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page index d052d4f5..c3ff89b3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooEnumType diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page index 5577eebe..8c0b6a23 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooError diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent.page index 0b77bcbb..ce368302 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEvent.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooEvent diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny.page index 45cd3a13..562ec03c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventAny.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooEventAny diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose.page index 7e9ca7d4..0000add5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEventExpose.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooEventExpose diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page index d4db757a..53539d49 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsNoType.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooFlagsNoType diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page index e4f3edef..2b4afeb5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooFlagsType.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooFlagsType diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page index 86bdfa3e..757033ff 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooForeignStruct diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.page index 06c5793f..312994a9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooForeignStruct diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page index 6cb6433e..d0be1eb5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface-do_regress_foo.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooInterface::do_regress_foo diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page index 465f9130..d94103f8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.page index bc0b7df2..d2a482f7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooInterface diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page index 7da66ea3..5a09792b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page index e5189c14..c2ca1c09 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-read_fn.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooObject::read_fn diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page index 691f7aed..ee6c20c5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-signal.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + signal diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-string.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-string.page index ce48885e..9d61f3ab 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-string.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-string.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + string diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page index e4579001..01cf6dba 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject-virtual_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooObject::virtual_method diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page index e291ab64..ecfd04f7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page index 7fa2ea7d..dce6f596 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooOtherObject diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page index 3d329fb5..4e2a8e4f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + unicode diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page index 09481e92..182f153f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Utility.Object diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page index 3b7c8722..68806e88 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSubobject diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page index 52a90560..bc94a277 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + unicode diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page index 5671a1cd..260c8dde 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page index 633c32fb..86788025 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page index 9a635381..3265e6b5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooObject diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page index 787081f0..1dc774f8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page index 4c825d80..ab006514 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page index 15227cd8..456f9cc0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page index 3e05ffae..60b38154 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + bool diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page index 4d9cabc6..44a63ab1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObjectCookie.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooObjectCookie diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page index 111b2aca..dadf5236 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooOtherObject.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooOtherObject diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page index e2f8bbeb..1a05ace0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page index 521a68bc..0cfef622 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooRectangle diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page index bd7a445b..8a08c9ae 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStackLayer.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooStackLayer diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page index 4088a6c2..84f5d192 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStruct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooStruct diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page index 675a861d..a42bb176 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy-event.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + destroy-event diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page index 4b925a9f..82dbc622 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-destroy_event.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSubInterface::destroy_event diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page index d07cadc9..a035189a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_bar.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSubInterface::do_bar diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page index 723cea8e..3b0404fa 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface-do_baz.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSubInterface::do_baz diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page index 45137e84..0e159413 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page index e95447c4..f5fcb437 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page index e4d936ab..81593d32 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSubInterface diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page index c4e1ce26..fc7b5ad1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubobject.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooSubobject diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page index 7ae6ae56..430dce7c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooThingWithArray.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooThingWithArray diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page index 06d2e800..9746f17e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUnion.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooUnion diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page index 0471b871..2b94f691 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooUtilityStruct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooUtilityStruct diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page index 18122490..c389ef05 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooXEvent.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooXEvent diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page index 05362e5c..44a946ee 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeGnomeKeyringPasswordSchema.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.LikeGnomeKeyringPasswordSchema diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page b/tests/scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page index 9af00b51..f66aee44 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.PtrArrayAlias.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.PtrArrayAlias diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page index 6a044d79..f31b58ec 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestABCError diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page index fa810dd4..85e76394 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxed diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page index e03d1f0a..9fe30619 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + bool diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page index c6792c50..baa423f2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxed diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page index 30b45992..e2b38f8e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxedB diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page index 46cf7c15..0e39780b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxedB diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page index 88dd1a4c..18b77d9f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedC.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxedC diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page index 6923488a..e350d80e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxedD diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page index 366fb2d2..d083007e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page index 551c6173..ea1ac4fd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page index 17b3c79b..995e80dd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestBoxedD diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page index 9a219e9e..bed84d50 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallback diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page index 7ceb2e07..7d3f7b83 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackArray.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallbackArray diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackFull.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackFull.page index 3de1fbe8..0b8fca1d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackFull.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackFull.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallbackFull diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page index 1f6f2bdb..804382f5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackGError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallbackGError diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page index 906947c1..06ebb706 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackHashtable.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallbackHashtable diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page index e7397a1b..28b21ea4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackOwnedGError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallbackOwnedGError diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page index f3047cfd..286c830a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestCallbackUserData.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestCallbackUserData diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page index 6a92ba9a..589059d5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestDEFError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestDEFError diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page index 9009dcda..814b474b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestEnum diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page index a0cd98cc..5c0c5594 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumNoGEnum.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestEnumNoGEnum diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page index 327cacc5..df3cfa1e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnumUnsigned.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestEnumUnsigned diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page index c635d0e0..d6a6ebb2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestError diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page index d5451972..d5bfeeb4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFlags.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFlags diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page index 87520bd8..a2b80e1d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFloating.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFloating diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page index af4623a2..7035407d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFundamentalObject diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page index 23164e09..af12914b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFundamentalObject diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page index 18f57651..90e7e881 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page index dfd65cef..73a33285 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectCopyFunction.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFundamentalObjectCopyFunction diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page index 2b9d965c..df0e8fba 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObjectFinalizeFunction.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFundamentalObjectFinalizeFunction diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page index 6f3a246e..6b1e810a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalSubObject.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestFundamentalSubObject diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page index 2aff243a..2d8d0b61 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page index 4f7d8e61..4524842d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page index ccd73b1b..983cb507 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page index 39d7bcca..09b0559b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page index d7ed30bc..1fdd2c89 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestInheritDrawable diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page index deaeea50..0df0396b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritPixmapObjectClass.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestInheritPixmapObjectClass diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page index 454ff74f..807e18ae 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInterface.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestInterface diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page index 2870e2bd..f8fb4a1c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-all.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + all diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page index aaea25a4..7a3b9c91 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-allow_none_vfunc.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestObj::allow_none_vfunc diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page index 97c7ee68..f1f1b520 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-bare.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + bare diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page index e8706270..a392a771 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-boxed.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + boxed diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page index 1e341964..f35c0314 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-cleanup.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + cleanup diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page index 8243a454..70fd579b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-double.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + double diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page index f35e30d7..b5bcd2c0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-first.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + first diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page index 8ff32c00..87be50fe 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-float.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + float diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page index b477bed4..6b222e4e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-gtype.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gtype diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page index 57d37ae5..c796f365 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table-old.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + hash-table-old diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page index 1c5a6eaf..c5d426cf 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-hash-table.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + hash-table diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page index 18089ad7..db7a89e1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-int.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page index 70fe6185..95367ec2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list-old.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + list-old diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page index b21f7238..aca148d8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-list.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + list diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page index a1f1fd98..fe7066a2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-matrix.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestObj::matrix diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page index cccc0903..eb1b99ff 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-prop.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-array-prop diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page index 0dfd9d8c..36a30d7e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-foreign-struct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-foreign-struct diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page index ef6ded31..2048ad2c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-hash-prop.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-hash-prop diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page index 9bfe4b9e..a782484b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-int64-prop.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-int64-prop diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page index 134a1bb4..d070f179 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-intarray-ret.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-intarray-ret diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page index f99b27f5..d4814a83 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-obj.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-obj diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page index a92fe03f..a7037a49 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-strv.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-strv diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page index 3c220f07..c89d1d16 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + sig-with-uint64-prop diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page index 345a8218..fa499937 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-string.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + string diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page index 674df4a2..736814c7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test-with-static-scope-arg.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + test-with-static-scope-arg diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page index e7ea1607..e09f531e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-test.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + test diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page index f7d905b8..31e6b146 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page index 4da0acf0..3871f1f2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page index a90da8dc..5c607d18 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page index 2f02db89..675aba97 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page index fede0a67..a6ad4b17 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page index 33a7507b..90bedec3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page index 6f0dab49..ec94048c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page index 34b74974..aa015c53 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page index f654e7e4..75381509 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page index 2da014f5..1ded23c7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestObj diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page index 52013d55..bbd16fe1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page index 609e8b30..d2eea266 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + bool diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page index b956db95..2a13be92 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + bool diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page index 9104649c..0a900ee7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + bool diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page index 4b1e9bbe..b4ae4584 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + bool diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page index dd5ca45c..1c10cea0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + bool diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page index df4963e3..6896d2ef 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + float diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page index 08e44411..32fe8e54 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page index c5d8c9f6..9ad27108 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page index 99540568..0313a70d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + bool diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page index d1887d5e..858e58a8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestOtherError diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page index 788441ac..66b477d2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateEnum.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestPrivateEnum diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page index fa508137..7b1309da 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestPrivateStruct.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestPrivateStruct diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page index 6b7b9ebe..10789f27 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestSimpleBoxedA diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page index 22a55259..5e191991 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestSimpleBoxedA diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page index 9616ddd9..426bd98b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + bool diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page index 2a8dd629..9117ddb9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestSimpleBoxedA diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page index 405778a8..95950d77 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestSimpleBoxedB diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page index b775b867..7ecc623e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestSimpleBoxedB diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page index 61bafb5f..f8157820 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleCallback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestSimpleCallback diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page index cbc5b426..ee47fb3e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page index 07b1752d..a6a98173 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructA diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page index d8bdaaeb..e557650d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page index cebaa169..4abe66bc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page index b5b2ff3f..21d86261 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructB diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page index 1db74ca2..6bd58122 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructC.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructC diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page index cf224e3e..aa9f131c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructD.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructD diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page index 75684f3d..b931c367 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructE diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page index 6f77035b..3b81e621 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructE__some_union__union.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructE__some_union__union diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page index fe5e7bc6..cfb434b4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructF.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructF diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page index 0db49624..427eef38 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page index b5df5294..db6e7893 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestStructFixedArray diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page index 417ba337..878b4058 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page index fef2f914..b1dc19b1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestSubObj diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page index bb2ad606..67a98067 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page index d815a3fe..e0a7bc09 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestTypeGUInt64.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestTypeGUInt64 diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page index 5846ac62..00c168bc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x-testbool.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + testbool diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page index 4b9de5a1..e9431c76 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + bool diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page index 67b7ecae..aef03874 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.TestWi8021x diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page index 22346642..d5afdb62 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page index 1fecc3af..be2afb92 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page index 377dcbd1..6b9f2789 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - aliased_caller_alloc + Regress.aliased_caller_alloc @accepts(Regress.AliasedTestBoxed) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page index 023e993a..e636e2d2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -24,7 +24,7 @@ - annotation_attribute_func + Regress.annotation_attribute_func @accepts(Regress.AnnotationObject, unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page index d98c2b82..fb428b2c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -28,7 +28,7 @@ - annotation_custom_destroy + Regress.annotation_custom_destroy @accepts(Regress.AnnotationCallback, Regress.AnnotationNotifyFunc, gpointer) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page index 73e35557..e8b0ac5e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + filename @@ -16,7 +16,7 @@ - annotation_get_source_file + Regress.annotation_get_source_file @returns(filename) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page index 09ee5b10..c94076ab 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -24,7 +24,7 @@ - annotation_init + Regress.annotation_init @accepts(int, [unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page index eec7b20e..038bb47e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - annotation_invalid_regress_annotation + Regress.annotation_invalid_regress_annotation @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page index 12752bbc..daf47ffa 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - annotation_ptr_array + Regress.annotation_ptr_array @accepts([GObject.Value]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page index 5b6e6bcf..c2a7371f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [unicode] @@ -20,7 +20,7 @@ - annotation_return_array + Regress.annotation_return_array @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page index c1e8e635..a5a8fa0c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + filename @@ -16,7 +16,7 @@ - annotation_return_filename + Regress.annotation_return_filename @returns(filename) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page index 504ef282..4dd41fcb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - annotation_set_source_file + Regress.annotation_set_source_file @accepts(filename) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page index 0307bd23..69351e90 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -16,7 +16,7 @@ - annotation_space_after_comment_bug631690 + Regress.annotation_space_after_comment_bug631690 @returns(none) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page index e42b140e..ca6241dd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -24,7 +24,7 @@ - annotation_string_array_length + Regress.annotation_string_array_length @accepts(int, [unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page index 8cafc09a..33ad8d1e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [unicode] @@ -16,7 +16,7 @@ - annotation_string_zero_terminated + Regress.annotation_string_zero_terminated @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page index 2c396ac0..008b4cdd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - annotation_string_zero_terminated_out + Regress.annotation_string_zero_terminated_out @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page index 402a6ff1..f3243ec7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject.Object @@ -16,7 +16,7 @@ - annotation_test_parsing_bug630862 + Regress.annotation_test_parsing_bug630862 @returns(GObject.Object) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page index 956465ca..0e19f1f8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject.Object @@ -16,7 +16,7 @@ - annotation_transfer_floating + Regress.annotation_transfer_floating @returns(GObject.Object) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page index a387a595..5ca4dbba 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -16,7 +16,7 @@ - annotation_versioned + Regress.annotation_versioned @returns(none) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page index 36401553..477e9856 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GLib.Quark @@ -16,7 +16,7 @@ - atest_error_quark + Regress.atest_error_quark @returns(GLib.Quark) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page index d9e9994b..399187ed 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -28,7 +28,7 @@ - foo_async_ready_callback + Regress.foo_async_ready_callback @accepts(Gio.Cancellable, Gio.AsyncReadyCallback, gpointer) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page index 1f758a64..3b9ccb9a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -28,7 +28,7 @@ - foo_destroy_notify_callback + Regress.foo_destroy_notify_callback @accepts(Regress.FooCallback, gpointer, GLib.DestroyNotify) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page index 4ee838b5..6195fbc7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -16,7 +16,7 @@ - foo_init + Regress.foo_init @returns(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page index 77a94c40..9095b088 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -32,7 +32,7 @@ - foo_method_external_references + Regress.foo_method_external_references @accepts(Utility.Object, Utility.EnumType, Utility.FlagType, Utility.Struct) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page index 0f58aaa3..9df41fac 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooObject @@ -16,7 +16,7 @@ - foo_not_a_constructor_new + Regress.foo_not_a_constructor_new @returns(Regress.FooObject) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page index 2680f708..8feb21f4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [unicode] @@ -16,7 +16,7 @@ - foo_test_array + Regress.foo_test_array @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page index 6be54b8e..e16a8dd2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - foo_test_const_char_param + Regress.foo_test_const_char_param @accepts(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page index 4eb0d3a7..b5c34125 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + unicode @@ -16,7 +16,7 @@ - foo_test_const_char_retval + Regress.foo_test_const_char_retval @returns(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page index 31532fc3..e37243af 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - foo_test_const_struct_param + Regress.foo_test_const_struct_param @accepts(Regress.FooStruct) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page index 140bbbb9..2f820a94 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + Regress.FooStruct @@ -16,7 +16,7 @@ - foo_test_const_struct_retval + Regress.foo_test_const_struct_retval @returns(Regress.FooStruct) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page index 1f9d3ccc..68ff1b46 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - foo_test_string_array + Regress.foo_test_string_array @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page index bf4b9a76..f5d18848 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - foo_test_string_array_with_g + Regress.foo_test_string_array_with_g @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page index 3c57204b..ed8bb964 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - foo_test_unsigned_qualifier + Regress.foo_test_unsigned_qualifier @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page index d869c4ea..0fe4bec8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - foo_test_unsigned_type + Regress.foo_test_unsigned_type @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page index 0c0d372e..5b968832 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - func_obj_null_in + Regress.func_obj_null_in @accepts(Regress.TestObj) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page index bc3fffe8..e5c60beb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - global_get_flags_out + Regress.global_get_flags_out @accepts(Regress.TestFlags) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page b/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page index 8010d9b5..9d7992d6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -24,7 +24,7 @@ - has_parameter_named_attrs + Regress.has_parameter_named_attrs @accepts(int, [guint32]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page b/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page index 230882fb..c024ff89 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - introspectable_via_alias + Regress.introspectable_via_alias @accepts(Regress.PtrArrayAlias) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page b/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page index 3eda9cde..ad326337 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - set_abort_on_error + Regress.set_abort_on_error @accepts(bool) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page index cf5c11ad..4da29a86 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -20,7 +20,7 @@ - test_array_callback + Regress.test_array_callback @accepts(Regress.TestCallbackArray) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page index 2fe68c95..e2d84b81 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_array_fixed_out_objects + Regress.test_array_fixed_out_objects @accepts([Regress.TestObj]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page index ed44e366..60ad1826 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -20,7 +20,7 @@ - test_array_fixed_size_int_in + Regress.test_array_fixed_size_int_in @accepts([int]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page index 30cebc41..3c6afc47 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_array_fixed_size_int_out + Regress.test_array_fixed_size_int_out @accepts([int]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page index d38e4f9f..0df5ae57 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [int] @@ -16,7 +16,7 @@ - test_array_fixed_size_int_return + Regress.test_array_fixed_size_int_return @returns([int]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page index db9e9044..e033affb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -24,7 +24,7 @@ - test_array_gint16_in + Regress.test_array_gint16_in @accepts(int, [gint16]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page index 21e09024..5a696b9a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint32 @@ -24,7 +24,7 @@ - test_array_gint32_in + Regress.test_array_gint32_in @accepts(int, [gint32]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page index 68b1158d..dafee3c2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -24,7 +24,7 @@ - test_array_gint64_in + Regress.test_array_gint64_in @accepts(int, [int]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page index 4c961947..40b38b28 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -24,7 +24,7 @@ - test_array_gint8_in + Regress.test_array_gint8_in @accepts(int, [gint8]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page index 42f73723..9cfb531a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + unicode @@ -24,7 +24,7 @@ - test_array_gtype_in + Regress.test_array_gtype_in @accepts(int, [GType]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page index b0d38636..4b2c4fa3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [int] @@ -20,7 +20,7 @@ - test_array_int_full_out + Regress.test_array_int_full_out @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page index 59a4be03..879821bb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -24,7 +24,7 @@ - test_array_int_in + Regress.test_array_int_in @accepts(int, [int]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page index 48fc0ac5..193d2f37 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -24,7 +24,7 @@ - test_array_int_inout + Regress.test_array_int_inout @accepts(int, [int]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page index 3c113930..745bbe75 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [int] @@ -20,7 +20,7 @@ - test_array_int_none_out + Regress.test_array_int_none_out @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page index a2f7ba98..194ecb52 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -24,7 +24,7 @@ - test_array_int_null_in + Regress.test_array_int_null_in @accepts([int], int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page index dd2aa751..6ee35174 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -24,7 +24,7 @@ - test_array_int_null_out + Regress.test_array_int_null_out @accepts([int], int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page index 15e62e1c..30eaea97 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -24,7 +24,7 @@ - test_array_int_out + Regress.test_array_int_out @accepts(int, [int]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page index 1486cc4e..4b2459ee 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_async_ready_callback + Regress.test_async_ready_callback @accepts(Gio.AsyncReadyCallback) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page index 8c196987..293e35b5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + bool @@ -20,7 +20,7 @@ - test_boolean + Regress.test_boolean @accepts(bool) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page index 7212f687..ee763269 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + bool @@ -20,7 +20,7 @@ - test_boolean_false + Regress.test_boolean_false @accepts(bool) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page index 13c90c2c..c233d794 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + bool @@ -20,7 +20,7 @@ - test_boolean_true + Regress.test_boolean_true @accepts(bool) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page index f927cf5f..b749fa49 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + cairo.Context @@ -16,7 +16,7 @@ - test_cairo_context_full_return + Regress.test_cairo_context_full_return @returns(cairo.Context) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page index d9cd2301..8b36aac4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_cairo_context_none_in + Regress.test_cairo_context_none_in @accepts(cairo.Context) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page index ec8da6f3..4e8a6366 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_cairo_surface_full_out + Regress.test_cairo_surface_full_out @accepts(cairo.Surface) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page index ac776954..a8557047 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + cairo.Surface @@ -16,7 +16,7 @@ - test_cairo_surface_full_return + Regress.test_cairo_surface_full_return @returns(cairo.Surface) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page index c2daf5f4..0d7e20b2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_cairo_surface_none_in + Regress.test_cairo_surface_none_in @accepts(cairo.Surface) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page index 4eda436c..de92a087 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + cairo.Surface @@ -16,7 +16,7 @@ - test_cairo_surface_none_return + Regress.test_cairo_surface_none_return @returns(cairo.Surface) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page index a5e52b55..d5074fab 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -20,7 +20,7 @@ - test_callback + Regress.test_callback @accepts(Regress.TestCallback) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page index 471926a0..cbf04b83 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -24,7 +24,7 @@ - test_callback_async + Regress.test_callback_async @accepts(Regress.TestCallbackUserData, gpointer) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page index 26a0c31d..5452fbf9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -28,7 +28,7 @@ - test_callback_destroy_notify + Regress.test_callback_destroy_notify @accepts(Regress.TestCallbackUserData, gpointer, GLib.DestroyNotify) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page index 7df745a1..11899cc0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -24,7 +24,7 @@ - test_callback_destroy_notify_no_user_data + Regress.test_callback_destroy_notify_no_user_data @accepts(Regress.TestCallbackUserData, GLib.DestroyNotify) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page index a94e6617..6280f9f7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -16,7 +16,7 @@ - test_callback_thaw_async + Regress.test_callback_thaw_async @returns(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page index 03158abe..cae6c5e4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -16,7 +16,7 @@ - test_callback_thaw_notifications + Regress.test_callback_thaw_notifications @returns(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page index d4a9578f..69cff3a7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -24,7 +24,7 @@ - test_callback_user_data + Regress.test_callback_user_data @accepts(Regress.TestCallbackUserData, gpointer) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page index cdbf8bb0..20db07c6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -20,7 +20,7 @@ - test_closure + Regress.test_closure @accepts(GObject.Closure) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page index b19753a4..7f35412b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -24,7 +24,7 @@ - test_closure_one_arg + Regress.test_closure_one_arg @accepts(GObject.Closure, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page index 6be06f3b..dae0cc0f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GLib.Variant @@ -24,7 +24,7 @@ - test_closure_variant + Regress.test_closure_variant @accepts(GObject.Closure, GLib.Variant) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page index bcdb8edd..13940184 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject.Value @@ -16,7 +16,7 @@ - test_date_in_gvalue + Regress.test_date_in_gvalue @returns(GObject.Value) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page index 89a1b503..e9200597 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GLib.Quark @@ -16,7 +16,7 @@ - test_def_error_quark + Regress.test_def_error_quark @returns(GLib.Quark) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page index efea2d69..0f75857f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + float @@ -20,7 +20,7 @@ - test_double + Regress.test_double @accepts(float) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page index 80eebb18..82b5e5f5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [filename] @@ -16,7 +16,7 @@ - test_filename_return + Regress.test_filename_return @returns([filename]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page index 50f89930..f63d37c0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + float @@ -20,7 +20,7 @@ - test_float + Regress.test_float @accepts(float) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page index 1d0ef3e5..86993b80 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [unicode] @@ -16,7 +16,7 @@ - test_garray_container_return + Regress.test_garray_container_return @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page index ef2bcfd7..162ca60b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [unicode] @@ -16,7 +16,7 @@ - test_garray_full_return + Regress.test_garray_full_return @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page index f4f94659..e68a8bb4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_gerror_callback + Regress.test_gerror_callback @accepts(Regress.TestCallbackGError) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page index 9a297dbe..6558c1de 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + {unicode: unicode} @@ -16,7 +16,7 @@ - test_ghash_container_return + Regress.test_ghash_container_return @returns({unicode: unicode}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page index 3040336d..9df7b861 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + {unicode: unicode} @@ -16,7 +16,7 @@ - test_ghash_everything_return + Regress.test_ghash_everything_return @returns({unicode: unicode}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page index 7028c8b0..d6c319cf 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_ghash_gvalue_in + Regress.test_ghash_gvalue_in @accepts({unicode: GObject.Value}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page index b24a3bdc..51143d3e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + {unicode: GObject.Value} @@ -16,7 +16,7 @@ - test_ghash_gvalue_return + Regress.test_ghash_gvalue_return @returns({unicode: GObject.Value}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page index 2039ab45..c8c9cd2d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + {unicode: {unicode: unicode}} @@ -16,7 +16,7 @@ - test_ghash_nested_everything_return + Regress.test_ghash_nested_everything_return @returns({unicode: {unicode: unicode}}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page index adac865e..932fd800 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + {unicode: {unicode: unicode}} @@ -16,7 +16,7 @@ - test_ghash_nested_everything_return2 + Regress.test_ghash_nested_everything_return2 @returns({unicode: {unicode: unicode}}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page index 264d31a1..44408900 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_ghash_nothing_in + Regress.test_ghash_nothing_in @accepts({unicode: unicode}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page index ac786a45..9d656091 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_ghash_nothing_in2 + Regress.test_ghash_nothing_in2 @accepts({unicode: unicode}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page index 1e3851f7..31983aa0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + {unicode: unicode} @@ -16,7 +16,7 @@ - test_ghash_nothing_return + Regress.test_ghash_nothing_return @returns({unicode: unicode}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page index 66aa7060..17d7dd82 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + {unicode: unicode} @@ -16,7 +16,7 @@ - test_ghash_nothing_return2 + Regress.test_ghash_nothing_return2 @returns({unicode: unicode}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page index 9b77e122..9488fd83 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_ghash_null_in + Regress.test_ghash_null_in @accepts({unicode: unicode}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page index 07d7e151..4ee31ff8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_ghash_null_out + Regress.test_ghash_null_out @accepts({unicode: unicode}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page index 71867408..d9d1050a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + {unicode: unicode} @@ -16,7 +16,7 @@ - test_ghash_null_return + Regress.test_ghash_null_return @returns({unicode: unicode}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page index 28be892d..069ece74 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [unicode] @@ -16,7 +16,7 @@ - test_glist_container_return + Regress.test_glist_container_return @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page index 2d449a4d..f0a80ed0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [unicode] @@ -16,7 +16,7 @@ - test_glist_everything_return + Regress.test_glist_everything_return @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page index 8f2d8851..42f5a251 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_glist_nothing_in + Regress.test_glist_nothing_in @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page index a9307604..b17e2a6d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_glist_nothing_in2 + Regress.test_glist_nothing_in2 @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page index 1230c517..9c41b074 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [unicode] @@ -16,7 +16,7 @@ - test_glist_nothing_return + Regress.test_glist_nothing_return @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page index 4d120ea0..f12e8447 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [unicode] @@ -16,7 +16,7 @@ - test_glist_nothing_return2 + Regress.test_glist_nothing_return2 @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page index 619f9414..92cb7123 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_glist_null_in + Regress.test_glist_null_in @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page index 9ed9114f..0bac2640 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_glist_null_out + Regress.test_glist_null_out @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page index 89574e27..60ffdfd6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [unicode] @@ -16,7 +16,7 @@ - test_gslist_container_return + Regress.test_gslist_container_return @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page index d0eafc0d..f73e1138 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [unicode] @@ -16,7 +16,7 @@ - test_gslist_everything_return + Regress.test_gslist_everything_return @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page index ab61b072..897923c5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_gslist_nothing_in + Regress.test_gslist_nothing_in @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page index df5af0ff..15e85772 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_gslist_nothing_in2 + Regress.test_gslist_nothing_in2 @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page index 71813808..231450ad 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [unicode] @@ -16,7 +16,7 @@ - test_gslist_nothing_return + Regress.test_gslist_nothing_return @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page index 60a28160..1384052c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [unicode] @@ -16,7 +16,7 @@ - test_gslist_nothing_return2 + Regress.test_gslist_nothing_return2 @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page index 6bf4307f..f36bb53c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_gslist_null_in + Regress.test_gslist_null_in @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page index b9ce49ed..7df7b1ef 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_gslist_null_out + Regress.test_gslist_null_out @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page index 798d219a..45f4f8b7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GType @@ -20,7 +20,7 @@ - test_gtype + Regress.test_gtype @accepts(GType) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page index c6fabf62..e77d4163 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GLib.Variant @@ -16,7 +16,7 @@ - test_gvariant_as + Regress.test_gvariant_as @returns(GLib.Variant) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page index a99d4022..73d31507 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GLib.Variant @@ -16,7 +16,7 @@ - test_gvariant_asv + Regress.test_gvariant_asv @returns(GLib.Variant) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page index 891ae8ba..c9a05dff 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GLib.Variant @@ -16,7 +16,7 @@ - test_gvariant_i + Regress.test_gvariant_i @returns(GLib.Variant) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page index cfabe8ba..939a9aaa 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GLib.Variant @@ -16,7 +16,7 @@ - test_gvariant_s + Regress.test_gvariant_s @returns(GLib.Variant) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page index 325e136c..b5dded4d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GLib.Variant @@ -16,7 +16,7 @@ - test_gvariant_v + Regress.test_gvariant_v @returns(GLib.Variant) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page index 94b02d40..bd58b7c9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -24,7 +24,7 @@ - test_hash_table_callback + Regress.test_hash_table_callback @accepts({unicode: int}, Regress.TestCallbackHashtable) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page index 538f8ce5..60308472 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -20,7 +20,7 @@ - test_int + Regress.test_int @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page index b749c85d..709d8c88 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint16 @@ -20,7 +20,7 @@ - test_int16 + Regress.test_int16 @accepts(gint16) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page index 29fd74ab..564bda3d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint32 @@ -20,7 +20,7 @@ - test_int32 + Regress.test_int32 @accepts(gint32) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page index 52413c05..aed6695e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -20,7 +20,7 @@ - test_int64 + Regress.test_int64 @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page index 50bfa635..3de4c454 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gint8 @@ -20,7 +20,7 @@ - test_int8 + Regress.test_int8 @accepts(gint8) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page index bf066219..7de63061 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -24,7 +24,7 @@ - test_int_out_utf8 + Regress.test_int_out_utf8 @accepts(int, unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page index cb034ddf..a7c20bc1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -20,7 +20,7 @@ - test_int_value_arg + Regress.test_int_value_arg @accepts(GObject.Value) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page index eb13e4f8..001afa10 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -20,7 +20,7 @@ - test_long + Regress.test_long @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page index 530f763e..c7dac3f1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -20,7 +20,7 @@ - test_multi_callback + Regress.test_multi_callback @accepts(Regress.TestCallback) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page index df6a9f85..97978203 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -28,7 +28,7 @@ - test_multi_double_args + Regress.test_multi_double_args @accepts(float, float, float) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page index 9b8ae8cd..fbae0d2d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -16,7 +16,7 @@ - test_multiline_doc_comments + Regress.test_multiline_doc_comments @returns(none) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page index 6ee8fc23..79ad6018 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_nested_parameter + Regress.test_nested_parameter @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page index 05b872e2..8f038dcc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_null_gerror_callback + Regress.test_null_gerror_callback @accepts(Regress.TestCallbackGError) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page index b2d23902..32a64eb6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_owned_gerror_callback + Regress.test_owned_gerror_callback @accepts(Regress.TestCallbackOwnedGError) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page index 40364efe..ebd556aa 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gshort @@ -20,7 +20,7 @@ - test_short + Regress.test_short @accepts(gshort) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page index fc87b44e..44ff654e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_simple_callback + Regress.test_simple_callback @accepts(Regress.TestSimpleCallback) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page index 24432094..9d5ef2fe 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gsize @@ -20,7 +20,7 @@ - test_size + Regress.test_size @accepts(gsize) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page index bcfe773a..1aa8869c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gssize @@ -20,7 +20,7 @@ - test_ssize + Regress.test_ssize @accepts(gssize) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page index fca58f0a..5b605e33 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + bool @@ -20,7 +20,7 @@ - test_strv_in + Regress.test_strv_in @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page index 1db56a92..27538af0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject.Value @@ -16,7 +16,7 @@ - test_strv_in_gvalue + Regress.test_strv_in_gvalue @returns(GObject.Value) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page index ca99305f..42e007f4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [unicode] @@ -16,7 +16,7 @@ - test_strv_out + Regress.test_strv_out @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page index ad925c4d..42c1328d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [unicode] @@ -16,7 +16,7 @@ - test_strv_out_c + Regress.test_strv_out_c @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page index 04b8152c..6b020cee 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + [unicode] @@ -16,7 +16,7 @@ - test_strv_out_container + Regress.test_strv_out_container @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page index 40882d5c..5a788664 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_strv_outarg + Regress.test_strv_outarg @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page index a93fd091..9ce19296 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -20,7 +20,7 @@ - test_timet + Regress.test_timet @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page index 2be46bb7..4a54bb0d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -40,7 +40,7 @@ - test_torture_signature_0 + Regress.test_torture_signature_0 @accepts(int, float, int, unicode, int, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page index 15cfb50f..e3549dc4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + bool @@ -40,7 +40,7 @@ - test_torture_signature_1 + Regress.test_torture_signature_1 @accepts(int, float, int, unicode, int, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page index 7ee3809f..b2f91328 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -52,7 +52,7 @@ - test_torture_signature_2 + Regress.test_torture_signature_2 @accepts(int, Regress.TestCallbackUserData, gpointer, GLib.DestroyNotify, float, int, unicode, int, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page index 7735c13c..6d91d532 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -20,7 +20,7 @@ - test_uint + Regress.test_uint @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page index 490c11fd..f10846c4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + guint16 @@ -20,7 +20,7 @@ - test_uint16 + Regress.test_uint16 @accepts(guint16) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page index 87a20ccd..142eb447 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + guint32 @@ -20,7 +20,7 @@ - test_uint32 + Regress.test_uint32 @accepts(guint32) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page index f697e694..862fa15f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -20,7 +20,7 @@ - test_uint64 + Regress.test_uint64 @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page index ae918cba..a357d9c7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + guint8 @@ -20,7 +20,7 @@ - test_uint8 + Regress.test_uint8 @accepts(guint8) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page index 349576c5..63d71619 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + int @@ -20,7 +20,7 @@ - test_ulong + Regress.test_ulong @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page index 2b705e8e..a7e7e66a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + unicode @@ -20,7 +20,7 @@ - test_unichar + Regress.test_unichar @accepts(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page index 31b91662..a489d9a0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + unicode @@ -20,7 +20,7 @@ - test_unsigned_enum_param + Regress.test_unsigned_enum_param @accepts(Regress.TestEnumUnsigned) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page index 68f0aa8a..2f7832fa 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + gushort @@ -20,7 +20,7 @@ - test_ushort + Regress.test_ushort @accepts(gushort) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page index 888e6eab..25f15b13 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_utf8_const_in + Regress.test_utf8_const_in @accepts(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page index b704c60d..6e1b935d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + unicode @@ -16,7 +16,7 @@ - test_utf8_const_return + Regress.test_utf8_const_return @returns(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page index 1839f096..efe32369 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_utf8_inout + Regress.test_utf8_inout @accepts(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page index 03049985..39c10832 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + unicode @@ -16,7 +16,7 @@ - test_utf8_nonconst_return + Regress.test_utf8_nonconst_return @returns(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page index 1fda6800..db0e6143 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_utf8_null_in + Regress.test_utf8_null_in @accepts(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page index f8d7b6fb..ab07678f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_utf8_null_out + Regress.test_utf8_null_out @accepts(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page index acc0a406..d6cf8fd3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -20,7 +20,7 @@ - test_utf8_out + Regress.test_utf8_out @accepts(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page index e7efb7b9..80d68185 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + unicode @@ -20,7 +20,7 @@ - test_utf8_out_nonconst_return + Regress.test_utf8_out_nonconst_return @accepts(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page index bde41d8e..1e31cf4e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -24,7 +24,7 @@ - test_utf8_out_out + Regress.test_utf8_out_out @accepts(unicode, unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page index 6470babc..63d03da8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + GObject.Value @@ -20,7 +20,7 @@ - test_value_return + Regress.test_value_return @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page index cac760a7..78a59f14 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page @@ -7,7 +7,7 @@ xmlns:ui="http://projectmallard.org/1.0/ui/"> - + none @@ -16,7 +16,7 @@ - test_versioning + Regress.test_versioning @returns(none) -- cgit v1.2.1 From 3dba3c40da7bc026bfa83109dc46ceb67471dd9d Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Fri, 15 Feb 2013 08:23:10 -0500 Subject: docwriter: Use the fully-qualified name for functions and methods --- giscanner/docwriter.py | 6 +++--- .../Regress.AnnotationObject.allow_none.page | 2 +- .../Regress.AnnotationObject.calleeowns.page | 2 +- .../Regress.AnnotationObject.calleesowns.page | 2 +- .../Regress.AnnotationObject.compute_sum.page | 2 +- .../Regress.AnnotationObject.compute_sum_n.page | 2 +- .../Regress.AnnotationObject.compute_sum_nz.page | 2 +- .../Regress.AnnotationObject.create_object.page | 2 +- .../Regress.AnnotationObject.do_not_use.page | 2 +- .../Regress.AnnotationObject.extra_annos.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page | 2 +- .../Regress.AnnotationObject.get_objects.page | 2 +- .../Regress.AnnotationObject.get_strings.page | 2 +- .../Regress.AnnotationObject.hidden_self.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page | 2 +- .../Regress.AnnotationObject.parse_args.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page | 2 +- .../Regress.AnnotationObject.set_data2.page | 2 +- .../Regress.AnnotationObject.set_data3.page | 2 +- .../Regress.AnnotationObject.string_out.page | 2 +- .../Regress.AnnotationObject.use_buffer.page | 2 +- .../Regress.AnnotationObject.watch_full.page | 2 +- .../Regress.AnnotationObject.with_voidp.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page | 2 +- .../Regress.FooInterface.do_regress_foo.page | 2 +- .../Regress.FooObject.append_new_stack_layer.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page | 2 +- .../Regress.TestBoxed.new_alternative_constructor1.page | 2 +- .../Regress.TestBoxed.new_alternative_constructor2.page | 2 +- .../Regress.TestBoxed.new_alternative_constructor3.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page | 2 +- .../Regress.TestFundamentalObject.unref.page | 2 +- .../Regress.TestFundamentalSubObject.new.page | 2 +- .../Regress.TestInheritDrawable.do_foo.page | 2 +- .../Regress.TestInheritDrawable.do_foo_maybe_throw.page | 2 +- .../Regress.TestInheritDrawable.get_origin.page | 2 +- .../Regress.TestInheritDrawable.get_size.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page | 2 +- .../Regress.TestObj.emit_sig_with_foreign_struct.page | 2 +- .../Regress.TestObj.emit_sig_with_int64.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page | 2 +- .../Regress.TestObj.emit_sig_with_uint64.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page | 2 +- .../Regress.TestObj.instance_method_callback.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page | 2 +- .../Regress.TestObj.skip_return_val_no_out.page | 2 +- .../Regress.TestObj.torture_signature_0.page | 2 +- .../Regress.TestObj.torture_signature_1.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page | 2 +- .../scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page | 2 +- .../Regress.TestSubObj.instance_method.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page | 2 +- tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page | 2 +- .../Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page | 2 +- .../Regress.AnnotationObject.allow_none.page | 2 +- .../Regress.AnnotationObject.calleeowns.page | 2 +- .../Regress.AnnotationObject.calleesowns.page | 2 +- .../Regress.AnnotationObject.compute_sum.page | 2 +- .../Regress.AnnotationObject.compute_sum_n.page | 2 +- .../Regress.AnnotationObject.compute_sum_nz.page | 2 +- .../Regress.AnnotationObject.create_object.page | 2 +- .../Regress.AnnotationObject.do_not_use.page | 2 +- .../Regress.AnnotationObject.extra_annos.page | 2 +- .../Regress.AnnotationObject.foreach.page | 2 +- .../Regress.AnnotationObject.get_hash.page | 2 +- .../Regress.AnnotationObject.get_objects.page | 2 +- .../Regress.AnnotationObject.get_strings.page | 2 +- .../Regress.AnnotationObject.hidden_self.page | 2 +- .../Regress-1.0-Python-expected/Regress.AnnotationObject.in.page | 2 +- .../Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page | 2 +- .../Regress.AnnotationObject.inout2.page | 2 +- .../Regress.AnnotationObject.inout3.page | 2 +- .../Regress.AnnotationObject.method.page | 2 +- .../Regress.AnnotationObject.notrans.page | 2 +- .../Regress-1.0-Python-expected/Regress.AnnotationObject.out.page | 2 +- .../Regress.AnnotationObject.parse_args.page | 2 +- .../Regress.AnnotationObject.set_data.page | 2 +- .../Regress.AnnotationObject.set_data2.page | 2 +- .../Regress.AnnotationObject.set_data3.page | 2 +- .../Regress.AnnotationObject.string_out.page | 2 +- .../Regress.AnnotationObject.use_buffer.page | 2 +- .../Regress.AnnotationObject.watch_full.page | 2 +- .../Regress.AnnotationObject.with_voidp.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooBoxed.method.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooDBusData.method.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page | 2 +- .../Regress.FooInterface.do_regress_foo.page | 2 +- .../Regress.FooInterface.static_method.page | 2 +- .../Regress.FooObject.a_global_method.page | 2 +- .../Regress.FooObject.append_new_stack_layer.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooObject.dup_name.page | 2 +- .../Regress.FooObject.external_type.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooObject.get_default.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooObject.get_name.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page | 2 +- .../Regress.FooObject.is_it_time_yet.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooObject.static_meth.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooObject.various.page | 2 +- .../Regress.FooObject.virtual_method.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooRectangle.add.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page | 2 +- .../Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestBoxed.equals.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestBoxedD.free.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page | 2 +- .../Regress.TestFundamentalObject.ref.page | 2 +- .../Regress.TestFundamentalObject.unref.page | 2 +- .../Regress.TestInheritDrawable.do_foo.page | 2 +- .../Regress.TestInheritDrawable.do_foo_maybe_throw.page | 2 +- .../Regress.TestInheritDrawable.get_origin.page | 2 +- .../Regress.TestInheritDrawable.get_size.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page | 2 +- .../Regress.TestObj.emit_sig_with_foreign_struct.page | 2 +- .../Regress.TestObj.emit_sig_with_int64.page | 2 +- .../Regress.TestObj.emit_sig_with_obj.page | 2 +- .../Regress.TestObj.emit_sig_with_uint64.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj.forced_method.page | 2 +- .../Regress.TestObj.instance_method.page | 2 +- .../Regress.TestObj.instance_method_callback.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj.null_out.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj.set_bare.page | 2 +- .../Regress.TestObj.skip_inout_param.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj.skip_param.page | 2 +- .../Regress.TestObj.skip_return_val.page | 2 +- .../Regress.TestObj.skip_return_val_no_out.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestObj.static_method.page | 2 +- .../Regress.TestObj.static_method_callback.page | 2 +- .../Regress.TestObj.torture_signature_0.page | 2 +- .../Regress.TestObj.torture_signature_1.page | 2 +- .../Regress.TestSimpleBoxedA.const_return.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page | 2 +- .../Regress.TestSimpleBoxedA.equals.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestStructA.clone.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestStructA.parse.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestStructB.clone.page | 2 +- .../Regress.TestStructFixedArray.frob.page | 2 +- .../Regress.TestSubObj.instance_method.page | 2 +- .../Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page | 2 +- .../Regress.TestWi8021x.get_testbool.page | 2 +- .../Regress.TestWi8021x.set_testbool.page | 2 +- .../Regress.TestWi8021x.static_method.page | 2 +- .../Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page | 2 +- .../Regress.annotation_attribute_func.page | 2 +- .../Regress.annotation_custom_destroy.page | 2 +- .../Regress.annotation_get_source_file.page | 2 +- .../Regress-1.0-Python-expected/Regress.annotation_init.page | 2 +- .../Regress.annotation_invalid_regress_annotation.page | 2 +- .../Regress-1.0-Python-expected/Regress.annotation_ptr_array.page | 2 +- .../Regress.annotation_return_array.page | 2 +- .../Regress.annotation_return_filename.page | 2 +- .../Regress.annotation_set_source_file.page | 2 +- .../Regress.annotation_space_after_comment_bug631690.page | 2 +- .../Regress.annotation_string_array_length.page | 2 +- .../Regress.annotation_string_zero_terminated.page | 2 +- .../Regress.annotation_string_zero_terminated_out.page | 2 +- .../Regress.annotation_test_parsing_bug630862.page | 2 +- .../Regress.annotation_transfer_floating.page | 2 +- .../Regress-1.0-Python-expected/Regress.annotation_versioned.page | 2 +- .../Regress-1.0-Python-expected/Regress.atest_error_quark.page | 2 +- .../Regress.foo_async_ready_callback.page | 2 +- .../Regress.foo_destroy_notify_callback.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page | 2 +- .../Regress.foo_method_external_references.page | 2 +- .../Regress.foo_not_a_constructor_new.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page | 2 +- .../Regress.foo_test_const_char_param.page | 2 +- .../Regress.foo_test_const_char_retval.page | 2 +- .../Regress.foo_test_const_struct_param.page | 2 +- .../Regress.foo_test_const_struct_retval.page | 2 +- .../Regress-1.0-Python-expected/Regress.foo_test_string_array.page | 2 +- .../Regress.foo_test_string_array_with_g.page | 2 +- .../Regress.foo_test_unsigned_qualifier.page | 2 +- .../Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page | 2 +- .../Regress-1.0-Python-expected/Regress.func_obj_null_in.page | 2 +- .../Regress-1.0-Python-expected/Regress.global_get_flags_out.page | 2 +- .../Regress.has_parameter_named_attrs.page | 2 +- .../Regress.introspectable_via_alias.page | 2 +- .../Regress-1.0-Python-expected/Regress.set_abort_on_error.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_array_callback.page | 2 +- .../Regress.test_array_fixed_out_objects.page | 2 +- .../Regress.test_array_fixed_size_int_in.page | 2 +- .../Regress.test_array_fixed_size_int_out.page | 2 +- .../Regress.test_array_fixed_size_int_return.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_array_gint16_in.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_array_gint32_in.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_array_gint64_in.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_array_gint8_in.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_array_gtype_in.page | 2 +- .../Regress.test_array_int_full_out.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_array_int_in.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_array_int_inout.page | 2 +- .../Regress.test_array_int_none_out.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_array_int_null_in.page | 2 +- .../Regress.test_array_int_null_out.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_array_int_out.page | 2 +- .../Regress.test_async_ready_callback.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_boolean_false.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_boolean_true.page | 2 +- .../Regress.test_cairo_context_full_return.page | 2 +- .../Regress.test_cairo_context_none_in.page | 2 +- .../Regress.test_cairo_surface_full_out.page | 2 +- .../Regress.test_cairo_surface_full_return.page | 2 +- .../Regress.test_cairo_surface_none_in.page | 2 +- .../Regress.test_cairo_surface_none_return.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.test_callback.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_callback_async.page | 2 +- .../Regress.test_callback_destroy_notify.page | 2 +- .../Regress.test_callback_destroy_notify_no_user_data.page | 2 +- .../Regress.test_callback_thaw_async.page | 2 +- .../Regress.test_callback_thaw_notifications.page | 2 +- .../Regress.test_callback_user_data.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_closure_one_arg.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_closure_variant.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_def_error_quark.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_filename_return.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page | 2 +- .../Regress.test_garray_container_return.page | 2 +- .../Regress.test_garray_full_return.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_gerror_callback.page | 2 +- .../Regress.test_ghash_container_return.page | 2 +- .../Regress.test_ghash_everything_return.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page | 2 +- .../Regress.test_ghash_gvalue_return.page | 2 +- .../Regress.test_ghash_nested_everything_return.page | 2 +- .../Regress.test_ghash_nested_everything_return2.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page | 2 +- .../Regress.test_ghash_nothing_return.page | 2 +- .../Regress.test_ghash_nothing_return2.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_ghash_null_in.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_ghash_null_out.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_ghash_null_return.page | 2 +- .../Regress.test_glist_container_return.page | 2 +- .../Regress.test_glist_everything_return.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page | 2 +- .../Regress.test_glist_nothing_return.page | 2 +- .../Regress.test_glist_nothing_return2.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_glist_null_in.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_glist_null_out.page | 2 +- .../Regress.test_gslist_container_return.page | 2 +- .../Regress.test_gslist_everything_return.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page | 2 +- .../Regress.test_gslist_nothing_in2.page | 2 +- .../Regress.test_gslist_nothing_return.page | 2 +- .../Regress.test_gslist_nothing_return2.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_gslist_null_in.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_gslist_null_out.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_gvariant_as.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_gvariant_asv.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_gvariant_i.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_gvariant_s.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_gvariant_v.page | 2 +- .../Regress.test_hash_table_callback.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_int_out_utf8.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_int_value_arg.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_multi_callback.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_multi_double_args.page | 2 +- .../Regress.test_multiline_doc_comments.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_nested_parameter.page | 2 +- .../Regress.test_null_gerror_callback.page | 2 +- .../Regress.test_owned_gerror_callback.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_simple_callback.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_strv_out_c.page | 2 +- .../Regress.test_strv_out_container.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_strv_outarg.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page | 2 +- .../Regress.test_torture_signature_0.page | 2 +- .../Regress.test_torture_signature_1.page | 2 +- .../Regress.test_torture_signature_2.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page | 2 +- .../Regress.test_unsigned_enum_param.page | 2 +- tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_utf8_const_in.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_utf8_const_return.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_utf8_inout.page | 2 +- .../Regress.test_utf8_nonconst_return.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_utf8_null_in.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_utf8_null_out.page | 2 +- .../scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page | 2 +- .../Regress.test_utf8_out_nonconst_return.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_utf8_out_out.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_value_return.page | 2 +- .../Regress-1.0-Python-expected/Regress.test_versioning.page | 2 +- 368 files changed, 370 insertions(+), 370 deletions(-) diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py index 7f337d21..e962b914 100644 --- a/giscanner/docwriter.py +++ b/giscanner/docwriter.py @@ -458,7 +458,7 @@ class DocFormatterPython(DocFormatterIntrospectableBase): def format_function_name(self, func): if func.parent is not None: - return "%s.%s" % (func.parent.name, func.name) + return "%s.%s" % (self.format_page_name(func.parent), func.name) else: return func.name @@ -523,9 +523,9 @@ class DocFormatterGjs(DocFormatterIntrospectableBase): def format_function_name(self, func): if func.is_method: - return "%s.prototype.%s" % (func.parent.name, func.name) + return "%s.prototype.%s" % (self.format_page_name(func.parent), func.name) elif func.is_constructor: - return "%s.%s" % (func.parent.name, func.name) + return "%s.%s" % (self.format_page_name(func.parent), func.name) else: return func.name diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page index 4246c2aa..414f5c63 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page @@ -20,7 +20,7 @@ - AnnotationObject.prototype.allow_none + Regress.AnnotationObject.prototype.allow_none function allow_none(somearg:String):GObject.Object { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page index b65b1ce6..8dd15f1c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page @@ -16,7 +16,7 @@ - AnnotationObject.prototype.calleeowns + Regress.AnnotationObject.prototype.calleeowns function calleeowns():Number { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page index 221b24c8..a12be358 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page @@ -16,7 +16,7 @@ - AnnotationObject.prototype.calleesowns + Regress.AnnotationObject.prototype.calleesowns function calleesowns():Number { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page index 2aa3f064..d7e6784d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum.page @@ -20,7 +20,7 @@ - AnnotationObject.prototype.compute_sum + Regress.AnnotationObject.prototype.compute_sum function compute_sum(nums:[Number]):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page index b769ba6d..16b62150 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_n.page @@ -20,7 +20,7 @@ - AnnotationObject.prototype.compute_sum_n + Regress.AnnotationObject.prototype.compute_sum_n function compute_sum_n(nums:[Number]):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page index b7a834a1..f4a3b7d6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.compute_sum_nz.page @@ -20,7 +20,7 @@ - AnnotationObject.prototype.compute_sum_nz + Regress.AnnotationObject.prototype.compute_sum_nz function compute_sum_nz(nums:[Number]):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page index b22eaf80..03ceac18 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page @@ -16,7 +16,7 @@ - AnnotationObject.prototype.create_object + Regress.AnnotationObject.prototype.create_object function create_object():GObject.Object { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page index 8b7912df..e89c8fe6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page @@ -16,7 +16,7 @@ - AnnotationObject.prototype.do_not_use + Regress.AnnotationObject.prototype.do_not_use function do_not_use():GObject.Object { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page index 90175931..cd58eed9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.extra_annos.page @@ -16,7 +16,7 @@ - AnnotationObject.prototype.extra_annos + Regress.AnnotationObject.prototype.extra_annos function extra_annos():void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page index cdf26c5c..e4cc4c0b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.foreach.page @@ -20,7 +20,7 @@ - AnnotationObject.prototype.foreach + Regress.AnnotationObject.prototype.foreach function foreach(func:Regress.AnnotationForeachFunc):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page index 20ffffdf..2e6ca61a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page @@ -16,7 +16,7 @@ - AnnotationObject.prototype.get_hash + Regress.AnnotationObject.prototype.get_hash function get_hash():{String: GObject.Object} { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page index 6ae6806d..c0350d7e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_objects.page @@ -16,7 +16,7 @@ - AnnotationObject.prototype.get_objects + Regress.AnnotationObject.prototype.get_objects function get_objects():[Regress.AnnotationObject] { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page index 96134cf3..e36d25a8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_strings.page @@ -16,7 +16,7 @@ - AnnotationObject.prototype.get_strings + Regress.AnnotationObject.prototype.get_strings function get_strings():[String] { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page index 2238d903..945acf01 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.hidden_self.page @@ -16,7 +16,7 @@ - AnnotationObject.prototype.hidden_self + Regress.AnnotationObject.prototype.hidden_self function hidden_self():void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page index cf669406..226b2b97 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.in.page @@ -20,7 +20,7 @@ - AnnotationObject.prototype.in + Regress.AnnotationObject.prototype.in function in(inarg:Number):Number { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page index b8d5088c..885412fb 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout.page @@ -20,7 +20,7 @@ - AnnotationObject.prototype.inout + Regress.AnnotationObject.prototype.inout function inout(inoutarg:Number):Number { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page index 6c34095a..34406b7b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout2.page @@ -20,7 +20,7 @@ - AnnotationObject.prototype.inout2 + Regress.AnnotationObject.prototype.inout2 function inout2(inoutarg:Number):Number { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page index d7adac12..2828964e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.inout3.page @@ -20,7 +20,7 @@ - AnnotationObject.prototype.inout3 + Regress.AnnotationObject.prototype.inout3 function inout3(inoutarg:Number):Number { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page index 217ae08b..49d937a1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.method.page @@ -16,7 +16,7 @@ - AnnotationObject.prototype.method + Regress.AnnotationObject.prototype.method function method():Number { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page index c9a864f7..0424719e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page @@ -16,7 +16,7 @@ - AnnotationObject.prototype.notrans + Regress.AnnotationObject.prototype.notrans function notrans():GObject.Object { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page index 3f845502..5120baf8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.out.page @@ -16,7 +16,7 @@ - AnnotationObject.prototype.out + Regress.AnnotationObject.prototype.out function out():Number { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page index 1bc89fbd..8476fd89 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.parse_args.page @@ -20,7 +20,7 @@ - AnnotationObject.prototype.parse_args + Regress.AnnotationObject.prototype.parse_args function parse_args(argv:[String]):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page index 6c5d1e7f..a5dafb97 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page @@ -20,7 +20,7 @@ - AnnotationObject.prototype.set_data + Regress.AnnotationObject.prototype.set_data function set_data(data:[guint8]):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page index de78bd3e..3fcd8188 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page @@ -20,7 +20,7 @@ - AnnotationObject.prototype.set_data2 + Regress.AnnotationObject.prototype.set_data2 function set_data2(data:[gint8]):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page index 94c689ed..22fb98dd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page @@ -20,7 +20,7 @@ - AnnotationObject.prototype.set_data3 + Regress.AnnotationObject.prototype.set_data3 function set_data3(data:[guint8]):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page index 78e1db7e..4d6029a1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.string_out.page @@ -16,7 +16,7 @@ - AnnotationObject.prototype.string_out + Regress.AnnotationObject.prototype.string_out function string_out():Boolean { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page index c2e5f111..c602a896 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.use_buffer.page @@ -20,7 +20,7 @@ - AnnotationObject.prototype.use_buffer + Regress.AnnotationObject.prototype.use_buffer function use_buffer(bytes:guint8):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page index 329c9688..a5ccad47 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page @@ -20,7 +20,7 @@ - AnnotationObject.prototype.watch_full + Regress.AnnotationObject.prototype.watch_full function watch_full(func:Regress.AnnotationForeachFunc):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page index 57eff666..6daccb5e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.with_voidp.page @@ -20,7 +20,7 @@ - AnnotationObject.prototype.with_voidp + Regress.AnnotationObject.prototype.with_voidp function with_voidp(data:gpointer):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page index 48b5bfd6..9091617a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.add.page @@ -20,7 +20,7 @@ - FooBRect.prototype.add + Regress.FooBRect.prototype.add function add(b2:Regress.FooBRect):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page index 21d810ae..2d2b5749 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page @@ -24,7 +24,7 @@ - FooBRect.new + Regress.FooBRect.new function new(x:Number, y:Number):Regress.FooBRect { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page index 4f00498d..896d02ad 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.method.page @@ -16,7 +16,7 @@ - FooBoxed.prototype.method + Regress.FooBoxed.prototype.method function method():void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page index 8cfb6191..67b1c4fc 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page @@ -16,7 +16,7 @@ - FooBoxed.new + Regress.FooBoxed.new function new():Regress.FooBoxed { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page index af7c408e..871ec7af 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBuffer.some_method.page @@ -16,7 +16,7 @@ - FooBuffer.prototype.some_method + Regress.FooBuffer.prototype.some_method function some_method():void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page index 47459952..0b1b6b86 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooDBusData.method.page @@ -16,7 +16,7 @@ - FooDBusData.prototype.method + Regress.FooDBusData.prototype.method function method():void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page index eb2fc332..1a61cfbb 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.copy.page @@ -16,7 +16,7 @@ - FooForeignStruct.prototype.copy + Regress.FooForeignStruct.prototype.copy function copy():Regress.FooForeignStruct { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page index fdeb3979..814eef35 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page @@ -16,7 +16,7 @@ - FooForeignStruct.new + Regress.FooForeignStruct.new function new():Regress.FooForeignStruct { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page index b91471d7..993998e4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooInterface.do_regress_foo.page @@ -20,7 +20,7 @@ - FooInterface.prototype.do_regress_foo + Regress.FooInterface.prototype.do_regress_foo function do_regress_foo(x:Number):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page index d53564b0..f1bfd923 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.append_new_stack_layer.page @@ -20,7 +20,7 @@ - FooObject.prototype.append_new_stack_layer + Regress.FooObject.prototype.append_new_stack_layer function append_new_stack_layer(x:Number):Regress.FooOtherObject { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page index 46a61b27..d74f95bf 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.dup_name.page @@ -16,7 +16,7 @@ - FooObject.prototype.dup_name + Regress.FooObject.prototype.dup_name function dup_name():String { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page index fb2b54c3..7da1b86e 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page @@ -16,7 +16,7 @@ - FooObject.prototype.external_type + Regress.FooObject.prototype.external_type function external_type():Utility.Object { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page index b06580f3..b9c69d2b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.get_name.page @@ -16,7 +16,7 @@ - FooObject.prototype.get_name + Regress.FooObject.prototype.get_name function get_name():String { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page index 746d830c..3209f200 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page @@ -20,7 +20,7 @@ - FooObject.prototype.handle_glyph + Regress.FooObject.prototype.handle_glyph function handle_glyph(glyph:Utility.Glyph):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page index 8f83b375..f42e16bb 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.is_it_time_yet.page @@ -20,7 +20,7 @@ - FooObject.prototype.is_it_time_yet + Regress.FooObject.prototype.is_it_time_yet function is_it_time_yet(time:Number):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page index 32500e14..fa40bfc3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page @@ -16,7 +16,7 @@ - FooObject.new + Regress.FooObject.new function new():Regress.FooObject { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page index 2c85b269..0323a1be 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page @@ -16,7 +16,7 @@ - FooObject.new_as_super + Regress.FooObject.new_as_super function new_as_super():GObject.Object { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page index b59223c9..78bdb648 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.read.page @@ -24,7 +24,7 @@ - FooObject.prototype.read + Regress.FooObject.prototype.read function read(offset:Number, length:Number):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page index 8ed0b6d6..1f509214 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.various.page @@ -24,7 +24,7 @@ - FooObject.prototype.various + Regress.FooObject.prototype.various function various(data:gpointer, some_type:GType):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page index 460c4615..3467ca20 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.virtual_method.page @@ -20,7 +20,7 @@ - FooObject.prototype.virtual_method + Regress.FooObject.prototype.virtual_method function virtual_method(first_param:Number):Boolean { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page index 46d62528..276450e6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooRectangle.add.page @@ -20,7 +20,7 @@ - FooRectangle.prototype.add + Regress.FooRectangle.prototype.add function add(r2:Regress.FooRectangle):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page index 8a1fd9e5..a258a3e6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_bar.page @@ -16,7 +16,7 @@ - FooSubInterface.prototype.do_bar + Regress.FooSubInterface.prototype.do_bar function do_bar():void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page index 10e8020e..b55a8d78 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page @@ -20,7 +20,7 @@ - FooSubInterface.prototype.do_baz + Regress.FooSubInterface.prototype.do_baz function do_baz(callback:GObject.Callback):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page index 6e400bb3..08cb116d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page @@ -16,7 +16,7 @@ - FooSubobject.new + Regress.FooSubobject.new function new():Regress.FooSubobject { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page index eac21331..751ce883 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.copy.page @@ -16,7 +16,7 @@ - TestBoxed.prototype.copy + Regress.TestBoxed.prototype.copy function copy():Regress.TestBoxed { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page index 23a6d7d6..5c23da2d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.equals.page @@ -20,7 +20,7 @@ - TestBoxed.prototype.equals + Regress.TestBoxed.prototype.equals function equals(other:Regress.TestBoxed):Boolean { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page index 5fbf83a5..88e33de3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page @@ -16,7 +16,7 @@ - TestBoxed.new + Regress.TestBoxed.new function new():Regress.TestBoxed { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page index 7d1b27be..801bad21 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor1.page @@ -20,7 +20,7 @@ - TestBoxed.new_alternative_constructor1 + Regress.TestBoxed.new_alternative_constructor1 function new_alternative_constructor1(i:Number):Regress.TestBoxed { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page index 3a4ef982..23fa6723 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor2.page @@ -24,7 +24,7 @@ - TestBoxed.new_alternative_constructor2 + Regress.TestBoxed.new_alternative_constructor2 function new_alternative_constructor2(i:Number, j:Number):Regress.TestBoxed { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page index da86a8ef..8f0c2d28 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new_alternative_constructor3.page @@ -20,7 +20,7 @@ - TestBoxed.new_alternative_constructor3 + Regress.TestBoxed.new_alternative_constructor3 function new_alternative_constructor3(s:String):Regress.TestBoxed { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page index 78b81658..06bccc87 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.copy.page @@ -16,7 +16,7 @@ - TestBoxedB.prototype.copy + Regress.TestBoxedB.prototype.copy function copy():Regress.TestBoxedB { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page index b68acc9f..e71147ae 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page @@ -24,7 +24,7 @@ - TestBoxedB.new + Regress.TestBoxedB.new function new(some_int8:gint8, some_long:Number):Regress.TestBoxedB { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page index 301936bb..542c93e4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page @@ -16,7 +16,7 @@ - TestBoxedC.new + Regress.TestBoxedC.new function new():Regress.TestBoxedC { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page index be4b26aa..7b51fd5b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.copy.page @@ -16,7 +16,7 @@ - TestBoxedD.prototype.copy + Regress.TestBoxedD.prototype.copy function copy():Regress.TestBoxedD { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page index 3198b66e..82df9040 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.free.page @@ -16,7 +16,7 @@ - TestBoxedD.prototype.free + Regress.TestBoxedD.prototype.free function free():void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page index fdb9dbff..0f7923e6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.get_magic.page @@ -16,7 +16,7 @@ - TestBoxedD.prototype.get_magic + Regress.TestBoxedD.prototype.get_magic function get_magic():Number { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page index 6ed46e59..cfd50c56 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page @@ -24,7 +24,7 @@ - TestBoxedD.new + Regress.TestBoxedD.new function new(a_string:String, a_int:Number):Regress.TestBoxedD { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page index 35ea1f41..94c80cfa 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page @@ -16,7 +16,7 @@ - TestFloating.new + Regress.TestFloating.new function new():Regress.TestFloating { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page index 7891d88b..b1c37efb 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page @@ -16,7 +16,7 @@ - TestFundamentalObject.prototype.ref + Regress.TestFundamentalObject.prototype.ref function ref():Regress.TestFundamentalObject { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page index 8992abc1..758a30d7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page @@ -16,7 +16,7 @@ - TestFundamentalObject.prototype.unref + Regress.TestFundamentalObject.prototype.unref function unref():void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page index 109cb52f..c6a31f90 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page @@ -22,7 +22,7 @@ - TestFundamentalSubObject.new + Regress.TestFundamentalSubObject.new function new(data:String):Regress.TestFundamentalSubObject { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page index eb60f557..176211b3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo.page @@ -20,7 +20,7 @@ - TestInheritDrawable.prototype.do_foo + Regress.TestInheritDrawable.prototype.do_foo function do_foo(x:Number):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page index f9f05b2f..038b73f9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page @@ -20,7 +20,7 @@ - TestInheritDrawable.prototype.do_foo_maybe_throw + Regress.TestInheritDrawable.prototype.do_foo_maybe_throw function do_foo_maybe_throw(x:Number):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page index 24489cf6..9dd2cbaa 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_origin.page @@ -16,7 +16,7 @@ - TestInheritDrawable.prototype.get_origin + Regress.TestInheritDrawable.prototype.get_origin function get_origin():void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page index f8c06b4f..669ab1ce 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestInheritDrawable.get_size.page @@ -16,7 +16,7 @@ - TestInheritDrawable.prototype.get_size + Regress.TestInheritDrawable.prototype.get_size function get_size():void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page index 14c8ba67..4f2183d8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page @@ -16,7 +16,7 @@ - TestObj.constructor + Regress.TestObj.constructor function constructor():Regress.TestObj { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page index 2b27fe66..0770d0d3 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.do_matrix.page @@ -20,7 +20,7 @@ - TestObj.prototype.do_matrix + Regress.TestObj.prototype.do_matrix function do_matrix(somestr:String):Number { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page index a2eb7eaf..5e719483 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_foreign_struct.page @@ -16,7 +16,7 @@ - TestObj.prototype.emit_sig_with_foreign_struct + Regress.TestObj.prototype.emit_sig_with_foreign_struct function emit_sig_with_foreign_struct():void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page index b2853ef8..1c46dfbb 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_int64.page @@ -16,7 +16,7 @@ - TestObj.prototype.emit_sig_with_int64 + Regress.TestObj.prototype.emit_sig_with_int64 function emit_sig_with_int64():void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page index c0f99504..ea33a826 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_obj.page @@ -16,7 +16,7 @@ - TestObj.prototype.emit_sig_with_obj + Regress.TestObj.prototype.emit_sig_with_obj function emit_sig_with_obj():void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page index 7ff7b0ba..35c06780 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.emit_sig_with_uint64.page @@ -16,7 +16,7 @@ - TestObj.prototype.emit_sig_with_uint64 + Regress.TestObj.prototype.emit_sig_with_uint64 function emit_sig_with_uint64():void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page index 771bba8c..b3ff3bf7 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.forced_method.page @@ -16,7 +16,7 @@ - TestObj.prototype.forced_method + Regress.TestObj.prototype.forced_method function forced_method():void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page index 096b7547..9ee87686 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method.page @@ -16,7 +16,7 @@ - TestObj.prototype.instance_method + Regress.TestObj.prototype.instance_method function instance_method():Number { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page index d0f6009d..fe260691 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.instance_method_callback.page @@ -20,7 +20,7 @@ - TestObj.prototype.instance_method_callback + Regress.TestObj.prototype.instance_method_callback function instance_method_callback(callback:Regress.TestCallback):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page index d3210cab..024db932 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page @@ -20,7 +20,7 @@ - TestObj.new + Regress.TestObj.new function new(obj:Regress.TestObj):Regress.TestObj { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page index 44279520..4eaa0365 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page @@ -20,7 +20,7 @@ - TestObj.new_callback + Regress.TestObj.new_callback function new_callback(callback:Regress.TestCallbackUserData):Regress.TestObj { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page index a4f99805..c54fa622 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page @@ -20,7 +20,7 @@ - TestObj.new_from_file + Regress.TestObj.new_from_file function new_from_file(x:String):Regress.TestObj { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page index d80d786c..dca89e84 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page @@ -20,7 +20,7 @@ - TestObj.prototype.set_bare + Regress.TestObj.prototype.set_bare function set_bare(bare:GObject.Object):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page index df6625d8..aee3f2c6 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_inout_param.page @@ -36,7 +36,7 @@ - TestObj.prototype.skip_inout_param + Regress.TestObj.prototype.skip_inout_param function skip_inout_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page index f557941c..75b7bb2c 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_out_param.page @@ -36,7 +36,7 @@ - TestObj.prototype.skip_out_param + Regress.TestObj.prototype.skip_out_param function skip_out_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page index 06c0c624..cd2081f8 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_param.page @@ -36,7 +36,7 @@ - TestObj.prototype.skip_param + Regress.TestObj.prototype.skip_param function skip_param(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page index 9ea28a1f..22ec5729 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val.page @@ -36,7 +36,7 @@ - TestObj.prototype.skip_return_val + Regress.TestObj.prototype.skip_return_val function skip_return_val(a:Number, c:Number, inout_d:Number, num1:Number, num2:Number):Boolean { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page index c61e93e0..74701f7d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.skip_return_val_no_out.page @@ -20,7 +20,7 @@ - TestObj.prototype.skip_return_val_no_out + Regress.TestObj.prototype.skip_return_val_no_out function skip_return_val_no_out(a:Number):Boolean { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page index 8053e0bf..78bf63ba 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_0.page @@ -28,7 +28,7 @@ - TestObj.prototype.torture_signature_0 + Regress.TestObj.prototype.torture_signature_0 function torture_signature_0(x:Number, foo:String, m:Number):void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page index 0ba6cbbe..553ddd20 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.torture_signature_1.page @@ -28,7 +28,7 @@ - TestObj.prototype.torture_signature_1 + Regress.TestObj.prototype.torture_signature_1 function torture_signature_1(x:Number, foo:String, m:Number):Boolean { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page index 2784f146..6aa09744 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.copy.page @@ -16,7 +16,7 @@ - TestSimpleBoxedA.prototype.copy + Regress.TestSimpleBoxedA.prototype.copy function copy():Regress.TestSimpleBoxedA { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page index aa9a02e4..52e58775 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedA.equals.page @@ -20,7 +20,7 @@ - TestSimpleBoxedA.prototype.equals + Regress.TestSimpleBoxedA.prototype.equals function equals(other_a:Regress.TestSimpleBoxedA):Boolean { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page index f0ca7210..b1bd51aa 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSimpleBoxedB.copy.page @@ -16,7 +16,7 @@ - TestSimpleBoxedB.prototype.copy + Regress.TestSimpleBoxedB.prototype.copy function copy():Regress.TestSimpleBoxedB { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page index 9d23bbd8..ded4a799 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructA.clone.page @@ -16,7 +16,7 @@ - TestStructA.prototype.clone + Regress.TestStructA.prototype.clone function clone():void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page index ed5f9c06..20278cd2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructB.clone.page @@ -16,7 +16,7 @@ - TestStructB.prototype.clone + Regress.TestStructB.prototype.clone function clone():void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page index a237385c..f0edd05a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructFixedArray.frob.page @@ -16,7 +16,7 @@ - TestStructFixedArray.prototype.frob + Regress.TestStructFixedArray.prototype.frob function frob():void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page index 4a7427e1..26fc7905 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.instance_method.page @@ -16,7 +16,7 @@ - TestSubObj.prototype.instance_method + Regress.TestSubObj.prototype.instance_method function instance_method():Number { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page index a66646bd..31deab7f 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page @@ -16,7 +16,7 @@ - TestSubObj.new + Regress.TestSubObj.new function new():Regress.TestObj { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page index 2b720ebf..a632f8f4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.unset_bare.page @@ -16,7 +16,7 @@ - TestSubObj.prototype.unset_bare + Regress.TestSubObj.prototype.unset_bare function unset_bare():void { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page index 0c9440b6..e42b0d74 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.get_testbool.page @@ -16,7 +16,7 @@ - TestWi8021x.prototype.get_testbool + Regress.TestWi8021x.prototype.get_testbool function get_testbool():Boolean { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page index c79a2f57..b8b162cf 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page @@ -16,7 +16,7 @@ - TestWi8021x.new + Regress.TestWi8021x.new function new():Regress.TestWi8021x { diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page index 471c51cd..e052ed5d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.set_testbool.page @@ -20,7 +20,7 @@ - TestWi8021x.prototype.set_testbool + Regress.TestWi8021x.prototype.set_testbool function set_testbool(v:Boolean):void { diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page index 5dc0d89c..a04abd75 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page @@ -24,7 +24,7 @@ - AnnotationObject.allow_none + Regress.AnnotationObject.allow_none @accepts(Regress.AnnotationObject, unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page index e8088523..bebf7737 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page @@ -24,7 +24,7 @@ - AnnotationObject.calleeowns + Regress.AnnotationObject.calleeowns @accepts(Regress.AnnotationObject, GObject.Object) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page index 0b6dd5dc..ef9361fd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page @@ -28,7 +28,7 @@ - AnnotationObject.calleesowns + Regress.AnnotationObject.calleesowns @accepts(Regress.AnnotationObject, GObject.Object, GObject.Object) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page index 32bdcff6..4f58e6fb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page @@ -24,7 +24,7 @@ - AnnotationObject.compute_sum + Regress.AnnotationObject.compute_sum @accepts(Regress.AnnotationObject, [int]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page index cc1c627e..fc993130 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page @@ -28,7 +28,7 @@ - AnnotationObject.compute_sum_n + Regress.AnnotationObject.compute_sum_n @accepts(Regress.AnnotationObject, [int], int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page index eb65fe36..67efe7c5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_nz.page @@ -28,7 +28,7 @@ - AnnotationObject.compute_sum_nz + Regress.AnnotationObject.compute_sum_nz @accepts(Regress.AnnotationObject, [int], int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page index bcd4fd5d..6498ac29 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page @@ -20,7 +20,7 @@ - AnnotationObject.create_object + Regress.AnnotationObject.create_object @accepts(Regress.AnnotationObject) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page index dd7f050d..fac9f167 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page @@ -20,7 +20,7 @@ - AnnotationObject.do_not_use + Regress.AnnotationObject.do_not_use @accepts(Regress.AnnotationObject) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page index d8729783..7e032668 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.extra_annos.page @@ -20,7 +20,7 @@ - AnnotationObject.extra_annos + Regress.AnnotationObject.extra_annos @accepts(Regress.AnnotationObject) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page index 63fedadb..1010a017 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.foreach.page @@ -28,7 +28,7 @@ - AnnotationObject.foreach + Regress.AnnotationObject.foreach @accepts(Regress.AnnotationObject, Regress.AnnotationForeachFunc, gpointer) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page index d0dbe7c3..8d658f50 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page @@ -20,7 +20,7 @@ - AnnotationObject.get_hash + Regress.AnnotationObject.get_hash @accepts(Regress.AnnotationObject) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page index 4d378e36..ef231f5c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page @@ -20,7 +20,7 @@ - AnnotationObject.get_objects + Regress.AnnotationObject.get_objects @accepts(Regress.AnnotationObject) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page index 7eb5735f..13570b66 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page @@ -20,7 +20,7 @@ - AnnotationObject.get_strings + Regress.AnnotationObject.get_strings @accepts(Regress.AnnotationObject) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page index 717525fa..ce1111fd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.hidden_self.page @@ -20,7 +20,7 @@ - AnnotationObject.hidden_self + Regress.AnnotationObject.hidden_self @accepts(Regress.AnnotationObject) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page index 2f7d526e..0e77f853 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page @@ -24,7 +24,7 @@ - AnnotationObject.in + Regress.AnnotationObject.in @accepts(Regress.AnnotationObject, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page index 4723d33f..6816eaf4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page @@ -24,7 +24,7 @@ - AnnotationObject.inout + Regress.AnnotationObject.inout @accepts(Regress.AnnotationObject, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page index 774f3234..aef9deca 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page @@ -24,7 +24,7 @@ - AnnotationObject.inout2 + Regress.AnnotationObject.inout2 @accepts(Regress.AnnotationObject, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page index 806b6e74..4ba4bf67 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page @@ -24,7 +24,7 @@ - AnnotationObject.inout3 + Regress.AnnotationObject.inout3 @accepts(Regress.AnnotationObject, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page index 11a0f0d0..b6badcfe 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page @@ -20,7 +20,7 @@ - AnnotationObject.method + Regress.AnnotationObject.method @accepts(Regress.AnnotationObject) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page index 4e474d0d..aa50a26e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page @@ -20,7 +20,7 @@ - AnnotationObject.notrans + Regress.AnnotationObject.notrans @accepts(Regress.AnnotationObject) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page index b1e037f5..606b4a12 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page @@ -24,7 +24,7 @@ - AnnotationObject.out + Regress.AnnotationObject.out @accepts(Regress.AnnotationObject, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page index a69df607..760e0be7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.parse_args.page @@ -28,7 +28,7 @@ - AnnotationObject.parse_args + Regress.AnnotationObject.parse_args @accepts(Regress.AnnotationObject, int, [unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page index e8a48794..7cd52364 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data.page @@ -28,7 +28,7 @@ - AnnotationObject.set_data + Regress.AnnotationObject.set_data @accepts(Regress.AnnotationObject, [guint8], gsize) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page index 63e540d3..cd47036a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data2.page @@ -28,7 +28,7 @@ - AnnotationObject.set_data2 + Regress.AnnotationObject.set_data2 @accepts(Regress.AnnotationObject, [gint8], gsize) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page index b01add00..b9016e87 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.set_data3.page @@ -28,7 +28,7 @@ - AnnotationObject.set_data3 + Regress.AnnotationObject.set_data3 @accepts(Regress.AnnotationObject, [guint8], gsize) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page index cd68ab76..c1d085aa 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.string_out.page @@ -24,7 +24,7 @@ - AnnotationObject.string_out + Regress.AnnotationObject.string_out @accepts(Regress.AnnotationObject, unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page index dddc4d57..385fe89f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page @@ -24,7 +24,7 @@ - AnnotationObject.use_buffer + Regress.AnnotationObject.use_buffer @accepts(Regress.AnnotationObject, guint8) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page index 3d3c7563..28ca71af 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page @@ -32,7 +32,7 @@ - AnnotationObject.watch_full + Regress.AnnotationObject.watch_full @accepts(Regress.AnnotationObject, Regress.AnnotationForeachFunc, gpointer, GLib.DestroyNotify) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page index a6b653a0..bda3e9a0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.with_voidp.page @@ -24,7 +24,7 @@ - AnnotationObject.with_voidp + Regress.AnnotationObject.with_voidp @accepts(Regress.AnnotationObject, gpointer) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page index dca11c35..c7e03ace 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBRect.add.page @@ -24,7 +24,7 @@ - FooBRect.add + Regress.FooBRect.add @accepts(Regress.FooBRect, Regress.FooBRect) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page index dfaf746a..95f06fbb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBoxed.method.page @@ -20,7 +20,7 @@ - FooBoxed.method + Regress.FooBoxed.method @accepts(Regress.FooBoxed) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page index bee0dd0d..e971b2d6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBuffer.some_method.page @@ -20,7 +20,7 @@ - FooBuffer.some_method + Regress.FooBuffer.some_method @accepts(Regress.FooBuffer) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page index 744cbf0e..fe1b6472 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooDBusData.method.page @@ -20,7 +20,7 @@ - FooDBusData.method + Regress.FooDBusData.method @accepts(Regress.FooDBusData) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page index 757033ff..1dbb5dc0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooForeignStruct.copy.page @@ -20,7 +20,7 @@ - FooForeignStruct.copy + Regress.FooForeignStruct.copy @accepts(Regress.FooForeignStruct) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page index d94103f8..3b2f26d6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.do_regress_foo.page @@ -24,7 +24,7 @@ - FooInterface.do_regress_foo + Regress.FooInterface.do_regress_foo @accepts(Regress.FooInterface, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page index 5a09792b..1c6c1660 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooInterface.static_method.page @@ -20,7 +20,7 @@ - FooInterface.static_method + Regress.FooInterface.static_method @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page index ecfd04f7..87645bcf 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.a_global_method.page @@ -20,7 +20,7 @@ - FooObject.a_global_method + Regress.FooObject.a_global_method @accepts(Utility.Object) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page index dce6f596..23ba26b8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.append_new_stack_layer.page @@ -24,7 +24,7 @@ - FooObject.append_new_stack_layer + Regress.FooObject.append_new_stack_layer @accepts(Regress.FooObject, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page index 4e2a8e4f..dcc20f6c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.dup_name.page @@ -20,7 +20,7 @@ - FooObject.dup_name + Regress.FooObject.dup_name @accepts(Regress.FooObject) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page index 182f153f..0b32befd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.external_type.page @@ -20,7 +20,7 @@ - FooObject.external_type + Regress.FooObject.external_type @accepts(Regress.FooObject) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page index 68806e88..826efd85 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_default.page @@ -16,7 +16,7 @@ - FooObject.get_default + Regress.FooObject.get_default @returns(Regress.FooSubobject) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page index bc94a277..e66d4932 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.get_name.page @@ -20,7 +20,7 @@ - FooObject.get_name + Regress.FooObject.get_name @accepts(Regress.FooObject) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page index 260c8dde..e171f820 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.handle_glyph.page @@ -24,7 +24,7 @@ - FooObject.handle_glyph + Regress.FooObject.handle_glyph @accepts(Regress.FooObject, Utility.Glyph) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page index 86788025..1781562f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.is_it_time_yet.page @@ -24,7 +24,7 @@ - FooObject.is_it_time_yet + Regress.FooObject.is_it_time_yet @accepts(Regress.FooObject, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page index 1dc774f8..88dee520 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.read.page @@ -28,7 +28,7 @@ - FooObject.read + Regress.FooObject.read @accepts(Regress.FooObject, int, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page index ab006514..c652a104 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.static_meth.page @@ -16,7 +16,7 @@ - FooObject.static_meth + Regress.FooObject.static_meth @returns(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page index 456f9cc0..efdc5c45 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.various.page @@ -28,7 +28,7 @@ - FooObject.various + Regress.FooObject.various @accepts(Regress.FooObject, gpointer, GType) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page index 60b38154..f4920bed 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooObject.virtual_method.page @@ -24,7 +24,7 @@ - FooObject.virtual_method + Regress.FooObject.virtual_method @accepts(Regress.FooObject, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page index 1a05ace0..fe924f40 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooRectangle.add.page @@ -24,7 +24,7 @@ - FooRectangle.add + Regress.FooRectangle.add @accepts(Regress.FooRectangle, Regress.FooRectangle) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page index 0e159413..1ecac0d2 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_bar.page @@ -20,7 +20,7 @@ - FooSubInterface.do_bar + Regress.FooSubInterface.do_bar @accepts(Regress.FooSubInterface) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page index f5fcb437..071fb0d5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooSubInterface.do_baz.page @@ -28,7 +28,7 @@ - FooSubInterface.do_baz + Regress.FooSubInterface.do_baz @accepts(Regress.FooSubInterface, GObject.Callback, gpointer) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page index 85e76394..6e69b52e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.copy.page @@ -20,7 +20,7 @@ - TestBoxed.copy + Regress.TestBoxed.copy @accepts(Regress.TestBoxed) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page index 9fe30619..b4e88aaf 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxed.equals.page @@ -24,7 +24,7 @@ - TestBoxed.equals + Regress.TestBoxed.equals @accepts(Regress.TestBoxed, Regress.TestBoxed) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page index e2b38f8e..2629154a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedB.copy.page @@ -20,7 +20,7 @@ - TestBoxedB.copy + Regress.TestBoxedB.copy @accepts(Regress.TestBoxedB) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page index e350d80e..9910236c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.copy.page @@ -20,7 +20,7 @@ - TestBoxedD.copy + Regress.TestBoxedD.copy @accepts(Regress.TestBoxedD) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page index d083007e..9750cc3f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.free.page @@ -20,7 +20,7 @@ - TestBoxedD.free + Regress.TestBoxedD.free @accepts(Regress.TestBoxedD) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page index ea1ac4fd..f050eb66 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedD.get_magic.page @@ -20,7 +20,7 @@ - TestBoxedD.get_magic + Regress.TestBoxedD.get_magic @accepts(Regress.TestBoxedD) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page index af12914b..ed3159d0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.ref.page @@ -20,7 +20,7 @@ - TestFundamentalObject.ref + Regress.TestFundamentalObject.ref @accepts(Regress.TestFundamentalObject) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page index 90e7e881..1ecf6c1e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestFundamentalObject.unref.page @@ -20,7 +20,7 @@ - TestFundamentalObject.unref + Regress.TestFundamentalObject.unref @accepts(Regress.TestFundamentalObject) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page index 2d8d0b61..1cfcfdcb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo.page @@ -24,7 +24,7 @@ - TestInheritDrawable.do_foo + Regress.TestInheritDrawable.do_foo @accepts(Regress.TestInheritDrawable, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page index 4524842d..e00b489c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.do_foo_maybe_throw.page @@ -24,7 +24,7 @@ - TestInheritDrawable.do_foo_maybe_throw + Regress.TestInheritDrawable.do_foo_maybe_throw @accepts(Regress.TestInheritDrawable, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page index 983cb507..357d0694 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_origin.page @@ -28,7 +28,7 @@ - TestInheritDrawable.get_origin + Regress.TestInheritDrawable.get_origin @accepts(Regress.TestInheritDrawable, int, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page index 09b0559b..3bbdfed1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestInheritDrawable.get_size.page @@ -28,7 +28,7 @@ - TestInheritDrawable.get_size + Regress.TestInheritDrawable.get_size @accepts(Regress.TestInheritDrawable, int, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page index 31e6b146..07eaa505 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.do_matrix.page @@ -24,7 +24,7 @@ - TestObj.do_matrix + Regress.TestObj.do_matrix @accepts(Regress.TestObj, unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page index 3871f1f2..065d7456 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_foreign_struct.page @@ -20,7 +20,7 @@ - TestObj.emit_sig_with_foreign_struct + Regress.TestObj.emit_sig_with_foreign_struct @accepts(Regress.TestObj) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page index 5c607d18..fb0679af 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_int64.page @@ -20,7 +20,7 @@ - TestObj.emit_sig_with_int64 + Regress.TestObj.emit_sig_with_int64 @accepts(Regress.TestObj) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page index 675aba97..25154985 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_obj.page @@ -20,7 +20,7 @@ - TestObj.emit_sig_with_obj + Regress.TestObj.emit_sig_with_obj @accepts(Regress.TestObj) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page index a6ad4b17..34fbfe39 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.emit_sig_with_uint64.page @@ -20,7 +20,7 @@ - TestObj.emit_sig_with_uint64 + Regress.TestObj.emit_sig_with_uint64 @accepts(Regress.TestObj) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page index 90bedec3..e4770525 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.forced_method.page @@ -20,7 +20,7 @@ - TestObj.forced_method + Regress.TestObj.forced_method @accepts(Regress.TestObj) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page index ec94048c..58c58e31 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method.page @@ -20,7 +20,7 @@ - TestObj.instance_method + Regress.TestObj.instance_method @accepts(Regress.TestObj) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page index aa015c53..d491fa61 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.instance_method_callback.page @@ -24,7 +24,7 @@ - TestObj.instance_method_callback + Regress.TestObj.instance_method_callback @accepts(Regress.TestObj, Regress.TestCallback) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page index 75381509..a1c06605 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.null_out.page @@ -20,7 +20,7 @@ - TestObj.null_out + Regress.TestObj.null_out @accepts(Regress.TestObj) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page index bbd16fe1..63acc894 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.set_bare.page @@ -24,7 +24,7 @@ - TestObj.set_bare + Regress.TestObj.set_bare @accepts(Regress.TestObj, GObject.Object) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page index d2eea266..3d32ba0b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_inout_param.page @@ -48,7 +48,7 @@ - TestObj.skip_inout_param + Regress.TestObj.skip_inout_param @accepts(Regress.TestObj, int, int, float, int, int, int, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page index 2a13be92..58c5268b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_out_param.page @@ -48,7 +48,7 @@ - TestObj.skip_out_param + Regress.TestObj.skip_out_param @accepts(Regress.TestObj, int, int, float, int, int, int, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page index 0a900ee7..c02f3b95 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_param.page @@ -48,7 +48,7 @@ - TestObj.skip_param + Regress.TestObj.skip_param @accepts(Regress.TestObj, int, int, float, int, int, int, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page index b4ae4584..2aadb427 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val.page @@ -48,7 +48,7 @@ - TestObj.skip_return_val + Regress.TestObj.skip_return_val @accepts(Regress.TestObj, int, int, float, int, int, int, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page index 1c10cea0..f0c50f5f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.skip_return_val_no_out.page @@ -24,7 +24,7 @@ - TestObj.skip_return_val_no_out + Regress.TestObj.skip_return_val_no_out @accepts(Regress.TestObj, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page index 6896d2ef..67510263 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method.page @@ -20,7 +20,7 @@ - TestObj.static_method + Regress.TestObj.static_method @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page index 32fe8e54..4d97f31f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.static_method_callback.page @@ -20,7 +20,7 @@ - TestObj.static_method_callback + Regress.TestObj.static_method_callback @accepts(Regress.TestCallback) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page index 9ad27108..4cc806d4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_0.page @@ -44,7 +44,7 @@ - TestObj.torture_signature_0 + Regress.TestObj.torture_signature_0 @accepts(Regress.TestObj, int, float, int, unicode, int, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page index 0313a70d..7ccc1327 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj.torture_signature_1.page @@ -44,7 +44,7 @@ - TestObj.torture_signature_1 + Regress.TestObj.torture_signature_1 @accepts(Regress.TestObj, int, float, int, unicode, int, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page index 10789f27..499a0475 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.const_return.page @@ -16,7 +16,7 @@ - TestSimpleBoxedA.const_return + Regress.TestSimpleBoxedA.const_return @returns(Regress.TestSimpleBoxedA) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page index 5e191991..5e3fc24d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.copy.page @@ -20,7 +20,7 @@ - TestSimpleBoxedA.copy + Regress.TestSimpleBoxedA.copy @accepts(Regress.TestSimpleBoxedA) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page index 426bd98b..a9ae5b2f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedA.equals.page @@ -24,7 +24,7 @@ - TestSimpleBoxedA.equals + Regress.TestSimpleBoxedA.equals @accepts(Regress.TestSimpleBoxedA, Regress.TestSimpleBoxedA) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page index 95950d77..999c8500 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSimpleBoxedB.copy.page @@ -20,7 +20,7 @@ - TestSimpleBoxedB.copy + Regress.TestSimpleBoxedB.copy @accepts(Regress.TestSimpleBoxedB) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page index ee47fb3e..cb2ea92f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.clone.page @@ -24,7 +24,7 @@ - TestStructA.clone + Regress.TestStructA.clone @accepts(Regress.TestStructA, Regress.TestStructA) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page index e557650d..bfd3189d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructA.parse.page @@ -24,7 +24,7 @@ - TestStructA.parse + Regress.TestStructA.parse @accepts(Regress.TestStructA, unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page index 4abe66bc..ea78efdb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructB.clone.page @@ -24,7 +24,7 @@ - TestStructB.clone + Regress.TestStructB.clone @accepts(Regress.TestStructB, Regress.TestStructB) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page index 427eef38..8f9e2888 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestStructFixedArray.frob.page @@ -20,7 +20,7 @@ - TestStructFixedArray.frob + Regress.TestStructFixedArray.frob @accepts(Regress.TestStructFixedArray) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page index 878b4058..9806d282 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.instance_method.page @@ -20,7 +20,7 @@ - TestSubObj.instance_method + Regress.TestSubObj.instance_method @accepts(Regress.TestSubObj) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page index 67a98067..2b548390 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestSubObj.unset_bare.page @@ -20,7 +20,7 @@ - TestSubObj.unset_bare + Regress.TestSubObj.unset_bare @accepts(Regress.TestSubObj) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page index e9431c76..cd83b9da 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.get_testbool.page @@ -20,7 +20,7 @@ - TestWi8021x.get_testbool + Regress.TestWi8021x.get_testbool @accepts(Regress.TestWi8021x) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page index d5afdb62..59dbbd94 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.set_testbool.page @@ -24,7 +24,7 @@ - TestWi8021x.set_testbool + Regress.TestWi8021x.set_testbool @accepts(Regress.TestWi8021x, bool) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page index be2afb92..d2d83e36 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestWi8021x.static_method.page @@ -20,7 +20,7 @@ - TestWi8021x.static_method + Regress.TestWi8021x.static_method @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page b/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page index 6b9f2789..e210a976 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.aliased_caller_alloc.page @@ -20,7 +20,7 @@ - Regress.aliased_caller_alloc + Index.aliased_caller_alloc @accepts(Regress.AliasedTestBoxed) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page index e636e2d2..edee18bf 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_attribute_func.page @@ -24,7 +24,7 @@ - Regress.annotation_attribute_func + Index.annotation_attribute_func @accepts(Regress.AnnotationObject, unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page index fb428b2c..7afb97ce 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page @@ -28,7 +28,7 @@ - Regress.annotation_custom_destroy + Index.annotation_custom_destroy @accepts(Regress.AnnotationCallback, Regress.AnnotationNotifyFunc, gpointer) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page index e8b0ac5e..51a2ce47 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_get_source_file.page @@ -16,7 +16,7 @@ - Regress.annotation_get_source_file + Index.annotation_get_source_file @returns(filename) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page index c94076ab..16c7ebd8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_init.page @@ -24,7 +24,7 @@ - Regress.annotation_init + Index.annotation_init @accepts(int, [unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page index 038bb47e..58701043 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_invalid_regress_annotation.page @@ -20,7 +20,7 @@ - Regress.annotation_invalid_regress_annotation + Index.annotation_invalid_regress_annotation @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page index daf47ffa..62cfbf7b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_ptr_array.page @@ -20,7 +20,7 @@ - Regress.annotation_ptr_array + Index.annotation_ptr_array @accepts([GObject.Value]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page index c2a7371f..fa1908d1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_array.page @@ -20,7 +20,7 @@ - Regress.annotation_return_array + Index.annotation_return_array @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page index a5a8fa0c..4cbc4dbe 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_return_filename.page @@ -16,7 +16,7 @@ - Regress.annotation_return_filename + Index.annotation_return_filename @returns(filename) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page index 4dd41fcb..6eb6e853 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_set_source_file.page @@ -20,7 +20,7 @@ - Regress.annotation_set_source_file + Index.annotation_set_source_file @accepts(filename) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page index 69351e90..00154848 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_space_after_comment_bug631690.page @@ -16,7 +16,7 @@ - Regress.annotation_space_after_comment_bug631690 + Index.annotation_space_after_comment_bug631690 @returns(none) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page index ca6241dd..c7d24096 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_array_length.page @@ -24,7 +24,7 @@ - Regress.annotation_string_array_length + Index.annotation_string_array_length @accepts(int, [unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page index 33ad8d1e..765658c0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated.page @@ -16,7 +16,7 @@ - Regress.annotation_string_zero_terminated + Index.annotation_string_zero_terminated @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page index 008b4cdd..1a9e2a42 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_string_zero_terminated_out.page @@ -20,7 +20,7 @@ - Regress.annotation_string_zero_terminated_out + Index.annotation_string_zero_terminated_out @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page index f3243ec7..868c2d84 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_test_parsing_bug630862.page @@ -16,7 +16,7 @@ - Regress.annotation_test_parsing_bug630862 + Index.annotation_test_parsing_bug630862 @returns(GObject.Object) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page index 0e19f1f8..223d1a2b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_transfer_floating.page @@ -16,7 +16,7 @@ - Regress.annotation_transfer_floating + Index.annotation_transfer_floating @returns(GObject.Object) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page index 5ca4dbba..51d53cd8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_versioned.page @@ -16,7 +16,7 @@ - Regress.annotation_versioned + Index.annotation_versioned @returns(none) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page index 477e9856..9adb4a8b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.atest_error_quark.page @@ -16,7 +16,7 @@ - Regress.atest_error_quark + Index.atest_error_quark @returns(GLib.Quark) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page index 399187ed..b2c0a69a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_async_ready_callback.page @@ -28,7 +28,7 @@ - Regress.foo_async_ready_callback + Index.foo_async_ready_callback @accepts(Gio.Cancellable, Gio.AsyncReadyCallback, gpointer) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page index 3b9ccb9a..873beb20 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_destroy_notify_callback.page @@ -28,7 +28,7 @@ - Regress.foo_destroy_notify_callback + Index.foo_destroy_notify_callback @accepts(Regress.FooCallback, gpointer, GLib.DestroyNotify) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page index 6195fbc7..6b62ac46 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_init.page @@ -16,7 +16,7 @@ - Regress.foo_init + Index.foo_init @returns(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page index 9095b088..4be81792 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_method_external_references.page @@ -32,7 +32,7 @@ - Regress.foo_method_external_references + Index.foo_method_external_references @accepts(Utility.Object, Utility.EnumType, Utility.FlagType, Utility.Struct) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page index 9df41fac..0f9ba11a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_not_a_constructor_new.page @@ -16,7 +16,7 @@ - Regress.foo_not_a_constructor_new + Index.foo_not_a_constructor_new @returns(Regress.FooObject) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page index 8feb21f4..d8cdbf50 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_array.page @@ -16,7 +16,7 @@ - Regress.foo_test_array + Index.foo_test_array @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page index e16a8dd2..fa7bc2e8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_param.page @@ -20,7 +20,7 @@ - Regress.foo_test_const_char_param + Index.foo_test_const_char_param @accepts(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page index b5c34125..34ae3f9c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_char_retval.page @@ -16,7 +16,7 @@ - Regress.foo_test_const_char_retval + Index.foo_test_const_char_retval @returns(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page index e37243af..f32ff39e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_param.page @@ -20,7 +20,7 @@ - Regress.foo_test_const_struct_param + Index.foo_test_const_struct_param @accepts(Regress.FooStruct) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page index 2f820a94..24337f06 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_const_struct_retval.page @@ -16,7 +16,7 @@ - Regress.foo_test_const_struct_retval + Index.foo_test_const_struct_retval @returns(Regress.FooStruct) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page index 68ff1b46..8e242c5a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array.page @@ -20,7 +20,7 @@ - Regress.foo_test_string_array + Index.foo_test_string_array @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page index f5d18848..92752bf4 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_string_array_with_g.page @@ -20,7 +20,7 @@ - Regress.foo_test_string_array_with_g + Index.foo_test_string_array_with_g @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page index ed8bb964..2006eaef 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_qualifier.page @@ -20,7 +20,7 @@ - Regress.foo_test_unsigned_qualifier + Index.foo_test_unsigned_qualifier @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page index 0fe4bec8..c32efe88 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.foo_test_unsigned_type.page @@ -20,7 +20,7 @@ - Regress.foo_test_unsigned_type + Index.foo_test_unsigned_type @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page index 5b968832..1e737c0f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.func_obj_null_in.page @@ -20,7 +20,7 @@ - Regress.func_obj_null_in + Index.func_obj_null_in @accepts(Regress.TestObj) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page index e5c60beb..825fe351 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.global_get_flags_out.page @@ -20,7 +20,7 @@ - Regress.global_get_flags_out + Index.global_get_flags_out @accepts(Regress.TestFlags) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page b/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page index 9d7992d6..51ae15f7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.has_parameter_named_attrs.page @@ -24,7 +24,7 @@ - Regress.has_parameter_named_attrs + Index.has_parameter_named_attrs @accepts(int, [guint32]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page b/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page index c024ff89..9fc5a47c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.introspectable_via_alias.page @@ -20,7 +20,7 @@ - Regress.introspectable_via_alias + Index.introspectable_via_alias @accepts(Regress.PtrArrayAlias) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page b/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page index ad326337..ad81bff0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.set_abort_on_error.page @@ -20,7 +20,7 @@ - Regress.set_abort_on_error + Index.set_abort_on_error @accepts(bool) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page index 4da29a86..536a02cd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_callback.page @@ -20,7 +20,7 @@ - Regress.test_array_callback + Index.test_array_callback @accepts(Regress.TestCallbackArray) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page index e2d84b81..26ddf0ca 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_out_objects.page @@ -20,7 +20,7 @@ - Regress.test_array_fixed_out_objects + Index.test_array_fixed_out_objects @accepts([Regress.TestObj]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page index 60ad1826..eb816b81 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_in.page @@ -20,7 +20,7 @@ - Regress.test_array_fixed_size_int_in + Index.test_array_fixed_size_int_in @accepts([int]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page index 3c6afc47..39db1de3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_out.page @@ -20,7 +20,7 @@ - Regress.test_array_fixed_size_int_out + Index.test_array_fixed_size_int_out @accepts([int]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page index 0df5ae57..30cfee8d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_fixed_size_int_return.page @@ -16,7 +16,7 @@ - Regress.test_array_fixed_size_int_return + Index.test_array_fixed_size_int_return @returns([int]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page index e033affb..62c1c4c5 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint16_in.page @@ -24,7 +24,7 @@ - Regress.test_array_gint16_in + Index.test_array_gint16_in @accepts(int, [gint16]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page index 5a696b9a..948b271b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint32_in.page @@ -24,7 +24,7 @@ - Regress.test_array_gint32_in + Index.test_array_gint32_in @accepts(int, [gint32]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page index dafee3c2..6756e0d0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint64_in.page @@ -24,7 +24,7 @@ - Regress.test_array_gint64_in + Index.test_array_gint64_in @accepts(int, [int]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page index 40b38b28..a7d70018 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gint8_in.page @@ -24,7 +24,7 @@ - Regress.test_array_gint8_in + Index.test_array_gint8_in @accepts(int, [gint8]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page index 9cfb531a..e56b5223 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_gtype_in.page @@ -24,7 +24,7 @@ - Regress.test_array_gtype_in + Index.test_array_gtype_in @accepts(int, [GType]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page index 4b2c4fa3..42cbb0f8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_full_out.page @@ -20,7 +20,7 @@ - Regress.test_array_int_full_out + Index.test_array_int_full_out @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page index 879821bb..8e706e8f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_in.page @@ -24,7 +24,7 @@ - Regress.test_array_int_in + Index.test_array_int_in @accepts(int, [int]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page index 193d2f37..b3f4448b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_inout.page @@ -24,7 +24,7 @@ - Regress.test_array_int_inout + Index.test_array_int_inout @accepts(int, [int]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page index 745bbe75..21e5bac0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_none_out.page @@ -20,7 +20,7 @@ - Regress.test_array_int_none_out + Index.test_array_int_none_out @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page index 194ecb52..9b3fc8b0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_in.page @@ -24,7 +24,7 @@ - Regress.test_array_int_null_in + Index.test_array_int_null_in @accepts([int], int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page index 6ee35174..5b83b30a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_null_out.page @@ -24,7 +24,7 @@ - Regress.test_array_int_null_out + Index.test_array_int_null_out @accepts([int], int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page index 30eaea97..b8f44411 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_array_int_out.page @@ -24,7 +24,7 @@ - Regress.test_array_int_out + Index.test_array_int_out @accepts(int, [int]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page index 4b2459ee..1dcf46cd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_async_ready_callback.page @@ -20,7 +20,7 @@ - Regress.test_async_ready_callback + Index.test_async_ready_callback @accepts(Gio.AsyncReadyCallback) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page index 293e35b5..22d2ebfa 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean.page @@ -20,7 +20,7 @@ - Regress.test_boolean + Index.test_boolean @accepts(bool) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page index ee763269..877f5820 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_false.page @@ -20,7 +20,7 @@ - Regress.test_boolean_false + Index.test_boolean_false @accepts(bool) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page index c233d794..3a1fc20a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boolean_true.page @@ -20,7 +20,7 @@ - Regress.test_boolean_true + Index.test_boolean_true @accepts(bool) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page index b749fa49..4bf83f02 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_full_return.page @@ -16,7 +16,7 @@ - Regress.test_cairo_context_full_return + Index.test_cairo_context_full_return @returns(cairo.Context) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page index 8b36aac4..a30b8d27 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_context_none_in.page @@ -20,7 +20,7 @@ - Regress.test_cairo_context_none_in + Index.test_cairo_context_none_in @accepts(cairo.Context) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page index 4e8a6366..cfda6fdf 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_out.page @@ -20,7 +20,7 @@ - Regress.test_cairo_surface_full_out + Index.test_cairo_surface_full_out @accepts(cairo.Surface) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page index a8557047..5de20a93 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_full_return.page @@ -16,7 +16,7 @@ - Regress.test_cairo_surface_full_return + Index.test_cairo_surface_full_return @returns(cairo.Surface) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page index 0d7e20b2..af1b9489 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_in.page @@ -20,7 +20,7 @@ - Regress.test_cairo_surface_none_in + Index.test_cairo_surface_none_in @accepts(cairo.Surface) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page index de92a087..98fa6eba 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_cairo_surface_none_return.page @@ -16,7 +16,7 @@ - Regress.test_cairo_surface_none_return + Index.test_cairo_surface_none_return @returns(cairo.Surface) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page index d5074fab..3481fc13 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback.page @@ -20,7 +20,7 @@ - Regress.test_callback + Index.test_callback @accepts(Regress.TestCallback) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page index cbf04b83..21dc7ee7 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_async.page @@ -24,7 +24,7 @@ - Regress.test_callback_async + Index.test_callback_async @accepts(Regress.TestCallbackUserData, gpointer) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page index 5452fbf9..86df7941 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify.page @@ -28,7 +28,7 @@ - Regress.test_callback_destroy_notify + Index.test_callback_destroy_notify @accepts(Regress.TestCallbackUserData, gpointer, GLib.DestroyNotify) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page index 11899cc0..05883e8c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_destroy_notify_no_user_data.page @@ -24,7 +24,7 @@ - Regress.test_callback_destroy_notify_no_user_data + Index.test_callback_destroy_notify_no_user_data @accepts(Regress.TestCallbackUserData, GLib.DestroyNotify) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page index 6280f9f7..d362cb86 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_async.page @@ -16,7 +16,7 @@ - Regress.test_callback_thaw_async + Index.test_callback_thaw_async @returns(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page index cae6c5e4..485e69b8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_thaw_notifications.page @@ -16,7 +16,7 @@ - Regress.test_callback_thaw_notifications + Index.test_callback_thaw_notifications @returns(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page index 69cff3a7..8ec83767 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_callback_user_data.page @@ -24,7 +24,7 @@ - Regress.test_callback_user_data + Index.test_callback_user_data @accepts(Regress.TestCallbackUserData, gpointer) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page index 20db07c6..d11a8a08 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure.page @@ -20,7 +20,7 @@ - Regress.test_closure + Index.test_closure @accepts(GObject.Closure) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page index 7f35412b..f8d91f13 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_one_arg.page @@ -24,7 +24,7 @@ - Regress.test_closure_one_arg + Index.test_closure_one_arg @accepts(GObject.Closure, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page index dae0cc0f..7d6a1ac3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_closure_variant.page @@ -24,7 +24,7 @@ - Regress.test_closure_variant + Index.test_closure_variant @accepts(GObject.Closure, GLib.Variant) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page index 13940184..04289860 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_date_in_gvalue.page @@ -16,7 +16,7 @@ - Regress.test_date_in_gvalue + Index.test_date_in_gvalue @returns(GObject.Value) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page index e9200597..95f40e3c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_def_error_quark.page @@ -16,7 +16,7 @@ - Regress.test_def_error_quark + Index.test_def_error_quark @returns(GLib.Quark) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page index 0f75857f..9a2b7866 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_double.page @@ -20,7 +20,7 @@ - Regress.test_double + Index.test_double @accepts(float) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page index 82b5e5f5..d267b55a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_filename_return.page @@ -16,7 +16,7 @@ - Regress.test_filename_return + Index.test_filename_return @returns([filename]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page index f63d37c0..9d362f8d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_float.page @@ -20,7 +20,7 @@ - Regress.test_float + Index.test_float @accepts(float) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page index 86993b80..43990b2c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_container_return.page @@ -16,7 +16,7 @@ - Regress.test_garray_container_return + Index.test_garray_container_return @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page index 162ca60b..f0bfb6d3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_garray_full_return.page @@ -16,7 +16,7 @@ - Regress.test_garray_full_return + Index.test_garray_full_return @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page index e68a8bb4..5630526c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gerror_callback.page @@ -20,7 +20,7 @@ - Regress.test_gerror_callback + Index.test_gerror_callback @accepts(Regress.TestCallbackGError) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page index 6558c1de..ec91c452 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_container_return.page @@ -16,7 +16,7 @@ - Regress.test_ghash_container_return + Index.test_ghash_container_return @returns({unicode: unicode}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page index 9df7b861..5356c011 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_everything_return.page @@ -16,7 +16,7 @@ - Regress.test_ghash_everything_return + Index.test_ghash_everything_return @returns({unicode: unicode}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page index d6c319cf..5bbde33c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_in.page @@ -20,7 +20,7 @@ - Regress.test_ghash_gvalue_in + Index.test_ghash_gvalue_in @accepts({unicode: GObject.Value}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page index 51143d3e..6d6a257f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_gvalue_return.page @@ -16,7 +16,7 @@ - Regress.test_ghash_gvalue_return + Index.test_ghash_gvalue_return @returns({unicode: GObject.Value}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page index c8c9cd2d..6bc643fb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return.page @@ -16,7 +16,7 @@ - Regress.test_ghash_nested_everything_return + Index.test_ghash_nested_everything_return @returns({unicode: {unicode: unicode}}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page index 932fd800..1cb34424 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nested_everything_return2.page @@ -16,7 +16,7 @@ - Regress.test_ghash_nested_everything_return2 + Index.test_ghash_nested_everything_return2 @returns({unicode: {unicode: unicode}}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page index 44408900..b1d295cf 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in.page @@ -20,7 +20,7 @@ - Regress.test_ghash_nothing_in + Index.test_ghash_nothing_in @accepts({unicode: unicode}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page index 9d656091..df58bb6d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_in2.page @@ -20,7 +20,7 @@ - Regress.test_ghash_nothing_in2 + Index.test_ghash_nothing_in2 @accepts({unicode: unicode}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page index 31983aa0..072fed9b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return.page @@ -16,7 +16,7 @@ - Regress.test_ghash_nothing_return + Index.test_ghash_nothing_return @returns({unicode: unicode}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page index 17d7dd82..161d3f62 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_nothing_return2.page @@ -16,7 +16,7 @@ - Regress.test_ghash_nothing_return2 + Index.test_ghash_nothing_return2 @returns({unicode: unicode}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page index 9488fd83..ee3ed32e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_in.page @@ -20,7 +20,7 @@ - Regress.test_ghash_null_in + Index.test_ghash_null_in @accepts({unicode: unicode}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page index 4ee31ff8..683efc41 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_out.page @@ -20,7 +20,7 @@ - Regress.test_ghash_null_out + Index.test_ghash_null_out @accepts({unicode: unicode}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page index d9d1050a..ea516226 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ghash_null_return.page @@ -16,7 +16,7 @@ - Regress.test_ghash_null_return + Index.test_ghash_null_return @returns({unicode: unicode}) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page index 069ece74..9d098baa 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_container_return.page @@ -16,7 +16,7 @@ - Regress.test_glist_container_return + Index.test_glist_container_return @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page index f0a80ed0..6b2d3704 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_everything_return.page @@ -16,7 +16,7 @@ - Regress.test_glist_everything_return + Index.test_glist_everything_return @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page index 42f5a251..4873a198 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in.page @@ -20,7 +20,7 @@ - Regress.test_glist_nothing_in + Index.test_glist_nothing_in @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page index b17e2a6d..e28d3a89 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_in2.page @@ -20,7 +20,7 @@ - Regress.test_glist_nothing_in2 + Index.test_glist_nothing_in2 @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page index 9c41b074..b4b12c81 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return.page @@ -16,7 +16,7 @@ - Regress.test_glist_nothing_return + Index.test_glist_nothing_return @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page index f12e8447..aab83e50 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_nothing_return2.page @@ -16,7 +16,7 @@ - Regress.test_glist_nothing_return2 + Index.test_glist_nothing_return2 @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page index 92cb7123..ac3f3d62 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_in.page @@ -20,7 +20,7 @@ - Regress.test_glist_null_in + Index.test_glist_null_in @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page index 0bac2640..335d1b21 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_glist_null_out.page @@ -20,7 +20,7 @@ - Regress.test_glist_null_out + Index.test_glist_null_out @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page index 60ffdfd6..702c635c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_container_return.page @@ -16,7 +16,7 @@ - Regress.test_gslist_container_return + Index.test_gslist_container_return @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page index f73e1138..95fd40c8 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_everything_return.page @@ -16,7 +16,7 @@ - Regress.test_gslist_everything_return + Index.test_gslist_everything_return @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page index 897923c5..534ac13e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in.page @@ -20,7 +20,7 @@ - Regress.test_gslist_nothing_in + Index.test_gslist_nothing_in @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page index 15e85772..a7e0635b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_in2.page @@ -20,7 +20,7 @@ - Regress.test_gslist_nothing_in2 + Index.test_gslist_nothing_in2 @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page index 231450ad..ff7d7e56 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return.page @@ -16,7 +16,7 @@ - Regress.test_gslist_nothing_return + Index.test_gslist_nothing_return @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page index 1384052c..cf0f67ab 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_nothing_return2.page @@ -16,7 +16,7 @@ - Regress.test_gslist_nothing_return2 + Index.test_gslist_nothing_return2 @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page index f36bb53c..b0174663 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_in.page @@ -20,7 +20,7 @@ - Regress.test_gslist_null_in + Index.test_gslist_null_in @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page index 7df7b1ef..24ef27f1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gslist_null_out.page @@ -20,7 +20,7 @@ - Regress.test_gslist_null_out + Index.test_gslist_null_out @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page index 45f4f8b7..38ffb442 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gtype.page @@ -20,7 +20,7 @@ - Regress.test_gtype + Index.test_gtype @accepts(GType) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page index e77d4163..f4c4cd80 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_as.page @@ -16,7 +16,7 @@ - Regress.test_gvariant_as + Index.test_gvariant_as @returns(GLib.Variant) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page index 73d31507..8357191f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_asv.page @@ -16,7 +16,7 @@ - Regress.test_gvariant_asv + Index.test_gvariant_asv @returns(GLib.Variant) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page index c9a05dff..c0db4608 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_i.page @@ -16,7 +16,7 @@ - Regress.test_gvariant_i + Index.test_gvariant_i @returns(GLib.Variant) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page index 939a9aaa..454fc8a9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_s.page @@ -16,7 +16,7 @@ - Regress.test_gvariant_s + Index.test_gvariant_s @returns(GLib.Variant) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page index b5dded4d..e8a6c00f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_gvariant_v.page @@ -16,7 +16,7 @@ - Regress.test_gvariant_v + Index.test_gvariant_v @returns(GLib.Variant) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page index bd58b7c9..2f8ebcb6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_hash_table_callback.page @@ -24,7 +24,7 @@ - Regress.test_hash_table_callback + Index.test_hash_table_callback @accepts({unicode: int}, Regress.TestCallbackHashtable) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page index 60308472..d0398835 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int.page @@ -20,7 +20,7 @@ - Regress.test_int + Index.test_int @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page index 709d8c88..7e995172 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int16.page @@ -20,7 +20,7 @@ - Regress.test_int16 + Index.test_int16 @accepts(gint16) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page index 564bda3d..03e5c07c 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int32.page @@ -20,7 +20,7 @@ - Regress.test_int32 + Index.test_int32 @accepts(gint32) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page index aed6695e..645792cf 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int64.page @@ -20,7 +20,7 @@ - Regress.test_int64 + Index.test_int64 @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page index 3de4c454..c733d1bd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int8.page @@ -20,7 +20,7 @@ - Regress.test_int8 + Index.test_int8 @accepts(gint8) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page index 7de63061..f43f0bce 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_out_utf8.page @@ -24,7 +24,7 @@ - Regress.test_int_out_utf8 + Index.test_int_out_utf8 @accepts(int, unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page index a7c20bc1..d7210b5e 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_int_value_arg.page @@ -20,7 +20,7 @@ - Regress.test_int_value_arg + Index.test_int_value_arg @accepts(GObject.Value) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page index 001afa10..147cae22 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_long.page @@ -20,7 +20,7 @@ - Regress.test_long + Index.test_long @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page index c7dac3f1..c195b821 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_callback.page @@ -20,7 +20,7 @@ - Regress.test_multi_callback + Index.test_multi_callback @accepts(Regress.TestCallback) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page index 97978203..7946d576 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multi_double_args.page @@ -28,7 +28,7 @@ - Regress.test_multi_double_args + Index.test_multi_double_args @accepts(float, float, float) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page index fbae0d2d..25161388 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_multiline_doc_comments.page @@ -16,7 +16,7 @@ - Regress.test_multiline_doc_comments + Index.test_multiline_doc_comments @returns(none) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page index 79ad6018..98c1fd3b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_nested_parameter.page @@ -20,7 +20,7 @@ - Regress.test_nested_parameter + Index.test_nested_parameter @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page index 8f038dcc..cdb1b928 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_null_gerror_callback.page @@ -20,7 +20,7 @@ - Regress.test_null_gerror_callback + Index.test_null_gerror_callback @accepts(Regress.TestCallbackGError) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page index 32a64eb6..f33b39ed 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_owned_gerror_callback.page @@ -20,7 +20,7 @@ - Regress.test_owned_gerror_callback + Index.test_owned_gerror_callback @accepts(Regress.TestCallbackOwnedGError) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page index ebd556aa..e2f45632 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_short.page @@ -20,7 +20,7 @@ - Regress.test_short + Index.test_short @accepts(gshort) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page index 44ff654e..a9fa29c0 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_simple_callback.page @@ -20,7 +20,7 @@ - Regress.test_simple_callback + Index.test_simple_callback @accepts(Regress.TestSimpleCallback) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page index 9d5ef2fe..7935c215 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_size.page @@ -20,7 +20,7 @@ - Regress.test_size + Index.test_size @accepts(gsize) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page index 1aa8869c..47fe2cd3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ssize.page @@ -20,7 +20,7 @@ - Regress.test_ssize + Index.test_ssize @accepts(gssize) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page index 5b605e33..1121a7da 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in.page @@ -20,7 +20,7 @@ - Regress.test_strv_in + Index.test_strv_in @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page index 27538af0..fcffe1bb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_in_gvalue.page @@ -16,7 +16,7 @@ - Regress.test_strv_in_gvalue + Index.test_strv_in_gvalue @returns(GObject.Value) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page index 42e007f4..eea084cb 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out.page @@ -16,7 +16,7 @@ - Regress.test_strv_out + Index.test_strv_out @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page index 42c1328d..c800fa0a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_c.page @@ -16,7 +16,7 @@ - Regress.test_strv_out_c + Index.test_strv_out_c @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page index 6b020cee..69f6c56f 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_out_container.page @@ -16,7 +16,7 @@ - Regress.test_strv_out_container + Index.test_strv_out_container @returns([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page index 5a788664..3624f8a9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_strv_outarg.page @@ -20,7 +20,7 @@ - Regress.test_strv_outarg + Index.test_strv_outarg @accepts([unicode]) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page index 9ce19296..51698280 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_timet.page @@ -20,7 +20,7 @@ - Regress.test_timet + Index.test_timet @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page index 4a54bb0d..7875a817 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_0.page @@ -40,7 +40,7 @@ - Regress.test_torture_signature_0 + Index.test_torture_signature_0 @accepts(int, float, int, unicode, int, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page index e3549dc4..6a499a56 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_1.page @@ -40,7 +40,7 @@ - Regress.test_torture_signature_1 + Index.test_torture_signature_1 @accepts(int, float, int, unicode, int, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page index b2f91328..01f77785 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_torture_signature_2.page @@ -52,7 +52,7 @@ - Regress.test_torture_signature_2 + Index.test_torture_signature_2 @accepts(int, Regress.TestCallbackUserData, gpointer, GLib.DestroyNotify, float, int, unicode, int, int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page index 6d91d532..f6943c0a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint.page @@ -20,7 +20,7 @@ - Regress.test_uint + Index.test_uint @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page index f10846c4..5ace288d 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint16.page @@ -20,7 +20,7 @@ - Regress.test_uint16 + Index.test_uint16 @accepts(guint16) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page index 142eb447..084d6192 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint32.page @@ -20,7 +20,7 @@ - Regress.test_uint32 + Index.test_uint32 @accepts(guint32) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page index 862fa15f..b2234a3a 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint64.page @@ -20,7 +20,7 @@ - Regress.test_uint64 + Index.test_uint64 @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page index a357d9c7..94e367b6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_uint8.page @@ -20,7 +20,7 @@ - Regress.test_uint8 + Index.test_uint8 @accepts(guint8) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page index 63d71619..dc98e475 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ulong.page @@ -20,7 +20,7 @@ - Regress.test_ulong + Index.test_ulong @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page index a7e7e66a..abc373ea 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unichar.page @@ -20,7 +20,7 @@ - Regress.test_unichar + Index.test_unichar @accepts(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page index a489d9a0..eb7ff64b 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_unsigned_enum_param.page @@ -20,7 +20,7 @@ - Regress.test_unsigned_enum_param + Index.test_unsigned_enum_param @accepts(Regress.TestEnumUnsigned) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page index 2f7832fa..4bebadc3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_ushort.page @@ -20,7 +20,7 @@ - Regress.test_ushort + Index.test_ushort @accepts(gushort) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page index 25f15b13..4d4ff1af 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_in.page @@ -20,7 +20,7 @@ - Regress.test_utf8_const_in + Index.test_utf8_const_in @accepts(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page index 6e1b935d..7149eac9 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_const_return.page @@ -16,7 +16,7 @@ - Regress.test_utf8_const_return + Index.test_utf8_const_return @returns(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page index efe32369..28ecfc27 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_inout.page @@ -20,7 +20,7 @@ - Regress.test_utf8_inout + Index.test_utf8_inout @accepts(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page index 39c10832..1d1be7dd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_nonconst_return.page @@ -16,7 +16,7 @@ - Regress.test_utf8_nonconst_return + Index.test_utf8_nonconst_return @returns(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page index db0e6143..8074cafd 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_in.page @@ -20,7 +20,7 @@ - Regress.test_utf8_null_in + Index.test_utf8_null_in @accepts(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page index ab07678f..da98d744 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_null_out.page @@ -20,7 +20,7 @@ - Regress.test_utf8_null_out + Index.test_utf8_null_out @accepts(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page index d6cf8fd3..3aa56f02 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out.page @@ -20,7 +20,7 @@ - Regress.test_utf8_out + Index.test_utf8_out @accepts(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page index 80d68185..0b775cc3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_nonconst_return.page @@ -20,7 +20,7 @@ - Regress.test_utf8_out_nonconst_return + Index.test_utf8_out_nonconst_return @accepts(unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page index 1e31cf4e..5a6bc2e6 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_utf8_out_out.page @@ -24,7 +24,7 @@ - Regress.test_utf8_out_out + Index.test_utf8_out_out @accepts(unicode, unicode) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page index 63d03da8..ef9f97e3 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_value_return.page @@ -20,7 +20,7 @@ - Regress.test_value_return + Index.test_value_return @accepts(int) diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page index 78a59f14..847a5c33 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_versioning.page @@ -16,7 +16,7 @@ - Regress.test_versioning + Index.test_versioning @returns(none) -- cgit v1.2.1 From a21f3238c8701f79f98486101123c6de01e439ea Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sat, 16 Feb 2013 00:38:37 -0500 Subject: sourcescanner: Remove unused "id" field https://bugzilla.gnome.org/show_bug.cgi?id=693939 --- giscanner/sourcescanner.h | 1 - 1 file changed, 1 deletion(-) diff --git a/giscanner/sourcescanner.h b/giscanner/sourcescanner.h index a2834caf..1c0a8b0b 100644 --- a/giscanner/sourcescanner.h +++ b/giscanner/sourcescanner.h @@ -120,7 +120,6 @@ struct _GISourceSymbol { int ref_count; GISourceSymbolType type; - int id; char *ident; GISourceType *base_type; gboolean const_int_set; -- cgit v1.2.1 From fa8e95cd172769c337a5945cfaa4f0aeb1d128ca Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sat, 16 Feb 2013 00:43:36 -0500 Subject: sourcescanner: Fix symbolic references in enum members We need to copy the source symbols, otherwise we'll overwrite their values. This isn't good. https://bugzilla.gnome.org/show_bug.cgi?id=693939 --- giscanner/scannerparser.y | 6 +++--- giscanner/sourcescanner.c | 20 ++++++++++++++++++++ giscanner/sourcescanner.h | 1 + tests/scanner/Regress-1.0-expected.gir | 29 ++++++++++++++--------------- tests/scanner/regress.h | 10 ++++++++++ 5 files changed, 48 insertions(+), 18 deletions(-) diff --git a/giscanner/scannerparser.y b/giscanner/scannerparser.y index 773e9612..3457b499 100644 --- a/giscanner/scannerparser.y +++ b/giscanner/scannerparser.y @@ -366,15 +366,15 @@ unary_expression $$ = $2; break; case UNARY_MINUS: - $$ = $2; + $$ = gi_source_symbol_copy ($2); $$->const_int = -$2->const_int; break; case UNARY_BITWISE_COMPLEMENT: - $$ = $2; + $$ = gi_source_symbol_copy ($2); $$->const_int = ~$2->const_int; break; case UNARY_LOGICAL_NEGATION: - $$ = $2; + $$ = gi_source_symbol_copy ($2); $$->const_int = !gi_source_symbol_get_const_boolean ($2); break; default: diff --git a/giscanner/sourcescanner.c b/giscanner/sourcescanner.c index 1b775b46..339bd897 100644 --- a/giscanner/sourcescanner.c +++ b/giscanner/sourcescanner.c @@ -44,6 +44,26 @@ ctype_free (GISourceType * type) g_slice_free (GISourceType, type); } +GISourceSymbol * +gi_source_symbol_copy (GISourceSymbol * symbol) +{ + GISourceSymbol *new_symbol = gi_source_symbol_new (symbol->type, + symbol->source_filename, + symbol->line); + new_symbol->ident = g_strdup (symbol->ident); + + if (symbol->base_type) + new_symbol->base_type = gi_source_type_copy (symbol->base_type); + if (symbol->const_int_set) + new_symbol->const_int = symbol->const_int; + else if (symbol->const_double_set) + new_symbol->const_double = symbol->const_double_set; + else if (symbol->const_string != NULL) + new_symbol->const_string = g_strdup (symbol->const_string); + + return new_symbol; +} + GISourceSymbol * gi_source_symbol_ref (GISourceSymbol * symbol) { diff --git a/giscanner/sourcescanner.h b/giscanner/sourcescanner.h index 1c0a8b0b..f67ae6bd 100644 --- a/giscanner/sourcescanner.h +++ b/giscanner/sourcescanner.h @@ -162,6 +162,7 @@ GISourceSymbol * gi_source_symbol_new (GISourceSymbolType type gboolean gi_source_symbol_get_const_boolean (GISourceSymbol *symbol); GISourceSymbol * gi_source_symbol_ref (GISourceSymbol *symbol); void gi_source_symbol_unref (GISourceSymbol *symbol); +GISourceSymbol * gi_source_symbol_copy (GISourceSymbol *symbol); /* Private */ void gi_source_scanner_add_symbol (GISourceScanner *scanner, diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 65628943..22c4b0db 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -1908,16 +1908,6 @@ exposed to language bindings. - - - - - - @@ -1963,11 +1953,6 @@ exposed to language bindings. c:type="REGRESS_Mixed_Case_Constant"> - - - @@ -3566,6 +3551,20 @@ the introspection client langage. + + + + + + + + + + + + + + Date: Mon, 18 Feb 2013 16:28:17 -0500 Subject: sourcescanner: Fix issues with double constants in the copy --- giscanner/sourcescanner.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giscanner/sourcescanner.c b/giscanner/sourcescanner.c index 339bd897..c14c3449 100644 --- a/giscanner/sourcescanner.c +++ b/giscanner/sourcescanner.c @@ -57,7 +57,7 @@ gi_source_symbol_copy (GISourceSymbol * symbol) if (symbol->const_int_set) new_symbol->const_int = symbol->const_int; else if (symbol->const_double_set) - new_symbol->const_double = symbol->const_double_set; + new_symbol->const_double = symbol->const_double; else if (symbol->const_string != NULL) new_symbol->const_string = g_strdup (symbol->const_string); -- cgit v1.2.1 From 1c57d575d195428a2cbaa4137095a3bffbd4c88f Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 18 Feb 2013 16:28:36 -0500 Subject: sourcescanner: Make sure to mark constants as set This fixes complex constants. --- giscanner/sourcescanner.c | 10 +++++++--- tests/scanner/Regress-1.0-expected.gir | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/giscanner/sourcescanner.c b/giscanner/sourcescanner.c index c14c3449..7ee0536c 100644 --- a/giscanner/sourcescanner.c +++ b/giscanner/sourcescanner.c @@ -54,12 +54,16 @@ gi_source_symbol_copy (GISourceSymbol * symbol) if (symbol->base_type) new_symbol->base_type = gi_source_type_copy (symbol->base_type); - if (symbol->const_int_set) + + if (symbol->const_int_set) { new_symbol->const_int = symbol->const_int; - else if (symbol->const_double_set) + new_symbol->const_int_set = TRUE; + } else if (symbol->const_double_set) { new_symbol->const_double = symbol->const_double; - else if (symbol->const_string != NULL) + new_symbol->const_double_set = TRUE; + } else if (symbol->const_string != NULL) { new_symbol->const_string = g_strdup (symbol->const_string); + } return new_symbol; } diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 22c4b0db..b238631a 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -1908,6 +1908,16 @@ exposed to language bindings. + + + + + + @@ -1953,6 +1963,11 @@ exposed to language bindings. c:type="REGRESS_Mixed_Case_Constant"> + + + -- cgit v1.2.1 From f7c28da4e57bdf318ed40eba3c2c0ed44d079759 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 18 Feb 2013 16:29:01 -0500 Subject: sourcescanner: Copy over the unsignedness as well --- giscanner/sourcescanner.c | 1 + 1 file changed, 1 insertion(+) diff --git a/giscanner/sourcescanner.c b/giscanner/sourcescanner.c index 7ee0536c..90db2946 100644 --- a/giscanner/sourcescanner.c +++ b/giscanner/sourcescanner.c @@ -57,6 +57,7 @@ gi_source_symbol_copy (GISourceSymbol * symbol) if (symbol->const_int_set) { new_symbol->const_int = symbol->const_int; + new_symbol->const_int_is_unsigned = symbol->const_int_is_unsigned; new_symbol->const_int_set = TRUE; } else if (symbol->const_double_set) { new_symbol->const_double = symbol->const_double; -- cgit v1.2.1 From efcaf9b873352122f7853be49fb29d8f92e14c7d Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Mon, 18 Feb 2013 16:33:13 -0500 Subject: tests: Add RegressTestReferenceEnum to the doc tests I really messed this one up :( --- .../Regress.TestReferenceEnum.page | 25 +++++++++++ .../Regress.TestReferenceEnum.page | 51 ++++++++++++++++++++++ .../Regress.TestReferenceEnum.page | 51 ++++++++++++++++++++++ 3 files changed, 127 insertions(+) create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestReferenceEnum.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestReferenceEnum.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestReferenceEnum.page diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestReferenceEnum.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestReferenceEnum.page new file mode 100644 index 00000000..44c3cadb --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestReferenceEnum.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestReferenceEnum + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestReferenceEnum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestReferenceEnum.page new file mode 100644 index 00000000..2c8b1abb --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestReferenceEnum.page @@ -0,0 +1,51 @@ + + + + + + + + Regress.TestReferenceEnum + + + + + + + + + + +<code>TestReferenceEnum.0</code> + + + +<code>TestReferenceEnum.1</code> + + + +<code>TestReferenceEnum.2</code> + + + +<code>TestReferenceEnum.3</code> + + + +<code>TestReferenceEnum.4</code> + + + +<code>TestReferenceEnum.5</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestReferenceEnum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestReferenceEnum.page new file mode 100644 index 00000000..2c8b1abb --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestReferenceEnum.page @@ -0,0 +1,51 @@ + + + + + + + + Regress.TestReferenceEnum + + + + + + + + + + +<code>TestReferenceEnum.0</code> + + + +<code>TestReferenceEnum.1</code> + + + +<code>TestReferenceEnum.2</code> + + + +<code>TestReferenceEnum.3</code> + + + +<code>TestReferenceEnum.4</code> + + + +<code>TestReferenceEnum.5</code> + + + + + + + -- cgit v1.2.1 From dd81e51bd155a7fd8ee0150b4ecb33d16f54ad91 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 19 Feb 2013 11:12:01 -0500 Subject: Release 1.35.8 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index c8e01731..83e86aec 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl the gi version number m4_define(gi_major_version, 1) m4_define(gi_minor_version, 35) -m4_define(gi_micro_version, 5) +m4_define(gi_micro_version, 8) m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version) AC_PREREQ([2.63]) -- cgit v1.2.1 From 81c65f22e124c7aa53686519776714c8fdbf8bc2 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 19 Feb 2013 11:53:18 -0500 Subject: tests: Be compatible with both Automake 1.12 and 1.13 Revert to using the serial test driver, as that's the easiest path for now, unless we generated a binary to run each warn test. https://bugzilla.gnome.org/693539 --- configure.ac | 2 +- tests/warn/Makefile.am | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 83e86aec..5adffdd6 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign -Wno-portability]) +AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign -Wno-portability serial-tests]) AM_MAINTAINER_MODE([enable]) AM_SILENT_RULES([yes]) diff --git a/tests/warn/Makefile.am b/tests/warn/Makefile.am index 80702300..c4354223 100644 --- a/tests/warn/Makefile.am +++ b/tests/warn/Makefile.am @@ -19,5 +19,4 @@ TESTS = \ EXTRA_DIST = warningtester.py common.h $(TESTS) -TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) -LOG_COMPILER = $(PYTHON) $(srcdir)/warningtester.py +TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) $(PYTHON) $(srcdir)/warningtester.py -- cgit v1.2.1 From 3e976212bfd34a675632c5a0aecc9f8070df8098 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 19 Feb 2013 17:56:32 -0500 Subject: tests: Be compatible with Automake 1.11, 1.12 and 1.13, and the future, hopefully Automake only sees it as one test now, but eh, who cares. https://bugzilla.gnome.org/show_bug.cgi?id=694198 --- configure.ac | 2 +- tests/warn/Makefile.am | 8 +++++--- tests/warn/warntestrunner | 8 ++++++++ 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100755 tests/warn/warntestrunner diff --git a/configure.ac b/configure.ac index 5adffdd6..83e86aec 100644 --- a/configure.ac +++ b/configure.ac @@ -17,7 +17,7 @@ AC_CONFIG_HEADER([config.h]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign -Wno-portability serial-tests]) +AM_INIT_AUTOMAKE([1.11 tar-ustar dist-xz no-dist-gzip foreign -Wno-portability]) AM_MAINTAINER_MODE([enable]) AM_SILENT_RULES([yes]) diff --git a/tests/warn/Makefile.am b/tests/warn/Makefile.am index c4354223..50e5ab15 100644 --- a/tests/warn/Makefile.am +++ b/tests/warn/Makefile.am @@ -1,6 +1,8 @@ include $(top_srcdir)/common.mk -TESTS = \ +TESTS = warntestrunner + +alltests = \ annotationparser.h \ callback-invalid-scope.h \ callback-missing-scope.h \ @@ -17,6 +19,6 @@ TESTS = \ unknown-parameter.h \ unresolved-type.h -EXTRA_DIST = warningtester.py common.h $(TESTS) +EXTRA_DIST = warningtester.py warntestrunner common.h $(TESTS) -TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) $(PYTHON) $(srcdir)/warningtester.py +TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) PYTHON=$(PYTHON) srcdir=$(srcdir) alltests="$(alltests)" diff --git a/tests/warn/warntestrunner b/tests/warn/warntestrunner new file mode 100755 index 00000000..3deb3814 --- /dev/null +++ b/tests/warn/warntestrunner @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +set -e + +for testname in ${alltests}; do + echo "Running warning test:" $testname + $PYTHON $srcdir/warningtester.py "$testname" +done -- cgit v1.2.1 From 8e8254cf687e4906c2758103af6f6a6320fa8857 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 20 Feb 2013 08:59:29 +0100 Subject: Ship missing header files for tests/warn/ check --- tests/warn/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/warn/Makefile.am b/tests/warn/Makefile.am index 50e5ab15..875d8efe 100644 --- a/tests/warn/Makefile.am +++ b/tests/warn/Makefile.am @@ -19,6 +19,6 @@ alltests = \ unknown-parameter.h \ unresolved-type.h -EXTRA_DIST = warningtester.py warntestrunner common.h $(TESTS) +EXTRA_DIST = warningtester.py warntestrunner $(alltests) common.h $(TESTS) TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) PYTHON=$(PYTHON) srcdir=$(srcdir) alltests="$(alltests)" -- cgit v1.2.1 From 58c6d3a39b7d78ab6d604ad26781664a62a35f3b Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 20 Feb 2013 08:40:13 +0100 Subject: Install utility.[hc] These are used by foo.[hc] and required to build Regress.gir. --- tests/scanner/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index 75bdc9f0..c0fd3e3b 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -45,7 +45,7 @@ libwarnlib_la_LDFLAGS = -export-symbols-regex '^warnlib_' -no-undefined libgettype_la_SOURCES = $(srcdir)/gettype.c $(srcdir)/gettype.h testsdir = $(datadir)/gobject-introspection-1.0/tests -tests_DATA = $(libregress_la_SOURCES) $(libwarnlib_la_SOURCES) +tests_DATA = $(libregress_la_SOURCES) $(libwarnlib_la_SOURCES) $(libutility_la_SOURCES) libregress_la_CPPFLAGS = if !HAVE_CAIRO -- cgit v1.2.1 From 0c9036c6c8524bf1cf70af7dc670b569577de0db Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 22 Feb 2013 17:33:48 +0800 Subject: Update def files for various test DLLs Some functions were added or renamed in the various DLLs, so reflect these changes there. --- build/win32/Regress.def | 17 +++++++ build/win32/annotation.def | 94 ++++++++++++++++++------------------- build/win32/foo.def | 95 +++++++++++++++++++------------------- build/win32/gimarshallingtests.def | 33 +++++++++++++ build/win32/testinherit.def | 10 ++-- 5 files changed, 149 insertions(+), 100 deletions(-) diff --git a/build/win32/Regress.def b/build/win32/Regress.def index ebef4e0d..693f053f 100644 --- a/build/win32/Regress.def +++ b/build/win32/Regress.def @@ -138,6 +138,7 @@ regress_test_unsigned_enum_param regress_global_get_flags_out regress_test_struct_a_clone +regress_test_struct_a_parse regress_test_struct_b_clone @@ -163,6 +164,14 @@ regress_test_boxed_b_get_type regress_test_boxed_b_new regress_test_boxed_b_copy +regress_test_boxed_c_get_type +regress_test_boxed_c_new + +regress_test_boxed_d_get_type +regress_test_boxed_d_new +regress_test_boxed_d_copy +regress_test_boxed_d_free +regress_test_boxed_d_get_magic regress_test_obj_get_type regress_test_obj_new @@ -170,6 +179,9 @@ regress_constructor regress_test_obj_new_from_file regress_test_obj_set_bare regress_test_obj_emit_sig_with_obj +regress_test_obj_emit_sig_with_foreign_struct +regress_test_obj_emit_sig_with_int64 +regress_test_obj_emit_sig_with_uint64 regress_test_obj_instance_method regress_test_obj_static_method regress_forced_method @@ -189,6 +201,7 @@ regress_test_sub_obj_get_type regress_test_sub_obj_new regress_test_sub_obj_unset_bare regress_test_sub_obj_instance_method +regress_test_skip_unannotated_callback regress_test_fundamental_object_get_type regress_test_fundamental_object_ref @@ -206,6 +219,7 @@ regress_test_multi_callback regress_test_array_callback regress_test_callback_user_data regress_test_callback_destroy_notify +regress_test_callback_destroy_notify_no_user_data regress_test_callback_thaw_notifications regress_test_callback_async @@ -253,3 +267,6 @@ regress_test_boxed_c_get_type regress_test_unconventional_error_get_type regress_test_abc_error_get_type regress_test_error_get_type + + +regress_test_versioning diff --git a/build/win32/annotation.def b/build/win32/annotation.def index c4e45945..27452281 100644 --- a/build/win32/annotation.def +++ b/build/win32/annotation.def @@ -1,48 +1,48 @@ EXPORTS -annotation_object_get_type -annotation_object_method -annotation_object_out -annotation_object_create_object -annotation_object_allow_none -annotation_object_notrans -annotation_object_inout -annotation_object_inout2 -annotation_object_inout3 -annotation_object_in -annotation_object_calleeowns -annotation_object_calleesowns -annotation_object_get_strings -annotation_object_get_hash -annotation_object_with_voidp -annotation_object_get_objects -annotation_object_use_buffer -annotation_object_compute_sum -annotation_object_compute_sum_n -annotation_object_compute_sum_nz -annotation_object_parse_args -annotation_object_string_out -annotation_object_foreach -annotation_object_set_data -annotation_object_set_data2 -annotation_object_set_data3 -annotation_object_do_not_use -annotation_object_watch -annotation_object_watch_full -annotation_object_hidden_self -annotation_init -annotation_return_array -annotation_versioned -annotation_string_zero_terminated -annotation_string_zero_terminated_out -annotation_string_array_length -annotation_object_extra_annos -annotation_custom_destroy -annotation_get_source_file -annotation_set_source_file -annotation_attribute_func -annotation_invalid_annotation -annotation_ptr_array -annotation_test_parsing_bug630862 -annotation_space_after_comment_bug631690 -annotation_return_filename -annotation_transfer_floating +regress_annotation_object_get_type +regress_annotation_object_method +regress_annotation_object_out +regress_annotation_object_create_object +regress_annotation_object_allow_none +regress_annotation_object_notrans +regress_annotation_object_inout +regress_annotation_object_inout2 +regress_annotation_object_inout3 +regress_annotation_object_in +regress_annotation_object_calleeowns +regress_annotation_object_calleesowns +regress_annotation_object_get_strings +regress_annotation_object_get_hash +regress_annotation_object_with_voidp +regress_annotation_object_get_objects +regress_annotation_object_use_buffer +regress_annotation_object_compute_sum +regress_annotation_object_compute_sum_n +regress_annotation_object_compute_sum_nz +regress_annotation_object_parse_args +regress_annotation_object_string_out +regress_annotation_object_foreach +regress_annotation_object_set_data +regress_annotation_object_set_data2 +regress_annotation_object_set_data3 +regress_annotation_object_do_not_use +regress_annotation_object_watch +regress_annotation_object_watch_full +regress_annotation_object_hidden_self +regress_annotation_init +regress_annotation_return_array +regress_annotation_versioned +regress_annotation_string_zero_terminated +regress_annotation_string_zero_terminated_out +regress_annotation_string_array_length +regress_annotation_object_extra_annos +regress_annotation_custom_destroy +regress_annotation_get_source_file +regress_annotation_set_source_file +regress_annotation_attribute_func +regress_annotation_invalid_regress_annotation +regress_annotation_ptr_array +regress_annotation_test_parsing_bug630862 +regress_annotation_space_after_comment_bug631690 +regress_annotation_return_filename +regress_annotation_transfer_floating diff --git a/build/win32/foo.def b/build/win32/foo.def index afa66ae9..cba3e2a2 100644 --- a/build/win32/foo.def +++ b/build/win32/foo.def @@ -1,49 +1,48 @@ EXPORTS -foo_interface_do_foo -foo_interface_static_method -foo_sub_interface_get_type -foo_sub_interface_do_bar -foo_sub_interface_do_moo -foo_sub_interface_do_baz -foo_init -foo_object_get_type -foo_object_new -foo_object_external_type -foo_object_new_as_super -foo_object_take_all -foo_object_new_cookie -foo_object_is_it_time_yet -foo_object_get_name -foo_object_dup_name -foo_object_read -foo_object_skipped_method -foo_subobject_get_type -foo_object_get_default -foo_buffer_get_type -foo_buffer_some_method -foo_other_object_get_type -foo_not_a_constructor_new -foo_enum_type_get_type -foo_flags_type_get_type -foo_boxed_get_type -foo_boxed_new -foo_boxed_method -foo_dbus_data_get_type -foo_rectangle_add -foo_rectangle_new -foo_brect_get_type -foo_bunion_get_type -foo_test_string_array -foo_test_string_array_with_g -foo_test_array -foo_test_varargs_callback -foo_test_varargs_callback2 -foo_test_varargs_callback3 -foo_error_get_type -foo_error_quark -foo_some_variant -foo_skip_me -foo_foreign_struct_new -foo_foreign_struct_copy -foo_object_append_new_stack_layer -foo_interface_get_type +regress_foo_interface_do_regress_foo +regress_foo_interface_static_method +regress_foo_sub_interface_get_type +regress_foo_sub_interface_do_bar +regress_foo_sub_interface_do_baz +regress_foo_init +regress_foo_object_get_type +regress_foo_object_new +regress_foo_object_external_type +regress_foo_object_new_as_super +regress_foo_object_take_all +regress_foo_object_new_cookie +regress_foo_object_is_it_time_yet +regress_foo_object_get_name +regress_foo_object_dup_name +regress_foo_object_read +regress_foo_object_skipped_method +regress_foo_subobject_get_type +regress_foo_object_get_default +regress_foo_buffer_get_type +regress_foo_buffer_some_method +regress_foo_other_object_get_type +regress_foo_not_a_constructor_new +regress_foo_enum_type_get_type +regress_foo_flags_type_get_type +regress_foo_boxed_get_type +regress_foo_boxed_new +regress_foo_boxed_method +regress_foo_dbus_data_get_type +regress_foo_rectangle_add +regress_foo_rectangle_new +regress_foo_brect_get_type +regress_foo_bunion_get_type +regress_foo_test_string_array +regress_foo_test_string_array_with_g +regress_foo_test_array +regress_foo_test_varargs_callback +regress_foo_test_varargs_callback2 +regress_foo_test_varargs_callback3 +regress_foo_error_get_type +regress_foo_error_quark +regress_foo_some_variant +regress_foo_skip_me +regress_foo_foreign_struct_new +regress_foo_foreign_struct_copy +regress_foo_object_append_new_stack_layer +regress_foo_interface_get_type diff --git a/build/win32/gimarshallingtests.def b/build/win32/gimarshallingtests.def index f957b5aa..268284dc 100644 --- a/build/win32/gimarshallingtests.def +++ b/build/win32/gimarshallingtests.def @@ -206,6 +206,7 @@ gi_marshalling_tests_utf8_dangling_out gi_marshalling_tests_utf8_none_inout gi_marshalling_tests_utf8_full_inout +gi_marshalling_tests_utf8_as_uint8array_in gi_marshalling_tests_filename_list_return @@ -262,6 +263,8 @@ gi_marshalling_tests_array_fixed_out_struct gi_marshalling_tests_array_fixed_inout +gi_marshalling_tests_array_in_nonzero_nonlen + gi_marshalling_tests_array_return gi_marshalling_tests_array_return_etc @@ -272,6 +275,7 @@ gi_marshalling_tests_array_string_in gi_marshalling_tests_array_uint8_in gi_marshalling_tests_array_struct_in gi_marshalling_tests_array_struct_take_in +gi_marshalling_tests_array_struct_value_in gi_marshalling_tests_array_simple_struct_in gi_marshalling_tests_multi_array_key_value_in gi_marshalling_tests_array_enum_in @@ -303,16 +307,19 @@ gi_marshalling_tests_array_gvariant_full_in gi_marshalling_tests_garray_int_none_return +gi_marshalling_tests_garray_uint64_none_return gi_marshalling_tests_garray_utf8_none_return gi_marshalling_tests_garray_utf8_container_return gi_marshalling_tests_garray_utf8_full_return gi_marshalling_tests_garray_int_none_in +gi_marshalling_tests_garray_uint64_none_in gi_marshalling_tests_garray_utf8_none_in gi_marshalling_tests_garray_utf8_none_out gi_marshalling_tests_garray_utf8_container_out gi_marshalling_tests_garray_utf8_full_out +gi_marshalling_tests_garray_utf8_full_out_caller_allocated gi_marshalling_tests_garray_utf8_none_inout gi_marshalling_tests_garray_utf8_container_inout @@ -346,11 +353,13 @@ gi_marshalling_tests_gstrv_inout gi_marshalling_tests_glist_int_none_return +gi_marshalling_tests_glist_uint32_none_return gi_marshalling_tests_glist_utf8_none_return gi_marshalling_tests_glist_utf8_container_return gi_marshalling_tests_glist_utf8_full_return gi_marshalling_tests_glist_int_none_in +gi_marshalling_tests_glist_uint32_none_in gi_marshalling_tests_glist_utf8_none_in gi_marshalling_tests_glist_utf8_none_out @@ -401,10 +410,13 @@ gi_marshalling_tests_gvalue_return gi_marshalling_tests_gvalue_in gi_marshalling_tests_gvalue_in_with_type +gi_marshalling_tests_gvalue_int64_in +gi_marshalling_tests_gvalue_int64_out gi_marshalling_tests_gvalue_in_enum gi_marshalling_tests_gvalue_out +gi_marshalling_tests_gvalue_out_caller_allocates gi_marshalling_tests_gvalue_inout @@ -469,6 +481,13 @@ gi_marshalling_tests_object_method gi_marshalling_tests_object_overridden_method gi_marshalling_tests_object_new +gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_none +gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_full +gi_marshalling_tests_object_get_ref_info_for_vfunc_out_object_transfer_none +gi_marshalling_tests_object_get_ref_info_for_vfunc_out_object_transfer_full +gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_none +gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_full + gi_marshalling_tests_object_method_array_in gi_marshalling_tests_object_method_array_out gi_marshalling_tests_object_method_array_inout @@ -476,11 +495,17 @@ gi_marshalling_tests_object_method_array_return gi_marshalling_tests_object_method_int8_in gi_marshalling_tests_object_method_int8_out +gi_marshalling_tests_object_method_int8_arg_and_out_caller +gi_marshalling_tests_object_method_int8_arg_and_out_callee +gi_marshalling_tests_object_method_str_arg_out_ret gi_marshalling_tests_object_method_with_default_implementation +;gi_marshalling_tests_object_method_variant_array_in ;unimplemented gi_marshalling_tests_object_vfunc_return_value_only gi_marshalling_tests_object_vfunc_one_out_parameter gi_marshalling_tests_object_vfunc_multiple_out_parameters +gi_marshalling_tests_object_vfunc_caller_allocated_out_parameter +gi_marshalling_tests_object_vfunc_array_out_parameter gi_marshalling_tests_object_vfunc_return_value_and_one_out_parameter gi_marshalling_tests_object_vfunc_return_value_and_multiple_out_parameters gi_marshalling_tests_object_vfunc_meth_with_error @@ -548,3 +573,11 @@ gi_marshalling_tests_overrides_object_returnv gi_marshalling_tests_properties_object_get_type gi_marshalling_tests_properties_object_new gi_marshalling_tests_interface3_get_type +gi_marshalling_tests_interface3_test_variant_array_in + +gi_marshalling_tests_param_spec_return +gi_marshalling_tests_param_spec_out +gi_marshalling_tests_param_spec_in_bool + +gi_marshalling_tests_gbytes_full_return +gi_marshalling_tests_gbytes_none_in \ No newline at end of file diff --git a/build/win32/testinherit.def b/build/win32/testinherit.def index 633a4e3c..8881dab7 100644 --- a/build/win32/testinherit.def +++ b/build/win32/testinherit.def @@ -1,6 +1,6 @@ EXPORTS -test_inherit_drawable_get_type -test_inherit_drawable_do_foo -test_inherit_drawable_get_origin -test_inherit_drawable_get_size -test_inherit_drawable_do_foo_maybe_throw +regress_test_inherit_drawable_get_type +regress_test_inherit_drawable_do_foo +regress_test_inherit_drawable_get_origin +regress_test_inherit_drawable_get_size +regress_test_inherit_drawable_do_foo_maybe_throw -- cgit v1.2.1 From 1513b683d7f897e825ae4704544fbe0c72bb611a Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 22 Feb 2013 16:35:41 +0800 Subject: dumper.py: Fix for Visual C++ usage -Wno-deprecated-declarations is a compilation flag that causes builds of introspection files to fail on Visual C++ builds, so use -wd4996 instead when we are using Visual C++, which serves the same purpose of -Wno-deprecated-declarations with Visual C++. --- giscanner/dumper.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/giscanner/dumper.py b/giscanner/dumper.py index dd1813f2..d95ea6ba 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py @@ -206,7 +206,12 @@ class DumpCompiler(object): # header of the library being introspected if self._compiler_cmd == 'gcc' and not self._options.init_sections: args.append('-Wall') - args.append("-Wno-deprecated-declarations") + # The Microsoft compiler uses different option flags for + # silencing warnings on deprecated function usage + if self._pkgconfig_msvc_flags: + args.append("-wd4996") + else: + args.append("-Wno-deprecated-declarations") pkgconfig_flags = self._run_pkgconfig('--cflags') args.extend(pkgconfig_flags) cflags = os.environ.get('CFLAGS', '') -- cgit v1.2.1 From 3a549931dff89f2b1885829386198005a207d29b Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 22 Feb 2013 17:40:00 +0800 Subject: test/gimarshallingtests.c: Fix build on C89 compilers https://bugzilla.gnome.org/show_bug.cgi?id=694426 --- tests/gimarshallingtests.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index 2e1279a2..4f4be615 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -4402,9 +4402,10 @@ void gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_none (GIMarshallingTestsObject *self, GType type, guint *ref_count, gboolean *is_floating) { static gboolean destroy_called; + GObject *object; destroy_called = FALSE; - GObject *object = g_object_new(type, NULL); + object = g_object_new(type, NULL); g_object_weak_ref (object, (GWeakNotify)_vfunc_in_object_destroy_callback, &destroy_called); GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_in_object_transfer_none (self, object); @@ -4429,9 +4430,10 @@ void gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_full (GIMarshallingTestsObject *self, GType type, guint *ref_count, gboolean *is_floating) { static gboolean destroy_called; + GObject *object; destroy_called = FALSE; - GObject *object = g_object_new(type, NULL); + object = g_object_new(type, NULL); g_object_weak_ref (object, (GWeakNotify)_vfunc_in_object_destroy_callback, &destroy_called); /* Calling the vfunc takes ownership of the object, so we use a weak_ref to determine -- cgit v1.2.1 From 9faf4b4e9eac13ceb9d8c214554d5ee2a384dc28 Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Fri, 22 Feb 2013 01:50:48 +0100 Subject: GIRepository: add API for extending library paths Previously we would require applications that shipped with private typelibs to add the private path to LD_LIBRARY_PATH, or to have a launcher binary with the right RPATH. Now they can just call GIRepository.prepend_library_path() before they access the module. https://bugzilla.gnome.org/show_bug.cgi?id=694485 --- docs/reference/gi-sections.txt | 1 + girepository/girepository.h | 1 + girepository/girepository.symbols | 1 + girepository/gitypelib.c | 91 ++++++++++++++++++++++++++++----------- 4 files changed, 70 insertions(+), 24 deletions(-) diff --git a/docs/reference/gi-sections.txt b/docs/reference/gi-sections.txt index b7565a13..8b880cf8 100644 --- a/docs/reference/gi-sections.txt +++ b/docs/reference/gi-sections.txt @@ -7,6 +7,7 @@ GIRepositoryLoadFlags GITypelib g_irepository_get_default g_irepository_prepend_search_path +g_irepository_prepend_library_path g_irepository_get_search_path g_irepository_load_typelib g_irepository_is_registered diff --git a/girepository/girepository.h b/girepository/girepository.h index eb990a27..2b2b1713 100644 --- a/girepository/girepository.h +++ b/girepository/girepository.h @@ -90,6 +90,7 @@ typedef enum GType g_irepository_get_type (void) G_GNUC_CONST; GIRepository *g_irepository_get_default (void); void g_irepository_prepend_search_path (const char *directory); +void g_irepository_prepend_library_path (const char *directory); GSList * g_irepository_get_search_path (void); const char * g_irepository_load_typelib (GIRepository *repository, GITypelib *typelib, diff --git a/girepository/girepository.symbols b/girepository/girepository.symbols index 8cb6c839..5f01adff 100644 --- a/girepository/girepository.symbols +++ b/girepository/girepository.symbols @@ -134,6 +134,7 @@ g_irepository_get_typelib_path g_irepository_get_version g_irepository_is_registered g_irepository_load_typelib +g_irepository_prepend_library_path g_irepository_prepend_search_path g_irepository_require g_irepository_require_private diff --git a/girepository/gitypelib.c b/girepository/gitypelib.c index 2af17e96..76a55de8 100644 --- a/girepository/gitypelib.c +++ b/girepository/gitypelib.c @@ -2062,6 +2062,72 @@ g_typelib_error_quark (void) return quark; } +static GSList *library_paths; + +/** + * g_irepository_prepend_library_path: + * @directory: (type filename): a single directory to scan for shared libraries + * + * Prepends @directory to the search path that is used to + * search shared libraries referenced by imported namespaces. + * Multiple calls to this function all contribute to the final + * list of paths. + * The list of paths is unique and shared for all #GIRepository + * instances across the process, but it doesn't affect namespaces + * imported before the call. + * + * If the library is not found in the directories configured + * in this way, loading will fall back to the system library + * path (ie. LD_LIBRARY_PATH and DT_RPATH in ELF systems). + * See the documentation of your dynamic linker for full details. + * + * Since: 1.35.8 + */ +void +g_irepository_prepend_library_path (const char *directory) +{ + library_paths = g_slist_prepend (library_paths, + g_strdup (directory)); +} + +/* Note on the GModule flags used by this function: + + * Glade's autoconnect feature and OpenGL's extension mechanism + * as used by Clutter rely on g_module_open(NULL) to work as a means of + * accessing the app's symbols. This keeps us from using + * G_MODULE_BIND_LOCAL. BIND_LOCAL may have other issues as well; + * in general libraries are not expecting multiple copies of + * themselves and are not expecting to be unloaded. So we just + * load modules globally for now. + */ +static GModule * +load_one_shared_library (const char *shlib) +{ + GSList *p; + GModule *m; + + if (!g_path_is_absolute (shlib)) + { + /* First try in configured library paths */ + for (p = library_paths; p; p = p->next) + { + char *path = g_build_filename (p->data, shlib, NULL); + + m = g_module_open (path, G_MODULE_BIND_LAZY); + + g_free (path); + if (m != NULL) + return m; + } + } + + /* Then try loading from standard paths */ + /* Do not attempt to fix up shlib to replace .la with .so: + it's done by GModule anyway. + */ + return g_module_open (shlib, G_MODULE_BIND_LAZY); +} + static void _g_typelib_do_dlopen (GITypelib *typelib) { @@ -2091,30 +2157,7 @@ _g_typelib_do_dlopen (GITypelib *typelib) { GModule *module; - /* Glade's autoconnect feature and OpenGL's extension mechanism - * as used by Clutter rely on g_module_open(NULL) to work as a means of - * accessing the app's symbols. This keeps us from using - * G_MODULE_BIND_LOCAL. BIND_LOCAL may have other issues as well; - * in general libraries are not expecting multiple copies of - * themselves and are not expecting to be unloaded. So we just - * load modules globally for now. - */ - - module = g_module_open (shlibs[i], G_MODULE_BIND_LAZY); - - if (module == NULL) - { - GString *shlib_full = g_string_new (shlibs[i]); - - module = g_module_open (shlib_full->str, G_MODULE_BIND_LAZY); - if (module == NULL) - { - g_string_overwrite (shlib_full, strlen (shlib_full->str)-2, SHLIB_SUFFIX); - module = g_module_open (shlib_full->str, G_MODULE_BIND_LAZY); - } - - g_string_free (shlib_full, TRUE); - } + module = load_one_shared_library (shlibs[i]); if (module == NULL) { -- cgit v1.2.1 From f7619e7452850fa8e92b5a560c8919c012002c1b Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 23 Feb 2013 16:41:10 -0500 Subject: scanner: Synthesize argument names if we don't see one While this is a bit lame, we need to do something. We preserve the warning message. https://bugzilla.gnome.org/show_bug.cgi?id=694593 --- giscanner/transformer.py | 16 ++++++++++------ .../Regress.FooObject.take_all.page | 2 +- tests/scanner/Regress-1.0-expected.gir | 4 ++-- tests/scanner/WarnLib-1.0-expected.gir | 12 ++++++------ 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/giscanner/transformer.py b/giscanner/transformer.py index d6a5f8f9..e05249c3 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -481,8 +481,8 @@ raise ValueError.""" def _create_parameters(self, symbol, base_type): # warn if we see annotations for unknown parameters param_names = set(child.ident for child in base_type.child_list) - for child in base_type.child_list: - yield self._create_parameter(symbol, child) + for i, child in enumerate(base_type.child_list): + yield self._create_parameter(symbol, i, child) def _synthesize_union_type(self, symbol, parent_symbol): # Synthesize a named union so that it can be referenced. @@ -695,16 +695,20 @@ raise ValueError.""" return container return ast.Type(ctype=ctype, is_const=is_const, complete_ctype=complete_ctype) - def _create_parameter(self, parent_symbol, symbol): + def _create_parameter(self, parent_symbol, index, symbol): if symbol.type == CSYMBOL_TYPE_ELLIPSIS: ptype = ast.Varargs() else: ptype = self._create_type_from_base(symbol.base_type, is_parameter=True) - if symbol.ident is None and symbol.base_type and symbol.base_type.type != CTYPE_VOID: - message.warn_symbol(parent_symbol, "missing parameter name; undocumentable") + if symbol.ident is None: + if symbol.base_type and symbol.base_type.type != CTYPE_VOID: + message.warn_symbol(parent_symbol, "missing parameter name; undocumentable") + ident = 'arg%d' % (index, ) + else: + ident = symbol.ident - return ast.Parameter(symbol.ident, ptype) + return ast.Parameter(ident, ptype) def _create_return(self, source_type): typeval = self._create_type_from_base(source_type, is_return=True) diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page index 649824f0..3947b3c5 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObject.take_all.page @@ -49,7 +49,7 @@ void regress_foo_object_take_all (RegressFooObject* object, -<code>None</code> +<code>arg2</code> diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index b238631a..a957824c 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -1472,7 +1472,7 @@ uses a C sugar return type. - + @@ -1902,7 +1902,7 @@ exposed to language bindings. - + diff --git a/tests/scanner/WarnLib-1.0-expected.gir b/tests/scanner/WarnLib-1.0-expected.gir index 3f8be712..e4a9a9b4 100644 --- a/tests/scanner/WarnLib-1.0-expected.gir +++ b/tests/scanner/WarnLib-1.0-expected.gir @@ -29,10 +29,10 @@ and/or use gtk-doc annotations. --> - + - + @@ -45,10 +45,10 @@ and/or use gtk-doc annotations. --> - + - + @@ -69,10 +69,10 @@ and/or use gtk-doc annotations. --> - + - + -- cgit v1.2.1 From d29bc4e5a9f89cf4c831ca79a2a2139906f9a4b1 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 23 Feb 2013 05:59:07 -0500 Subject: doctool: Switch default language to C https://bugzilla.gnome.org/show_bug.cgi?id=694593 --- giscanner/docmain.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giscanner/docmain.py b/giscanner/docmain.py index fc78ed62..afd509ff 100644 --- a/giscanner/docmain.py +++ b/giscanner/docmain.py @@ -32,7 +32,7 @@ def doc_main(args): help="Directory to write output to") parser.add_option("-l", "--language", action="store", dest="language", - default="Python", + default="c", help="Output language") parser.add_option("", "--add-include-path", action="append", dest="include_paths", default=[], -- cgit v1.2.1 From d2f9c78e30f3fe4dc8d072d23445d6d6cd15b586 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 24 Feb 2013 09:49:28 -0500 Subject: scanner: Also traverse GObject properties when walking namespace This could be done manually by the caller, but it's better if we're consistent here, since we do traverse fields. https://bugzilla.gnome.org/show_bug.cgi?id=694593 --- giscanner/ast.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/giscanner/ast.py b/giscanner/ast.py index c2f89a62..09616f65 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -1020,6 +1020,8 @@ class Class(Node, Registered): field.anonymous_node.walk(callback, chain) for sig in self.signals: sig.walk(callback, chain) + for prop in self.properties: + prop.walk(callback, chain) class Interface(Node, Registered): -- cgit v1.2.1 From 971d1f98053eec324756429a7966aab2279abd87 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 23 Feb 2013 11:55:56 -0500 Subject: doctool: Use builtin namespace walker Rather than hand-rolling our own. This ensures we traverse all nodes. https://bugzilla.gnome.org/show_bug.cgi?id=694593 --- giscanner/docwriter.py | 53 +++++++++++++--------- .../Regress.AnnotationObject.watch.page | 2 +- .../Regress.FooBUnion.get_contained_type.page | 48 ++++++++++++++++++++ .../Regress.FooBUnion.new.page | 40 ++++++++++++++++ .../Regress.FooEnumType.method.page | 48 ++++++++++++++++++++ .../Regress.FooEnumType.returnv.page | 48 ++++++++++++++++++++ .../Regress.FooError.quark.page | 40 ++++++++++++++++ .../Regress.FooInterfaceIface.do_regress_foo.page | 25 ++++++++++ .../Regress.FooObjectClass.read_fn.page | 25 ++++++++++ .../Regress.FooObjectClass.virtual_method.page | 25 ++++++++++ ...Regress.FooSubInterfaceIface.destroy_event.page | 25 ++++++++++ .../Regress.FooSubInterfaceIface.do_bar.page | 25 ++++++++++ .../Regress.FooSubInterfaceIface.do_baz.page | 25 ++++++++++ .../Regress.TestABCError.quark.page | 40 ++++++++++++++++ .../Regress.TestEnum.param.page | 48 ++++++++++++++++++++ .../Regress.TestError.quark.page | 40 ++++++++++++++++ .../Regress.TestObjClass._regress_reserved1.page | 25 ++++++++++ .../Regress.TestObjClass._regress_reserved2.page | 25 ++++++++++ .../Regress.TestObjClass.allow_none_vfunc.page | 25 ++++++++++ .../Regress.TestObjClass.matrix.page | 25 ++++++++++ .../Regress.TestOtherError.quark.page | 40 ++++++++++++++++ 21 files changed, 674 insertions(+), 23 deletions(-) create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.get_contained_type.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.new.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.method.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.returnv.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooError.quark.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.do_regress_foo.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.read_fn.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.virtual_method.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.destroy_event.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_bar.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_baz.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.quark.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.param.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestError.quark.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved1.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved2.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.allow_none_vfunc.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.matrix.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.quark.page diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py index e962b914..7924b2d3 100644 --- a/giscanner/docwriter.py +++ b/giscanner/docwriter.py @@ -38,10 +38,18 @@ def make_page_id(node, recursive=False): else: return 'index' + if hasattr(node, '_chain') and node._chain: + parent = node._chain[-1] + else: + parent = None + + if parent is None: + return '%s.%s' % (node.namespace.name, node.name) + if isinstance(node, (ast.Property, ast.Signal, ast.VFunction)): - return '%s-%s' % (make_page_id(node.parent, recursive=True), node.name) + return '%s-%s' % (make_page_id(parent, recursive=True), node.name) else: - return '%s.%s' % (make_page_id(node.parent, recursive=True), node.name) + return '%s.%s' % (make_page_id(parent, recursive=True), node.name) def get_node_kind(node): if isinstance(node, ast.Namespace): @@ -314,7 +322,10 @@ class DocFormatter(object): return make_page_id(node) def format_xref(self, node, **attrdict): - if isinstance(node, ast.Member): + if node is None: + attrs = [('xref', 'index')] + attrdict.items() + return xmlwriter.build_xml_tag('link', attrs) + elif isinstance(node, ast.Member): # Enum/BitField members are linked to the main enum page. return self.format_xref(node.parent, **attrdict) + '.' + node.name else: @@ -587,27 +598,25 @@ class DocWriter(object): # directory already made pass - nodes = [self._transformer.namespace] - for node in self._transformer.namespace.itervalues(): - if isinstance(node, ast.Function) and node.moved_to is not None: - continue - if getattr(node, 'disguised', False): - continue - nodes.append(node) - if isinstance(node, (ast.Class, ast.Interface, ast.Record)): - nodes += getattr(node, 'methods', []) - nodes += getattr(node, 'static_methods', []) - nodes += getattr(node, 'virtual_methods', []) - nodes += getattr(node, 'properties', []) - nodes += getattr(node, 'signals', []) - nodes += getattr(node, 'constructors', []) - for node in nodes: - if self._formatter.should_render_node(node): - self._render_node(node, output) - - def _render_node(self, node, output): + self._walk_node(output, self._transformer.namespace, []) + self._transformer.namespace.walk(lambda node, chain: self._walk_node(output, node, chain)) + + def _walk_node(self, output, node, chain): + if isinstance(node, ast.Function) and node.moved_to is not None: + return False + if getattr(node, 'disguised', False): + return False + if self._formatter.should_render_node(node): + self._render_node(node, chain, output) + return True + return False + + def _render_node(self, node, chain, output): namespace = self._transformer.namespace + # A bit of a hack...maybe this should be an official API + node._chain = list(chain) + page_kind = get_node_kind(node) template_name = '%s/%s.tmpl' % (self._language, page_kind) page_id = make_page_id(node) diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page index 0f9933de..76402aab 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page @@ -38,7 +38,7 @@ void regress_annotation_object_watch (RegressAnnotationObject* object,

This is here just for the sake of being overriden by its -.

+.

diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.get_contained_type.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.get_contained_type.page new file mode 100644 index 00000000..1ee353fd --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.get_contained_type.page @@ -0,0 +1,48 @@ + + + + + + + + int + + regress_foo_bunion_get_contained_type + + RegressFooBUnion* + bunion + + + + + regress_foo_bunion_get_contained_type + + +int regress_foo_bunion_get_contained_type (RegressFooBUnion* bunion); + + + + + + + + + + +<code>bunion</code> + + + +<code>Returns</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.new.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.new.page new file mode 100644 index 00000000..b760f204 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBUnion.new.page @@ -0,0 +1,40 @@ + + + + + + + + RegressFooBUnion* + + regress_foo_bunion_new + + + + regress_foo_bunion_new + + +RegressFooBUnion* regress_foo_bunion_new (void); + + + + + + + + + + +<code>Returns</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.method.page new file mode 100644 index 00000000..6ecf2dd9 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.method.page @@ -0,0 +1,48 @@ + + + + + + + + int + + regress_foo_enum_type_method + + RegressFooEnumType + regress_foo_enum + + + + + regress_foo_enum_type_method + + +int regress_foo_enum_type_method (RegressFooEnumType regress_foo_enum); + + + + + + + + + + +<code>regress_foo_enum</code> + + + +<code>Returns</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.returnv.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.returnv.page new file mode 100644 index 00000000..aa0c6c1b --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.returnv.page @@ -0,0 +1,48 @@ + + + + + + + + RegressFooEnumType + + regress_foo_enum_type_returnv + + int + x + + + + + regress_foo_enum_type_returnv + + +RegressFooEnumType regress_foo_enum_type_returnv (int x); + + + + + + + + + + +<code>x</code> + + + +<code>Returns</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooError.quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooError.quark.page new file mode 100644 index 00000000..dde46fb0 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooError.quark.page @@ -0,0 +1,40 @@ + + + + + + + + GQuark + + regress_foo_error_quark + + + + regress_foo_error_quark + + +GQuark regress_foo_error_quark (void); + + + + + + + + + + +<code>Returns</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.do_regress_foo.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.do_regress_foo.page new file mode 100644 index 00000000..0b900420 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooInterfaceIface.do_regress_foo.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooInterfaceIface.do_regress_foo + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.read_fn.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.read_fn.page new file mode 100644 index 00000000..39078bfc --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.read_fn.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooObjectClass.read_fn + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.virtual_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.virtual_method.page new file mode 100644 index 00000000..2882c6d7 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooObjectClass.virtual_method.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooObjectClass.virtual_method + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.destroy_event.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.destroy_event.page new file mode 100644 index 00000000..95136833 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.destroy_event.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooSubInterfaceIface.destroy_event + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_bar.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_bar.page new file mode 100644 index 00000000..ec46cdde --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_bar.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooSubInterfaceIface.do_bar + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_baz.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_baz.page new file mode 100644 index 00000000..d0f58041 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooSubInterfaceIface.do_baz.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.FooSubInterfaceIface.do_baz + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.quark.page new file mode 100644 index 00000000..7ed5152f --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.quark.page @@ -0,0 +1,40 @@ + + + + + + + + GQuark + + regress_test_abc_error_quark + + + + regress_test_abc_error_quark + + +GQuark regress_test_abc_error_quark (void); + + + + + + + + + + +<code>Returns</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.param.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.param.page new file mode 100644 index 00000000..542ba60c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.param.page @@ -0,0 +1,48 @@ + + + + + + + + const gchar* + + regress_test_enum_param + + RegressTestEnum + e + + + + + regress_test_enum_param + + +const gchar* regress_test_enum_param (RegressTestEnum e); + + + + + + + + + + +<code>e</code> + + + +<code>Returns</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestError.quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestError.quark.page new file mode 100644 index 00000000..9140ac56 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestError.quark.page @@ -0,0 +1,40 @@ + + + + + + + + GQuark + + regress_test_error_quark + + + + regress_test_error_quark + + +GQuark regress_test_error_quark (void); + + + + + + + + + + +<code>Returns</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved1.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved1.page new file mode 100644 index 00000000..3aec1433 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved1.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestObjClass._regress_reserved1 + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved2.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved2.page new file mode 100644 index 00000000..8bfc4d19 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass._regress_reserved2.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestObjClass._regress_reserved2 + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.allow_none_vfunc.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.allow_none_vfunc.page new file mode 100644 index 00000000..b45f05d2 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.allow_none_vfunc.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestObjClass.allow_none_vfunc + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.matrix.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.matrix.page new file mode 100644 index 00000000..312b198e --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObjClass.matrix.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.TestObjClass.matrix + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.quark.page new file mode 100644 index 00000000..4ed8d539 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.quark.page @@ -0,0 +1,40 @@ + + + + + + + + GQuark + + regress_test_unconventional_error_quark + + + + regress_test_unconventional_error_quark + + +GQuark regress_test_unconventional_error_quark (void); + + + + + + + + + + +<code>Returns</code> + + + + + + + -- cgit v1.2.1 From dfeaf33c8a4ae7e25b4a83d0b31c4d435b4ef7de Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 24 Feb 2013 03:55:18 -0500 Subject: scanner: internals cleanup: Key more things off Namespace The .gir format has a weird legacy where stuff like the includes are outside of the . But conceptually they're tied together, so let's start reflecting this in the code. This way we can just pass around and look at a Namespace object instead of a 4-tuple of (namespace, includes, c_includes, pkg_config). https://bugzilla.gnome.org/show_bug.cgi?id=694593 --- giscanner/ast.py | 1 + giscanner/girparser.py | 7 ++----- giscanner/girwriter.py | 10 ++++------ giscanner/scannermain.py | 3 +-- giscanner/transformer.py | 31 ++++++++++++++----------------- tests/scanner/Bar-1.0-expected.gir | 1 - tests/scanner/GetType-1.0-expected.gir | 1 - tests/scanner/GtkFrob-1.0-expected.gir | 1 - tests/scanner/Regress-1.0-expected.gir | 2 -- tests/scanner/SLetter-1.0-expected.gir | 2 -- tests/scanner/Utility-1.0-expected.gir | 1 - tests/scanner/WarnLib-1.0-expected.gir | 2 -- 12 files changed, 22 insertions(+), 40 deletions(-) diff --git a/giscanner/ast.py b/giscanner/ast.py index 09616f65..d9f23539 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -372,6 +372,7 @@ class Namespace(object): self.type_names = {} # Maps from GTName -> node self.ctypes = {} # Maps from CType -> node self.symbols = {} # Maps from function symbols -> Function + self.includes = set() # Include def type_from_name(self, name, ctype=None): """Backwards compatibility method for older .gir files, which diff --git a/giscanner/girparser.py b/giscanner/girparser.py index 4cba5065..f2908bff 100644 --- a/giscanner/girparser.py +++ b/giscanner/girparser.py @@ -47,7 +47,6 @@ class GIRParser(object): def __init__(self, types_only=False): self._types_only = types_only self._shared_libraries = [] - self._includes = set() self._pkgconfig_packages = set() self._namespace = None self._filename_stack = [] @@ -62,10 +61,10 @@ class GIRParser(object): self._filename_stack.pop() def parse_tree(self, tree): - self._includes.clear() self._namespace = None self._shared_libraries = [] self._pkgconfig_packages = set() + self._includes = set() self._c_includes = set() self._c_prefix = None self._parse_api(tree.getroot()) @@ -76,9 +75,6 @@ class GIRParser(object): def get_shared_libraries(self): return self._shared_libraries - def get_includes(self): - return self._includes - def get_c_includes(self): return self._c_includes @@ -146,6 +142,7 @@ class GIRParser(object): if 'shared-library' in ns.attrib: self._shared_libraries.extend( ns.attrib['shared-library'].split(',')) + self._namespace.includes = self._includes parser_methods = { _corens('alias'): self._parse_alias, diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py index ea9305cd..73b58772 100644 --- a/giscanner/girwriter.py +++ b/giscanner/girwriter.py @@ -30,19 +30,17 @@ COMPATIBLE_GIR_VERSION = '1.2' class GIRWriter(XMLWriter): - def __init__(self, namespace, shlibs, includes, pkgs, c_includes): + def __init__(self, namespace, shlibs, pkgs, c_includes): super(GIRWriter, self).__init__() self.write_comment( '''This file was automatically generated from C sources - DO NOT EDIT! To affect the contents of this file, edit the original C definitions, and/or use gtk-doc annotations. ''') - self._write_repository(namespace, shlibs, includes, pkgs, + self._write_repository(namespace, shlibs, pkgs, c_includes) - def _write_repository(self, namespace, shlibs, includes=None, + def _write_repository(self, namespace, shlibs, packages=None, c_includes=None): - if includes is None: - includes = frozenset() if packages is None: packages = frozenset() if c_includes is None: @@ -54,7 +52,7 @@ and/or use gtk-doc annotations. ''') ('xmlns:glib', 'http://www.gtk.org/introspection/glib/1.0'), ] with self.tagcontext('repository', attrs): - for include in sorted(includes): + for include in sorted(namespace.includes): self._write_include(include) for pkg in sorted(set(packages)): self._write_pkgconfig_pkg(pkg) diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py index 56d73f8c..9ca45a2f 100755 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -195,7 +195,6 @@ def passthrough_gir(path, f): writer = GIRWriter(parser.get_namespace(), parser.get_shared_libraries(), - parser.get_includes(), parser.get_pkgconfig_packages(), parser.get_c_includes()) f.write(writer.get_xml()) @@ -473,7 +472,7 @@ def scanner_main(args): else: exported_packages = options.packages - writer = Writer(transformer.namespace, shlibs, transformer.get_includes(), + writer = Writer(transformer.namespace, shlibs, exported_packages, options.c_includes) data = writer.get_xml() diff --git a/giscanner/transformer.py b/giscanner/transformer.py index e05249c3..4c008da1 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -54,15 +54,11 @@ class Transformer(object): self._namespace = namespace self._pkg_config_packages = set() self._typedefs_ns = {} - self._includes = {} # Namespace> - self._include_names = set() # string namespace + self._parsed_includes = {} # Namespace> self._includepaths = [] self._passthrough_mode = False self._annotations = {} - def get_includes(self): - return self._include_names - def get_pkgconfig_packages(self): return self._pkg_config_packages @@ -125,11 +121,11 @@ class Transformer(object): self._includepaths = list(paths) def register_include(self, include): - if include in self._include_names: + if include in self._namespace.includes: return + self._namespace.includes.add(include) filename = self._find_include(include) self._parse_include(filename) - self._include_names.add(include) def register_include_uninstalled(self, include_path): basename = os.path.basename(include_path) @@ -138,10 +134,10 @@ class Transformer(object): "Include path %r must be a filename path ending in .gir" % (include_path, )) girname = basename[:-4] include = ast.Include.from_string(girname) - if include in self._include_names: + if include in self._namespace.includes: return + self._namespace.includes.add(include) self._parse_include(include_path, uninstalled=True) - self._include_names.add(include) def lookup_giname(self, name): """Given a name of the form Foo or Bar.Foo, @@ -155,11 +151,11 @@ namespaces.""" if ns == self._namespace.name: return self._namespace.get(giname) # Fallback to the main namespace if not a dependency and matches a prefix - if ns in self._namespace.identifier_prefixes and not ns in self._includes: + if ns in self._namespace.identifier_prefixes and not ns in self._parsed_includes: message.warn(("Deprecated reference to identifier " + "prefix %s in GIName %s") % (ns, name)) return self._namespace.get(giname) - include = self._includes[ns] + include = self._parsed_includes[ns] return include.get(giname) def lookup_typenode(self, typeobj): @@ -196,7 +192,7 @@ None.""" self._parse_include(filename) parser = self._cachestore.load(filename) self._namespace = parser.get_namespace() - del self._includes[self._namespace.name] + del self._parsed_includes[self._namespace.name] return self def _parse_include(self, filename, uninstalled=False): @@ -209,20 +205,21 @@ None.""" if self._cachestore is not None: self._cachestore.store(filename, parser) - for include in parser.get_includes(): - self.register_include(include) + for include in parser.get_namespace().includes: + dep_filename = self._find_include(include) + self._parse_include(dep_filename) if not uninstalled: for pkg in parser.get_pkgconfig_packages(): self._pkg_config_packages.add(pkg) namespace = parser.get_namespace() - self._includes[namespace.name] = namespace + self._parsed_includes[namespace.name] = namespace def _iter_namespaces(self): """Return an iterator over all included namespaces; the currently-scanned namespace is first.""" yield self._namespace - for ns in self._includes.itervalues(): + for ns in self._parsed_includes.itervalues(): yield ns def _sort_matches(self, x, y): @@ -899,7 +896,7 @@ Note that type resolution may not succeed.""" # which has nominal namespace of "Meta", but a few classes are # "Mutter". We don't export that data in introspection currently. # Basically the library should be fixed, but we'll hack around it here. - for namespace in self._includes.itervalues(): + for namespace in self._parsed_includes.itervalues(): target = namespace.get_by_ctype(pointer_stripped) if target: typeval.target_giname = '%s.%s' % (namespace.name, target.name) diff --git a/tests/scanner/Bar-1.0-expected.gir b/tests/scanner/Bar-1.0-expected.gir index ef92fcc4..245adfff 100644 --- a/tests/scanner/Bar-1.0-expected.gir +++ b/tests/scanner/Bar-1.0-expected.gir @@ -6,7 +6,6 @@ and/or use gtk-doc annotations. --> xmlns="http://www.gtk.org/introspection/core/1.0" xmlns:c="http://www.gtk.org/introspection/c/1.0" xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> - xmlns="http://www.gtk.org/introspection/core/1.0" xmlns:c="http://www.gtk.org/introspection/c/1.0" xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> - diff --git a/tests/scanner/GtkFrob-1.0-expected.gir b/tests/scanner/GtkFrob-1.0-expected.gir index c8758472..a4e39ef1 100644 --- a/tests/scanner/GtkFrob-1.0-expected.gir +++ b/tests/scanner/GtkFrob-1.0-expected.gir @@ -6,7 +6,6 @@ and/or use gtk-doc annotations. --> xmlns="http://www.gtk.org/introspection/core/1.0" xmlns:c="http://www.gtk.org/introspection/c/1.0" xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> - xmlns="http://www.gtk.org/introspection/core/1.0" xmlns:c="http://www.gtk.org/introspection/c/1.0" xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> - - diff --git a/tests/scanner/SLetter-1.0-expected.gir b/tests/scanner/SLetter-1.0-expected.gir index 0c438609..a98ebb27 100644 --- a/tests/scanner/SLetter-1.0-expected.gir +++ b/tests/scanner/SLetter-1.0-expected.gir @@ -6,8 +6,6 @@ and/or use gtk-doc annotations. --> xmlns="http://www.gtk.org/introspection/core/1.0" xmlns:c="http://www.gtk.org/introspection/c/1.0" xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> - - xmlns="http://www.gtk.org/introspection/core/1.0" xmlns:c="http://www.gtk.org/introspection/c/1.0" xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> - diff --git a/tests/scanner/WarnLib-1.0-expected.gir b/tests/scanner/WarnLib-1.0-expected.gir index e4a9a9b4..0fc0d846 100644 --- a/tests/scanner/WarnLib-1.0-expected.gir +++ b/tests/scanner/WarnLib-1.0-expected.gir @@ -6,8 +6,6 @@ and/or use gtk-doc annotations. --> xmlns="http://www.gtk.org/introspection/core/1.0" xmlns:c="http://www.gtk.org/introspection/c/1.0" xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> - - Date: Sun, 24 Feb 2013 11:58:57 -0500 Subject: scanner: internals cleanup: Move shared libraries to Namespace Continuing on with previous commit. --- giscanner/ast.py | 1 + giscanner/girparser.py | 8 +------- giscanner/girwriter.py | 12 ++++++------ giscanner/scannermain.py | 5 +++-- 4 files changed, 11 insertions(+), 15 deletions(-) diff --git a/giscanner/ast.py b/giscanner/ast.py index d9f23539..23a0c9e7 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -373,6 +373,7 @@ class Namespace(object): self.ctypes = {} # Maps from CType -> node self.symbols = {} # Maps from function symbols -> Function self.includes = set() # Include + self.shared_libraries = [] # str def type_from_name(self, name, ctype=None): """Backwards compatibility method for older .gir files, which diff --git a/giscanner/girparser.py b/giscanner/girparser.py index f2908bff..bae09b9a 100644 --- a/giscanner/girparser.py +++ b/giscanner/girparser.py @@ -46,7 +46,6 @@ class GIRParser(object): def __init__(self, types_only=False): self._types_only = types_only - self._shared_libraries = [] self._pkgconfig_packages = set() self._namespace = None self._filename_stack = [] @@ -62,7 +61,6 @@ class GIRParser(object): def parse_tree(self, tree): self._namespace = None - self._shared_libraries = [] self._pkgconfig_packages = set() self._includes = set() self._c_includes = set() @@ -72,9 +70,6 @@ class GIRParser(object): def get_namespace(self): return self._namespace - def get_shared_libraries(self): - return self._shared_libraries - def get_c_includes(self): return self._c_includes @@ -140,8 +135,7 @@ class GIRParser(object): identifier_prefixes=identifier_prefixes, symbol_prefixes=symbol_prefixes) if 'shared-library' in ns.attrib: - self._shared_libraries.extend( - ns.attrib['shared-library'].split(',')) + self._namespace.shared_libraries = ns.attrib['shared-library'].split(',') self._namespace.includes = self._includes parser_methods = { diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py index 73b58772..e15ad51f 100644 --- a/giscanner/girwriter.py +++ b/giscanner/girwriter.py @@ -30,16 +30,16 @@ COMPATIBLE_GIR_VERSION = '1.2' class GIRWriter(XMLWriter): - def __init__(self, namespace, shlibs, pkgs, c_includes): + def __init__(self, namespace, pkgs, c_includes): super(GIRWriter, self).__init__() self.write_comment( '''This file was automatically generated from C sources - DO NOT EDIT! To affect the contents of this file, edit the original C definitions, and/or use gtk-doc annotations. ''') - self._write_repository(namespace, shlibs, pkgs, + self._write_repository(namespace, pkgs, c_includes) - def _write_repository(self, namespace, shlibs, + def _write_repository(self, namespace, packages=None, c_includes=None): if packages is None: packages = frozenset() @@ -59,7 +59,7 @@ and/or use gtk-doc annotations. ''') for c_include in sorted(set(c_includes)): self._write_c_include(c_include) self._namespace = namespace - self._write_namespace(namespace, shlibs) + self._write_namespace(namespace) self._namespace = None def _write_include(self, include): @@ -74,10 +74,10 @@ and/or use gtk-doc annotations. ''') attrs = [('name', c_include)] self.write_tag('c:include', attrs) - def _write_namespace(self, namespace, shlibs): + def _write_namespace(self, namespace): attrs = [('name', namespace.name), ('version', namespace.version), - ('shared-library', ','.join(shlibs)), + ('shared-library', ','.join(namespace.shared_libraries)), ('c:identifier-prefixes', ','.join(namespace.identifier_prefixes)), ('c:symbol-prefixes', ','.join(namespace.symbol_prefixes))] with self.tagcontext('namespace', attrs): diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py index 9ca45a2f..ccd828da 100755 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -194,7 +194,6 @@ def passthrough_gir(path, f): parser.parse(path) writer = GIRWriter(parser.get_namespace(), - parser.get_shared_libraries(), parser.get_pkgconfig_packages(), parser.get_c_includes()) f.write(writer.get_xml()) @@ -450,6 +449,8 @@ def scanner_main(args): else: shlibs = [] + transformer.namespace.shared_libraries = shlibs + main = MainTransformer(transformer, blocks) main.transform() @@ -472,7 +473,7 @@ def scanner_main(args): else: exported_packages = options.packages - writer = Writer(transformer.namespace, shlibs, + writer = Writer(transformer.namespace, exported_packages, options.c_includes) data = writer.get_xml() -- cgit v1.2.1 From c0ebb1e9888ee745437e87482d0b89c30cab355f Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 24 Feb 2013 12:07:28 -0500 Subject: scanner: internals cleanup: Move c_includes to Namespace Continuation of previous work. --- giscanner/ast.py | 1 + giscanner/girparser.py | 4 +--- giscanner/girwriter.py | 12 ++++-------- giscanner/scannermain.py | 6 +++--- 4 files changed, 9 insertions(+), 14 deletions(-) diff --git a/giscanner/ast.py b/giscanner/ast.py index 23a0c9e7..506643d0 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -374,6 +374,7 @@ class Namespace(object): self.symbols = {} # Maps from function symbols -> Function self.includes = set() # Include self.shared_libraries = [] # str + self.c_includes = [] # str def type_from_name(self, name, ctype=None): """Backwards compatibility method for older .gir files, which diff --git a/giscanner/girparser.py b/giscanner/girparser.py index bae09b9a..5944cc41 100644 --- a/giscanner/girparser.py +++ b/giscanner/girparser.py @@ -70,9 +70,6 @@ class GIRParser(object): def get_namespace(self): return self._namespace - def get_c_includes(self): - return self._c_includes - def get_c_prefix(self): return self._c_prefix @@ -137,6 +134,7 @@ class GIRParser(object): if 'shared-library' in ns.attrib: self._namespace.shared_libraries = ns.attrib['shared-library'].split(',') self._namespace.includes = self._includes + self._namespace.c_includes = self._c_includes parser_methods = { _corens('alias'): self._parse_alias, diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py index e15ad51f..58169eba 100644 --- a/giscanner/girwriter.py +++ b/giscanner/girwriter.py @@ -30,21 +30,17 @@ COMPATIBLE_GIR_VERSION = '1.2' class GIRWriter(XMLWriter): - def __init__(self, namespace, pkgs, c_includes): + def __init__(self, namespace, pkgs): super(GIRWriter, self).__init__() self.write_comment( '''This file was automatically generated from C sources - DO NOT EDIT! To affect the contents of this file, edit the original C definitions, and/or use gtk-doc annotations. ''') - self._write_repository(namespace, pkgs, - c_includes) + self._write_repository(namespace, pkgs) - def _write_repository(self, namespace, - packages=None, c_includes=None): + def _write_repository(self, namespace, packages=None): if packages is None: packages = frozenset() - if c_includes is None: - c_includes = frozenset() attrs = [ ('version', COMPATIBLE_GIR_VERSION), ('xmlns', 'http://www.gtk.org/introspection/core/1.0'), @@ -56,7 +52,7 @@ and/or use gtk-doc annotations. ''') self._write_include(include) for pkg in sorted(set(packages)): self._write_pkgconfig_pkg(pkg) - for c_include in sorted(set(c_includes)): + for c_include in sorted(set(namespace.c_includes)): self._write_c_include(c_include) self._namespace = namespace self._write_namespace(namespace) diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py index ccd828da..3d402fac 100755 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -194,8 +194,7 @@ def passthrough_gir(path, f): parser.parse(path) writer = GIRWriter(parser.get_namespace(), - parser.get_pkgconfig_packages(), - parser.get_c_includes()) + parser.get_pkgconfig_packages()) f.write(writer.get_xml()) def test_codegen(optstring): @@ -473,8 +472,9 @@ def scanner_main(args): else: exported_packages = options.packages + transformer.namespace.c_includes = options.c_includes writer = Writer(transformer.namespace, - exported_packages, options.c_includes) + exported_packages) data = writer.get_xml() write_output(data, options) -- cgit v1.2.1 From f17dfbe3e65acd9274c2f98292362b0824564e0d Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 24 Feb 2013 12:07:28 -0500 Subject: scanner: internals cleanup: Move pkgconfig list to Namespace Continuation of previous work. --- giscanner/ast.py | 1 + giscanner/girparser.py | 7 +------ giscanner/girwriter.py | 10 ++++------ giscanner/scannermain.py | 7 +++---- giscanner/transformer.py | 2 +- 5 files changed, 10 insertions(+), 17 deletions(-) diff --git a/giscanner/ast.py b/giscanner/ast.py index 506643d0..58540912 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -375,6 +375,7 @@ class Namespace(object): self.includes = set() # Include self.shared_libraries = [] # str self.c_includes = [] # str + self.exported_packages = [] # str def type_from_name(self, name, ctype=None): """Backwards compatibility method for older .gir files, which diff --git a/giscanner/girparser.py b/giscanner/girparser.py index 5944cc41..63a3fd02 100644 --- a/giscanner/girparser.py +++ b/giscanner/girparser.py @@ -46,7 +46,6 @@ class GIRParser(object): def __init__(self, types_only=False): self._types_only = types_only - self._pkgconfig_packages = set() self._namespace = None self._filename_stack = [] @@ -73,11 +72,6 @@ class GIRParser(object): def get_c_prefix(self): return self._c_prefix - def get_pkgconfig_packages(self): - if not hasattr(self, '_pkgconfig_packages'): - self._pkgconfig_packages = [] - return self._pkgconfig_packages - # Private def _find_first_child(self, node, name_or_names): @@ -135,6 +129,7 @@ class GIRParser(object): self._namespace.shared_libraries = ns.attrib['shared-library'].split(',') self._namespace.includes = self._includes self._namespace.c_includes = self._c_includes + self._namespace.exported_packages = self._pkgconfig_packages parser_methods = { _corens('alias'): self._parse_alias, diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py index 58169eba..d6b3485b 100644 --- a/giscanner/girwriter.py +++ b/giscanner/girwriter.py @@ -30,17 +30,15 @@ COMPATIBLE_GIR_VERSION = '1.2' class GIRWriter(XMLWriter): - def __init__(self, namespace, pkgs): + def __init__(self, namespace): super(GIRWriter, self).__init__() self.write_comment( '''This file was automatically generated from C sources - DO NOT EDIT! To affect the contents of this file, edit the original C definitions, and/or use gtk-doc annotations. ''') - self._write_repository(namespace, pkgs) + self._write_repository(namespace) - def _write_repository(self, namespace, packages=None): - if packages is None: - packages = frozenset() + def _write_repository(self, namespace): attrs = [ ('version', COMPATIBLE_GIR_VERSION), ('xmlns', 'http://www.gtk.org/introspection/core/1.0'), @@ -50,7 +48,7 @@ and/or use gtk-doc annotations. ''') with self.tagcontext('repository', attrs): for include in sorted(namespace.includes): self._write_include(include) - for pkg in sorted(set(packages)): + for pkg in sorted(set(namespace.exported_packages)): self._write_pkgconfig_pkg(pkg) for c_include in sorted(set(namespace.c_includes)): self._write_c_include(c_include) diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py index 3d402fac..5fa370ce 100755 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -193,8 +193,7 @@ def passthrough_gir(path, f): parser = GIRParser() parser.parse(path) - writer = GIRWriter(parser.get_namespace(), - parser.get_pkgconfig_packages()) + writer = GIRWriter(parser.get_namespace()) f.write(writer.get_xml()) def test_codegen(optstring): @@ -473,8 +472,8 @@ def scanner_main(args): exported_packages = options.packages transformer.namespace.c_includes = options.c_includes - writer = Writer(transformer.namespace, - exported_packages) + transformer.namespace.exported_packages = exported_packages + writer = Writer(transformer.namespace) data = writer.get_xml() write_output(data, options) diff --git a/giscanner/transformer.py b/giscanner/transformer.py index 4c008da1..e8cbf3d9 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -210,7 +210,7 @@ None.""" self._parse_include(dep_filename) if not uninstalled: - for pkg in parser.get_pkgconfig_packages(): + for pkg in parser.get_namespace().exported_packages: self._pkg_config_packages.add(pkg) namespace = parser.get_namespace() self._parsed_includes[namespace.name] = namespace -- cgit v1.2.1 From de6946c8a4ced56f7a24078b0d1aeacdb77e7f14 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 27 Feb 2013 08:46:53 -0500 Subject: tests: Add missing expected files --- .../Regress.FooBUnion.get_contained_type.page | 42 ++++++++++++++++++ .../Regress.FooBUnion.new.page | 42 ++++++++++++++++++ .../Regress.FooEnumType.method.page | 50 +++++++++++++++++++++ .../Regress.FooEnumType.returnv.page | 50 +++++++++++++++++++++ .../Regress.FooError.quark.page | 42 ++++++++++++++++++ .../Regress.TestABCError.quark.page | 42 ++++++++++++++++++ .../Regress.TestEnum.param.page | 50 +++++++++++++++++++++ .../Regress.TestError.quark.page | 42 ++++++++++++++++++ .../Regress.TestOtherError.quark.page | 42 ++++++++++++++++++ .../Regress.FooBUnion.get_contained_type.page | 51 ++++++++++++++++++++++ .../Regress.FooEnumType.method.page | 51 ++++++++++++++++++++++ .../Regress.FooEnumType.returnv.page | 51 ++++++++++++++++++++++ .../Regress.FooError.quark.page | 42 ++++++++++++++++++ .../Regress.TestABCError.quark.page | 42 ++++++++++++++++++ .../Regress.TestEnum.param.page | 51 ++++++++++++++++++++++ .../Regress.TestError.quark.page | 42 ++++++++++++++++++ .../Regress.TestOtherError.quark.page | 42 ++++++++++++++++++ 17 files changed, 774 insertions(+) create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.get_contained_type.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.new.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.method.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.returnv.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.quark.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.quark.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.param.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.quark.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.quark.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.get_contained_type.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.method.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.returnv.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.FooError.quark.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.quark.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.param.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestError.quark.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.quark.page diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.get_contained_type.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.get_contained_type.page new file mode 100644 index 00000000..7d82f4f6 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.get_contained_type.page @@ -0,0 +1,42 @@ + + + + + + + + Number + + regress_foo_bunion_get_contained_type + + + + Regress.FooBUnion.prototype.get_contained_type + + +function get_contained_type():Number { + // Gjs wrapper for regress_foo_bunion_get_contained_type() +} + + + + + + + + + + +<code>Returns</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.new.page new file mode 100644 index 00000000..e16397c9 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.new.page @@ -0,0 +1,42 @@ + + + + + + + + Regress.FooBUnion + + regress_foo_bunion_new + + + + Regress.FooBUnion.new + + +function new():Regress.FooBUnion { + // Gjs wrapper for regress_foo_bunion_new() +} + + + + + + + + + + +<code>Returns</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.method.page new file mode 100644 index 00000000..e3240c10 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.method.page @@ -0,0 +1,50 @@ + + + + + + + + Number + + regress_foo_enum_type_method + + Regress.FooEnumType + regress_foo_enum + + + + + method + + +function method(regress_foo_enum:Regress.FooEnumType):Number { + // Gjs wrapper for regress_foo_enum_type_method() +} + + + + + + + + + + +<code>regress_foo_enum</code> + + + +<code>Returns</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.returnv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.returnv.page new file mode 100644 index 00000000..4e42fdeb --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.returnv.page @@ -0,0 +1,50 @@ + + + + + + + + Regress.FooEnumType + + regress_foo_enum_type_returnv + + Number + x + + + + + returnv + + +function returnv(x:Number):Regress.FooEnumType { + // Gjs wrapper for regress_foo_enum_type_returnv() +} + + + + + + + + + + +<code>x</code> + + + +<code>Returns</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.quark.page new file mode 100644 index 00000000..ed023765 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.quark.page @@ -0,0 +1,42 @@ + + + + + + + + GLib.Quark + + regress_foo_error_quark + + + + quark + + +function quark():GLib.Quark { + // Gjs wrapper for regress_foo_error_quark() +} + + + + + + + + + + +<code>Returns</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.quark.page new file mode 100644 index 00000000..72f9adc3 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.quark.page @@ -0,0 +1,42 @@ + + + + + + + + GLib.Quark + + regress_test_abc_error_quark + + + + quark + + +function quark():GLib.Quark { + // Gjs wrapper for regress_test_abc_error_quark() +} + + + + + + + + + + +<code>Returns</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.param.page new file mode 100644 index 00000000..b4dfb296 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.param.page @@ -0,0 +1,50 @@ + + + + + + + + String + + regress_test_enum_param + + Regress.TestEnum + e + + + + + param + + +function param(e:Regress.TestEnum):String { + // Gjs wrapper for regress_test_enum_param() +} + + + + + + + + + + +<code>e</code> + + + +<code>Returns</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.quark.page new file mode 100644 index 00000000..f849bfe4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.quark.page @@ -0,0 +1,42 @@ + + + + + + + + GLib.Quark + + regress_test_error_quark + + + + quark + + +function quark():GLib.Quark { + // Gjs wrapper for regress_test_error_quark() +} + + + + + + + + + + +<code>Returns</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.quark.page new file mode 100644 index 00000000..d75b6aa4 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.quark.page @@ -0,0 +1,42 @@ + + + + + + + + GLib.Quark + + regress_test_unconventional_error_quark + + + + quark + + +function quark():GLib.Quark { + // Gjs wrapper for regress_test_unconventional_error_quark() +} + + + + + + + + + + +<code>Returns</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.get_contained_type.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.get_contained_type.page new file mode 100644 index 00000000..4052ec56 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooBUnion.get_contained_type.page @@ -0,0 +1,51 @@ + + + + + + + + int + + regress_foo_bunion_get_contained_type + + Regress.FooBUnion + self + + + + + Regress.FooBUnion.get_contained_type + + +@accepts(Regress.FooBUnion) +@returns(int) +def get_contained_type(self): + # Python wrapper for regress_foo_bunion_get_contained_type() + + + + + + + + + + +<code>self</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.method.page new file mode 100644 index 00000000..a802f265 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.method.page @@ -0,0 +1,51 @@ + + + + + + + + int + + regress_foo_enum_type_method + + Regress.FooEnumType + regress_foo_enum + + + + + Index.method + + +@accepts(Regress.FooEnumType) +@returns(int) +def method(regress_foo_enum): + # Python wrapper for regress_foo_enum_type_method() + + + + + + + + + + +<code>regress_foo_enum</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.returnv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.returnv.page new file mode 100644 index 00000000..149cc4fe --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.returnv.page @@ -0,0 +1,51 @@ + + + + + + + + Regress.FooEnumType + + regress_foo_enum_type_returnv + + int + x + + + + + Index.returnv + + +@accepts(int) +@returns(Regress.FooEnumType) +def returnv(x): + # Python wrapper for regress_foo_enum_type_returnv() + + + + + + + + + + +<code>x</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.quark.page new file mode 100644 index 00000000..81f81a7d --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.quark.page @@ -0,0 +1,42 @@ + + + + + + + + GLib.Quark + + regress_foo_error_quark + + + + Index.quark + + +@returns(GLib.Quark) +def quark(): + # Python wrapper for regress_foo_error_quark() + + + + + + + + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.quark.page new file mode 100644 index 00000000..8a8114df --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.quark.page @@ -0,0 +1,42 @@ + + + + + + + + GLib.Quark + + regress_test_abc_error_quark + + + + Index.quark + + +@returns(GLib.Quark) +def quark(): + # Python wrapper for regress_test_abc_error_quark() + + + + + + + + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.param.page new file mode 100644 index 00000000..24684786 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.param.page @@ -0,0 +1,51 @@ + + + + + + + + unicode + + regress_test_enum_param + + Regress.TestEnum + e + + + + + Index.param + + +@accepts(Regress.TestEnum) +@returns(unicode) +def param(e): + # Python wrapper for regress_test_enum_param() + + + + + + + + + + +<code>e</code> + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.quark.page new file mode 100644 index 00000000..07a91a37 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.quark.page @@ -0,0 +1,42 @@ + + + + + + + + GLib.Quark + + regress_test_error_quark + + + + Index.quark + + +@returns(GLib.Quark) +def quark(): + # Python wrapper for regress_test_error_quark() + + + + + + + + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.quark.page new file mode 100644 index 00000000..341e774e --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.quark.page @@ -0,0 +1,42 @@ + + + + + + + + GLib.Quark + + regress_test_unconventional_error_quark + + + + Index.quark + + +@returns(GLib.Quark) +def quark(): + # Python wrapper for regress_test_unconventional_error_quark() + + + + + + + + + + +<code>Returns</code> +{formatter.format(node, node.retval.doc)} + + + + + + -- cgit v1.2.1 From 2af5386d6cc1deba21f03c398c6368a9de6ed4ba Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 27 Feb 2013 12:14:16 +0100 Subject: Add test case for signal with a C array and length argument By-product of https://bugzilla.gnome.org/show_bug.cgi?id=662241. --- tests/repository/gitypelibtest.c | 43 +++++++++++++++++++ .../Regress.TestObj-sig-with-array-len-prop.page | 44 +++++++++++++++++++ .../Regress.TestObj-sig-with-array-len-prop.page | 39 +++++++++++++++++ .../Regress.TestObj-sig-with-array-len-prop.page | 49 ++++++++++++++++++++++ tests/scanner/Regress-1.0-expected.gir | 18 ++++++++ tests/scanner/regress.c | 22 ++++++++++ 6 files changed, 215 insertions(+) create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-len-prop.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-len-prop.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-len-prop.page diff --git a/tests/repository/gitypelibtest.c b/tests/repository/gitypelibtest.c index 54fe5234..e078699a 100644 --- a/tests/repository/gitypelibtest.c +++ b/tests/repository/gitypelibtest.c @@ -232,6 +232,48 @@ test_char_types (GIRepository *repo) g_base_info_unref (prop_obj); } +static void +test_signal_array_len (GIRepository *repo) +{ + GIObjectInfo *testobj_info; + GISignalInfo *sig_info; + GIArgInfo arg_info; + GITypeInfo type_info; + int i; + + g_assert (g_irepository_require (repo, "Regress", NULL, 0, NULL)); + testobj_info = g_irepository_find_by_name (repo, "Regress", "TestObj"); + g_assert (testobj_info != NULL); + + /* find sig-with-array-len-prop signal */ + for (i = g_object_info_get_n_signals (testobj_info) - 1; i >= 0; --i) { + sig_info = g_object_info_get_signal (testobj_info, i); + g_assert (sig_info != NULL); + if (strcmp (g_base_info_get_name (sig_info), "sig-with-array-len-prop") == 0) + break; + g_base_info_unref (sig_info); + } + g_assert (i >= 0); + + g_assert_cmpint (g_callable_info_get_n_args (sig_info), ==, 2); + + /* verify array argument */ + g_callable_info_load_arg (sig_info, 0, &arg_info); + g_assert_cmpstr (g_base_info_get_name (&arg_info), ==, "arr"); + g_arg_info_load_type (&arg_info, &type_info); + g_assert_cmpint (g_type_info_get_tag (&type_info), ==, GI_TYPE_TAG_ARRAY); + g_assert_cmpint (g_type_info_get_array_type (&type_info), ==, GI_ARRAY_TYPE_C); + g_assert (!g_type_info_is_zero_terminated (&type_info)); + g_assert_cmpint (g_type_info_get_array_length (&type_info), ==, 1); + + /* verify array length argument */ + g_callable_info_load_arg (sig_info, 1, &arg_info); + g_assert_cmpstr (g_base_info_get_name (&arg_info), ==, "len"); + + g_base_info_unref (sig_info); + g_base_info_unref (testobj_info); +} + int main(int argc, char **argv) { @@ -247,6 +289,7 @@ main(int argc, char **argv) test_fundamental_get_ref_function_pointer (repo); test_hash_with_cairo_typelib (repo); test_char_types (repo); + test_signal_array_len (repo); exit(0); } diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-len-prop.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-len-prop.page new file mode 100644 index 00000000..9ec983b1 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestObj-sig-with-array-len-prop.page @@ -0,0 +1,44 @@ + + + + + + sig-with-array-len-prop + + + Regress.TestObj::sig-with-array-len-prop + + +void sig-with-array-len-prop (guint* arr, + gint len); + + + +

This test signal similar to GSettings::change-event

+ + + + + + +<code>arr</code> +

numbers, or NULL

+ + +<code>len</code> +

length of arr, or 0

+ + +<code>Returns</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-len-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-len-prop.page new file mode 100644 index 00000000..c359b137 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-len-prop.page @@ -0,0 +1,39 @@ + + + + + + sig-with-array-len-prop + + + Regress.TestObj::sig-with-array-len-prop + + +function callback(test_obj, arr:[Number], ):void; + + + +

This test signal similar to GSettings::change-event

+ + + + + + +<code>test_obj</code> +

instance of that is emitting the signal

+ + +<code>arr</code> +

numbers, or null

+ + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-len-prop.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-len-prop.page new file mode 100644 index 00000000..a228de1f --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestObj-sig-with-array-len-prop.page @@ -0,0 +1,49 @@ + + + + + + sig-with-array-len-prop + + + Regress.TestObj::sig-with-array-len-prop + + +def callback(test_obj, arr, len, user_param1, ...) + + + +

This test signal similar to GSettings::change-event

+ + + + + + +<code>test_obj</code> +

instance of that is emitting the signal

+ + +<code>arr</code> +

numbers, or None

+ + +<code>len</code> +

length of arr, or 0

+ +<code>user_param1</code> +

first user parameter (if any) specified with the connect() method

+ +<code>...</code> +

additional user parameters (if any)

+ + + + + + diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 35c7c694..53773cae 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -3331,6 +3331,24 @@ raise an error. + + This test signal similar to GSettings::change-event + + + + + + numbers, or %NULL + + + + + + length of @arr, or 0 + + + + This test signal is like TelepathyGlib's TpChannel:: group-members-changed-detailed: diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c index b5fc8585..f54c2f91 100644 --- a/tests/scanner/regress.c +++ b/tests/scanner/regress.c @@ -2173,6 +2173,7 @@ regress_test_obj_default_matrix (RegressTestObj *obj, const char *somestr) enum { REGRESS_TEST_OBJ_SIGNAL_SIG_NEW_WITH_ARRAY_PROP, + REGRESS_TEST_OBJ_SIGNAL_SIG_NEW_WITH_ARRAY_LEN_PROP, REGRESS_TEST_OBJ_SIGNAL_SIG_WITH_HASH_PROP, REGRESS_TEST_OBJ_SIGNAL_SIG_WITH_STRV, REGRESS_TEST_OBJ_SIGNAL_SIG_WITH_OBJ, @@ -2240,6 +2241,27 @@ regress_test_obj_class_init (RegressTestObjClass *klass) 1, G_TYPE_ARRAY); + /** + * RegressTestObj::sig-with-array-len-prop: + * @self: an object + * @arr: (array length=len) (element-type uint) (allow-none): numbers, or %NULL + * @len: length of @arr, or 0 + * + * This test signal similar to GSettings::change-event + */ + regress_test_obj_signals[REGRESS_TEST_OBJ_SIGNAL_SIG_NEW_WITH_ARRAY_LEN_PROP] = + g_signal_new ("sig-with-array-len-prop", + G_TYPE_FROM_CLASS (gobject_class), + G_SIGNAL_RUN_LAST, + 0, + NULL, + NULL, + NULL, + G_TYPE_NONE, + 2, + G_TYPE_POINTER, + G_TYPE_INT); + /** * RegressTestObj::sig-with-hash-prop: * @self: an object -- cgit v1.2.1 From a701d2737277cd6cd8084e105db9922f14ec5fe5 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Wed, 27 Feb 2013 15:15:35 +0100 Subject: Reformat code to GNU style This was achieved by running "indent -gnu -i2 -nut -l120" over C files which use a different style, and manually fixing pointer declarations and modelines. --- examples/glib-print.c | 60 +- tests/gimarshallingtests.c | 3337 ++++++++++++++++++++------------------ tests/repository/gitypelibtest.c | 434 ++--- tests/scanner/gettype.c | 14 +- 4 files changed, 1973 insertions(+), 1872 deletions(-) diff --git a/examples/glib-print.c b/examples/glib-print.c index 606a29f3..4e117d9d 100644 --- a/examples/glib-print.c +++ b/examples/glib-print.c @@ -1,44 +1,48 @@ #include -int main(void) +int +main (void) { - GIRepository *repository; - GError *error = NULL; - GIBaseInfo *base_info; - GIArgument in_args[5]; - GIArgument retval; + GIRepository *repository; + GError *error = NULL; + GIBaseInfo *base_info; + GIArgument in_args[5]; + GIArgument retval; - repository = g_irepository_get_default(); - g_irepository_require(repository, "GLib", "2.0", 0, &error); - if (error) { - g_error("ERROR: %s\n", error->message); + repository = g_irepository_get_default (); + g_irepository_require (repository, "GLib", "2.0", 0, &error); + if (error) + { + g_error ("ERROR: %s\n", error->message); return 1; } - base_info = g_irepository_find_by_name(repository, "GLib", "assertion_message"); - if (!base_info) { - g_error("ERROR: %s\n", "Could not find GLib.warn_message"); + base_info = g_irepository_find_by_name (repository, "GLib", "assertion_message"); + if (!base_info) + { + g_error ("ERROR: %s\n", "Could not find GLib.warn_message"); return 1; } - in_args[0].v_pointer = "domain"; - in_args[1].v_pointer = "glib-print.c"; - in_args[2].v_pointer = "30"; - in_args[3].v_pointer = "main"; - in_args[4].v_pointer = "hello world"; + in_args[0].v_pointer = "domain"; + in_args[1].v_pointer = "glib-print.c"; + in_args[2].v_pointer = "30"; + in_args[3].v_pointer = "main"; + in_args[4].v_pointer = "hello world"; - if (!g_function_info_invoke ((GIFunctionInfo *)base_info, - (const GIArgument*)&in_args, - 5, - NULL, - 0, - &retval, - &error)) { - g_error("ERROR: %s\n", error->message); + if (!g_function_info_invoke ((GIFunctionInfo *) base_info, + (const GIArgument *) &in_args, + 5, + NULL, + 0, + &retval, + &error)) + { + g_error ("ERROR: %s\n", error->message); return 1; } - g_base_info_unref (base_info); + g_base_info_unref (base_info); - return 0; + return 0; } diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index 4f4be615..0869a9a2 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -1,5 +1,5 @@ /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- - * vim: tabstop=4 shiftwidth=4 expandtab + *vim: tabstop=4 shiftwidth=4 expandtab */ #include "gimarshallingtests.h" @@ -13,25 +13,25 @@ static void gi_marshalling_tests_boxed_struct_free (GIMarshallingTestsBoxedStruc gboolean gi_marshalling_tests_boolean_return_true (void) { - return TRUE; + return TRUE; } gboolean gi_marshalling_tests_boolean_return_false (void) { - return FALSE; + return FALSE; } void gi_marshalling_tests_boolean_in_true (gboolean v) { - g_assert (v == TRUE); + g_assert (v == TRUE); } void gi_marshalling_tests_boolean_in_false (gboolean v) { - g_assert (v == FALSE); + g_assert (v == FALSE); } /** @@ -41,7 +41,7 @@ gi_marshalling_tests_boolean_in_false (gboolean v) void gi_marshalling_tests_boolean_out_true (gboolean *v) { - *v = TRUE; + *v = TRUE; } /** @@ -51,7 +51,7 @@ gi_marshalling_tests_boolean_out_true (gboolean *v) void gi_marshalling_tests_boolean_out_false (gboolean *v) { - *v = FALSE; + *v = FALSE; } /** @@ -61,8 +61,8 @@ gi_marshalling_tests_boolean_out_false (gboolean *v) void gi_marshalling_tests_boolean_inout_true_false (gboolean *v) { - g_assert (*v == TRUE); - *v = FALSE; + g_assert (*v == TRUE); + *v = FALSE; } /** @@ -72,8 +72,8 @@ gi_marshalling_tests_boolean_inout_true_false (gboolean *v) void gi_marshalling_tests_boolean_inout_false_true (gboolean *v) { - g_assert (*v == FALSE); - *v = TRUE; + g_assert (*v == FALSE); + *v = TRUE; } @@ -82,25 +82,25 @@ gi_marshalling_tests_boolean_inout_false_true (gboolean *v) gint8 gi_marshalling_tests_int8_return_max (void) { - return G_MAXINT8; + return G_MAXINT8; } gint8 gi_marshalling_tests_int8_return_min (void) { - return G_MININT8; + return G_MININT8; } void gi_marshalling_tests_int8_in_max (gint8 v) { - g_assert_cmpint(v, ==, G_MAXINT8); + g_assert_cmpint (v, ==, G_MAXINT8); } void gi_marshalling_tests_int8_in_min (gint8 v) { - g_assert_cmpint(v, ==, G_MININT8); + g_assert_cmpint (v, ==, G_MININT8); } /** @@ -110,7 +110,7 @@ gi_marshalling_tests_int8_in_min (gint8 v) void gi_marshalling_tests_int8_out_max (gint8 *v) { - *v = G_MAXINT8; + *v = G_MAXINT8; } /** @@ -120,7 +120,7 @@ gi_marshalling_tests_int8_out_max (gint8 *v) void gi_marshalling_tests_int8_out_min (gint8 *v) { - *v = G_MININT8; + *v = G_MININT8; } /** @@ -130,8 +130,8 @@ gi_marshalling_tests_int8_out_min (gint8 *v) void gi_marshalling_tests_int8_inout_max_min (gint8 *v) { - g_assert_cmpint(*v, ==, G_MAXINT8); - *v = G_MININT8; + g_assert_cmpint (*v, ==, G_MAXINT8); + *v = G_MININT8; } /** @@ -141,21 +141,21 @@ gi_marshalling_tests_int8_inout_max_min (gint8 *v) void gi_marshalling_tests_int8_inout_min_max (gint8 *v) { - g_assert_cmpint(*v, ==, G_MININT8); - *v = G_MAXINT8; + g_assert_cmpint (*v, ==, G_MININT8); + *v = G_MAXINT8; } guint8 gi_marshalling_tests_uint8_return (void) { - return G_MAXUINT8; + return G_MAXUINT8; } void gi_marshalling_tests_uint8_in (guint8 v) { - g_assert_cmpuint(v, ==, G_MAXUINT8); + g_assert_cmpuint (v, ==, G_MAXUINT8); } /** @@ -165,7 +165,7 @@ gi_marshalling_tests_uint8_in (guint8 v) void gi_marshalling_tests_uint8_out (guint8 *v) { - *v = G_MAXUINT8; + *v = G_MAXUINT8; } /** @@ -175,33 +175,33 @@ gi_marshalling_tests_uint8_out (guint8 *v) void gi_marshalling_tests_uint8_inout (guint8 *v) { - g_assert_cmpuint(*v, ==, G_MAXUINT8); - *v = 0; + g_assert_cmpuint (*v, ==, G_MAXUINT8); + *v = 0; } gint16 gi_marshalling_tests_int16_return_max (void) { - return G_MAXINT16; + return G_MAXINT16; } gint16 gi_marshalling_tests_int16_return_min (void) { - return G_MININT16; + return G_MININT16; } void gi_marshalling_tests_int16_in_max (gint16 v) { - g_assert_cmpint(v, ==, G_MAXINT16); + g_assert_cmpint (v, ==, G_MAXINT16); } void gi_marshalling_tests_int16_in_min (gint16 v) { - g_assert_cmpint(v, ==, G_MININT16); + g_assert_cmpint (v, ==, G_MININT16); } /** @@ -211,7 +211,7 @@ gi_marshalling_tests_int16_in_min (gint16 v) void gi_marshalling_tests_int16_out_max (gint16 *v) { - *v = G_MAXINT16; + *v = G_MAXINT16; } /** @@ -221,7 +221,7 @@ gi_marshalling_tests_int16_out_max (gint16 *v) void gi_marshalling_tests_int16_out_min (gint16 *v) { - *v = G_MININT16; + *v = G_MININT16; } /** @@ -231,8 +231,8 @@ gi_marshalling_tests_int16_out_min (gint16 *v) void gi_marshalling_tests_int16_inout_max_min (gint16 *v) { - g_assert_cmpint(*v, ==, G_MAXINT16); - *v = G_MININT16; + g_assert_cmpint (*v, ==, G_MAXINT16); + *v = G_MININT16; } /** @@ -242,21 +242,21 @@ gi_marshalling_tests_int16_inout_max_min (gint16 *v) void gi_marshalling_tests_int16_inout_min_max (gint16 *v) { - g_assert_cmpint(*v, ==, G_MININT16); - *v = G_MAXINT16; + g_assert_cmpint (*v, ==, G_MININT16); + *v = G_MAXINT16; } guint16 gi_marshalling_tests_uint16_return (void) { - return G_MAXUINT16; + return G_MAXUINT16; } void gi_marshalling_tests_uint16_in (guint16 v) { - g_assert_cmpuint(v, ==, G_MAXUINT16); + g_assert_cmpuint (v, ==, G_MAXUINT16); } /** @@ -266,7 +266,7 @@ gi_marshalling_tests_uint16_in (guint16 v) void gi_marshalling_tests_uint16_out (guint16 *v) { - *v = G_MAXUINT16; + *v = G_MAXUINT16; } /** @@ -276,33 +276,33 @@ gi_marshalling_tests_uint16_out (guint16 *v) void gi_marshalling_tests_uint16_inout (guint16 *v) { - g_assert_cmpuint(*v, ==, G_MAXUINT16); - *v = 0; + g_assert_cmpuint (*v, ==, G_MAXUINT16); + *v = 0; } gint32 gi_marshalling_tests_int32_return_max (void) { - return G_MAXINT32; + return G_MAXINT32; } gint32 gi_marshalling_tests_int32_return_min (void) { - return G_MININT32; + return G_MININT32; } void gi_marshalling_tests_int32_in_max (gint32 v) { - g_assert_cmpint(v, ==, G_MAXINT32); + g_assert_cmpint (v, ==, G_MAXINT32); } void gi_marshalling_tests_int32_in_min (gint32 v) { - g_assert_cmpint(v, ==, G_MININT32); + g_assert_cmpint (v, ==, G_MININT32); } /** @@ -312,7 +312,7 @@ gi_marshalling_tests_int32_in_min (gint32 v) void gi_marshalling_tests_int32_out_max (gint32 *v) { - *v = G_MAXINT32; + *v = G_MAXINT32; } /** @@ -322,7 +322,7 @@ gi_marshalling_tests_int32_out_max (gint32 *v) void gi_marshalling_tests_int32_out_min (gint32 *v) { - *v = G_MININT32; + *v = G_MININT32; } /** @@ -332,8 +332,8 @@ gi_marshalling_tests_int32_out_min (gint32 *v) void gi_marshalling_tests_int32_inout_max_min (gint32 *v) { - g_assert_cmpint(*v, ==, G_MAXINT32); - *v = G_MININT32; + g_assert_cmpint (*v, ==, G_MAXINT32); + *v = G_MININT32; } /** @@ -343,21 +343,21 @@ gi_marshalling_tests_int32_inout_max_min (gint32 *v) void gi_marshalling_tests_int32_inout_min_max (gint32 *v) { - g_assert_cmpint(*v, ==, G_MININT32); - *v = G_MAXINT32; + g_assert_cmpint (*v, ==, G_MININT32); + *v = G_MAXINT32; } guint32 gi_marshalling_tests_uint32_return (void) { - return G_MAXUINT32; + return G_MAXUINT32; } void gi_marshalling_tests_uint32_in (guint32 v) { - g_assert_cmpuint(v, ==, G_MAXUINT32); + g_assert_cmpuint (v, ==, G_MAXUINT32); } /** @@ -367,7 +367,7 @@ gi_marshalling_tests_uint32_in (guint32 v) void gi_marshalling_tests_uint32_out (guint32 *v) { - *v = G_MAXUINT32; + *v = G_MAXUINT32; } /** @@ -377,33 +377,33 @@ gi_marshalling_tests_uint32_out (guint32 *v) void gi_marshalling_tests_uint32_inout (guint32 *v) { - g_assert_cmpuint(*v, ==, G_MAXUINT32); - *v = 0; + g_assert_cmpuint (*v, ==, G_MAXUINT32); + *v = 0; } gint64 gi_marshalling_tests_int64_return_max (void) { - return G_MAXINT64; + return G_MAXINT64; } gint64 gi_marshalling_tests_int64_return_min (void) { - return G_MININT64; + return G_MININT64; } void gi_marshalling_tests_int64_in_max (gint64 v) { - g_assert_cmpint(v, ==, G_MAXINT64); + g_assert_cmpint (v, ==, G_MAXINT64); } void gi_marshalling_tests_int64_in_min (gint64 v) { - g_assert_cmpint(v, ==, G_MININT64); + g_assert_cmpint (v, ==, G_MININT64); } /** @@ -413,7 +413,7 @@ gi_marshalling_tests_int64_in_min (gint64 v) void gi_marshalling_tests_int64_out_max (gint64 *v) { - *v = G_MAXINT64; + *v = G_MAXINT64; } /** @@ -423,7 +423,7 @@ gi_marshalling_tests_int64_out_max (gint64 *v) void gi_marshalling_tests_int64_out_min (gint64 *v) { - *v = G_MININT64; + *v = G_MININT64; } /** @@ -433,8 +433,8 @@ gi_marshalling_tests_int64_out_min (gint64 *v) void gi_marshalling_tests_int64_inout_max_min (gint64 *v) { - g_assert_cmpint(*v, ==, G_MAXINT64); - *v = G_MININT64; + g_assert_cmpint (*v, ==, G_MAXINT64); + *v = G_MININT64; } /** @@ -444,21 +444,21 @@ gi_marshalling_tests_int64_inout_max_min (gint64 *v) void gi_marshalling_tests_int64_inout_min_max (gint64 *v) { - g_assert_cmpint(*v, ==, G_MININT64); - *v = G_MAXINT64; + g_assert_cmpint (*v, ==, G_MININT64); + *v = G_MAXINT64; } guint64 gi_marshalling_tests_uint64_return (void) { - return G_MAXUINT64; + return G_MAXUINT64; } void gi_marshalling_tests_uint64_in (guint64 v) { - g_assert_cmpuint(v, ==, G_MAXUINT64); + g_assert_cmpuint (v, ==, G_MAXUINT64); } /** @@ -468,7 +468,7 @@ gi_marshalling_tests_uint64_in (guint64 v) void gi_marshalling_tests_uint64_out (guint64 *v) { - *v = G_MAXUINT64; + *v = G_MAXUINT64; } /** @@ -478,33 +478,33 @@ gi_marshalling_tests_uint64_out (guint64 *v) void gi_marshalling_tests_uint64_inout (guint64 *v) { - g_assert_cmpuint(*v, ==, G_MAXUINT64); - *v = 0; + g_assert_cmpuint (*v, ==, G_MAXUINT64); + *v = 0; } gshort gi_marshalling_tests_short_return_max (void) { - return G_MAXSHORT; + return G_MAXSHORT; } gshort gi_marshalling_tests_short_return_min (void) { - return G_MINSHORT; + return G_MINSHORT; } void gi_marshalling_tests_short_in_max (gshort short_) { - g_assert_cmpint(short_, ==, G_MAXSHORT); + g_assert_cmpint (short_, ==, G_MAXSHORT); } void gi_marshalling_tests_short_in_min (gshort short_) { - g_assert_cmpint(short_, ==, G_MINSHORT); + g_assert_cmpint (short_, ==, G_MINSHORT); } /** @@ -514,7 +514,7 @@ gi_marshalling_tests_short_in_min (gshort short_) void gi_marshalling_tests_short_out_max (gshort *short_) { - *short_ = G_MAXSHORT; + *short_ = G_MAXSHORT; } /** @@ -524,7 +524,7 @@ gi_marshalling_tests_short_out_max (gshort *short_) void gi_marshalling_tests_short_out_min (gshort *short_) { - *short_ = G_MINSHORT; + *short_ = G_MINSHORT; } /** @@ -534,8 +534,8 @@ gi_marshalling_tests_short_out_min (gshort *short_) void gi_marshalling_tests_short_inout_max_min (gshort *short_) { - g_assert_cmpint(*short_, ==, G_MAXSHORT); - *short_ = G_MINSHORT; + g_assert_cmpint (*short_, ==, G_MAXSHORT); + *short_ = G_MINSHORT; } /** @@ -545,21 +545,21 @@ gi_marshalling_tests_short_inout_max_min (gshort *short_) void gi_marshalling_tests_short_inout_min_max (gshort *short_) { - g_assert_cmpint(*short_, ==, G_MINSHORT); - *short_ = G_MAXSHORT; + g_assert_cmpint (*short_, ==, G_MINSHORT); + *short_ = G_MAXSHORT; } gushort gi_marshalling_tests_ushort_return (void) { - return G_MAXUSHORT; + return G_MAXUSHORT; } void gi_marshalling_tests_ushort_in (gushort ushort_) { - g_assert_cmpuint(ushort_, ==, G_MAXUSHORT); + g_assert_cmpuint (ushort_, ==, G_MAXUSHORT); } /** @@ -569,7 +569,7 @@ gi_marshalling_tests_ushort_in (gushort ushort_) void gi_marshalling_tests_ushort_out (gushort *ushort_) { - *ushort_ = G_MAXUSHORT; + *ushort_ = G_MAXUSHORT; } /** @@ -579,33 +579,33 @@ gi_marshalling_tests_ushort_out (gushort *ushort_) void gi_marshalling_tests_ushort_inout (gushort *ushort_) { - g_assert_cmpuint(*ushort_, ==, G_MAXUSHORT); - *ushort_ = 0; + g_assert_cmpuint (*ushort_, ==, G_MAXUSHORT); + *ushort_ = 0; } gint gi_marshalling_tests_int_return_max (void) { - return G_MAXINT; + return G_MAXINT; } gint gi_marshalling_tests_int_return_min (void) { - return G_MININT; + return G_MININT; } void gi_marshalling_tests_int_in_max (gint int_) { - g_assert_cmpint(int_, ==, G_MAXINT); + g_assert_cmpint (int_, ==, G_MAXINT); } void gi_marshalling_tests_int_in_min (gint int_) { - g_assert_cmpint(int_, ==, G_MININT); + g_assert_cmpint (int_, ==, G_MININT); } /** @@ -615,7 +615,7 @@ gi_marshalling_tests_int_in_min (gint int_) void gi_marshalling_tests_int_out_max (gint *int_) { - *int_ = G_MAXINT; + *int_ = G_MAXINT; } /** @@ -625,7 +625,7 @@ gi_marshalling_tests_int_out_max (gint *int_) void gi_marshalling_tests_int_out_min (gint *int_) { - *int_ = G_MININT; + *int_ = G_MININT; } /** @@ -635,8 +635,8 @@ gi_marshalling_tests_int_out_min (gint *int_) void gi_marshalling_tests_int_inout_max_min (gint *int_) { - g_assert_cmpint(*int_, ==, G_MAXINT); - *int_ = G_MININT; + g_assert_cmpint (*int_, ==, G_MAXINT); + *int_ = G_MININT; } /** @@ -646,21 +646,21 @@ gi_marshalling_tests_int_inout_max_min (gint *int_) void gi_marshalling_tests_int_inout_min_max (gint *int_) { - g_assert_cmpint(*int_, ==, G_MININT); - *int_ = G_MAXINT; + g_assert_cmpint (*int_, ==, G_MININT); + *int_ = G_MAXINT; } guint gi_marshalling_tests_uint_return (void) { - return G_MAXUINT; + return G_MAXUINT; } void gi_marshalling_tests_uint_in (guint uint_) { - g_assert_cmpuint(uint_, ==, G_MAXUINT); + g_assert_cmpuint (uint_, ==, G_MAXUINT); } /** @@ -670,7 +670,7 @@ gi_marshalling_tests_uint_in (guint uint_) void gi_marshalling_tests_uint_out (guint *uint_) { - *uint_ = G_MAXUINT; + *uint_ = G_MAXUINT; } /** @@ -680,33 +680,33 @@ gi_marshalling_tests_uint_out (guint *uint_) void gi_marshalling_tests_uint_inout (guint *uint_) { - g_assert_cmpuint(*uint_, ==, G_MAXUINT); - *uint_ = 0; + g_assert_cmpuint (*uint_, ==, G_MAXUINT); + *uint_ = 0; } glong gi_marshalling_tests_long_return_max (void) { - return G_MAXLONG; + return G_MAXLONG; } glong gi_marshalling_tests_long_return_min (void) { - return G_MINLONG; + return G_MINLONG; } void gi_marshalling_tests_long_in_max (glong long_) { - g_assert_cmpint(long_, ==, G_MAXLONG); + g_assert_cmpint (long_, ==, G_MAXLONG); } void gi_marshalling_tests_long_in_min (glong long_) { - g_assert_cmpint(long_, ==, G_MINLONG); + g_assert_cmpint (long_, ==, G_MINLONG); } /** @@ -716,7 +716,7 @@ gi_marshalling_tests_long_in_min (glong long_) void gi_marshalling_tests_long_out_max (glong *long_) { - *long_ = G_MAXLONG; + *long_ = G_MAXLONG; } /** @@ -726,7 +726,7 @@ gi_marshalling_tests_long_out_max (glong *long_) void gi_marshalling_tests_long_out_min (glong *long_) { - *long_ = G_MINLONG; + *long_ = G_MINLONG; } /** @@ -736,8 +736,8 @@ gi_marshalling_tests_long_out_min (glong *long_) void gi_marshalling_tests_long_inout_max_min (glong *long_) { - g_assert_cmpint(*long_, ==, G_MAXLONG); - *long_ = G_MINLONG; + g_assert_cmpint (*long_, ==, G_MAXLONG); + *long_ = G_MINLONG; } /** @@ -747,21 +747,21 @@ gi_marshalling_tests_long_inout_max_min (glong *long_) void gi_marshalling_tests_long_inout_min_max (glong *long_) { - g_assert_cmpint(*long_, ==, G_MINLONG); - *long_ = G_MAXLONG; + g_assert_cmpint (*long_, ==, G_MINLONG); + *long_ = G_MAXLONG; } gulong gi_marshalling_tests_ulong_return (void) { - return G_MAXULONG; + return G_MAXULONG; } void gi_marshalling_tests_ulong_in (gulong ulong_) { - g_assert_cmpuint(ulong_, ==, G_MAXULONG); + g_assert_cmpuint (ulong_, ==, G_MAXULONG); } /** @@ -771,7 +771,7 @@ gi_marshalling_tests_ulong_in (gulong ulong_) void gi_marshalling_tests_ulong_out (gulong *ulong_) { - *ulong_ = G_MAXULONG; + *ulong_ = G_MAXULONG; } /** @@ -781,33 +781,33 @@ gi_marshalling_tests_ulong_out (gulong *ulong_) void gi_marshalling_tests_ulong_inout (gulong *ulong_) { - g_assert_cmpuint(*ulong_, ==, G_MAXULONG); - *ulong_ = 0; + g_assert_cmpuint (*ulong_, ==, G_MAXULONG); + *ulong_ = 0; } gssize gi_marshalling_tests_ssize_return_max (void) { - return G_MAXSSIZE; + return G_MAXSSIZE; } gssize gi_marshalling_tests_ssize_return_min (void) { - return G_MINSSIZE; + return G_MINSSIZE; } void gi_marshalling_tests_ssize_in_max (gssize ssize) { - g_assert_cmpint(ssize, ==, G_MAXSSIZE); + g_assert_cmpint (ssize, ==, G_MAXSSIZE); } void gi_marshalling_tests_ssize_in_min (gssize ssize) { - g_assert_cmpint(ssize, ==, G_MINSSIZE); + g_assert_cmpint (ssize, ==, G_MINSSIZE); } /** @@ -817,7 +817,7 @@ gi_marshalling_tests_ssize_in_min (gssize ssize) void gi_marshalling_tests_ssize_out_max (gssize *ssize) { - *ssize = G_MAXSSIZE; + *ssize = G_MAXSSIZE; } /** @@ -827,7 +827,7 @@ gi_marshalling_tests_ssize_out_max (gssize *ssize) void gi_marshalling_tests_ssize_out_min (gssize *ssize) { - *ssize = G_MINSSIZE; + *ssize = G_MINSSIZE; } /** @@ -837,8 +837,8 @@ gi_marshalling_tests_ssize_out_min (gssize *ssize) void gi_marshalling_tests_ssize_inout_max_min (gssize *ssize) { - g_assert_cmpint(*ssize, ==, G_MAXSSIZE); - *ssize = G_MINSSIZE; + g_assert_cmpint (*ssize, ==, G_MAXSSIZE); + *ssize = G_MINSSIZE; } /** @@ -848,21 +848,21 @@ gi_marshalling_tests_ssize_inout_max_min (gssize *ssize) void gi_marshalling_tests_ssize_inout_min_max (gssize *ssize) { - g_assert_cmpint(*ssize, ==, G_MINSSIZE); - *ssize = G_MAXSSIZE; + g_assert_cmpint (*ssize, ==, G_MINSSIZE); + *ssize = G_MAXSSIZE; } gsize gi_marshalling_tests_size_return (void) { - return G_MAXSIZE; + return G_MAXSIZE; } void gi_marshalling_tests_size_in (gsize size) { - g_assert_cmpuint(size, ==, G_MAXSIZE); + g_assert_cmpuint (size, ==, G_MAXSIZE); } /** @@ -872,7 +872,7 @@ gi_marshalling_tests_size_in (gsize size) void gi_marshalling_tests_size_out (gsize *size) { - *size = G_MAXSIZE; + *size = G_MAXSIZE; } /** @@ -882,21 +882,21 @@ gi_marshalling_tests_size_out (gsize *size) void gi_marshalling_tests_size_inout (gsize *size) { - g_assert_cmpuint(*size, ==, G_MAXSIZE); - *size = 0; + g_assert_cmpuint (*size, ==, G_MAXSIZE); + *size = 0; } gfloat gi_marshalling_tests_float_return (void) { - return G_MAXFLOAT; + return G_MAXFLOAT; } void gi_marshalling_tests_float_in (gfloat v) { - g_assert_cmpfloat(v, ==, G_MAXFLOAT); + g_assert_cmpfloat (v, ==, G_MAXFLOAT); } /** @@ -906,7 +906,7 @@ gi_marshalling_tests_float_in (gfloat v) void gi_marshalling_tests_float_out (gfloat *v) { - *v = G_MAXFLOAT; + *v = G_MAXFLOAT; } /** @@ -916,21 +916,21 @@ gi_marshalling_tests_float_out (gfloat *v) void gi_marshalling_tests_float_inout (gfloat *v) { - g_assert_cmpfloat(*v, ==, G_MAXFLOAT); - *v = G_MINFLOAT; + g_assert_cmpfloat (*v, ==, G_MAXFLOAT); + *v = G_MINFLOAT; } gdouble gi_marshalling_tests_double_return (void) { - return G_MAXDOUBLE; + return G_MAXDOUBLE; } void gi_marshalling_tests_double_in (gdouble v) { - g_assert_cmpfloat(v, ==, G_MAXDOUBLE); + g_assert_cmpfloat (v, ==, G_MAXDOUBLE); } /** @@ -940,7 +940,7 @@ gi_marshalling_tests_double_in (gdouble v) void gi_marshalling_tests_double_out (gdouble *v) { - *v = G_MAXDOUBLE; + *v = G_MAXDOUBLE; } /** @@ -950,21 +950,21 @@ gi_marshalling_tests_double_out (gdouble *v) void gi_marshalling_tests_double_inout (gdouble *v) { - g_assert_cmpfloat(*v, ==, G_MAXDOUBLE); - *v = G_MINDOUBLE; + g_assert_cmpfloat (*v, ==, G_MAXDOUBLE); + *v = G_MINDOUBLE; } time_t gi_marshalling_tests_time_t_return (void) { - return 1234567890; + return 1234567890; } void gi_marshalling_tests_time_t_in (time_t v) { - g_assert_cmpuint(v, ==, 1234567890); + g_assert_cmpuint (v, ==, 1234567890); } /** @@ -974,7 +974,7 @@ gi_marshalling_tests_time_t_in (time_t v) void gi_marshalling_tests_time_t_out (time_t *v) { - *v = 1234567890; + *v = 1234567890; } /** @@ -984,33 +984,33 @@ gi_marshalling_tests_time_t_out (time_t *v) void gi_marshalling_tests_time_t_inout (time_t *v) { - g_assert_cmpuint(*v, ==, 1234567890); - *v = 0; + g_assert_cmpuint (*v, ==, 1234567890); + *v = 0; } GType gi_marshalling_tests_gtype_return (void) { - return G_TYPE_NONE; + return G_TYPE_NONE; } GType gi_marshalling_tests_gtype_string_return (void) { - return G_TYPE_STRING; + return G_TYPE_STRING; } void gi_marshalling_tests_gtype_in (GType gtype) { - g_assert(gtype == G_TYPE_NONE); + g_assert (gtype == G_TYPE_NONE); } void gi_marshalling_tests_gtype_string_in (GType gtype) { - g_assert(gtype == G_TYPE_STRING); + g_assert (gtype == G_TYPE_STRING); } @@ -1021,7 +1021,7 @@ gi_marshalling_tests_gtype_string_in (GType gtype) void gi_marshalling_tests_gtype_out (GType *gtype) { - *gtype = G_TYPE_NONE; + *gtype = G_TYPE_NONE; } /** @@ -1031,7 +1031,7 @@ gi_marshalling_tests_gtype_out (GType *gtype) void gi_marshalling_tests_gtype_string_out (GType *gtype) { - *gtype = G_TYPE_STRING; + *gtype = G_TYPE_STRING; } /** @@ -1041,27 +1041,27 @@ gi_marshalling_tests_gtype_string_out (GType *gtype) void gi_marshalling_tests_gtype_inout (GType *gtype) { - g_assert(*gtype == G_TYPE_NONE); - *gtype = G_TYPE_INT; + g_assert (*gtype == G_TYPE_NONE); + *gtype = G_TYPE_INT; } const gchar * gi_marshalling_tests_utf8_none_return (void) { - return GI_MARSHALLING_TESTS_CONSTANT_UTF8; + return GI_MARSHALLING_TESTS_CONSTANT_UTF8; } gchar * gi_marshalling_tests_utf8_full_return (void) { - return g_strdup(GI_MARSHALLING_TESTS_CONSTANT_UTF8); + return g_strdup (GI_MARSHALLING_TESTS_CONSTANT_UTF8); } void gi_marshalling_tests_utf8_none_in (const gchar *utf8) { - g_assert_cmpstr(GI_MARSHALLING_TESTS_CONSTANT_UTF8, ==, utf8); + g_assert_cmpstr (GI_MARSHALLING_TESTS_CONSTANT_UTF8, ==, utf8); } /** @@ -1074,8 +1074,7 @@ gi_marshalling_tests_utf8_none_in (const gchar *utf8) * UTF-16) to UTF-8. */ void -gi_marshalling_tests_utf8_as_uint8array_in (const guint8 *array, - gsize len) +gi_marshalling_tests_utf8_as_uint8array_in (const guint8 *array, gsize len) { gsize orig_len = strlen (GI_MARSHALLING_TESTS_CONSTANT_UTF8); g_assert_cmpint (orig_len, ==, len); @@ -1089,7 +1088,7 @@ gi_marshalling_tests_utf8_as_uint8array_in (const guint8 *array, void gi_marshalling_tests_utf8_none_out (gchar **utf8) { - *utf8 = GI_MARSHALLING_TESTS_CONSTANT_UTF8; + *utf8 = GI_MARSHALLING_TESTS_CONSTANT_UTF8; } /** @@ -1099,7 +1098,7 @@ gi_marshalling_tests_utf8_none_out (gchar **utf8) void gi_marshalling_tests_utf8_full_out (gchar **utf8) { - *utf8 = g_strdup(GI_MARSHALLING_TESTS_CONSTANT_UTF8); + *utf8 = g_strdup (GI_MARSHALLING_TESTS_CONSTANT_UTF8); } /** @@ -1109,11 +1108,11 @@ gi_marshalling_tests_utf8_full_out (gchar **utf8) void gi_marshalling_tests_utf8_dangling_out (gchar **utf8) { - /* Intentionally don't touch the pointer to see how - the bindings handle this case. Bindings should be - robust against broken C functions and can initialize - even OUT vlues to NULL. - */ + /* Intentionally don't touch the pointer to see how + the bindings handle this case. Bindings should be + robust against broken C functions and can initialize + even OUT vlues to NULL. + */ } /** @@ -1123,8 +1122,8 @@ gi_marshalling_tests_utf8_dangling_out (gchar **utf8) void gi_marshalling_tests_utf8_none_inout (gchar **utf8) { - g_assert_cmpstr(GI_MARSHALLING_TESTS_CONSTANT_UTF8, ==, *utf8); - *utf8 = ""; + g_assert_cmpstr (GI_MARSHALLING_TESTS_CONSTANT_UTF8, ==, *utf8); + *utf8 = ""; } /** @@ -1134,9 +1133,9 @@ gi_marshalling_tests_utf8_none_inout (gchar **utf8) void gi_marshalling_tests_utf8_full_inout (gchar **utf8) { - g_assert_cmpstr(GI_MARSHALLING_TESTS_CONSTANT_UTF8, ==, *utf8); - g_free(*utf8); - *utf8 = g_strdup(""); + g_assert_cmpstr (GI_MARSHALLING_TESTS_CONSTANT_UTF8, ==, *utf8); + g_free (*utf8); + *utf8 = g_strdup (""); } @@ -1150,15 +1149,15 @@ gi_marshalling_tests_utf8_full_inout (gchar **utf8) gboolean gi_marshalling_tests_init_function (gint *n_args, char ***argv) { - if (n_args == NULL) - return TRUE; + if (n_args == NULL) + return TRUE; - if (*n_args == 0) - return TRUE; - (*n_args)--; - g_assert (argv != NULL); - (*argv)[*n_args] = NULL; + if (*n_args == 0) return TRUE; + (*n_args)--; + g_assert (argv != NULL); + (*argv)[*n_args] = NULL; + return TRUE; } /** @@ -1169,8 +1168,8 @@ gi_marshalling_tests_init_function (gint *n_args, char ***argv) const gint * gi_marshalling_tests_array_fixed_int_return (void) { - static gint ints[] = {-1, 0, 1, 2}; - return ints; + static gint ints[] = { -1, 0, 1, 2 }; + return ints; } /** @@ -1181,8 +1180,8 @@ gi_marshalling_tests_array_fixed_int_return (void) const gshort * gi_marshalling_tests_array_fixed_short_return (void) { - static gshort shorts[] = {-1, 0, 1, 2}; - return shorts; + static gshort shorts[] = { -1, 0, 1, 2 }; + return shorts; } /** @@ -1192,10 +1191,10 @@ gi_marshalling_tests_array_fixed_short_return (void) void gi_marshalling_tests_array_fixed_int_in (const gint *ints) { - g_assert_cmpint(ints[0], ==, -1); - g_assert_cmpint(ints[1], ==, 0); - g_assert_cmpint(ints[2], ==, 1); - g_assert_cmpint(ints[3], ==, 2); + g_assert_cmpint (ints[0], ==, -1); + g_assert_cmpint (ints[1], ==, 0); + g_assert_cmpint (ints[2], ==, 1); + g_assert_cmpint (ints[3], ==, 2); } /** @@ -1205,10 +1204,10 @@ gi_marshalling_tests_array_fixed_int_in (const gint *ints) void gi_marshalling_tests_array_fixed_short_in (const gshort *shorts) { - g_assert_cmpint(shorts[0], ==, -1); - g_assert_cmpint(shorts[1], ==, 0); - g_assert_cmpint(shorts[2], ==, 1); - g_assert_cmpint(shorts[3], ==, 2); + g_assert_cmpint (shorts[0], ==, -1); + g_assert_cmpint (shorts[1], ==, 0); + g_assert_cmpint (shorts[2], ==, 1); + g_assert_cmpint (shorts[3], ==, 2); } /** @@ -1218,8 +1217,8 @@ gi_marshalling_tests_array_fixed_short_in (const gshort *shorts) void gi_marshalling_tests_array_fixed_out (gint **ints) { - static gint values[] = {-1, 0, 1, 2}; - *ints = values; + static gint values[] = { -1, 0, 1, 2 }; + *ints = values; } /** @@ -1229,19 +1228,20 @@ gi_marshalling_tests_array_fixed_out (gint **ints) void gi_marshalling_tests_array_fixed_out_struct (GIMarshallingTestsSimpleStruct **structs) { - static GIMarshallingTestsSimpleStruct *values; + static GIMarshallingTestsSimpleStruct *values; - if (values == NULL) { - values = g_new(GIMarshallingTestsSimpleStruct, 2); + if (values == NULL) + { + values = g_new (GIMarshallingTestsSimpleStruct, 2); - values[0].long_ = 7; - values[0].int8 = 6; + values[0].long_ = 7; + values[0].int8 = 6; - values[1].long_ = 6; - values[1].int8 = 7; + values[1].long_ = 6; + values[1].int8 = 7; } - *structs = values; + *structs = values; } /** @@ -1251,14 +1251,14 @@ gi_marshalling_tests_array_fixed_out_struct (GIMarshallingTestsSimpleStruct **st void gi_marshalling_tests_array_fixed_inout (gint **ints) { - static gint values[] = {2, 1, 0, -1}; + static gint values[] = { 2, 1, 0, -1 }; - g_assert_cmpint((*ints)[0], ==, -1); - g_assert_cmpint((*ints)[1], ==, 0); - g_assert_cmpint((*ints)[2], ==, 1); - g_assert_cmpint((*ints)[3], ==, 2); + g_assert_cmpint ((*ints)[0], ==, -1); + g_assert_cmpint ((*ints)[1], ==, 0); + g_assert_cmpint ((*ints)[2], ==, 1); + g_assert_cmpint ((*ints)[3], ==, 2); - *ints = values; + *ints = values; } @@ -1270,10 +1270,10 @@ gi_marshalling_tests_array_fixed_inout (gint **ints) const gint * gi_marshalling_tests_array_return (gint *length) { - static gint ints[] = {-1, 0, 1, 2}; + static gint ints[] = { -1, 0, 1, 2 }; - *length = 4; - return ints; + *length = 4; + return ints; } /** @@ -1288,13 +1288,13 @@ gi_marshalling_tests_array_return (gint *length) const gint * gi_marshalling_tests_array_return_etc (gint first, gint *length, gint last, gint *sum) { - static gint ints[] = {-1, 0, 1, 2}; + static gint ints[] = { -1, 0, 1, 2 }; - ints[0] = first; - ints[3] = last; - *sum = first + last; - *length = 4; - return ints; + ints[0] = first; + ints[3] = last; + *sum = first + last; + *length = 4; + return ints; } /** @@ -1305,11 +1305,11 @@ gi_marshalling_tests_array_return_etc (gint first, gint *length, gint last, gint void gi_marshalling_tests_array_in (const gint *ints, gint length) { - g_assert_cmpint(length, ==, 4); - g_assert_cmpint(ints[0], ==, -1); - g_assert_cmpint(ints[1], ==, 0); - g_assert_cmpint(ints[2], ==, 1); - g_assert_cmpint(ints[3], ==, 2); + g_assert_cmpint (length, ==, 4); + g_assert_cmpint (ints[0], ==, -1); + g_assert_cmpint (ints[1], ==, 0); + g_assert_cmpint (ints[2], ==, 1); + g_assert_cmpint (ints[3], ==, 2); } /** @@ -1320,7 +1320,7 @@ gi_marshalling_tests_array_in (const gint *ints, gint length) void gi_marshalling_tests_array_in_len_before (gint length, const gint *ints) { - gi_marshalling_tests_array_in (ints, length); + gi_marshalling_tests_array_in (ints, length); } /** @@ -1331,15 +1331,15 @@ gi_marshalling_tests_array_in_len_before (gint length, const gint *ints) void gi_marshalling_tests_array_in_len_zero_terminated (const gint *ints, gint length) { - g_assert_cmpint(length, ==, 4); + g_assert_cmpint (length, ==, 4); - g_assert_cmpint(ints[0], ==, -1); - g_assert_cmpint(ints[1], ==, 0); - g_assert_cmpint(ints[2], ==, 1); - g_assert_cmpint(ints[3], ==, 2); + g_assert_cmpint (ints[0], ==, -1); + g_assert_cmpint (ints[1], ==, 0); + g_assert_cmpint (ints[2], ==, 1); + g_assert_cmpint (ints[3], ==, 2); - /* One past the end, null terminator */ - g_assert_cmpint(ints[4], ==, 0); + /* One past the end, null terminator */ + g_assert_cmpint (ints[4], ==, 0); } /** @@ -1349,9 +1349,9 @@ gi_marshalling_tests_array_in_len_zero_terminated (const gint *ints, gint length void gi_marshalling_tests_array_string_in (const gchar **strings, gint length) { - g_assert_cmpint(length, ==, 2); - g_assert_cmpstr(strings[0], ==, "foo"); - g_assert_cmpstr(strings[1], ==, "bar"); + g_assert_cmpint (length, ==, 2); + g_assert_cmpstr (strings[0], ==, "foo"); + g_assert_cmpstr (strings[1], ==, "bar"); } /** @@ -1361,11 +1361,11 @@ gi_marshalling_tests_array_string_in (const gchar **strings, gint length) void gi_marshalling_tests_array_uint8_in (const guint8 *chars, gint length) { - g_assert_cmpint(length, ==, 4); - g_assert(chars[0] == 'a'); - g_assert(chars[1] == 'b'); - g_assert(chars[2] == 'c'); - g_assert(chars[3] == 'd'); + g_assert_cmpint (length, ==, 4); + g_assert (chars[0] == 'a'); + g_assert (chars[1] == 'b'); + g_assert (chars[2] == 'c'); + g_assert (chars[3] == 'd'); } /** @@ -1375,10 +1375,10 @@ gi_marshalling_tests_array_uint8_in (const guint8 *chars, gint length) void gi_marshalling_tests_array_struct_in (GIMarshallingTestsBoxedStruct **structs, gint length) { - g_assert_cmpint(length, ==, 3); - g_assert_cmpint(structs[0]->long_, ==, 1); - g_assert_cmpint(structs[1]->long_, ==, 2); - g_assert_cmpint(structs[2]->long_, ==, 3); + g_assert_cmpint (length, ==, 3); + g_assert_cmpint (structs[0]->long_, ==, 1); + g_assert_cmpint (structs[1]->long_, ==, 2); + g_assert_cmpint (structs[2]->long_, ==, 3); } /** @@ -1388,10 +1388,10 @@ gi_marshalling_tests_array_struct_in (GIMarshallingTestsBoxedStruct **structs, g void gi_marshalling_tests_array_struct_value_in (GIMarshallingTestsBoxedStruct *structs, gint length) { - g_assert_cmpint(length, ==, 3); - g_assert_cmpint(structs[0].long_, ==, 1); - g_assert_cmpint(structs[1].long_, ==, 2); - g_assert_cmpint(structs[2].long_, ==, 3); + g_assert_cmpint (length, ==, 3); + g_assert_cmpint (structs[0].long_, ==, 1); + g_assert_cmpint (structs[1].long_, ==, 2); + g_assert_cmpint (structs[2].long_, ==, 3); } /** @@ -1401,10 +1401,10 @@ gi_marshalling_tests_array_struct_value_in (GIMarshallingTestsBoxedStruct *struc void gi_marshalling_tests_array_simple_struct_in (GIMarshallingTestsSimpleStruct *structs, gint length) { - g_assert_cmpint(length, ==, 3); - g_assert_cmpint(structs[0].long_, ==, 1); - g_assert_cmpint(structs[1].long_, ==, 2); - g_assert_cmpint(structs[2].long_, ==, 3); + g_assert_cmpint (length, ==, 3); + g_assert_cmpint (structs[0].long_, ==, 1); + g_assert_cmpint (structs[1].long_, ==, 2); + g_assert_cmpint (structs[2].long_, ==, 3); } /** @@ -1415,13 +1415,13 @@ gi_marshalling_tests_array_simple_struct_in (GIMarshallingTestsSimpleStruct *str void gi_marshalling_tests_multi_array_key_value_in (gint length, const gchar **keys, const GValue *values) { - g_assert_cmpint(length, ==, 3); - g_assert_cmpstr("one", ==, keys[0]); - g_assert_cmpint(g_value_get_int(&values[0]), ==, 1); - g_assert_cmpstr("two", ==, keys[1]); - g_assert_cmpint(g_value_get_int(&values[1]), ==, 2); - g_assert_cmpstr("three", ==, keys[2]); - g_assert_cmpint(g_value_get_int(&values[2]), ==, 3); + g_assert_cmpint (length, ==, 3); + g_assert_cmpstr ("one", ==, keys[0]); + g_assert_cmpint (g_value_get_int (&values[0]), ==, 1); + g_assert_cmpstr ("two", ==, keys[1]); + g_assert_cmpint (g_value_get_int (&values[1]), ==, 2); + g_assert_cmpstr ("three", ==, keys[2]); + g_assert_cmpint (g_value_get_int (&values[2]), ==, 3); } @@ -1432,13 +1432,13 @@ gi_marshalling_tests_multi_array_key_value_in (gint length, const gchar **keys, void gi_marshalling_tests_array_struct_take_in (GIMarshallingTestsBoxedStruct **structs, gint length) { - gi_marshalling_tests_array_struct_in (structs, length); + gi_marshalling_tests_array_struct_in (structs, length); - /* only really useful if run in valgrind actually */ - gi_marshalling_tests_boxed_struct_free (structs[0]); - gi_marshalling_tests_boxed_struct_free (structs[1]); - gi_marshalling_tests_boxed_struct_free (structs[2]); - g_free (structs); + /* only really useful if run in valgrind actually */ + gi_marshalling_tests_boxed_struct_free (structs[0]); + gi_marshalling_tests_boxed_struct_free (structs[1]); + gi_marshalling_tests_boxed_struct_free (structs[2]); + g_free (structs); } /** @@ -1449,10 +1449,10 @@ gi_marshalling_tests_array_struct_take_in (GIMarshallingTestsBoxedStruct **struc void gi_marshalling_tests_array_enum_in (GIMarshallingTestsEnum *v, gint length) { - g_assert_cmpint(length, ==, 3); - g_assert_cmpint(v[0], ==, GI_MARSHALLING_TESTS_ENUM_VALUE1); - g_assert_cmpint(v[1], ==, GI_MARSHALLING_TESTS_ENUM_VALUE2); - g_assert_cmpint(v[2], ==, GI_MARSHALLING_TESTS_ENUM_VALUE3); + g_assert_cmpint (length, ==, 3); + g_assert_cmpint (v[0], ==, GI_MARSHALLING_TESTS_ENUM_VALUE1); + g_assert_cmpint (v[1], ==, GI_MARSHALLING_TESTS_ENUM_VALUE2); + g_assert_cmpint (v[2], ==, GI_MARSHALLING_TESTS_ENUM_VALUE3); } /** @@ -1463,9 +1463,9 @@ gi_marshalling_tests_array_enum_in (GIMarshallingTestsEnum *v, gint length) void gi_marshalling_tests_array_in_guint64_len (const gint *ints, guint64 length) { - g_assert_cmpint(length, ==, 4); + g_assert_cmpint (length, ==, 4); - gi_marshalling_tests_array_in (ints, length); + gi_marshalling_tests_array_in (ints, length); } /** @@ -1476,9 +1476,9 @@ gi_marshalling_tests_array_in_guint64_len (const gint *ints, guint64 length) void gi_marshalling_tests_array_in_guint8_len (const gint *ints, guint8 length) { - g_assert_cmpint(length, ==, 4); + g_assert_cmpint (length, ==, 4); - gi_marshalling_tests_array_in (ints, length); + gi_marshalling_tests_array_in (ints, length); } /** @@ -1488,10 +1488,10 @@ gi_marshalling_tests_array_in_guint8_len (const gint *ints, guint8 length) void gi_marshalling_tests_array_out (gint **ints, gint *length) { - static gint values[] = {-1, 0, 1, 2}; + static gint values[] = { -1, 0, 1, 2 }; - *length = 4; - *ints = values; + *length = 4; + *ints = values; } /** @@ -1505,13 +1505,13 @@ gi_marshalling_tests_array_out (gint **ints, gint *length) void gi_marshalling_tests_array_out_etc (gint first, gint **ints, gint *length, gint last, gint *sum) { - static gint values[] = {-1, 0, 1, 2}; + static gint values[] = { -1, 0, 1, 2 }; - values[0] = first; - values[3] = last; - *sum = first + last; - *length = 4; - *ints = values; + values[0] = first; + values[3] = last; + *sum = first + last; + *length = 4; + *ints = values; } /** @@ -1522,16 +1522,16 @@ gi_marshalling_tests_array_out_etc (gint first, gint **ints, gint *length, gint void gi_marshalling_tests_array_inout (gint **ints, gint *length) { - static gint values[] = {-2, -1, 0, 1, 2}; + static gint values[] = { -2, -1, 0, 1, 2 }; - g_assert_cmpint(*length, ==, 4); - g_assert_cmpint((*ints)[0], ==, -1); - g_assert_cmpint((*ints)[1], ==, 0); - g_assert_cmpint((*ints)[2], ==, 1); - g_assert_cmpint((*ints)[3], ==, 2); + g_assert_cmpint (*length, ==, 4); + g_assert_cmpint ((*ints)[0], ==, -1); + g_assert_cmpint ((*ints)[1], ==, 0); + g_assert_cmpint ((*ints)[2], ==, 1); + g_assert_cmpint ((*ints)[3], ==, 2); - *length = 5; - *ints = values; + *length = 5; + *ints = values; } /** @@ -1545,19 +1545,19 @@ gi_marshalling_tests_array_inout (gint **ints, gint *length) void gi_marshalling_tests_array_inout_etc (gint first, gint **ints, gint *length, gint last, gint *sum) { - static gint values[] = {-2, -1, 0, 1, 2}; + static gint values[] = { -2, -1, 0, 1, 2 }; - g_assert_cmpint(*length, ==, 4); - g_assert_cmpint((*ints)[0], ==, -1); - g_assert_cmpint((*ints)[1], ==, 0); - g_assert_cmpint((*ints)[2], ==, 1); - g_assert_cmpint((*ints)[3], ==, 2); + g_assert_cmpint (*length, ==, 4); + g_assert_cmpint ((*ints)[0], ==, -1); + g_assert_cmpint ((*ints)[1], ==, 0); + g_assert_cmpint ((*ints)[2], ==, 1); + g_assert_cmpint ((*ints)[3], ==, 2); - values[0] = first; - values[4] = last; - *sum = first + last; - *length = 5; - *ints = values; + values[0] = first; + values[4] = last; + *sum = first + last; + *length = 5; + *ints = values; } /** @@ -1568,10 +1568,10 @@ gi_marshalling_tests_array_inout_etc (gint first, gint **ints, gint *length, gin void gi_marshalling_tests_array_in_nonzero_nonlen (gint first, const guint8 *chars) { - g_assert(chars[0] == 'a'); - g_assert(chars[1] == 'b'); - g_assert(chars[2] == 'c'); - g_assert(chars[3] == 'd'); + g_assert (chars[0] == 'a'); + g_assert (chars[1] == 'b'); + g_assert (chars[2] == 'c'); + g_assert (chars[3] == 'd'); } /** @@ -1582,8 +1582,8 @@ gi_marshalling_tests_array_in_nonzero_nonlen (gint first, const guint8 *chars) gchar ** gi_marshalling_tests_array_zero_terminated_return (void) { - static gchar *values[] = {"0", "1", "2", NULL}; - return values; + static gchar *values[] = { "0", "1", "2", NULL }; + return values; } /** @@ -1594,7 +1594,7 @@ gi_marshalling_tests_array_zero_terminated_return (void) gchar ** gi_marshalling_tests_array_zero_terminated_return_null (void) { - return NULL; + return NULL; } /** @@ -1605,20 +1605,20 @@ gi_marshalling_tests_array_zero_terminated_return_null (void) GIMarshallingTestsBoxedStruct ** gi_marshalling_tests_array_zero_terminated_return_struct (void) { - GIMarshallingTestsBoxedStruct **ret = (GIMarshallingTestsBoxedStruct**) g_new (gpointer, 4); + GIMarshallingTestsBoxedStruct **ret = (GIMarshallingTestsBoxedStruct **) g_new (gpointer, 4); - ret[0] = gi_marshalling_tests_boxed_struct_new (); - ret[0]->long_ = 42; + ret[0] = gi_marshalling_tests_boxed_struct_new (); + ret[0]->long_ = 42; - ret[1] = gi_marshalling_tests_boxed_struct_new (); - ret[1]->long_ = 43; + ret[1] = gi_marshalling_tests_boxed_struct_new (); + ret[1]->long_ = 43; - ret[2] = gi_marshalling_tests_boxed_struct_new (); - ret[2]->long_ = 44; + ret[2] = gi_marshalling_tests_boxed_struct_new (); + ret[2]->long_ = 44; - ret[3] = NULL; + ret[3] = NULL; - return ret; + return ret; } /** @@ -1628,10 +1628,10 @@ gi_marshalling_tests_array_zero_terminated_return_struct (void) void gi_marshalling_tests_array_zero_terminated_in (gchar **utf8s) { - g_assert(g_strv_length(utf8s)); - g_assert_cmpstr(utf8s[0], ==, "0"); - g_assert_cmpstr(utf8s[1], ==, "1"); - g_assert_cmpstr(utf8s[2], ==, "2"); + g_assert (g_strv_length (utf8s)); + g_assert_cmpstr (utf8s[0], ==, "0"); + g_assert_cmpstr (utf8s[1], ==, "1"); + g_assert_cmpstr (utf8s[2], ==, "2"); } /** @@ -1639,10 +1639,10 @@ gi_marshalling_tests_array_zero_terminated_in (gchar **utf8s) * @utf8s: (out) (array zero-terminated=1) (transfer none): */ void -gi_marshalling_tests_array_zero_terminated_out (gchar ***utf8s) +gi_marshalling_tests_array_zero_terminated_out (gchar *** utf8s) { - static gchar *values[] = {"0", "1", "2", NULL}; - *utf8s = values; + static gchar *values[] = { "0", "1", "2", NULL }; + *utf8s = values; } /** @@ -1650,16 +1650,16 @@ gi_marshalling_tests_array_zero_terminated_out (gchar ***utf8s) * @utf8s: (inout) (array zero-terminated=1) (transfer none): */ void -gi_marshalling_tests_array_zero_terminated_inout (gchar ***utf8s) +gi_marshalling_tests_array_zero_terminated_inout (gchar *** utf8s) { - static gchar *values[] = {"-1", "0", "1", "2", NULL}; + static gchar *values[] = { "-1", "0", "1", "2", NULL }; - g_assert(g_strv_length(*utf8s)); - g_assert_cmpstr((*utf8s)[0], ==, "0"); - g_assert_cmpstr((*utf8s)[1], ==, "1"); - g_assert_cmpstr((*utf8s)[2], ==, "2"); + g_assert (g_strv_length (*utf8s)); + g_assert_cmpstr ((*utf8s)[0], ==, "0"); + g_assert_cmpstr ((*utf8s)[1], ==, "1"); + g_assert_cmpstr ((*utf8s)[2], ==, "2"); - *utf8s = values; + *utf8s = values; } /** @@ -1671,20 +1671,21 @@ gi_marshalling_tests_array_zero_terminated_inout (gchar ***utf8s) GVariant ** gi_marshalling_tests_array_gvariant_none_in (GVariant **variants) { - /* Use a static container to detect if someone tries to free it */ - static GVariant *private_container[3] = { NULL, NULL, NULL }; - - if (private_container[0] == NULL) { + /* Use a static container to detect if someone tries to free it */ + static GVariant *private_container[3] = { NULL, NULL, NULL }; + + if (private_container[0] == NULL) + { private_container[0] = g_variant_new_int32 (27); private_container[1] = g_variant_new_string ("Hello"); } - g_assert (variants != NULL); - g_assert_cmpint (g_variant_get_int32 (variants[0]), ==, 27); - g_assert_cmpstr (g_variant_get_string (variants[1], NULL), ==, "Hello"); - g_assert (variants[2] == NULL); + g_assert (variants != NULL); + g_assert_cmpint (g_variant_get_int32 (variants[0]), ==, 27); + g_assert_cmpstr (g_variant_get_string (variants[1], NULL), ==, "Hello"); + g_assert (variants[2] == NULL); - return private_container; + return private_container; } /** @@ -1696,19 +1697,19 @@ gi_marshalling_tests_array_gvariant_none_in (GVariant **variants) GVariant ** gi_marshalling_tests_array_gvariant_container_in (GVariant **variants) { - GVariant **container; + GVariant **container; + + g_assert (variants != NULL); + g_assert_cmpint (g_variant_get_int32 (variants[0]), ==, 27); + g_assert_cmpstr (g_variant_get_string (variants[1], NULL), ==, "Hello"); + g_assert (variants[2] == NULL); - g_assert (variants != NULL); - g_assert_cmpint (g_variant_get_int32 (variants[0]), ==, 27); - g_assert_cmpstr (g_variant_get_string (variants[1], NULL), ==, "Hello"); - g_assert (variants[2] == NULL); - - container = g_new0 (GVariant*, 3); - container[0] = variants[0]; - container[1] = variants[1]; - g_free (variants); - - return container; + container = g_new0 (GVariant *, 3); + container[0] = variants[0]; + container[1] = variants[1]; + g_free (variants); + + return container; } /** @@ -1720,23 +1721,23 @@ gi_marshalling_tests_array_gvariant_container_in (GVariant **variants) GVariant ** gi_marshalling_tests_array_gvariant_full_in (GVariant **variants) { - GVariant **container; + GVariant **container; + + g_assert (variants != NULL); + g_assert_cmpint (g_variant_get_int32 (variants[0]), ==, 27); + g_assert_cmpstr (g_variant_get_string (variants[1], NULL), ==, "Hello"); + g_assert (variants[2] == NULL); - g_assert (variants != NULL); - g_assert_cmpint (g_variant_get_int32 (variants[0]), ==, 27); - g_assert_cmpstr (g_variant_get_string (variants[1], NULL), ==, "Hello"); - g_assert (variants[2] == NULL); - - /* To catch different behaviors we reconstruct one variant from scratch, - * while leaving the other untouched. Both approaches are legal with full - * transfer in and out */ - container = g_new0 (GVariant*, 3); - container[0] = g_variant_new_int32 (g_variant_get_int32 (variants[0])); - g_variant_unref (variants[0]); - container[1] = variants[1]; - g_free (variants); + /* To catch different behaviors we reconstruct one variant from scratch, + * while leaving the other untouched. Both approaches are legal with full + * transfer in and out */ + container = g_new0 (GVariant *, 3); + container[0] = g_variant_new_int32 (g_variant_get_int32 (variants[0])); + g_variant_unref (variants[0]); + container[1] = variants[1]; + g_free (variants); - return container; + return container; } /** @@ -1747,16 +1748,17 @@ gi_marshalling_tests_array_gvariant_full_in (GVariant **variants) GArray * gi_marshalling_tests_garray_int_none_return (void) { - static GArray *v = NULL; - gint i; + static GArray *v = NULL; + gint i; - if (v == NULL) { - v = g_array_new (TRUE, TRUE, sizeof (gint)); - for (i = -1; i < 3; i++) - g_array_append_val (v, i); + if (v == NULL) + { + v = g_array_new (TRUE, TRUE, sizeof (gint)); + for (i = -1; i < 3; i++) + g_array_append_val (v, i); } - return v; + return v; } /** @@ -1767,18 +1769,19 @@ gi_marshalling_tests_garray_int_none_return (void) GArray * gi_marshalling_tests_garray_uint64_none_return (void) { - static GArray *array = NULL; - guint64 i; + static GArray *array = NULL; + guint64 i; - if (array == NULL) { - array = g_array_new (TRUE, TRUE, sizeof (guint64)); - i = 0; - g_array_append_val (array, i); - i = G_MAXUINT64; - g_array_append_val (array, i); + if (array == NULL) + { + array = g_array_new (TRUE, TRUE, sizeof (guint64)); + i = 0; + g_array_append_val (array, i); + i = G_MAXUINT64; + g_array_append_val (array, i); } - return array; + return array; } /** @@ -1789,17 +1792,18 @@ gi_marshalling_tests_garray_uint64_none_return (void) GArray * gi_marshalling_tests_garray_utf8_none_return (void) { - static GArray *array = NULL; - static gchar *values[] = {"0", "1", "2", NULL}; - gint i; + static GArray *array = NULL; + static gchar *values[] = { "0", "1", "2", NULL }; + gint i; - if (array == NULL) { - array = g_array_new (TRUE, TRUE, sizeof (gchar *)); - for (i = 0; values[i]; i++) - g_array_append_val (array, values[i]); + if (array == NULL) + { + array = g_array_new (TRUE, TRUE, sizeof (gchar *)); + for (i = 0; values[i]; i++) + g_array_append_val (array, values[i]); } - return array; + return array; } /** @@ -1810,15 +1814,15 @@ gi_marshalling_tests_garray_utf8_none_return (void) GArray * gi_marshalling_tests_garray_utf8_container_return (void) { - GArray *array = NULL; - static gchar *values[] = {"0", "1", "2", NULL}; - gint i; + GArray *array = NULL; + static gchar *values[] = { "0", "1", "2", NULL }; + gint i; - array = g_array_new (TRUE, TRUE, sizeof (gchar *)); - for (i = 0; values[i]; i++) - g_array_append_val (array, values[i]); + array = g_array_new (TRUE, TRUE, sizeof (gchar *)); + for (i = 0; values[i]; i++) + g_array_append_val (array, values[i]); - return array; + return array; } /** @@ -1829,17 +1833,18 @@ gi_marshalling_tests_garray_utf8_container_return (void) GArray * gi_marshalling_tests_garray_utf8_full_return (void) { - GArray *array = NULL; - static gchar *values[] = {"0", "1", "2", NULL}; - gint i; + GArray *array = NULL; + static gchar *values[] = { "0", "1", "2", NULL }; + gint i; - array = g_array_new (TRUE, TRUE, sizeof (gchar *)); - for (i = 0; values[i]; i++) { - gchar *str = g_strdup (values[i]); - g_array_append_val (array, str); + array = g_array_new (TRUE, TRUE, sizeof (gchar *)); + for (i = 0; values[i]; i++) + { + gchar *str = g_strdup (values[i]); + g_array_append_val (array, str); } - return array; + return array; } /** @@ -1849,11 +1854,11 @@ gi_marshalling_tests_garray_utf8_full_return (void) void gi_marshalling_tests_garray_int_none_in (GArray *array_) { - g_assert_cmpint(array_->len, ==, 4); - g_assert_cmpint(g_array_index (array_, gint, 0), ==, -1); - g_assert_cmpint(g_array_index (array_, gint, 1), ==, 0); - g_assert_cmpint(g_array_index (array_, gint, 2), ==, 1); - g_assert_cmpint(g_array_index (array_, gint, 3), ==, 2); + g_assert_cmpint (array_->len, ==, 4); + g_assert_cmpint (g_array_index (array_, gint, 0), ==, -1); + g_assert_cmpint (g_array_index (array_, gint, 1), ==, 0); + g_assert_cmpint (g_array_index (array_, gint, 2), ==, 1); + g_assert_cmpint (g_array_index (array_, gint, 3), ==, 2); } /** @@ -1863,9 +1868,9 @@ gi_marshalling_tests_garray_int_none_in (GArray *array_) void gi_marshalling_tests_garray_uint64_none_in (GArray *array_) { - g_assert_cmpint(array_->len, ==, 2); - g_assert_cmpint(g_array_index (array_, guint64, 0), ==, 0); - g_assert_cmpint(g_array_index (array_, guint64, 1), ==, G_MAXUINT64); + g_assert_cmpint (array_->len, ==, 2); + g_assert_cmpint (g_array_index (array_, guint64, 0), ==, 0); + g_assert_cmpint (g_array_index (array_, guint64, 1), ==, G_MAXUINT64); } /** @@ -1875,10 +1880,10 @@ gi_marshalling_tests_garray_uint64_none_in (GArray *array_) void gi_marshalling_tests_garray_utf8_none_in (GArray *array_) { - g_assert_cmpint(array_->len, ==, 3); - g_assert_cmpstr(g_array_index (array_, gchar*, 0), ==, "0"); - g_assert_cmpstr(g_array_index (array_, gchar*, 1), ==, "1"); - g_assert_cmpstr(g_array_index (array_, gchar*, 2), ==, "2"); + g_assert_cmpint (array_->len, ==, 3); + g_assert_cmpstr (g_array_index (array_, gchar *, 0), ==, "0"); + g_assert_cmpstr (g_array_index (array_, gchar *, 1), ==, "1"); + g_assert_cmpstr (g_array_index (array_, gchar *, 2), ==, "2"); } /** @@ -1888,17 +1893,18 @@ gi_marshalling_tests_garray_utf8_none_in (GArray *array_) void gi_marshalling_tests_garray_utf8_none_out (GArray **array_) { - static GArray *internal = NULL; - static gchar *values[] = {"0", "1", "2", NULL}; - gint i; + static GArray *internal = NULL; + static gchar *values[] = { "0", "1", "2", NULL }; + gint i; - if (internal == NULL) { - internal = g_array_new (TRUE, TRUE, sizeof (gchar *)); - for (i = 0; values[i]; i++) - g_array_append_val (internal, values[i]); + if (internal == NULL) + { + internal = g_array_new (TRUE, TRUE, sizeof (gchar *)); + for (i = 0; values[i]; i++) + g_array_append_val (internal, values[i]); } - *array_ = internal; + *array_ = internal; } /** @@ -1908,14 +1914,14 @@ gi_marshalling_tests_garray_utf8_none_out (GArray **array_) void gi_marshalling_tests_garray_utf8_container_out (GArray **array_) { - static gchar *values[] = {"0", "1", "2", NULL}; - gint i; + static gchar *values[] = { "0", "1", "2", NULL }; + gint i; - *array_ = NULL; + *array_ = NULL; - *array_ = g_array_new (TRUE, TRUE, sizeof (gchar *)); - for (i = 0; values[i]; i++) - g_array_append_val (*array_, values[i]); + *array_ = g_array_new (TRUE, TRUE, sizeof (gchar *)); + for (i = 0; values[i]; i++) + g_array_append_val (*array_, values[i]); } /** @@ -1925,15 +1931,16 @@ gi_marshalling_tests_garray_utf8_container_out (GArray **array_) void gi_marshalling_tests_garray_utf8_full_out (GArray **array_) { - static gchar *values[] = {"0", "1", "2", NULL}; - gint i; + static gchar *values[] = { "0", "1", "2", NULL }; + gint i; - *array_ = NULL; + *array_ = NULL; - *array_ = g_array_new (TRUE, TRUE, sizeof (gchar *)); - for (i = 0; values[i]; i++) { - gchar *str = g_strdup (values[i]); - g_array_append_val (*array_, str); + *array_ = g_array_new (TRUE, TRUE, sizeof (gchar *)); + for (i = 0; values[i]; i++) + { + gchar *str = g_strdup (values[i]); + g_array_append_val (*array_, str); } } @@ -1944,13 +1951,14 @@ gi_marshalling_tests_garray_utf8_full_out (GArray **array_) void gi_marshalling_tests_garray_utf8_full_out_caller_allocated (GArray *array_) { - static gchar *values[] = {"0", "1", "2", NULL}; - gint i; + static gchar *values[] = { "0", "1", "2", NULL }; + gint i; - g_array_set_size (array_, 0); - for (i = 0; values[i]; i++) { - gchar *str = g_strdup (values[i]); - g_array_append_val (array_, str); + g_array_set_size (array_, 0); + for (i = 0; values[i]; i++) + { + gchar *str = g_strdup (values[i]); + g_array_append_val (array_, str); } } @@ -1961,22 +1969,23 @@ gi_marshalling_tests_garray_utf8_full_out_caller_allocated (GArray *array_) void gi_marshalling_tests_garray_utf8_none_inout (GArray **array_) { - static GArray *internal = NULL; - static gchar *values[] = {"-2", "-1", "0", "1", NULL}; - gint i; + static GArray *internal = NULL; + static gchar *values[] = { "-2", "-1", "0", "1", NULL }; + gint i; - g_assert_cmpint((*array_)->len, ==, 3); - g_assert_cmpstr(g_array_index (*array_, gchar*, 0), ==, "0"); - g_assert_cmpstr(g_array_index (*array_, gchar*, 1), ==, "1"); - g_assert_cmpstr(g_array_index (*array_, gchar*, 2), ==, "2"); + g_assert_cmpint ((*array_)->len, ==, 3); + g_assert_cmpstr (g_array_index (*array_, gchar *, 0), ==, "0"); + g_assert_cmpstr (g_array_index (*array_, gchar *, 1), ==, "1"); + g_assert_cmpstr (g_array_index (*array_, gchar *, 2), ==, "2"); - if (internal == NULL) { - internal = g_array_new (TRUE, TRUE, sizeof (gchar *)); - for (i = 0; values[i]; i++) - g_array_append_val (internal, values[i]); + if (internal == NULL) + { + internal = g_array_new (TRUE, TRUE, sizeof (gchar *)); + for (i = 0; values[i]; i++) + g_array_append_val (internal, values[i]); } - *array_ = internal; + *array_ = internal; } /** @@ -1986,24 +1995,24 @@ gi_marshalling_tests_garray_utf8_none_inout (GArray **array_) void gi_marshalling_tests_garray_utf8_container_inout (GArray **array_) { - static gchar *val1 = "-2"; - static gchar *val2 = "-1"; - static gchar *val3 = "0"; - static gchar *val4 = "1"; - GArray *result; + static gchar *val1 = "-2"; + static gchar *val2 = "-1"; + static gchar *val3 = "0"; + static gchar *val4 = "1"; + GArray *result; - g_assert_cmpint((*array_)->len, ==, 3); - g_assert_cmpstr(g_array_index (*array_, gchar*, 0), ==, "0"); - g_assert_cmpstr(g_array_index (*array_, gchar*, 1), ==, "1"); - g_assert_cmpstr(g_array_index (*array_, gchar*, 2), ==, "2"); + g_assert_cmpint ((*array_)->len, ==, 3); + g_assert_cmpstr (g_array_index (*array_, gchar *, 0), ==, "0"); + g_assert_cmpstr (g_array_index (*array_, gchar *, 1), ==, "1"); + g_assert_cmpstr (g_array_index (*array_, gchar *, 2), ==, "2"); - result = g_array_new (TRUE, TRUE, sizeof (gchar *)); - g_array_append_val (result, val1); - g_array_append_val (result, val2); - g_array_append_val (result, val3); - g_array_append_val (result, val4); + result = g_array_new (TRUE, TRUE, sizeof (gchar *)); + g_array_append_val (result, val1); + g_array_append_val (result, val2); + g_array_append_val (result, val3); + g_array_append_val (result, val4); - *array_ = result; + *array_ = result; } /** @@ -2013,27 +2022,27 @@ gi_marshalling_tests_garray_utf8_container_inout (GArray **array_) void gi_marshalling_tests_garray_utf8_full_inout (GArray **array_) { - static gchar *val1 = "-1"; - static gchar *val2 = "-2"; - gchar *val; - GArray *result; + static gchar *val1 = "-1"; + static gchar *val2 = "-2"; + gchar *val; + GArray *result; - g_assert_cmpint((*array_)->len, ==, 3); - g_assert_cmpstr(g_array_index (*array_, gchar*, 0), ==, "0"); - g_assert_cmpstr(g_array_index (*array_, gchar*, 1), ==, "1"); - g_assert_cmpstr(g_array_index (*array_, gchar*, 2), ==, "2"); + g_assert_cmpint ((*array_)->len, ==, 3); + g_assert_cmpstr (g_array_index (*array_, gchar *, 0), ==, "0"); + g_assert_cmpstr (g_array_index (*array_, gchar *, 1), ==, "1"); + g_assert_cmpstr (g_array_index (*array_, gchar *, 2), ==, "2"); - result = g_array_new (TRUE, TRUE, sizeof (gchar *)); - val = g_strdup (val2); - g_array_append_val(result, val); - val = g_strdup (val1); - g_array_append_val(result, val); - val = g_strdup ("0"); - g_array_append_val(result, val); - val = g_strdup ("1"); - g_array_append_val(result, val); + result = g_array_new (TRUE, TRUE, sizeof (gchar *)); + val = g_strdup (val2); + g_array_append_val (result, val); + val = g_strdup (val1); + g_array_append_val (result, val); + val = g_strdup ("0"); + g_array_append_val (result, val); + val = g_strdup ("1"); + g_array_append_val (result, val); - *array_ = result; + *array_ = result; } /** @@ -2044,17 +2053,18 @@ gi_marshalling_tests_garray_utf8_full_inout (GArray **array_) GPtrArray * gi_marshalling_tests_gptrarray_utf8_none_return (void) { - static GPtrArray *parray = NULL; - static gchar *values[] = {"0", "1", "2"}; - gint i; + static GPtrArray *parray = NULL; + static gchar *values[] = { "0", "1", "2" }; + gint i; - if (parray == NULL) { - parray = g_ptr_array_new (); - for (i = 0; i < 3; i++) - g_ptr_array_add (parray, (gpointer) values[i]); + if (parray == NULL) + { + parray = g_ptr_array_new (); + for (i = 0; i < 3; i++) + g_ptr_array_add (parray, (gpointer) values[i]); } - return parray; + return parray; } /** @@ -2065,15 +2075,15 @@ gi_marshalling_tests_gptrarray_utf8_none_return (void) GPtrArray * gi_marshalling_tests_gptrarray_utf8_container_return (void) { - GPtrArray *parray = NULL; - static gchar *values[] = {"0", "1", "2", NULL}; - gint i; + GPtrArray *parray = NULL; + static gchar *values[] = { "0", "1", "2", NULL }; + gint i; - parray = g_ptr_array_new (); - for (i = 0; values[i]; i++) - g_ptr_array_add (parray, (gpointer)values[i]); + parray = g_ptr_array_new (); + for (i = 0; values[i]; i++) + g_ptr_array_add (parray, (gpointer) values[i]); - return parray; + return parray; } /** @@ -2084,17 +2094,18 @@ gi_marshalling_tests_gptrarray_utf8_container_return (void) GPtrArray * gi_marshalling_tests_gptrarray_utf8_full_return (void) { - GPtrArray *parray = NULL; - static gchar *values[] = {"0", "1", "2", NULL}; - gint i; + GPtrArray *parray = NULL; + static gchar *values[] = { "0", "1", "2", NULL }; + gint i; - parray = g_ptr_array_new (); - for (i = 0; values[i]; i++) { - gchar *str = g_strdup (values[i]); - g_ptr_array_add (parray, (gpointer)str); + parray = g_ptr_array_new (); + for (i = 0; values[i]; i++) + { + gchar *str = g_strdup (values[i]); + g_ptr_array_add (parray, (gpointer) str); } - return parray; + return parray; } /** @@ -2104,10 +2115,10 @@ gi_marshalling_tests_gptrarray_utf8_full_return (void) void gi_marshalling_tests_gptrarray_utf8_none_in (GPtrArray *parray_) { - g_assert_cmpint(parray_->len, ==, 3); - g_assert_cmpstr(g_ptr_array_index (parray_, 0), ==, "0"); - g_assert_cmpstr(g_ptr_array_index (parray_, 1), ==, "1"); - g_assert_cmpstr(g_ptr_array_index (parray_, 2), ==, "2"); + g_assert_cmpint (parray_->len, ==, 3); + g_assert_cmpstr (g_ptr_array_index (parray_, 0), ==, "0"); + g_assert_cmpstr (g_ptr_array_index (parray_, 1), ==, "1"); + g_assert_cmpstr (g_ptr_array_index (parray_, 2), ==, "2"); } /** @@ -2117,17 +2128,18 @@ gi_marshalling_tests_gptrarray_utf8_none_in (GPtrArray *parray_) void gi_marshalling_tests_gptrarray_utf8_none_out (GPtrArray **parray_) { - static GPtrArray *internal = NULL; - static gchar *values[] = {"0", "1", "2", NULL}; - gint i; + static GPtrArray *internal = NULL; + static gchar *values[] = { "0", "1", "2", NULL }; + gint i; - if (internal == NULL) { - internal = g_ptr_array_new (); - for (i = 0; values[i]; i++) - g_ptr_array_add (internal, (gpointer)values[i]); + if (internal == NULL) + { + internal = g_ptr_array_new (); + for (i = 0; values[i]; i++) + g_ptr_array_add (internal, (gpointer) values[i]); } - *parray_ = internal; + *parray_ = internal; } /** @@ -2137,14 +2149,14 @@ gi_marshalling_tests_gptrarray_utf8_none_out (GPtrArray **parray_) void gi_marshalling_tests_gptrarray_utf8_container_out (GPtrArray **parray_) { - static gchar *values[] = {"0", "1", "2", NULL}; - gint i; + static gchar *values[] = { "0", "1", "2", NULL }; + gint i; - *parray_ = NULL; + *parray_ = NULL; - *parray_ = g_ptr_array_new (); - for (i = 0; values[i]; i++) - g_ptr_array_add (*parray_, (gpointer)values[i]); + *parray_ = g_ptr_array_new (); + for (i = 0; values[i]; i++) + g_ptr_array_add (*parray_, (gpointer) values[i]); } /** @@ -2154,15 +2166,16 @@ gi_marshalling_tests_gptrarray_utf8_container_out (GPtrArray **parray_) void gi_marshalling_tests_gptrarray_utf8_full_out (GPtrArray **parray_) { - static gchar *values[] = {"0", "1", "2", NULL}; - gint i; + static gchar *values[] = { "0", "1", "2", NULL }; + gint i; - *parray_ = NULL; + *parray_ = NULL; - *parray_ = g_ptr_array_new (); - for (i = 0; values[i]; i++) { - gchar *str = g_strdup (values[i]); - g_ptr_array_add (*parray_, (gpointer)str); + *parray_ = g_ptr_array_new (); + for (i = 0; values[i]; i++) + { + gchar *str = g_strdup (values[i]); + g_ptr_array_add (*parray_, (gpointer) str); } } @@ -2173,22 +2186,23 @@ gi_marshalling_tests_gptrarray_utf8_full_out (GPtrArray **parray_) void gi_marshalling_tests_gptrarray_utf8_none_inout (GPtrArray **parray_) { - static GPtrArray *internal = NULL; - static gchar *values[] = {"-2", "-1", "0", "1", NULL}; - gint i; + static GPtrArray *internal = NULL; + static gchar *values[] = { "-2", "-1", "0", "1", NULL }; + gint i; - g_assert_cmpint((*parray_)->len, ==, 3); - g_assert_cmpstr(g_ptr_array_index (*parray_, 0), ==, "0"); - g_assert_cmpstr(g_ptr_array_index (*parray_, 1), ==, "1"); - g_assert_cmpstr(g_ptr_array_index (*parray_, 2), ==, "2"); + g_assert_cmpint ((*parray_)->len, ==, 3); + g_assert_cmpstr (g_ptr_array_index (*parray_, 0), ==, "0"); + g_assert_cmpstr (g_ptr_array_index (*parray_, 1), ==, "1"); + g_assert_cmpstr (g_ptr_array_index (*parray_, 2), ==, "2"); - if (internal == NULL) { - internal = g_ptr_array_new (); - for (i = 0; values[i]; i++) - g_ptr_array_add (internal, (gpointer) values[i]); + if (internal == NULL) + { + internal = g_ptr_array_new (); + for (i = 0; values[i]; i++) + g_ptr_array_add (internal, (gpointer) values[i]); } - *parray_ = internal; + *parray_ = internal; } /** @@ -2198,24 +2212,24 @@ gi_marshalling_tests_gptrarray_utf8_none_inout (GPtrArray **parray_) void gi_marshalling_tests_gptrarray_utf8_container_inout (GPtrArray **parray_) { - static gchar *val1 = "-2"; - static gchar *val2 = "-1"; - static gchar *val3 = "0"; - static gchar *val4 = "1"; - GPtrArray *result; + static gchar *val1 = "-2"; + static gchar *val2 = "-1"; + static gchar *val3 = "0"; + static gchar *val4 = "1"; + GPtrArray *result; - g_assert_cmpint((*parray_)->len, ==, 3); - g_assert_cmpstr(g_ptr_array_index (*parray_, 0), ==, "0"); - g_assert_cmpstr(g_ptr_array_index (*parray_, 1), ==, "1"); - g_assert_cmpstr(g_ptr_array_index (*parray_, 2), ==, "2"); + g_assert_cmpint ((*parray_)->len, ==, 3); + g_assert_cmpstr (g_ptr_array_index (*parray_, 0), ==, "0"); + g_assert_cmpstr (g_ptr_array_index (*parray_, 1), ==, "1"); + g_assert_cmpstr (g_ptr_array_index (*parray_, 2), ==, "2"); - result = g_ptr_array_new (); - g_ptr_array_add (result, (gpointer) val1); - g_ptr_array_add (result, (gpointer) val2); - g_ptr_array_add (result, (gpointer) val3); - g_ptr_array_add (result, (gpointer) val4); + result = g_ptr_array_new (); + g_ptr_array_add (result, (gpointer) val1); + g_ptr_array_add (result, (gpointer) val2); + g_ptr_array_add (result, (gpointer) val3); + g_ptr_array_add (result, (gpointer) val4); - *parray_ = result; + *parray_ = result; } /** @@ -2225,27 +2239,27 @@ gi_marshalling_tests_gptrarray_utf8_container_inout (GPtrArray **parray_) void gi_marshalling_tests_gptrarray_utf8_full_inout (GPtrArray **parray_) { - static gchar *val1 = "-1"; - static gchar *val2 = "-2"; - gchar *val; - GPtrArray *result; + static gchar *val1 = "-1"; + static gchar *val2 = "-2"; + gchar *val; + GPtrArray *result; - g_assert_cmpint((*parray_)->len, ==, 3); - g_assert_cmpstr(g_ptr_array_index (*parray_, 0), ==, "0"); - g_assert_cmpstr(g_ptr_array_index (*parray_, 1), ==, "1"); - g_assert_cmpstr(g_ptr_array_index (*parray_, 2), ==, "2"); + g_assert_cmpint ((*parray_)->len, ==, 3); + g_assert_cmpstr (g_ptr_array_index (*parray_, 0), ==, "0"); + g_assert_cmpstr (g_ptr_array_index (*parray_, 1), ==, "1"); + g_assert_cmpstr (g_ptr_array_index (*parray_, 2), ==, "2"); - result = g_ptr_array_new (); - val = g_strdup (val2); - g_ptr_array_add(result, (gpointer) val); - val = g_strdup (val1); - g_ptr_array_add(result, (gpointer) val); - val = g_strdup ("0"); - g_ptr_array_add(result, (gpointer) val); - val = g_strdup ("1"); - g_ptr_array_add(result, (gpointer) val); + result = g_ptr_array_new (); + val = g_strdup (val2); + g_ptr_array_add (result, (gpointer) val); + val = g_strdup (val1); + g_ptr_array_add (result, (gpointer) val); + val = g_strdup ("0"); + g_ptr_array_add (result, (gpointer) val); + val = g_strdup ("1"); + g_ptr_array_add (result, (gpointer) val); - *parray_ = result; + *parray_ = result; } /** @@ -2256,13 +2270,13 @@ gi_marshalling_tests_gptrarray_utf8_full_inout (GPtrArray **parray_) GByteArray * gi_marshalling_tests_bytearray_full_return (void) { - GByteArray *array = NULL; - guint8 data[] = {'\0', '1', '\xFF', '3'}; + GByteArray *array = NULL; + guint8 data[] = { '\0', '1', '\xFF', '3' }; - array = g_byte_array_new (); - g_byte_array_append (array, (const guint8*)data, G_N_ELEMENTS(data)); + array = g_byte_array_new (); + g_byte_array_append (array, (const guint8 *) data, G_N_ELEMENTS (data)); - return array; + return array; } @@ -2273,11 +2287,11 @@ gi_marshalling_tests_bytearray_full_return (void) void gi_marshalling_tests_bytearray_none_in (GByteArray *v) { - g_assert_cmpuint (v->len, ==, 4); - g_assert_cmpuint (g_array_index (v, unsigned char, 0), ==, 0); - g_assert_cmpuint (g_array_index (v, unsigned char, 1), ==, 49); - g_assert_cmpuint (g_array_index (v, unsigned char, 2), ==, 0xFF); - g_assert_cmpuint (g_array_index (v, unsigned char, 3), ==, 51); + g_assert_cmpuint (v->len, ==, 4); + g_assert_cmpuint (g_array_index (v, unsigned char, 0), ==, 0); + g_assert_cmpuint (g_array_index (v, unsigned char, 1), ==, 49); + g_assert_cmpuint (g_array_index (v, unsigned char, 2), ==, 0xFF); + g_assert_cmpuint (g_array_index (v, unsigned char, 3), ==, 51); } /** @@ -2288,9 +2302,9 @@ gi_marshalling_tests_bytearray_none_in (GByteArray *v) GBytes * gi_marshalling_tests_gbytes_full_return (void) { - static guint8 data[] = {0, 49, 0xFF, 51}; + static guint8 data[] = { 0, 49, 0xFF, 51 }; - return g_bytes_new_static (data, G_N_ELEMENTS(data)); + return g_bytes_new_static (data, G_N_ELEMENTS (data)); } /** @@ -2318,12 +2332,12 @@ gi_marshalling_tests_gbytes_none_in (GBytes *v) GStrv gi_marshalling_tests_gstrv_return (void) { - GStrv values = g_new0 (gchar*, 4); - values[0] = g_strdup ("0"); - values[1] = g_strdup ("1"); - values[2] = g_strdup ("2"); - values[3] = NULL; - return values; + GStrv values = g_new0 (gchar *, 4); + values[0] = g_strdup ("0"); + values[1] = g_strdup ("1"); + values[2] = g_strdup ("2"); + values[3] = NULL; + return values; } /** @@ -2333,10 +2347,10 @@ gi_marshalling_tests_gstrv_return (void) void gi_marshalling_tests_gstrv_in (GStrv g_strv) { - g_assert_cmpint(g_strv_length(g_strv), ==, 3); - g_assert_cmpstr(g_strv[0], ==, "0"); - g_assert_cmpstr(g_strv[1], ==, "1"); - g_assert_cmpstr(g_strv[2], ==, "2"); + g_assert_cmpint (g_strv_length (g_strv), ==, 3); + g_assert_cmpstr (g_strv[0], ==, "0"); + g_assert_cmpstr (g_strv[1], ==, "1"); + g_assert_cmpstr (g_strv[2], ==, "2"); } /** @@ -2346,8 +2360,8 @@ gi_marshalling_tests_gstrv_in (GStrv g_strv) void gi_marshalling_tests_gstrv_out (GStrv *g_strv) { - static gchar *values[] = {"0", "1", "2", NULL}; - *g_strv = values; + static gchar *values[] = { "0", "1", "2", NULL }; + *g_strv = values; } /** @@ -2357,14 +2371,14 @@ gi_marshalling_tests_gstrv_out (GStrv *g_strv) void gi_marshalling_tests_gstrv_inout (GStrv *g_strv) { - static gchar *values[] = {"-1", "0", "1", "2", NULL}; + static gchar *values[] = { "-1", "0", "1", "2", NULL }; - g_assert(g_strv_length(*g_strv) == 3); - g_assert(strcmp((*g_strv)[0], "0") == 0); - g_assert(strcmp((*g_strv)[1], "1") == 0); - g_assert(strcmp((*g_strv)[2], "2") == 0); + g_assert (g_strv_length (*g_strv) == 3); + g_assert (strcmp ((*g_strv)[0], "0") == 0); + g_assert (strcmp ((*g_strv)[1], "1") == 0); + g_assert (strcmp ((*g_strv)[2], "2") == 0); - *g_strv = values; + *g_strv = values; } /** @@ -2375,16 +2389,17 @@ gi_marshalling_tests_gstrv_inout (GStrv *g_strv) GList * gi_marshalling_tests_glist_int_none_return (void) { - static GList *list = NULL; + static GList *list = NULL; - if (list == NULL) { - list = g_list_append(list, GINT_TO_POINTER(-1)); - list = g_list_append(list, GINT_TO_POINTER(0)); - list = g_list_append(list, GINT_TO_POINTER(1)); - list = g_list_append(list, GINT_TO_POINTER(2)); + if (list == NULL) + { + list = g_list_append (list, GINT_TO_POINTER (-1)); + list = g_list_append (list, GINT_TO_POINTER (0)); + list = g_list_append (list, GINT_TO_POINTER (1)); + list = g_list_append (list, GINT_TO_POINTER (2)); } - return list; + return list; } /** @@ -2395,14 +2410,15 @@ gi_marshalling_tests_glist_int_none_return (void) GList * gi_marshalling_tests_glist_uint32_none_return (void) { - static GList *list = NULL; + static GList *list = NULL; - if (list == NULL) { - list = g_list_append(list, GUINT_TO_POINTER(0)); - list = g_list_append(list, GUINT_TO_POINTER(G_MAXUINT32)); + if (list == NULL) + { + list = g_list_append (list, GUINT_TO_POINTER (0)); + list = g_list_append (list, GUINT_TO_POINTER (G_MAXUINT32)); } - return list; + return list; } /** @@ -2413,15 +2429,16 @@ gi_marshalling_tests_glist_uint32_none_return (void) GList * gi_marshalling_tests_glist_utf8_none_return (void) { - static GList *list = NULL; + static GList *list = NULL; - if (list == NULL) { - list = g_list_append(list, "0"); - list = g_list_append(list, "1"); - list = g_list_append(list, "2"); + if (list == NULL) + { + list = g_list_append (list, "0"); + list = g_list_append (list, "1"); + list = g_list_append (list, "2"); } - return list; + return list; } /** @@ -2432,13 +2449,13 @@ gi_marshalling_tests_glist_utf8_none_return (void) GList * gi_marshalling_tests_glist_utf8_container_return (void) { - GList *list = NULL; + GList *list = NULL; - list = g_list_append(list, "0"); - list = g_list_append(list, "1"); - list = g_list_append(list, "2"); + list = g_list_append (list, "0"); + list = g_list_append (list, "1"); + list = g_list_append (list, "2"); - return list; + return list; } /** @@ -2449,13 +2466,13 @@ gi_marshalling_tests_glist_utf8_container_return (void) GList * gi_marshalling_tests_glist_utf8_full_return (void) { - GList *list = NULL; + GList *list = NULL; - list = g_list_append(list, g_strdup("0")); - list = g_list_append(list, g_strdup("1")); - list = g_list_append(list, g_strdup("2")); + list = g_list_append (list, g_strdup ("0")); + list = g_list_append (list, g_strdup ("1")); + list = g_list_append (list, g_strdup ("2")); - return list; + return list; } /** @@ -2465,11 +2482,11 @@ gi_marshalling_tests_glist_utf8_full_return (void) void gi_marshalling_tests_glist_int_none_in (GList *list) { - g_assert_cmpint(g_list_length(list), ==, 4); - g_assert_cmpint(GPOINTER_TO_INT(g_list_nth_data(list, 0)), ==, -1); - g_assert_cmpint(GPOINTER_TO_INT(g_list_nth_data(list, 1)), ==, 0); - g_assert_cmpint(GPOINTER_TO_INT(g_list_nth_data(list, 2)), ==, 1); - g_assert_cmpint(GPOINTER_TO_INT(g_list_nth_data(list, 3)), ==, 2); + g_assert_cmpint (g_list_length (list), ==, 4); + g_assert_cmpint (GPOINTER_TO_INT (g_list_nth_data (list, 0)), ==, -1); + g_assert_cmpint (GPOINTER_TO_INT (g_list_nth_data (list, 1)), ==, 0); + g_assert_cmpint (GPOINTER_TO_INT (g_list_nth_data (list, 2)), ==, 1); + g_assert_cmpint (GPOINTER_TO_INT (g_list_nth_data (list, 3)), ==, 2); } /** @@ -2479,9 +2496,9 @@ gi_marshalling_tests_glist_int_none_in (GList *list) void gi_marshalling_tests_glist_uint32_none_in (GList *list) { - g_assert_cmpint(g_list_length(list), ==, 2); - g_assert_cmpint(GPOINTER_TO_UINT(g_list_nth_data(list, 0)), ==, 0); - g_assert_cmpint(GPOINTER_TO_UINT(g_list_nth_data(list, 1)), ==, G_MAXUINT32); + g_assert_cmpint (g_list_length (list), ==, 2); + g_assert_cmpint (GPOINTER_TO_UINT (g_list_nth_data (list, 0)), ==, 0); + g_assert_cmpint (GPOINTER_TO_UINT (g_list_nth_data (list, 1)), ==, G_MAXUINT32); } /** @@ -2491,10 +2508,10 @@ gi_marshalling_tests_glist_uint32_none_in (GList *list) void gi_marshalling_tests_glist_utf8_none_in (GList *list) { - g_assert_cmpint(g_list_length(list), ==, 3); - g_assert_cmpint(strcmp(g_list_nth_data(list, 0), "0"), ==, 0); - g_assert_cmpint(strcmp(g_list_nth_data(list, 1), "1"), ==, 0); - g_assert_cmpint(strcmp(g_list_nth_data(list, 2), "2"), ==, 0); + g_assert_cmpint (g_list_length (list), ==, 3); + g_assert_cmpint (strcmp (g_list_nth_data (list, 0), "0"), ==, 0); + g_assert_cmpint (strcmp (g_list_nth_data (list, 1), "1"), ==, 0); + g_assert_cmpint (strcmp (g_list_nth_data (list, 2), "2"), ==, 0); } /** @@ -2504,15 +2521,16 @@ gi_marshalling_tests_glist_utf8_none_in (GList *list) void gi_marshalling_tests_glist_utf8_none_out (GList **list) { - static GList *values = NULL; + static GList *values = NULL; - if (values == NULL) { - values = g_list_append(values, "0"); - values = g_list_append(values, "1"); - values = g_list_append(values, "2"); + if (values == NULL) + { + values = g_list_append (values, "0"); + values = g_list_append (values, "1"); + values = g_list_append (values, "2"); } - *list = values; + *list = values; } /** @@ -2522,11 +2540,11 @@ gi_marshalling_tests_glist_utf8_none_out (GList **list) void gi_marshalling_tests_glist_utf8_container_out (GList **list) { - *list = NULL; + *list = NULL; - *list = g_list_append(*list, "0"); - *list = g_list_append(*list, "1"); - *list = g_list_append(*list, "2"); + *list = g_list_append (*list, "0"); + *list = g_list_append (*list, "1"); + *list = g_list_append (*list, "2"); } /** @@ -2536,11 +2554,11 @@ gi_marshalling_tests_glist_utf8_container_out (GList **list) void gi_marshalling_tests_glist_utf8_full_out (GList **list) { - *list = NULL; + *list = NULL; - *list = g_list_append(*list, g_strdup("0")); - *list = g_list_append(*list, g_strdup("1")); - *list = g_list_append(*list, g_strdup("2")); + *list = g_list_append (*list, g_strdup ("0")); + *list = g_list_append (*list, g_strdup ("1")); + *list = g_list_append (*list, g_strdup ("2")); } /** @@ -2550,21 +2568,22 @@ gi_marshalling_tests_glist_utf8_full_out (GList **list) void gi_marshalling_tests_glist_utf8_none_inout (GList **list) { - static GList *values = NULL; + static GList *values = NULL; - g_assert_cmpint(g_list_length(*list), ==, 3); - g_assert_cmpstr(g_list_nth_data(*list, 0), ==, "0"); - g_assert_cmpstr(g_list_nth_data(*list, 1), ==, "1"); - g_assert_cmpstr(g_list_nth_data(*list, 2), ==, "2"); + g_assert_cmpint (g_list_length (*list), ==, 3); + g_assert_cmpstr (g_list_nth_data (*list, 0), ==, "0"); + g_assert_cmpstr (g_list_nth_data (*list, 1), ==, "1"); + g_assert_cmpstr (g_list_nth_data (*list, 2), ==, "2"); - if (values == NULL) { - values = g_list_append(values, "-2"); - values = g_list_append(values, "-1"); - values = g_list_append(values, "0"); - values = g_list_append(values, "1"); + if (values == NULL) + { + values = g_list_append (values, "-2"); + values = g_list_append (values, "-1"); + values = g_list_append (values, "0"); + values = g_list_append (values, "1"); } - *list = values; + *list = values; } /** @@ -2574,19 +2593,19 @@ gi_marshalling_tests_glist_utf8_none_inout (GList **list) void gi_marshalling_tests_glist_utf8_container_inout (GList **list) { - GList *result = NULL; + GList *result = NULL; - g_assert_cmpint(g_list_length(*list), ==, 3); - g_assert_cmpstr(g_list_nth_data(*list, 0), ==, "0"); - g_assert_cmpstr(g_list_nth_data(*list, 1), ==, "1"); - g_assert_cmpstr(g_list_nth_data(*list, 2), ==, "2"); + g_assert_cmpint (g_list_length (*list), ==, 3); + g_assert_cmpstr (g_list_nth_data (*list, 0), ==, "0"); + g_assert_cmpstr (g_list_nth_data (*list, 1), ==, "1"); + g_assert_cmpstr (g_list_nth_data (*list, 2), ==, "2"); - result = g_list_prepend(result, "1"); - result = g_list_prepend(result, "0"); - result = g_list_prepend(result, "-1"); - result = g_list_prepend(result, "-2"); + result = g_list_prepend (result, "1"); + result = g_list_prepend (result, "0"); + result = g_list_prepend (result, "-1"); + result = g_list_prepend (result, "-2"); - *list = result; + *list = result; } /** @@ -2596,19 +2615,19 @@ gi_marshalling_tests_glist_utf8_container_inout (GList **list) void gi_marshalling_tests_glist_utf8_full_inout (GList **list) { - GList *result = NULL; + GList *result = NULL; - g_assert_cmpint(g_list_length(*list), ==, 3); - g_assert_cmpstr(g_list_nth_data(*list, 0), ==, "0"); - g_assert_cmpstr(g_list_nth_data(*list, 1), ==, "1"); - g_assert_cmpstr(g_list_nth_data(*list, 2), ==, "2"); + g_assert_cmpint (g_list_length (*list), ==, 3); + g_assert_cmpstr (g_list_nth_data (*list, 0), ==, "0"); + g_assert_cmpstr (g_list_nth_data (*list, 1), ==, "1"); + g_assert_cmpstr (g_list_nth_data (*list, 2), ==, "2"); - result = g_list_prepend(result, g_strdup("1")); - result = g_list_prepend(result, g_strdup("0")); - result = g_list_prepend(result, g_strdup("-1")); - result = g_list_prepend(result, g_strdup("-2")); + result = g_list_prepend (result, g_strdup ("1")); + result = g_list_prepend (result, g_strdup ("0")); + result = g_list_prepend (result, g_strdup ("-1")); + result = g_list_prepend (result, g_strdup ("-2")); - *list = result; + *list = result; } @@ -2620,17 +2639,18 @@ gi_marshalling_tests_glist_utf8_full_inout (GList **list) GSList * gi_marshalling_tests_gslist_int_none_return (void) { - static GSList *list = NULL; + static GSList *list = NULL; - if (list == NULL) { - list = g_slist_prepend(list, GINT_TO_POINTER(-1)); - list = g_slist_prepend(list, GINT_TO_POINTER(0)); - list = g_slist_prepend(list, GINT_TO_POINTER(1)); - list = g_slist_prepend(list, GINT_TO_POINTER(2)); - list = g_slist_reverse(list); + if (list == NULL) + { + list = g_slist_prepend (list, GINT_TO_POINTER (-1)); + list = g_slist_prepend (list, GINT_TO_POINTER (0)); + list = g_slist_prepend (list, GINT_TO_POINTER (1)); + list = g_slist_prepend (list, GINT_TO_POINTER (2)); + list = g_slist_reverse (list); } - return list; + return list; } /** @@ -2641,16 +2661,17 @@ gi_marshalling_tests_gslist_int_none_return (void) GSList * gi_marshalling_tests_gslist_utf8_none_return (void) { - static GSList *list = NULL; + static GSList *list = NULL; - if (list == NULL) { - list = g_slist_prepend(list, "0"); - list = g_slist_prepend(list, "1"); - list = g_slist_prepend(list, "2"); - list = g_slist_reverse(list); + if (list == NULL) + { + list = g_slist_prepend (list, "0"); + list = g_slist_prepend (list, "1"); + list = g_slist_prepend (list, "2"); + list = g_slist_reverse (list); } - return list; + return list; } /** @@ -2661,14 +2682,14 @@ gi_marshalling_tests_gslist_utf8_none_return (void) GSList * gi_marshalling_tests_gslist_utf8_container_return (void) { - GSList *list = NULL; + GSList *list = NULL; - list = g_slist_prepend(list, "0"); - list = g_slist_prepend(list, "1"); - list = g_slist_prepend(list, "2"); - list = g_slist_reverse(list); + list = g_slist_prepend (list, "0"); + list = g_slist_prepend (list, "1"); + list = g_slist_prepend (list, "2"); + list = g_slist_reverse (list); - return list; + return list; } /** @@ -2679,14 +2700,14 @@ gi_marshalling_tests_gslist_utf8_container_return (void) GSList * gi_marshalling_tests_gslist_utf8_full_return (void) { - GSList *list = NULL; + GSList *list = NULL; - list = g_slist_prepend(list, g_strdup("0")); - list = g_slist_prepend(list, g_strdup("1")); - list = g_slist_prepend(list, g_strdup("2")); - list = g_slist_reverse(list); + list = g_slist_prepend (list, g_strdup ("0")); + list = g_slist_prepend (list, g_strdup ("1")); + list = g_slist_prepend (list, g_strdup ("2")); + list = g_slist_reverse (list); - return list; + return list; } /** @@ -2696,11 +2717,11 @@ gi_marshalling_tests_gslist_utf8_full_return (void) void gi_marshalling_tests_gslist_int_none_in (GSList *list) { - g_assert_cmpint(g_slist_length(list), ==, 4); - g_assert_cmpint(GPOINTER_TO_INT(g_slist_nth_data(list, 0)), ==, -1); - g_assert_cmpint(GPOINTER_TO_INT(g_slist_nth_data(list, 1)), ==, 0); - g_assert_cmpint(GPOINTER_TO_INT(g_slist_nth_data(list, 2)), ==, 1); - g_assert_cmpint(GPOINTER_TO_INT(g_slist_nth_data(list, 3)), ==, 2); + g_assert_cmpint (g_slist_length (list), ==, 4); + g_assert_cmpint (GPOINTER_TO_INT (g_slist_nth_data (list, 0)), ==, -1); + g_assert_cmpint (GPOINTER_TO_INT (g_slist_nth_data (list, 1)), ==, 0); + g_assert_cmpint (GPOINTER_TO_INT (g_slist_nth_data (list, 2)), ==, 1); + g_assert_cmpint (GPOINTER_TO_INT (g_slist_nth_data (list, 3)), ==, 2); } /** @@ -2710,10 +2731,10 @@ gi_marshalling_tests_gslist_int_none_in (GSList *list) void gi_marshalling_tests_gslist_utf8_none_in (GSList *list) { - g_assert_cmpint(g_slist_length(list), ==, 3); - g_assert_cmpstr(g_slist_nth_data(list, 0), ==, "0"); - g_assert_cmpstr(g_slist_nth_data(list, 1), ==, "1"); - g_assert_cmpstr(g_slist_nth_data(list, 2), ==, "2"); + g_assert_cmpint (g_slist_length (list), ==, 3); + g_assert_cmpstr (g_slist_nth_data (list, 0), ==, "0"); + g_assert_cmpstr (g_slist_nth_data (list, 1), ==, "1"); + g_assert_cmpstr (g_slist_nth_data (list, 2), ==, "2"); } /** @@ -2723,16 +2744,17 @@ gi_marshalling_tests_gslist_utf8_none_in (GSList *list) void gi_marshalling_tests_gslist_utf8_none_out (GSList **list) { - static GSList *values = NULL; + static GSList *values = NULL; - if (values == NULL) { - values = g_slist_prepend(values, "0"); - values = g_slist_prepend(values, "1"); - values = g_slist_prepend(values, "2"); - values = g_slist_reverse(values); + if (values == NULL) + { + values = g_slist_prepend (values, "0"); + values = g_slist_prepend (values, "1"); + values = g_slist_prepend (values, "2"); + values = g_slist_reverse (values); } - *list = values; + *list = values; } /** @@ -2742,12 +2764,12 @@ gi_marshalling_tests_gslist_utf8_none_out (GSList **list) void gi_marshalling_tests_gslist_utf8_container_out (GSList **list) { - *list = NULL; + *list = NULL; - *list = g_slist_prepend(*list, "0"); - *list = g_slist_prepend(*list, "1"); - *list = g_slist_prepend(*list, "2"); - *list = g_slist_reverse(*list); + *list = g_slist_prepend (*list, "0"); + *list = g_slist_prepend (*list, "1"); + *list = g_slist_prepend (*list, "2"); + *list = g_slist_reverse (*list); } /** @@ -2757,12 +2779,12 @@ gi_marshalling_tests_gslist_utf8_container_out (GSList **list) void gi_marshalling_tests_gslist_utf8_full_out (GSList **list) { - *list = NULL; + *list = NULL; - *list = g_slist_prepend(*list, g_strdup("0")); - *list = g_slist_prepend(*list, g_strdup("1")); - *list = g_slist_prepend(*list, g_strdup("2")); - *list = g_slist_reverse(*list); + *list = g_slist_prepend (*list, g_strdup ("0")); + *list = g_slist_prepend (*list, g_strdup ("1")); + *list = g_slist_prepend (*list, g_strdup ("2")); + *list = g_slist_reverse (*list); } /** @@ -2772,22 +2794,23 @@ gi_marshalling_tests_gslist_utf8_full_out (GSList **list) void gi_marshalling_tests_gslist_utf8_none_inout (GSList **list) { - static GSList *values = NULL; + static GSList *values = NULL; - g_assert_cmpint(g_slist_length(*list), ==, 3); - g_assert_cmpstr(g_slist_nth_data(*list, 0), ==, "0"); - g_assert_cmpstr(g_slist_nth_data(*list, 1), ==, "1"); - g_assert_cmpstr(g_slist_nth_data(*list, 2), ==, "2"); + g_assert_cmpint (g_slist_length (*list), ==, 3); + g_assert_cmpstr (g_slist_nth_data (*list, 0), ==, "0"); + g_assert_cmpstr (g_slist_nth_data (*list, 1), ==, "1"); + g_assert_cmpstr (g_slist_nth_data (*list, 2), ==, "2"); - if (values == NULL) { - values = g_slist_prepend(values, "-2"); - values = g_slist_prepend(values, "-1"); - values = g_slist_prepend(values, "0"); - values = g_slist_prepend(values, "1"); - values = g_slist_reverse(values); + if (values == NULL) + { + values = g_slist_prepend (values, "-2"); + values = g_slist_prepend (values, "-1"); + values = g_slist_prepend (values, "0"); + values = g_slist_prepend (values, "1"); + values = g_slist_reverse (values); } - *list = values; + *list = values; } /** @@ -2797,19 +2820,19 @@ gi_marshalling_tests_gslist_utf8_none_inout (GSList **list) void gi_marshalling_tests_gslist_utf8_container_inout (GSList **list) { - GSList *result = NULL; + GSList *result = NULL; - g_assert_cmpint(g_slist_length(*list), ==, 3); - g_assert_cmpstr(g_slist_nth_data(*list, 0), ==, "0"); - g_assert_cmpstr(g_slist_nth_data(*list, 1), ==, "1"); - g_assert_cmpstr(g_slist_nth_data(*list, 2), ==, "2"); + g_assert_cmpint (g_slist_length (*list), ==, 3); + g_assert_cmpstr (g_slist_nth_data (*list, 0), ==, "0"); + g_assert_cmpstr (g_slist_nth_data (*list, 1), ==, "1"); + g_assert_cmpstr (g_slist_nth_data (*list, 2), ==, "2"); - result = g_slist_prepend(result, "1"); - result = g_slist_prepend(result, "0"); - result = g_slist_prepend(result, "-1"); - result = g_slist_prepend(result, "-2"); + result = g_slist_prepend (result, "1"); + result = g_slist_prepend (result, "0"); + result = g_slist_prepend (result, "-1"); + result = g_slist_prepend (result, "-2"); - *list = result; + *list = result; } /** @@ -2819,19 +2842,19 @@ gi_marshalling_tests_gslist_utf8_container_inout (GSList **list) void gi_marshalling_tests_gslist_utf8_full_inout (GSList **list) { - GSList *result = NULL; + GSList *result = NULL; - g_assert_cmpint(g_slist_length(*list), ==, 3); - g_assert_cmpstr(g_slist_nth_data(*list, 0), ==, "0"); - g_assert_cmpstr(g_slist_nth_data(*list, 1), ==, "1"); - g_assert_cmpstr(g_slist_nth_data(*list, 2), ==, "2"); + g_assert_cmpint (g_slist_length (*list), ==, 3); + g_assert_cmpstr (g_slist_nth_data (*list, 0), ==, "0"); + g_assert_cmpstr (g_slist_nth_data (*list, 1), ==, "1"); + g_assert_cmpstr (g_slist_nth_data (*list, 2), ==, "2"); - result = g_slist_prepend(result, g_strdup("1")); - result = g_slist_prepend(result, g_strdup("0")); - result = g_slist_prepend(result, g_strdup("-1")); - result = g_slist_prepend(result, g_strdup("-2")); + result = g_slist_prepend (result, g_strdup ("1")); + result = g_slist_prepend (result, g_strdup ("0")); + result = g_slist_prepend (result, g_strdup ("-1")); + result = g_slist_prepend (result, g_strdup ("-2")); - *list = result; + *list = result; } @@ -2843,17 +2866,18 @@ gi_marshalling_tests_gslist_utf8_full_inout (GSList **list) GHashTable * gi_marshalling_tests_ghashtable_int_none_return (void) { - static GHashTable *hash_table = NULL; + static GHashTable *hash_table = NULL; - if (hash_table == NULL) { - hash_table = g_hash_table_new(NULL, NULL); - g_hash_table_insert(hash_table, GINT_TO_POINTER(-1), GINT_TO_POINTER(1)); - g_hash_table_insert(hash_table, GINT_TO_POINTER(0), GINT_TO_POINTER(0)); - g_hash_table_insert(hash_table, GINT_TO_POINTER(1), GINT_TO_POINTER(-1)); - g_hash_table_insert(hash_table, GINT_TO_POINTER(2), GINT_TO_POINTER(-2)); + if (hash_table == NULL) + { + hash_table = g_hash_table_new (NULL, NULL); + g_hash_table_insert (hash_table, GINT_TO_POINTER (-1), GINT_TO_POINTER (1)); + g_hash_table_insert (hash_table, GINT_TO_POINTER (0), GINT_TO_POINTER (0)); + g_hash_table_insert (hash_table, GINT_TO_POINTER (1), GINT_TO_POINTER (-1)); + g_hash_table_insert (hash_table, GINT_TO_POINTER (2), GINT_TO_POINTER (-2)); } - return hash_table; + return hash_table; } /** @@ -2864,17 +2888,18 @@ gi_marshalling_tests_ghashtable_int_none_return (void) GHashTable * gi_marshalling_tests_ghashtable_utf8_none_return (void) { - static GHashTable *hash_table = NULL; + static GHashTable *hash_table = NULL; - if (hash_table == NULL) { - hash_table = g_hash_table_new(g_str_hash, g_str_equal); - g_hash_table_insert(hash_table, "-1", "1"); - g_hash_table_insert(hash_table, "0", "0"); - g_hash_table_insert(hash_table, "1", "-1"); - g_hash_table_insert(hash_table, "2", "-2"); + if (hash_table == NULL) + { + hash_table = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (hash_table, "-1", "1"); + g_hash_table_insert (hash_table, "0", "0"); + g_hash_table_insert (hash_table, "1", "-1"); + g_hash_table_insert (hash_table, "2", "-2"); } - return hash_table; + return hash_table; } /** @@ -2885,15 +2910,15 @@ gi_marshalling_tests_ghashtable_utf8_none_return (void) GHashTable * gi_marshalling_tests_ghashtable_utf8_container_return (void) { - GHashTable *hash_table = NULL; + GHashTable *hash_table = NULL; - hash_table = g_hash_table_new(g_str_hash, g_str_equal); - g_hash_table_insert(hash_table, "-1", "1"); - g_hash_table_insert(hash_table, "0", "0"); - g_hash_table_insert(hash_table, "1", "-1"); - g_hash_table_insert(hash_table, "2", "-2"); + hash_table = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (hash_table, "-1", "1"); + g_hash_table_insert (hash_table, "0", "0"); + g_hash_table_insert (hash_table, "1", "-1"); + g_hash_table_insert (hash_table, "2", "-2"); - return hash_table; + return hash_table; } /** @@ -2904,15 +2929,15 @@ gi_marshalling_tests_ghashtable_utf8_container_return (void) GHashTable * gi_marshalling_tests_ghashtable_utf8_full_return (void) { - GHashTable *hash_table = NULL; + GHashTable *hash_table = NULL; - hash_table = g_hash_table_new(g_str_hash, g_str_equal); - g_hash_table_insert(hash_table, g_strdup("-1"), g_strdup("1")); - g_hash_table_insert(hash_table, g_strdup("0"), g_strdup("0")); - g_hash_table_insert(hash_table, g_strdup("1"), g_strdup("-1")); - g_hash_table_insert(hash_table, g_strdup("2"), g_strdup("-2")); + hash_table = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (hash_table, g_strdup ("-1"), g_strdup ("1")); + g_hash_table_insert (hash_table, g_strdup ("0"), g_strdup ("0")); + g_hash_table_insert (hash_table, g_strdup ("1"), g_strdup ("-1")); + g_hash_table_insert (hash_table, g_strdup ("2"), g_strdup ("-2")); - return hash_table; + return hash_table; } /** @@ -2922,10 +2947,10 @@ gi_marshalling_tests_ghashtable_utf8_full_return (void) void gi_marshalling_tests_ghashtable_int_none_in (GHashTable *hash_table) { - g_assert_cmpint(GPOINTER_TO_INT(g_hash_table_lookup(hash_table, GINT_TO_POINTER(-1))), ==, 1); - g_assert_cmpint(GPOINTER_TO_INT(g_hash_table_lookup(hash_table, GINT_TO_POINTER(0))), ==, 0); - g_assert_cmpint(GPOINTER_TO_INT(g_hash_table_lookup(hash_table, GINT_TO_POINTER(1))), ==, -1); - g_assert_cmpint(GPOINTER_TO_INT(g_hash_table_lookup(hash_table, GINT_TO_POINTER(2))), ==, -2); + g_assert_cmpint (GPOINTER_TO_INT (g_hash_table_lookup (hash_table, GINT_TO_POINTER (-1))), ==, 1); + g_assert_cmpint (GPOINTER_TO_INT (g_hash_table_lookup (hash_table, GINT_TO_POINTER (0))), ==, 0); + g_assert_cmpint (GPOINTER_TO_INT (g_hash_table_lookup (hash_table, GINT_TO_POINTER (1))), ==, -1); + g_assert_cmpint (GPOINTER_TO_INT (g_hash_table_lookup (hash_table, GINT_TO_POINTER (2))), ==, -2); } /** @@ -2935,10 +2960,10 @@ gi_marshalling_tests_ghashtable_int_none_in (GHashTable *hash_table) void gi_marshalling_tests_ghashtable_utf8_none_in (GHashTable *hash_table) { - g_assert_cmpstr(g_hash_table_lookup(hash_table, "-1"), ==, "1"); - g_assert_cmpstr(g_hash_table_lookup(hash_table, "0"), ==, "0"); - g_assert_cmpstr(g_hash_table_lookup(hash_table, "1"), ==, "-1"); - g_assert_cmpstr(g_hash_table_lookup(hash_table, "2"), ==, "-2"); + g_assert_cmpstr (g_hash_table_lookup (hash_table, "-1"), ==, "1"); + g_assert_cmpstr (g_hash_table_lookup (hash_table, "0"), ==, "0"); + g_assert_cmpstr (g_hash_table_lookup (hash_table, "1"), ==, "-1"); + g_assert_cmpstr (g_hash_table_lookup (hash_table, "2"), ==, "-2"); } /** @@ -2948,17 +2973,18 @@ gi_marshalling_tests_ghashtable_utf8_none_in (GHashTable *hash_table) void gi_marshalling_tests_ghashtable_utf8_none_out (GHashTable **hash_table) { - static GHashTable *new_hash_table = NULL; + static GHashTable *new_hash_table = NULL; - if (new_hash_table == NULL) { - new_hash_table = g_hash_table_new(g_str_hash, g_str_equal); - g_hash_table_insert(new_hash_table, "-1", "1"); - g_hash_table_insert(new_hash_table, "0", "0"); - g_hash_table_insert(new_hash_table, "1", "-1"); - g_hash_table_insert(new_hash_table, "2", "-2"); + if (new_hash_table == NULL) + { + new_hash_table = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (new_hash_table, "-1", "1"); + g_hash_table_insert (new_hash_table, "0", "0"); + g_hash_table_insert (new_hash_table, "1", "-1"); + g_hash_table_insert (new_hash_table, "2", "-2"); } - *hash_table = new_hash_table; + *hash_table = new_hash_table; } /** @@ -2968,11 +2994,11 @@ gi_marshalling_tests_ghashtable_utf8_none_out (GHashTable **hash_table) void gi_marshalling_tests_ghashtable_utf8_container_out (GHashTable **hash_table) { - *hash_table = g_hash_table_new(g_str_hash, g_str_equal); - g_hash_table_insert(*hash_table, "-1", "1"); - g_hash_table_insert(*hash_table, "0", "0"); - g_hash_table_insert(*hash_table, "1", "-1"); - g_hash_table_insert(*hash_table, "2", "-2"); + *hash_table = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (*hash_table, "-1", "1"); + g_hash_table_insert (*hash_table, "0", "0"); + g_hash_table_insert (*hash_table, "1", "-1"); + g_hash_table_insert (*hash_table, "2", "-2"); } /** @@ -2982,11 +3008,11 @@ gi_marshalling_tests_ghashtable_utf8_container_out (GHashTable **hash_table) void gi_marshalling_tests_ghashtable_utf8_full_out (GHashTable **hash_table) { - *hash_table = g_hash_table_new(g_str_hash, g_str_equal); - g_hash_table_insert(*hash_table, g_strdup("-1"), g_strdup("1")); - g_hash_table_insert(*hash_table, g_strdup("0"), g_strdup("0")); - g_hash_table_insert(*hash_table, g_strdup("1"), g_strdup("-1")); - g_hash_table_insert(*hash_table, g_strdup("2"), g_strdup("-2")); + *hash_table = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (*hash_table, g_strdup ("-1"), g_strdup ("1")); + g_hash_table_insert (*hash_table, g_strdup ("0"), g_strdup ("0")); + g_hash_table_insert (*hash_table, g_strdup ("1"), g_strdup ("-1")); + g_hash_table_insert (*hash_table, g_strdup ("2"), g_strdup ("-2")); } /** @@ -2996,21 +3022,22 @@ gi_marshalling_tests_ghashtable_utf8_full_out (GHashTable **hash_table) void gi_marshalling_tests_ghashtable_utf8_none_inout (GHashTable **hash_table) { - static GHashTable *new_hash_table = NULL; + static GHashTable *new_hash_table = NULL; - g_assert_cmpstr(g_hash_table_lookup(*hash_table, "-1"), ==, "1"); - g_assert_cmpstr(g_hash_table_lookup(*hash_table, "0"), ==, "0"); - g_assert_cmpstr(g_hash_table_lookup(*hash_table, "1"), ==, "-1"); - g_assert_cmpstr(g_hash_table_lookup(*hash_table, "2"), ==, "-2"); + g_assert_cmpstr (g_hash_table_lookup (*hash_table, "-1"), ==, "1"); + g_assert_cmpstr (g_hash_table_lookup (*hash_table, "0"), ==, "0"); + g_assert_cmpstr (g_hash_table_lookup (*hash_table, "1"), ==, "-1"); + g_assert_cmpstr (g_hash_table_lookup (*hash_table, "2"), ==, "-2"); - if (new_hash_table == NULL) { - new_hash_table = g_hash_table_new(g_str_hash, g_str_equal); - g_hash_table_insert(new_hash_table, "-1", "1"); - g_hash_table_insert(new_hash_table, "0", "0"); - g_hash_table_insert(new_hash_table, "1", "1"); + if (new_hash_table == NULL) + { + new_hash_table = g_hash_table_new (g_str_hash, g_str_equal); + g_hash_table_insert (new_hash_table, "-1", "1"); + g_hash_table_insert (new_hash_table, "0", "0"); + g_hash_table_insert (new_hash_table, "1", "1"); } - *hash_table = new_hash_table; + *hash_table = new_hash_table; } /** @@ -3020,18 +3047,18 @@ gi_marshalling_tests_ghashtable_utf8_none_inout (GHashTable **hash_table) void gi_marshalling_tests_ghashtable_utf8_container_inout (GHashTable **hash_table) { - GHashTable *result = g_hash_table_new(g_str_hash, g_str_equal); + GHashTable *result = g_hash_table_new (g_str_hash, g_str_equal); - g_assert_cmpstr(g_hash_table_lookup(*hash_table, "-1"), ==, "1"); - g_assert_cmpstr(g_hash_table_lookup(*hash_table, "0"), ==, "0"); - g_assert_cmpstr(g_hash_table_lookup(*hash_table, "1"), ==, "-1"); - g_assert_cmpstr(g_hash_table_lookup(*hash_table, "2"), ==, "-2"); + g_assert_cmpstr (g_hash_table_lookup (*hash_table, "-1"), ==, "1"); + g_assert_cmpstr (g_hash_table_lookup (*hash_table, "0"), ==, "0"); + g_assert_cmpstr (g_hash_table_lookup (*hash_table, "1"), ==, "-1"); + g_assert_cmpstr (g_hash_table_lookup (*hash_table, "2"), ==, "-2"); - g_hash_table_insert(result, "-1", "1"); - g_hash_table_insert(result, "0", "0"); - g_hash_table_insert(result, "1", "1"); + g_hash_table_insert (result, "-1", "1"); + g_hash_table_insert (result, "0", "0"); + g_hash_table_insert (result, "1", "1"); - *hash_table = result; + *hash_table = result; } /** @@ -3041,19 +3068,19 @@ gi_marshalling_tests_ghashtable_utf8_container_inout (GHashTable **hash_table) void gi_marshalling_tests_ghashtable_utf8_full_inout (GHashTable **hash_table) { - GHashTable *result = g_hash_table_new_full(g_str_hash, g_str_equal, - g_free, g_free); + GHashTable *result = g_hash_table_new_full (g_str_hash, g_str_equal, + g_free, g_free); - g_assert_cmpstr(g_hash_table_lookup(*hash_table, "-1"), ==, "1"); - g_assert_cmpstr(g_hash_table_lookup(*hash_table, "0"), ==, "0"); - g_assert_cmpstr(g_hash_table_lookup(*hash_table, "1"), ==, "-1"); - g_assert_cmpstr(g_hash_table_lookup(*hash_table, "2"), ==, "-2"); + g_assert_cmpstr (g_hash_table_lookup (*hash_table, "-1"), ==, "1"); + g_assert_cmpstr (g_hash_table_lookup (*hash_table, "0"), ==, "0"); + g_assert_cmpstr (g_hash_table_lookup (*hash_table, "1"), ==, "-1"); + g_assert_cmpstr (g_hash_table_lookup (*hash_table, "2"), ==, "-2"); - g_hash_table_insert(result, g_strdup("-1"), g_strdup("1")); - g_hash_table_insert(result, g_strdup("0"), g_strdup("0")); - g_hash_table_insert(result, g_strdup("1"), g_strdup("1")); + g_hash_table_insert (result, g_strdup ("-1"), g_strdup ("1")); + g_hash_table_insert (result, g_strdup ("0"), g_strdup ("0")); + g_hash_table_insert (result, g_strdup ("1"), g_strdup ("1")); - *hash_table = result; + *hash_table = result; } @@ -3065,15 +3092,16 @@ gi_marshalling_tests_ghashtable_utf8_full_inout (GHashTable **hash_table) GValue * gi_marshalling_tests_gvalue_return (void) { - static GValue *value = NULL; + static GValue *value = NULL; - if (value == NULL) { - value = g_new0(GValue, 1); - g_value_init(value, G_TYPE_INT); - g_value_set_int(value, 42); + if (value == NULL) + { + value = g_new0 (GValue, 1); + g_value_init (value, G_TYPE_INT); + g_value_set_int (value, 42); } - return value; + return value; } /** @@ -3083,7 +3111,7 @@ gi_marshalling_tests_gvalue_return (void) void gi_marshalling_tests_gvalue_in (GValue *value) { - g_assert_cmpint(g_value_get_int(value), ==, 42); + g_assert_cmpint (g_value_get_int (value), ==, 42); } /** @@ -3093,7 +3121,7 @@ gi_marshalling_tests_gvalue_in (GValue *value) void gi_marshalling_tests_gvalue_int64_in (GValue *value) { - g_assert_cmpint(g_value_get_int64(value), ==, G_MAXINT64); + g_assert_cmpint (g_value_get_int64 (value), ==, G_MAXINT64); } /** @@ -3104,7 +3132,7 @@ gi_marshalling_tests_gvalue_int64_in (GValue *value) void gi_marshalling_tests_gvalue_in_with_type (GValue *value, GType type) { - g_assert(g_type_is_a(G_VALUE_TYPE(value), type)); + g_assert (g_type_is_a (G_VALUE_TYPE (value), type)); } /** @@ -3114,7 +3142,7 @@ gi_marshalling_tests_gvalue_in_with_type (GValue *value, GType type) void gi_marshalling_tests_gvalue_in_enum (GValue *value) { - g_assert(g_value_get_enum(value) == GI_MARSHALLING_TESTS_ENUM_VALUE3); + g_assert (g_value_get_enum (value) == GI_MARSHALLING_TESTS_ENUM_VALUE3); } /** @@ -3124,15 +3152,16 @@ gi_marshalling_tests_gvalue_in_enum (GValue *value) void gi_marshalling_tests_gvalue_out (GValue **value) { - static GValue *new_value = NULL; + static GValue *new_value = NULL; - if (new_value == NULL) { - new_value = g_new0(GValue, 1); - g_value_init(new_value, G_TYPE_INT); - g_value_set_int(new_value, 42); + if (new_value == NULL) + { + new_value = g_new0 (GValue, 1); + g_value_init (new_value, G_TYPE_INT); + g_value_set_int (new_value, 42); } - *value = new_value; + *value = new_value; } /** @@ -3142,15 +3171,16 @@ gi_marshalling_tests_gvalue_out (GValue **value) void gi_marshalling_tests_gvalue_int64_out (GValue **value) { - static GValue *new_value = NULL; + static GValue *new_value = NULL; - if (new_value == NULL) { - new_value = g_new0(GValue, 1); - g_value_init(new_value, G_TYPE_INT64); - g_value_set_int64(new_value, G_MAXINT64); + if (new_value == NULL) + { + new_value = g_new0 (GValue, 1); + g_value_init (new_value, G_TYPE_INT64); + g_value_set_int64 (new_value, G_MAXINT64); } - *value = new_value; + *value = new_value; } /** @@ -3160,8 +3190,8 @@ gi_marshalling_tests_gvalue_int64_out (GValue **value) void gi_marshalling_tests_gvalue_out_caller_allocates (GValue *value) { - g_value_init(value, G_TYPE_INT); - g_value_set_int(value, 42); + g_value_init (value, G_TYPE_INT); + g_value_set_int (value, 42); } /** @@ -3171,10 +3201,10 @@ gi_marshalling_tests_gvalue_out_caller_allocates (GValue *value) void gi_marshalling_tests_gvalue_inout (GValue **value) { - g_assert_cmpint(g_value_get_int(*value), ==, 42); - g_value_unset(*value); - g_value_init(*value, G_TYPE_STRING); - g_value_set_string(*value, "42"); + g_assert_cmpint (g_value_get_int (*value), ==, 42); + g_value_unset (*value); + g_value_init (*value, G_TYPE_STRING); + g_value_set_string (*value, "42"); } /** @@ -3183,14 +3213,13 @@ gi_marshalling_tests_gvalue_inout (GValue **value) * @values: (array length=n_values): an array containing values */ void -gi_marshalling_tests_gvalue_flat_array (guint n_values, - const GValue *values) +gi_marshalling_tests_gvalue_flat_array (guint n_values, const GValue *values) { - g_assert (n_values == 3); + g_assert (n_values == 3); - g_assert_cmpint (g_value_get_int (&values[0]), ==, 42); - g_assert_cmpstr (g_value_get_string (&values[1]), ==, "42"); - g_assert_cmpint (g_value_get_boolean (&values[2]), ==, TRUE); + g_assert_cmpint (g_value_get_int (&values[0]), ==, 42); + g_assert_cmpstr (g_value_get_string (&values[1]), ==, "42"); + g_assert_cmpint (g_value_get_boolean (&values[2]), ==, TRUE); } /** @@ -3201,18 +3230,18 @@ gi_marshalling_tests_gvalue_flat_array (guint n_values, GValue * gi_marshalling_tests_return_gvalue_flat_array (void) { - GValue *array = g_new0 (GValue, 3); + GValue *array = g_new0 (GValue, 3); - g_value_init (&array[0], G_TYPE_INT); - g_value_set_int (&array[0], 42); + g_value_init (&array[0], G_TYPE_INT); + g_value_set_int (&array[0], 42); - g_value_init (&array[1], G_TYPE_STRING); - g_value_set_static_string (&array[1], "42"); + g_value_init (&array[1], G_TYPE_STRING); + g_value_set_static_string (&array[1], "42"); - g_value_init (&array[2], G_TYPE_BOOLEAN); - g_value_set_boolean (&array[2], TRUE); + g_value_init (&array[2], G_TYPE_BOOLEAN); + g_value_set_boolean (&array[2], TRUE); - return array; + return array; } /** @@ -3224,16 +3253,14 @@ gi_marshalling_tests_return_gvalue_flat_array (void) * Returns: (array fixed-size=3) (transfer full): a flat array of [@one, @two, @three] */ GValue * -gi_marshalling_tests_gvalue_flat_array_round_trip (const GValue one, - const GValue two, - const GValue three) +gi_marshalling_tests_gvalue_flat_array_round_trip (const GValue one, const GValue two, const GValue three) { - GValue *array = g_new (GValue, 3); - array[0] = one; - array[1] = two; - array[2] = three; + GValue *array = g_new (GValue, 3); + array[0] = one; + array[1] = two; + array[2] = three; - return array; + return array; } /** @@ -3243,18 +3270,15 @@ gi_marshalling_tests_gvalue_flat_array_round_trip (const GValue one, void gi_marshalling_tests_gclosure_in (GClosure *closure) { - GValue return_value = {0, }; + GValue return_value = { 0, }; - g_value_init (&return_value, G_TYPE_INT); + g_value_init (&return_value, G_TYPE_INT); - g_closure_invoke (closure, - &return_value, - 0, NULL, - NULL); + g_closure_invoke (closure, &return_value, 0, NULL, NULL); - g_assert_cmpint(g_value_get_int (&return_value), ==, 42); + g_assert_cmpint (g_value_get_int (&return_value), ==, 42); - g_value_unset(&return_value); + g_value_unset (&return_value); } static gint @@ -3266,17 +3290,14 @@ _closure_return_42 (void) static void _marshal_INT__VOID (GClosure *closure, GValue *return_value, - guint n_param_values, - const GValue *param_values, - gpointer invocation_hint, - gpointer marshal_data) + guint n_param_values, const GValue *param_values, gpointer invocation_hint, gpointer marshal_data) { typedef gint (*GMarshalFunc_INT__VOID) (void); register GMarshalFunc_INT__VOID callback; - register GCClosure *cc = (GCClosure*) closure; + register GCClosure *cc = (GCClosure *) closure; callback = (GMarshalFunc_INT__VOID) cc->callback; - g_value_set_int(return_value, callback()); + g_value_set_int (return_value, callback ()); } /** @@ -3287,11 +3308,11 @@ _marshal_INT__VOID (GClosure *closure, GClosure * gi_marshalling_tests_gclosure_return (void) { - GClosure *closure = g_cclosure_new ((GCallback)_closure_return_42, - NULL, NULL); - g_closure_set_marshal (closure, _marshal_INT__VOID); + GClosure *closure = g_cclosure_new ((GCallback) _closure_return_42, + NULL, NULL); + g_closure_set_marshal (closure, _marshal_INT__VOID); - return closure; + return closure; } @@ -3299,10 +3320,9 @@ gi_marshalling_tests_gclosure_return (void) * gi_marshalling_tests_callback_return_value_only: * @callback: (scope call): */ -glong -gi_marshalling_tests_callback_return_value_only (GIMarshallingTestsCallbackReturnValueOnly callback) +glong gi_marshalling_tests_callback_return_value_only (GIMarshallingTestsCallbackReturnValueOnly callback) { - return callback (); + return callback (); } /** @@ -3310,11 +3330,9 @@ gi_marshalling_tests_callback_return_value_only (GIMarshallingTestsCallbackRetur * @callback: (scope call): * @a: (out): */ -void -gi_marshalling_tests_callback_one_out_parameter (GIMarshallingTestsCallbackOneOutParameter callback, - gfloat *a) +void gi_marshalling_tests_callback_one_out_parameter (GIMarshallingTestsCallbackOneOutParameter callback, gfloat *a) { - callback (a); + callback (a); } /** @@ -3324,11 +3342,10 @@ gi_marshalling_tests_callback_one_out_parameter (GIMarshallingTestsCallbackOneOu * @b: (out): */ void -gi_marshalling_tests_callback_multiple_out_parameters (GIMarshallingTestsCallbackMultipleOutParameters callback, - gfloat *a, - gfloat *b) + gi_marshalling_tests_callback_multiple_out_parameters + (GIMarshallingTestsCallbackMultipleOutParameters callback, gfloat *a, gfloat *b) { - callback (a, b); + callback (a, b); } /** @@ -3337,10 +3354,10 @@ gi_marshalling_tests_callback_multiple_out_parameters (GIMarshallingTestsCallbac * @a: (out): */ glong -gi_marshalling_tests_callback_return_value_and_one_out_parameter (GIMarshallingTestsCallbackReturnValueAndOneOutParameter callback, - glong *a) + gi_marshalling_tests_callback_return_value_and_one_out_parameter + (GIMarshallingTestsCallbackReturnValueAndOneOutParameter callback, glong *a) { - return callback (a); + return callback (a); } /** @@ -3350,11 +3367,10 @@ gi_marshalling_tests_callback_return_value_and_one_out_parameter (GIMarshallingT * @b: (out): */ glong -gi_marshalling_tests_callback_return_value_and_multiple_out_parameters (GIMarshallingTestsCallbackReturnValueAndMultipleOutParameters callback, - glong *a, - glong *b) + gi_marshalling_tests_callback_return_value_and_multiple_out_parameters + (GIMarshallingTestsCallbackReturnValueAndMultipleOutParameters callback, glong *a, glong *b) { - return callback (a, b); + return callback (a, b); } @@ -3367,36 +3383,40 @@ gi_marshalling_tests_callback_return_value_and_multiple_out_parameters (GIMarsha gpointer gi_marshalling_tests_pointer_in_return (gpointer pointer) { - return pointer; + return pointer; } GType gi_marshalling_tests_genum_get_type (void) { - static GType type = 0; - if (G_UNLIKELY(type == 0)) { - static const GEnumValue values[] = { - { GI_MARSHALLING_TESTS_GENUM_VALUE1, "GI_MARSHALLING_TESTS_GENUM_VALUE1", "value1" }, - { GI_MARSHALLING_TESTS_GENUM_VALUE2, "GI_MARSHALLING_TESTS_GENUM_VALUE2", "value2" }, - { GI_MARSHALLING_TESTS_GENUM_VALUE3, "GI_MARSHALLING_TESTS_GENUM_VALUE3", "value3" }, - { 0, NULL, NULL } - }; - type = g_enum_register_static (g_intern_static_string ("GIMarshallingTestsGEnum"), values); + static GType type = 0; + if (G_UNLIKELY (type == 0)) + { + static const GEnumValue values[] = { + {GI_MARSHALLING_TESTS_GENUM_VALUE1, + "GI_MARSHALLING_TESTS_GENUM_VALUE1", "value1"}, + {GI_MARSHALLING_TESTS_GENUM_VALUE2, + "GI_MARSHALLING_TESTS_GENUM_VALUE2", "value2"}, + {GI_MARSHALLING_TESTS_GENUM_VALUE3, + "GI_MARSHALLING_TESTS_GENUM_VALUE3", "value3"}, + {0, NULL, NULL} + }; + type = g_enum_register_static (g_intern_static_string ("GIMarshallingTestsGEnum"), values); } - return type; + return type; } GIMarshallingTestsGEnum gi_marshalling_tests_genum_returnv (void) { - return GI_MARSHALLING_TESTS_GENUM_VALUE3; + return GI_MARSHALLING_TESTS_GENUM_VALUE3; } void gi_marshalling_tests_genum_in (GIMarshallingTestsGEnum v) { - g_assert_cmpint(v, ==, GI_MARSHALLING_TESTS_GENUM_VALUE3); + g_assert_cmpint (v, ==, GI_MARSHALLING_TESTS_GENUM_VALUE3); } /** @@ -3406,7 +3426,7 @@ gi_marshalling_tests_genum_in (GIMarshallingTestsGEnum v) void gi_marshalling_tests_genum_out (GIMarshallingTestsGEnum *v) { - *v = GI_MARSHALLING_TESTS_GENUM_VALUE3; + *v = GI_MARSHALLING_TESTS_GENUM_VALUE3; } /** @@ -3416,21 +3436,21 @@ gi_marshalling_tests_genum_out (GIMarshallingTestsGEnum *v) void gi_marshalling_tests_genum_inout (GIMarshallingTestsGEnum *v) { - g_assert_cmpint(*v, ==, GI_MARSHALLING_TESTS_GENUM_VALUE3); - *v = GI_MARSHALLING_TESTS_GENUM_VALUE1; + g_assert_cmpint (*v, ==, GI_MARSHALLING_TESTS_GENUM_VALUE3); + *v = GI_MARSHALLING_TESTS_GENUM_VALUE1; } GIMarshallingTestsEnum gi_marshalling_tests_enum_returnv (void) { - return GI_MARSHALLING_TESTS_ENUM_VALUE3; + return GI_MARSHALLING_TESTS_ENUM_VALUE3; } void gi_marshalling_tests_enum_in (GIMarshallingTestsEnum v) { - g_assert_cmpint(v, ==, GI_MARSHALLING_TESTS_ENUM_VALUE3); + g_assert_cmpint (v, ==, GI_MARSHALLING_TESTS_ENUM_VALUE3); } /** @@ -3440,7 +3460,7 @@ gi_marshalling_tests_enum_in (GIMarshallingTestsEnum v) void gi_marshalling_tests_enum_out (GIMarshallingTestsEnum *v) { - *v = GI_MARSHALLING_TESTS_ENUM_VALUE3; + *v = GI_MARSHALLING_TESTS_ENUM_VALUE3; } /** @@ -3450,46 +3470,52 @@ gi_marshalling_tests_enum_out (GIMarshallingTestsEnum *v) void gi_marshalling_tests_enum_inout (GIMarshallingTestsEnum *v) { - g_assert_cmpint(*v, ==, GI_MARSHALLING_TESTS_ENUM_VALUE3); - *v = GI_MARSHALLING_TESTS_ENUM_VALUE1; + g_assert_cmpint (*v, ==, GI_MARSHALLING_TESTS_ENUM_VALUE3); + *v = GI_MARSHALLING_TESTS_ENUM_VALUE1; } GType gi_marshalling_tests_flags_get_type (void) { - static GType type = 0; - if (G_UNLIKELY(type == 0)) { - static const GFlagsValue values[] = { - { GI_MARSHALLING_TESTS_FLAGS_VALUE1, "GI_MARSHALLING_TESTS_FLAGS_VALUE1", "value1" }, - { GI_MARSHALLING_TESTS_FLAGS_VALUE2, "GI_MARSHALLING_TESTS_FLAGS_VALUE2", "value2" }, - { GI_MARSHALLING_TESTS_FLAGS_VALUE3, "GI_MARSHALLING_TESTS_FLAGS_VALUE3", "value3" }, - { GI_MARSHALLING_TESTS_FLAGS_MASK, "GI_MARSHALLING_TESTS_FLAGS_MASK", "mask" }, - { GI_MARSHALLING_TESTS_FLAGS_MASK2, "GI_MARSHALLING_TESTS_FLAGS_MASK2", "mask2" }, - { 0, NULL, NULL } - }; - type = g_flags_register_static (g_intern_static_string ("GIMarshallingTestsFlags"), values); + static GType type = 0; + if (G_UNLIKELY (type == 0)) + { + static const GFlagsValue values[] = { + {GI_MARSHALLING_TESTS_FLAGS_VALUE1, + "GI_MARSHALLING_TESTS_FLAGS_VALUE1", "value1"}, + {GI_MARSHALLING_TESTS_FLAGS_VALUE2, + "GI_MARSHALLING_TESTS_FLAGS_VALUE2", "value2"}, + {GI_MARSHALLING_TESTS_FLAGS_VALUE3, + "GI_MARSHALLING_TESTS_FLAGS_VALUE3", "value3"}, + {GI_MARSHALLING_TESTS_FLAGS_MASK, "GI_MARSHALLING_TESTS_FLAGS_MASK", + "mask"}, + {GI_MARSHALLING_TESTS_FLAGS_MASK2, "GI_MARSHALLING_TESTS_FLAGS_MASK2", + "mask2"}, + {0, NULL, NULL} + }; + type = g_flags_register_static (g_intern_static_string ("GIMarshallingTestsFlags"), values); } - return type; + return type; } GIMarshallingTestsFlags gi_marshalling_tests_flags_returnv (void) { - return GI_MARSHALLING_TESTS_FLAGS_VALUE2; + return GI_MARSHALLING_TESTS_FLAGS_VALUE2; } void gi_marshalling_tests_flags_in (GIMarshallingTestsFlags v) { - g_assert(v == GI_MARSHALLING_TESTS_FLAGS_VALUE2); + g_assert (v == GI_MARSHALLING_TESTS_FLAGS_VALUE2); } void gi_marshalling_tests_flags_in_zero (GIMarshallingTestsFlags v) { - g_assert(v == 0); + g_assert (v == 0); } /** @@ -3499,7 +3525,7 @@ gi_marshalling_tests_flags_in_zero (GIMarshallingTestsFlags v) void gi_marshalling_tests_flags_out (GIMarshallingTestsFlags *v) { - *v = GI_MARSHALLING_TESTS_FLAGS_VALUE2; + *v = GI_MARSHALLING_TESTS_FLAGS_VALUE2; } /** @@ -3509,27 +3535,27 @@ gi_marshalling_tests_flags_out (GIMarshallingTestsFlags *v) void gi_marshalling_tests_flags_inout (GIMarshallingTestsFlags *v) { - g_assert(*v == GI_MARSHALLING_TESTS_FLAGS_VALUE2); - *v = GI_MARSHALLING_TESTS_FLAGS_VALUE1; + g_assert (*v == GI_MARSHALLING_TESTS_FLAGS_VALUE2); + *v = GI_MARSHALLING_TESTS_FLAGS_VALUE1; } GIMarshallingTestsNoTypeFlags gi_marshalling_tests_no_type_flags_returnv (void) { - return GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2; + return GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2; } void gi_marshalling_tests_no_type_flags_in (GIMarshallingTestsNoTypeFlags v) { - g_assert(v == GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2); + g_assert (v == GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2); } void gi_marshalling_tests_no_type_flags_in_zero (GIMarshallingTestsNoTypeFlags v) { - g_assert(v == 0); + g_assert (v == 0); } /** @@ -3539,7 +3565,7 @@ gi_marshalling_tests_no_type_flags_in_zero (GIMarshallingTestsNoTypeFlags v) void gi_marshalling_tests_no_type_flags_out (GIMarshallingTestsNoTypeFlags *v) { - *v = GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2; + *v = GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2; } /** @@ -3549,8 +3575,8 @@ gi_marshalling_tests_no_type_flags_out (GIMarshallingTestsNoTypeFlags *v) void gi_marshalling_tests_no_type_flags_inout (GIMarshallingTestsNoTypeFlags *v) { - g_assert(*v == GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2); - *v = GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE1; + g_assert (*v == GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE2); + *v = GI_MARSHALLING_TESTS_NO_TYPE_FLAGS_VALUE1; } @@ -3562,16 +3588,17 @@ gi_marshalling_tests_no_type_flags_inout (GIMarshallingTestsNoTypeFlags *v) GIMarshallingTestsSimpleStruct * gi_marshalling_tests_simple_struct_returnv (void) { - static GIMarshallingTestsSimpleStruct *struct_ = NULL; + static GIMarshallingTestsSimpleStruct *struct_ = NULL; - if (struct_ == NULL) { - struct_ = g_new(GIMarshallingTestsSimpleStruct, 1); + if (struct_ == NULL) + { + struct_ = g_new (GIMarshallingTestsSimpleStruct, 1); - struct_->long_ = 6; - struct_->int8 = 7; + struct_->long_ = 6; + struct_->int8 = 7; } - return struct_; + return struct_; } /** @@ -3581,28 +3608,29 @@ gi_marshalling_tests_simple_struct_returnv (void) void gi_marshalling_tests_simple_struct_inv (GIMarshallingTestsSimpleStruct *struct_) { - g_assert_cmpint(struct_->long_, ==, 6); - g_assert_cmpint(struct_->int8, ==, 7); + g_assert_cmpint (struct_->long_, ==, 6); + g_assert_cmpint (struct_->int8, ==, 7); } void gi_marshalling_tests_simple_struct_method (GIMarshallingTestsSimpleStruct *struct_) { - g_assert_cmpint(struct_->long_, ==, 6); - g_assert_cmpint(struct_->int8, ==, 7); + g_assert_cmpint (struct_->long_, ==, 6); + g_assert_cmpint (struct_->int8, ==, 7); } GType gi_marshalling_tests_pointer_struct_get_type (void) { - static GType type = 0; + static GType type = 0; - if (type == 0) { - type = g_pointer_type_register_static ("GIMarshallingTestsPointerStruct"); + if (type == 0) + { + type = g_pointer_type_register_static ("GIMarshallingTestsPointerStruct"); } - return type; + return type; } /** @@ -3613,15 +3641,16 @@ gi_marshalling_tests_pointer_struct_get_type (void) GIMarshallingTestsPointerStruct * gi_marshalling_tests_pointer_struct_returnv (void) { - static GIMarshallingTestsPointerStruct *struct_ = NULL; + static GIMarshallingTestsPointerStruct *struct_ = NULL; - if (struct_ == NULL) { - struct_ = g_new(GIMarshallingTestsPointerStruct, 1); + if (struct_ == NULL) + { + struct_ = g_new (GIMarshallingTestsPointerStruct, 1); - struct_->long_ = 42; + struct_->long_ = 42; } - return struct_; + return struct_; } /** @@ -3631,66 +3660,69 @@ gi_marshalling_tests_pointer_struct_returnv (void) void gi_marshalling_tests_pointer_struct_inv (GIMarshallingTestsPointerStruct *struct_) { - g_assert_cmpint(struct_->long_, ==, 42); + g_assert_cmpint (struct_->long_, ==, 42); } static GIMarshallingTestsBoxedStruct * gi_marshalling_tests_boxed_struct_copy (GIMarshallingTestsBoxedStruct *struct_) { - GIMarshallingTestsBoxedStruct *new_struct; + GIMarshallingTestsBoxedStruct *new_struct; - if (struct_ == NULL) - return NULL; + if (struct_ == NULL) + return NULL; - new_struct = g_slice_new (GIMarshallingTestsBoxedStruct); + new_struct = g_slice_new (GIMarshallingTestsBoxedStruct); - *new_struct = *struct_; - new_struct->string_ = g_strdup (struct_->string_); + *new_struct = *struct_; + new_struct->string_ = g_strdup (struct_->string_); - return new_struct; + return new_struct; } static void gi_marshalling_tests_boxed_struct_free (GIMarshallingTestsBoxedStruct *struct_) { - if (struct_ != NULL) { - g_free (struct_->string_); - g_slice_free (GIMarshallingTestsBoxedStruct, struct_); + if (struct_ != NULL) + { + g_free (struct_->string_); + g_slice_free (GIMarshallingTestsBoxedStruct, struct_); } } GType gi_marshalling_tests_boxed_struct_get_type (void) { - static GType type = 0; + static GType type = 0; - if (type == 0) { - type = g_boxed_type_register_static ("GIMarshallingTestsBoxedStruct", - (GBoxedCopyFunc) gi_marshalling_tests_boxed_struct_copy, - (GBoxedFreeFunc) gi_marshalling_tests_boxed_struct_free); + if (type == 0) + { + type = g_boxed_type_register_static ("GIMarshallingTestsBoxedStruct", + (GBoxedCopyFunc) + gi_marshalling_tests_boxed_struct_copy, + (GBoxedFreeFunc) gi_marshalling_tests_boxed_struct_free); } - return type; + return type; } static GType gi_marshalling_tests_boxed_glist_get_type (void) { - static GType type = 0; + static GType type = 0; - if (type == 0) { - type = g_boxed_type_register_static ("GIMarshallingTestsBoxedGList", - (GBoxedCopyFunc) g_list_copy, - (GBoxedFreeFunc) g_list_free); + if (type == 0) + { + type = g_boxed_type_register_static ("GIMarshallingTestsBoxedGList", + (GBoxedCopyFunc) g_list_copy, (GBoxedFreeFunc) g_list_free); } - return type; + return type; } GIMarshallingTestsBoxedStruct * gi_marshalling_tests_boxed_struct_new (void) { - return g_slice_new0 (GIMarshallingTestsBoxedStruct); + return g_slice_new0 (GIMarshallingTestsBoxedStruct); } /** @@ -3701,21 +3733,22 @@ gi_marshalling_tests_boxed_struct_new (void) GIMarshallingTestsBoxedStruct * gi_marshalling_tests_boxed_struct_returnv (void) { - static GIMarshallingTestsBoxedStruct *struct_ = NULL; + static GIMarshallingTestsBoxedStruct *struct_ = NULL; - if (struct_ == NULL) { - struct_ = g_new(GIMarshallingTestsBoxedStruct, 1); + if (struct_ == NULL) + { + struct_ = g_new (GIMarshallingTestsBoxedStruct, 1); - struct_->long_ = 42; - struct_->string_ = g_strdup("hello"); - struct_->g_strv = g_new0(gchar*, 4); - struct_->g_strv[0] = g_strdup("0"); - struct_->g_strv[1] = g_strdup("1"); - struct_->g_strv[2] = g_strdup("2"); - struct_->g_strv[3] = NULL; + struct_->long_ = 42; + struct_->string_ = g_strdup ("hello"); + struct_->g_strv = g_new0 (gchar *, 4); + struct_->g_strv[0] = g_strdup ("0"); + struct_->g_strv[1] = g_strdup ("1"); + struct_->g_strv[2] = g_strdup ("2"); + struct_->g_strv[3] = NULL; } - return struct_; + return struct_; } /** @@ -3725,7 +3758,7 @@ gi_marshalling_tests_boxed_struct_returnv (void) void gi_marshalling_tests_boxed_struct_inv (GIMarshallingTestsBoxedStruct *struct_) { - g_assert_cmpint(struct_->long_, ==, 42); + g_assert_cmpint (struct_->long_, ==, 42); } /** @@ -3735,15 +3768,16 @@ gi_marshalling_tests_boxed_struct_inv (GIMarshallingTestsBoxedStruct *struct_) void gi_marshalling_tests_boxed_struct_out (GIMarshallingTestsBoxedStruct **struct_) { - static GIMarshallingTestsBoxedStruct *new_struct = NULL; + static GIMarshallingTestsBoxedStruct *new_struct = NULL; - if (new_struct == NULL) { - new_struct = g_new0(GIMarshallingTestsBoxedStruct, 1); + if (new_struct == NULL) + { + new_struct = g_new0 (GIMarshallingTestsBoxedStruct, 1); - new_struct->long_ = 42; + new_struct->long_ = 42; } - *struct_ = new_struct; + *struct_ = new_struct; } /** @@ -3753,42 +3787,44 @@ gi_marshalling_tests_boxed_struct_out (GIMarshallingTestsBoxedStruct **struct_) void gi_marshalling_tests_boxed_struct_inout (GIMarshallingTestsBoxedStruct **struct_) { - g_assert_cmpint((*struct_)->long_, ==, 42); + g_assert_cmpint ((*struct_)->long_, ==, 42); - (*struct_) = g_slice_new0 (GIMarshallingTestsBoxedStruct); - (*struct_)->long_ = 0; + (*struct_) = g_slice_new0 (GIMarshallingTestsBoxedStruct); + (*struct_)->long_ = 0; } static GIMarshallingTestsUnion * gi_marshalling_tests_union_copy (GIMarshallingTestsUnion *union_) { - GIMarshallingTestsUnion *new_union; + GIMarshallingTestsUnion *new_union; - new_union = g_slice_new (GIMarshallingTestsUnion); + new_union = g_slice_new (GIMarshallingTestsUnion); - *new_union = *union_; + *new_union = *union_; - return new_union; + return new_union; } static void gi_marshalling_tests_union_free (GIMarshallingTestsUnion *union_) { - g_slice_free (GIMarshallingTestsUnion, union_); + g_slice_free (GIMarshallingTestsUnion, union_); } GType gi_marshalling_tests_union_get_type (void) { - static GType type = 0; + static GType type = 0; - if (type == 0) { - type = g_boxed_type_register_static ("GIMarshallingTestsUnion", - (GBoxedCopyFunc) gi_marshalling_tests_union_copy, - (GBoxedFreeFunc) gi_marshalling_tests_union_free); + if (type == 0) + { + type = g_boxed_type_register_static ("GIMarshallingTestsUnion", + (GBoxedCopyFunc) + gi_marshalling_tests_union_copy, + (GBoxedFreeFunc) gi_marshalling_tests_union_free); } - return type; + return type; } /** @@ -3799,15 +3835,16 @@ gi_marshalling_tests_union_get_type (void) GIMarshallingTestsUnion * gi_marshalling_tests_union_returnv (void) { - static GIMarshallingTestsUnion *union_ = NULL; + static GIMarshallingTestsUnion *union_ = NULL; - if (union_ == NULL) { - union_ = g_new(GIMarshallingTestsUnion, 1); + if (union_ == NULL) + { + union_ = g_new (GIMarshallingTestsUnion, 1); - union_->long_ = 42; + union_->long_ = 42; } - return union_; + return union_; } /** @@ -3817,25 +3854,25 @@ gi_marshalling_tests_union_returnv (void) void gi_marshalling_tests_union_inv (GIMarshallingTestsUnion *union_) { - g_assert_cmpint(union_->long_, ==, 42); + g_assert_cmpint (union_->long_, ==, 42); } void gi_marshalling_tests_union_method (GIMarshallingTestsUnion *union_) { - g_assert_cmpint(union_->long_, ==, 42); + g_assert_cmpint (union_->long_, ==, 42); } enum { - PROP_0, - PROP_INT_ + PROP_0, + PROP_INT_ }; -static void gi_marshalling_tests_object_real_method_with_default_implementation ( - GIMarshallingTestsObject *self, gint8 in); +static void + gi_marshalling_tests_object_real_method_with_default_implementation (GIMarshallingTestsObject *self, gint8 in); G_DEFINE_TYPE (GIMarshallingTestsObject, gi_marshalling_tests_object, G_TYPE_OBJECT); @@ -3847,56 +3884,60 @@ gi_marshalling_tests_object_init (GIMarshallingTestsObject *object) static void gi_marshalling_tests_object_finalize (GObject *object) { - G_OBJECT_CLASS (gi_marshalling_tests_object_parent_class)->finalize (object); + G_OBJECT_CLASS (gi_marshalling_tests_object_parent_class)->finalize (object); } static void gi_marshalling_tests_object_set_property (GObject *object, guint prop_id, const GValue *value, GParamSpec *pspec) { - g_return_if_fail (GI_MARSHALLING_TESTS_IS_OBJECT (object)); + g_return_if_fail (GI_MARSHALLING_TESTS_IS_OBJECT (object)); - switch (prop_id) { - case PROP_INT_: - GI_MARSHALLING_TESTS_OBJECT (object)->int_ = g_value_get_int (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } + switch (prop_id) + { + case PROP_INT_: + GI_MARSHALLING_TESTS_OBJECT (object)->int_ = g_value_get_int (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } } static void gi_marshalling_tests_object_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec) { - g_return_if_fail (GI_MARSHALLING_TESTS_IS_OBJECT (object)); + g_return_if_fail (GI_MARSHALLING_TESTS_IS_OBJECT (object)); - switch (prop_id) { - case PROP_INT_: - g_value_set_int (value, GI_MARSHALLING_TESTS_OBJECT (object)->int_); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; - } + switch (prop_id) + { + case PROP_INT_: + g_value_set_int (value, GI_MARSHALLING_TESTS_OBJECT (object)->int_); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + break; + } } static void gi_marshalling_tests_object_class_init (GIMarshallingTestsObjectClass *klass) { - GObjectClass* object_class = G_OBJECT_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); #if 0 - GObjectClass* parent_class = G_OBJECT_CLASS (klass); + GObjectClass *parent_class = G_OBJECT_CLASS (klass); #endif - object_class->finalize = gi_marshalling_tests_object_finalize; - object_class->set_property = gi_marshalling_tests_object_set_property; - object_class->get_property = gi_marshalling_tests_object_get_property; + object_class->finalize = gi_marshalling_tests_object_finalize; + object_class->set_property = gi_marshalling_tests_object_set_property; + object_class->get_property = gi_marshalling_tests_object_get_property; - g_object_class_install_property (object_class, PROP_INT_, - g_param_spec_int ("int", "Integer", "An integer", G_MININT, G_MAXINT, 0, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + g_object_class_install_property (object_class, PROP_INT_, + g_param_spec_int ("int", "Integer", + "An integer", G_MININT, + G_MAXINT, 0, + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); - klass->method_with_default_implementation = gi_marshalling_tests_object_real_method_with_default_implementation; + klass->method_with_default_implementation = gi_marshalling_tests_object_real_method_with_default_implementation; } @@ -3908,21 +3949,21 @@ gi_marshalling_tests_object_static_method (void) void gi_marshalling_tests_object_method (GIMarshallingTestsObject *object) { - g_return_if_fail (GI_MARSHALLING_TESTS_IS_OBJECT (object)); - g_assert_cmpint (object->int_, ==, 42); + g_return_if_fail (GI_MARSHALLING_TESTS_IS_OBJECT (object)); + g_assert_cmpint (object->int_, ==, 42); } void gi_marshalling_tests_object_overridden_method (GIMarshallingTestsObject *object) { - g_return_if_fail (GI_MARSHALLING_TESTS_IS_OBJECT (object)); - g_assert_cmpint (object->int_, ==, 0); + g_return_if_fail (GI_MARSHALLING_TESTS_IS_OBJECT (object)); + g_assert_cmpint (object->int_, ==, 0); } GIMarshallingTestsObject * gi_marshalling_tests_object_new (gint int_) { - return g_object_new (GI_MARSHALLING_TESTS_TYPE_OBJECT, "int", int_, NULL); + return g_object_new (GI_MARSHALLING_TESTS_TYPE_OBJECT, "int", int_, NULL); } /** @@ -3932,11 +3973,11 @@ gi_marshalling_tests_object_new (gint int_) void gi_marshalling_tests_object_method_array_in (GIMarshallingTestsObject *object, const gint *ints, gint length) { - g_assert_cmpint(length, ==, 4); - g_assert_cmpint(ints[0], ==, -1); - g_assert_cmpint(ints[1], ==, 0); - g_assert_cmpint(ints[2], ==, 1); - g_assert_cmpint(ints[3], ==, 2); + g_assert_cmpint (length, ==, 4); + g_assert_cmpint (ints[0], ==, -1); + g_assert_cmpint (ints[1], ==, 0); + g_assert_cmpint (ints[2], ==, 1); + g_assert_cmpint (ints[3], ==, 2); } /** @@ -3946,10 +3987,10 @@ gi_marshalling_tests_object_method_array_in (GIMarshallingTestsObject *object, c void gi_marshalling_tests_object_method_array_out (GIMarshallingTestsObject *object, gint **ints, gint *length) { - static gint values[] = {-1, 0, 1, 2}; + static gint values[] = { -1, 0, 1, 2 }; - *length = 4; - *ints = values; + *length = 4; + *ints = values; } /** @@ -3960,16 +4001,16 @@ gi_marshalling_tests_object_method_array_out (GIMarshallingTestsObject *object, void gi_marshalling_tests_object_method_array_inout (GIMarshallingTestsObject *object, gint **ints, gint *length) { - static gint values[] = {-2, -1, 0, 1, 2}; + static gint values[] = { -2, -1, 0, 1, 2 }; - g_assert_cmpint(*length, ==, 4); - g_assert_cmpint((*ints)[0], ==, -1); - g_assert_cmpint((*ints)[1], ==, 0); - g_assert_cmpint((*ints)[2], ==, 1); - g_assert_cmpint((*ints)[3], ==, 2); + g_assert_cmpint (*length, ==, 4); + g_assert_cmpint ((*ints)[0], ==, -1); + g_assert_cmpint ((*ints)[1], ==, 0); + g_assert_cmpint ((*ints)[2], ==, 1); + g_assert_cmpint ((*ints)[3], ==, 2); - *length = 5; - *ints = values; + *length = 5; + *ints = values; } /** @@ -3980,10 +4021,10 @@ gi_marshalling_tests_object_method_array_inout (GIMarshallingTestsObject *object const gint * gi_marshalling_tests_object_method_array_return (GIMarshallingTestsObject *object, gint *length) { - static gint ints[] = {-1, 0, 1, 2}; + static gint ints[] = { -1, 0, 1, 2 }; - *length = 4; - return ints; + *length = 4; + return ints; } /** @@ -4011,7 +4052,7 @@ gi_marshalling_tests_object_method_int8_out (GIMarshallingTestsObject *self, gin * @out: (out caller-allocates): */ void -gi_marshalling_tests_object_method_int8_arg_and_out_caller (GIMarshallingTestsObject *self, gint8 arg, gint8 *out) + gi_marshalling_tests_object_method_int8_arg_and_out_caller (GIMarshallingTestsObject *self, gint8 arg, gint8 *out) { GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->method_int8_arg_and_out_caller (self, arg, out); } @@ -4021,7 +4062,7 @@ gi_marshalling_tests_object_method_int8_arg_and_out_caller (GIMarshallingTestsOb * @out: (out): */ void -gi_marshalling_tests_object_method_int8_arg_and_out_callee (GIMarshallingTestsObject *self, gint8 arg, gint8 **out) + gi_marshalling_tests_object_method_int8_arg_and_out_callee (GIMarshallingTestsObject *self, gint8 arg, gint8 **out) { GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->method_int8_arg_and_out_callee (self, arg, out); } @@ -4032,8 +4073,8 @@ gi_marshalling_tests_object_method_int8_arg_and_out_callee (GIMarshallingTestsOb * * Returns: (transfer none) */ -const gchar* -gi_marshalling_tests_object_method_str_arg_out_ret (GIMarshallingTestsObject *self, const gchar* arg, guint *out) +const gchar * +gi_marshalling_tests_object_method_str_arg_out_ret (GIMarshallingTestsObject *self, const gchar *arg, guint *out) { return GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->method_str_arg_out_ret (self, arg, out); } @@ -4042,19 +4083,18 @@ gi_marshalling_tests_object_method_str_arg_out_ret (GIMarshallingTestsObject *se * gi_marshalling_tests_object_method_with_default_implementation: * @in: (in): */ -void -gi_marshalling_tests_object_method_with_default_implementation (GIMarshallingTestsObject *self, gint8 in) +void gi_marshalling_tests_object_method_with_default_implementation (GIMarshallingTestsObject *self, gint8 in) { - GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->method_with_default_implementation (self, in); + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->method_with_default_implementation (self, in); } static void -gi_marshalling_tests_object_real_method_with_default_implementation (GIMarshallingTestsObject *self, gint8 in) + gi_marshalling_tests_object_real_method_with_default_implementation (GIMarshallingTestsObject *self, gint8 in) { - GValue val = {0, }; - g_value_init (&val, G_TYPE_INT); - g_value_set_int (&val, in); - g_object_set_property (G_OBJECT (self), "int", &val); + GValue val = { 0, }; + g_value_init (&val, G_TYPE_INT); + g_value_set_int (&val, in); + g_object_set_property (G_OBJECT (self), "int", &val); } /** @@ -4065,9 +4105,8 @@ gi_marshalling_tests_object_real_method_with_default_implementation (GIMarshalli * Virtual: vfunc_with_callback */ void -gi_marshalling_tests_object_vfunc_with_callback (GIMarshallingTestsObject *object, - GIMarshallingTestsCallbackIntInt callback, - void *callback_data) +gi_marshalling_tests_object_vfunc_with_callback (GIMarshallingTestsObject * + object, GIMarshallingTestsCallbackIntInt callback, void *callback_data) { } @@ -4075,16 +4114,14 @@ gi_marshalling_tests_object_vfunc_with_callback (GIMarshallingTestsObject *objec static int _callback (int val, void *user_data) { - g_assert (user_data == (gpointer)0xdeadbeef); + g_assert (user_data == (gpointer) 0xdeadbeef); return val; } void gi_marshalling_tests_object_call_vfunc_with_callback (GIMarshallingTestsObject *object) { - GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (object)->vfunc_with_callback (object, - _callback, - (void *) 0xdeadbeef); + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (object)->vfunc_with_callback (object, _callback, (void *) 0xdeadbeef); } /** @@ -4095,13 +4132,14 @@ gi_marshalling_tests_object_call_vfunc_with_callback (GIMarshallingTestsObject * GIMarshallingTestsObject * gi_marshalling_tests_object_none_return (void) { - static GIMarshallingTestsObject *object = NULL; + static GIMarshallingTestsObject *object = NULL; - if (object == NULL) { - object = g_object_new(GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL); + if (object == NULL) + { + object = g_object_new (GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL); } - return object; + return object; } /** @@ -4112,7 +4150,7 @@ gi_marshalling_tests_object_none_return (void) GIMarshallingTestsObject * gi_marshalling_tests_object_full_return (void) { - return g_object_new(GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL); + return g_object_new (GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL); } /** @@ -4122,7 +4160,7 @@ gi_marshalling_tests_object_full_return (void) void gi_marshalling_tests_object_none_in (GIMarshallingTestsObject *object) { - g_assert_cmpint(object->int_, ==, 42); + g_assert_cmpint (object->int_, ==, 42); } /** @@ -4132,13 +4170,14 @@ gi_marshalling_tests_object_none_in (GIMarshallingTestsObject *object) void gi_marshalling_tests_object_none_out (GIMarshallingTestsObject **object) { - static GIMarshallingTestsObject *new_object = NULL; + static GIMarshallingTestsObject *new_object = NULL; - if (new_object == NULL) { - new_object = g_object_new(GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL); + if (new_object == NULL) + { + new_object = g_object_new (GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL); } - *object = new_object; + *object = new_object; } /** @@ -4148,7 +4187,7 @@ gi_marshalling_tests_object_none_out (GIMarshallingTestsObject **object) void gi_marshalling_tests_object_full_out (GIMarshallingTestsObject **object) { - *object = g_object_new(GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL); + *object = g_object_new (GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL); } /** @@ -4158,16 +4197,17 @@ gi_marshalling_tests_object_full_out (GIMarshallingTestsObject **object) void gi_marshalling_tests_object_none_inout (GIMarshallingTestsObject **object) { - static GIMarshallingTestsObject *new_object = NULL; + static GIMarshallingTestsObject *new_object = NULL; - g_assert_cmpint((*object)->int_, ==, 42); + g_assert_cmpint ((*object)->int_, ==, 42); - if (new_object == NULL) { - new_object = g_object_new(GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL); - new_object->int_ = 0; + if (new_object == NULL) + { + new_object = g_object_new (GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL); + new_object->int_ = 0; } - *object = new_object; + *object = new_object; } /** @@ -4177,9 +4217,9 @@ gi_marshalling_tests_object_none_inout (GIMarshallingTestsObject **object) void gi_marshalling_tests_object_full_inout (GIMarshallingTestsObject **object) { - g_assert_cmpint((*object)->int_, ==, 42); + g_assert_cmpint ((*object)->int_, ==, 42); - *object = g_object_new(GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL); + *object = g_object_new (GI_MARSHALLING_TESTS_TYPE_OBJECT, NULL); } /** @@ -4208,12 +4248,12 @@ gi_marshalling_tests_object_int8_out (GIMarshallingTestsObject *object, gint8 *o glong gi_marshalling_tests_object_vfunc_return_value_only (GIMarshallingTestsObject *self) { - /* make sure that local variables don't get smashed */ - glong return_value; - gulong local = 0x12345678; - return_value = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_value_only (self); - g_assert_cmpint(local, ==, 0x12345678); - return return_value; + /* make sure that local variables don't get smashed */ + glong return_value; + gulong local = 0x12345678; + return_value = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_value_only (self); + g_assert_cmpint (local, ==, 0x12345678); + return return_value; } /** @@ -4223,10 +4263,10 @@ gi_marshalling_tests_object_vfunc_return_value_only (GIMarshallingTestsObject *s void gi_marshalling_tests_object_vfunc_one_out_parameter (GIMarshallingTestsObject *self, gfloat *a) { - /* make sure that local variables don't get smashed */ - gulong local = 0x12345678; - GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_one_out_parameter (self, a); - g_assert_cmpint(local, ==, 0x12345678); + /* make sure that local variables don't get smashed */ + gulong local = 0x12345678; + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_one_out_parameter (self, a); + g_assert_cmpint (local, ==, 0x12345678); } /** @@ -4234,54 +4274,50 @@ gi_marshalling_tests_object_vfunc_one_out_parameter (GIMarshallingTestsObject *s * @a: (out): * @b: (out): */ -void -gi_marshalling_tests_object_vfunc_multiple_out_parameters (GIMarshallingTestsObject *self, gfloat *a, gfloat *b) +void gi_marshalling_tests_object_vfunc_multiple_out_parameters (GIMarshallingTestsObject *self, gfloat *a, gfloat *b) { - /* make sure that local variables don't get smashed */ - gulong local = 0x12345678; - GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_multiple_out_parameters (self, a, b); - g_assert_cmpint(local, ==, 0x12345678); + /* make sure that local variables don't get smashed */ + gulong local = 0x12345678; + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_multiple_out_parameters (self, a, b); + g_assert_cmpint (local, ==, 0x12345678); } /** * gi_marshalling_tests_object_vfunc_caller_allocated_out_parameter: * @a: (out): */ -void -gi_marshalling_tests_object_vfunc_caller_allocated_out_parameter (GIMarshallingTestsObject *self, GValue *a) +void gi_marshalling_tests_object_vfunc_caller_allocated_out_parameter (GIMarshallingTestsObject *self, GValue *a) { - /* make sure that local variables don't get smashed */ - gulong local = 0x12345678; - GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_caller_allocated_out_parameter (self, a); - g_assert_cmpint(local, ==, 0x12345678); + /* make sure that local variables don't get smashed */ + gulong local = 0x12345678; + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_caller_allocated_out_parameter (self, a); + g_assert_cmpint (local, ==, 0x12345678); } /** * gi_marshalling_tests_object_vfunc_array_out_parameter: * @a: (out) (array zero-terminated=1): */ -void -gi_marshalling_tests_object_vfunc_array_out_parameter (GIMarshallingTestsObject *self, gfloat **a) +void gi_marshalling_tests_object_vfunc_array_out_parameter (GIMarshallingTestsObject *self, gfloat **a) { - /* make sure that local variables don't get smashed */ - gulong local = 0x12345678; - GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_array_out_parameter (self, a); - g_assert_cmpint(local, ==, 0x12345678); + /* make sure that local variables don't get smashed */ + gulong local = 0x12345678; + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_array_out_parameter (self, a); + g_assert_cmpint (local, ==, 0x12345678); } /** * gi_marshalling_tests_object_vfunc_return_value_and_one_out_parameter: * @a: (out): */ -glong -gi_marshalling_tests_object_vfunc_return_value_and_one_out_parameter (GIMarshallingTestsObject *self, glong *a) +glong gi_marshalling_tests_object_vfunc_return_value_and_one_out_parameter (GIMarshallingTestsObject *self, glong *a) { - /* make sure that local variables don't get smashed */ - gulong return_value; - gulong local = 0x12345678; - return_value = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_value_and_one_out_parameter (self, a); - g_assert_cmpint(local, ==, 0x12345678); - return return_value; + /* make sure that local variables don't get smashed */ + gulong return_value; + gulong local = 0x12345678; + return_value = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_value_and_one_out_parameter (self, a); + g_assert_cmpint (local, ==, 0x12345678); + return return_value; } /** @@ -4290,23 +4326,25 @@ gi_marshalling_tests_object_vfunc_return_value_and_one_out_parameter (GIMarshall * @b: (out): */ glong -gi_marshalling_tests_object_vfunc_return_value_and_multiple_out_parameters (GIMarshallingTestsObject *self, glong *a, glong *b) + gi_marshalling_tests_object_vfunc_return_value_and_multiple_out_parameters + (GIMarshallingTestsObject *self, glong *a, glong *b) { - gulong return_value; - gulong local = 0x12345678; - return_value = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_value_and_multiple_out_parameters (self, a, b); - g_assert_cmpint(local, ==, 0x12345678); - return return_value; + gulong return_value; + gulong local = 0x12345678; + return_value = + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_value_and_multiple_out_parameters (self, a, b); + g_assert_cmpint (local, ==, 0x12345678); + return return_value; } gboolean -gi_marshalling_tests_object_vfunc_meth_with_error (GIMarshallingTestsObject *self, - gint x, - GError **error) +gi_marshalling_tests_object_vfunc_meth_with_error (GIMarshallingTestsObject *self, gint x, GError **error) { gulong local = 0x12345678; - gboolean ret = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_meth_with_err (self, x, error); - g_assert_cmpint(local, ==, 0x12345678); + gboolean ret = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_meth_with_err (self, + x, + error); + g_assert_cmpint (local, ==, 0x12345678); return ret; } @@ -4327,15 +4365,16 @@ gi_marshalling_tests_object_vfunc_meth_with_error (GIMarshallingTestsObject *sel * @is_floating: (out): Floating state object returned from the vfunc directly after vfunc call. */ void -gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_none (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating) + gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_none + (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating) { - GObject *object = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_object_transfer_none (self); - *ref_count = object->ref_count; - *is_floating = g_object_is_floating(object); + GObject *object = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_object_transfer_none (self); + *ref_count = object->ref_count; + *is_floating = g_object_is_floating (object); - /* Attempt to sink and unref the returned object and avoid any potential leaks */ - g_object_ref_sink(object); - g_object_unref(object); + /* Attempt to sink and unref the returned object and avoid any potential leaks */ + g_object_ref_sink (object); + g_object_unref (object); } /** @@ -4344,12 +4383,13 @@ gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_none ( * @is_floating: (out): Floating state object returned from the vfunc directly after vfunc call. */ void -gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_full (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating) + gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_full + (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating) { - GObject *object = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_object_transfer_full (self); - *ref_count = object->ref_count; - *is_floating = g_object_is_floating(object); - g_object_unref(object); + GObject *object = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_object_transfer_full (self); + *ref_count = object->ref_count; + *is_floating = g_object_is_floating (object); + g_object_unref (object); } /** @@ -4358,16 +4398,17 @@ gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_full ( * @is_floating: (out): Floating state object returned from the vfunc directly after vfunc call. */ void -gi_marshalling_tests_object_get_ref_info_for_vfunc_out_object_transfer_none (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating) + gi_marshalling_tests_object_get_ref_info_for_vfunc_out_object_transfer_none + (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating) { - GObject *object = NULL; - GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_out_object_transfer_none (self, &object); - *ref_count = object->ref_count; - *is_floating = g_object_is_floating(object); + GObject *object = NULL; + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_out_object_transfer_none (self, &object); + *ref_count = object->ref_count; + *is_floating = g_object_is_floating (object); - /* Attempt to sink and unref the returned object and avoid any potential leaks */ - g_object_ref_sink(object); - g_object_unref(object); + /* Attempt to sink and unref the returned object and avoid any potential leaks */ + g_object_ref_sink (object); + g_object_unref (object); } /** @@ -4376,17 +4417,19 @@ gi_marshalling_tests_object_get_ref_info_for_vfunc_out_object_transfer_none (GIM * @is_floating: (out): Floating state object returned from the vfunc directly after vfunc call. */ void -gi_marshalling_tests_object_get_ref_info_for_vfunc_out_object_transfer_full (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating) + gi_marshalling_tests_object_get_ref_info_for_vfunc_out_object_transfer_full + (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating) { - GObject *object = NULL; - GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_out_object_transfer_full (self, &object); - *ref_count = object->ref_count; - *is_floating = g_object_is_floating(object); - g_object_unref(object); + GObject *object = NULL; + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_out_object_transfer_full (self, &object); + *ref_count = object->ref_count; + *is_floating = g_object_is_floating (object); + g_object_unref (object); } static void -_vfunc_in_object_destroy_callback(gboolean *destroy_called, GObject *where_the_object_was) { +_vfunc_in_object_destroy_callback (gboolean *destroy_called, GObject *where_the_object_was) +{ *destroy_called = TRUE; } @@ -4399,23 +4442,27 @@ _vfunc_in_object_destroy_callback(gboolean *destroy_called, GObject *where_the_o * Calls vfunc_in_object_transfer_none with a new object of the given type. */ void -gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_none (GIMarshallingTestsObject *self, GType type, guint *ref_count, gboolean *is_floating) + gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_none + (GIMarshallingTestsObject *self, GType type, guint *ref_count, gboolean *is_floating) { - static gboolean destroy_called; - GObject *object; - destroy_called = FALSE; + static gboolean destroy_called; + GObject *object; + destroy_called = FALSE; - object = g_object_new(type, NULL); - g_object_weak_ref (object, (GWeakNotify)_vfunc_in_object_destroy_callback, &destroy_called); + object = g_object_new (type, NULL); + g_object_weak_ref (object, (GWeakNotify) _vfunc_in_object_destroy_callback, &destroy_called); - GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_in_object_transfer_none (self, object); - if (destroy_called) { - *ref_count = 0; - *is_floating = FALSE; - } else { - *ref_count = object->ref_count; - *is_floating = g_object_is_floating (object); - g_object_unref (object); + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_in_object_transfer_none (self, object); + if (destroy_called) + { + *ref_count = 0; + *is_floating = FALSE; + } + else + { + *ref_count = object->ref_count; + *is_floating = g_object_is_floating (object); + g_object_unref (object); } } @@ -4427,25 +4474,29 @@ gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_none (GIMa * @is_floating: (out): Floating state of in object directly after vfunc call. */ void -gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_full (GIMarshallingTestsObject *self, GType type, guint *ref_count, gboolean *is_floating) + gi_marshalling_tests_object_get_ref_info_for_vfunc_in_object_transfer_full + (GIMarshallingTestsObject *self, GType type, guint *ref_count, gboolean *is_floating) { - static gboolean destroy_called; - GObject *object; - destroy_called = FALSE; + static gboolean destroy_called; + GObject *object; + destroy_called = FALSE; - object = g_object_new(type, NULL); - g_object_weak_ref (object, (GWeakNotify)_vfunc_in_object_destroy_callback, &destroy_called); + object = g_object_new (type, NULL); + g_object_weak_ref (object, (GWeakNotify) _vfunc_in_object_destroy_callback, &destroy_called); - /* Calling the vfunc takes ownership of the object, so we use a weak_ref to determine - * if the object gets destroyed after the call and appropriately return 0 as the ref count. - */ - GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_in_object_transfer_full (self, object); - if (destroy_called) { - *ref_count = 0; - *is_floating = FALSE; - } else { - *ref_count = object->ref_count; - *is_floating = g_object_is_floating (object); + /* Calling the vfunc takes ownership of the object, so we use a weak_ref to determine + * if the object gets destroyed after the call and appropriately return 0 as the ref count. + */ + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_in_object_transfer_full (self, object); + if (destroy_called) + { + *ref_count = 0; + *is_floating = FALSE; + } + else + { + *ref_count = object->ref_count; + *is_floating = g_object_is_floating (object); } } @@ -4460,69 +4511,69 @@ gi_marshalling_tests_sub_object_init (GIMarshallingTestsSubObject *object) static void gi_marshalling_tests_sub_object_finalize (GObject *object) { - G_OBJECT_CLASS(gi_marshalling_tests_sub_object_parent_class)->finalize(object); + G_OBJECT_CLASS (gi_marshalling_tests_sub_object_parent_class)->finalize (object); } static void method_deep_hierarchy (GIMarshallingTestsObject *self, gint8 in) { - GValue val = {0, }; - g_value_init (&val, G_TYPE_INT); - g_value_set_int (&val, in); - g_object_set_property (G_OBJECT (self), "int", &val); + GValue val = { 0, }; + g_value_init (&val, G_TYPE_INT); + g_value_set_int (&val, in); + g_object_set_property (G_OBJECT (self), "int", &val); } static void gi_marshalling_tests_sub_object_class_init (GIMarshallingTestsSubObjectClass *klass) { - G_OBJECT_CLASS(klass)->finalize = gi_marshalling_tests_sub_object_finalize; - GI_MARSHALLING_TESTS_OBJECT_CLASS(klass)->method_deep_hierarchy = method_deep_hierarchy; + G_OBJECT_CLASS (klass)->finalize = gi_marshalling_tests_sub_object_finalize; + GI_MARSHALLING_TESTS_OBJECT_CLASS (klass)->method_deep_hierarchy = method_deep_hierarchy; } void gi_marshalling_tests_sub_object_sub_method (GIMarshallingTestsSubObject *object) { - g_assert_cmpint(GI_MARSHALLING_TESTS_OBJECT(object)->int_, ==, 0); + g_assert_cmpint (GI_MARSHALLING_TESTS_OBJECT (object)->int_, ==, 0); } -void -gi_marshalling_tests_sub_object_overwritten_method (GIMarshallingTestsSubObject *object) +void gi_marshalling_tests_sub_object_overwritten_method (GIMarshallingTestsSubObject *object) { - g_assert_cmpint(GI_MARSHALLING_TESTS_OBJECT(object)->int_, ==, 0); + g_assert_cmpint (GI_MARSHALLING_TESTS_OBJECT (object)->int_, ==, 0); } -G_DEFINE_TYPE (GIMarshallingTestsSubSubObject, gi_marshalling_tests_sub_sub_object, GI_MARSHALLING_TESTS_TYPE_SUB_OBJECT); +G_DEFINE_TYPE (GIMarshallingTestsSubSubObject, + gi_marshalling_tests_sub_sub_object, GI_MARSHALLING_TESTS_TYPE_SUB_OBJECT); static void gi_marshalling_tests_sub_sub_object_init (GIMarshallingTestsSubSubObject *object) { } -static void -gi_marshalling_tests_sub_sub_object_class_init (GIMarshallingTestsSubSubObjectClass *klass) +static void gi_marshalling_tests_sub_sub_object_class_init (GIMarshallingTestsSubSubObjectClass *klass) { } /* Interfaces */ static void -gi_marshalling_tests_interface_class_init(void *g_iface) +gi_marshalling_tests_interface_class_init (void *g_iface) { } GType -gi_marshalling_tests_interface_get_type(void) -{ - static GType type = 0; - if (type == 0) { - type = g_type_register_static_simple (G_TYPE_INTERFACE, - "GIMarshallingTestsInterface", - sizeof (GIMarshallingTestsInterfaceIface), - (GClassInitFunc) gi_marshalling_tests_interface_class_init, - 0, NULL, 0); +gi_marshalling_tests_interface_get_type (void) +{ + static GType type = 0; + if (type == 0) + { + type = g_type_register_static_simple (G_TYPE_INTERFACE, + "GIMarshallingTestsInterface", + sizeof + (GIMarshallingTestsInterfaceIface), + (GClassInitFunc) gi_marshalling_tests_interface_class_init, 0, NULL, 0); } - return type; + return type; } /** @@ -4547,43 +4598,45 @@ gi_marshalling_tests_test_interface_test_int8_in (GIMarshallingTestsInterface *t static void -gi_marshalling_tests_interface2_class_init(void *g_iface) +gi_marshalling_tests_interface2_class_init (void *g_iface) { } GType -gi_marshalling_tests_interface2_get_type(void) -{ - static GType type = 0; - if (type == 0) { - type = g_type_register_static_simple (G_TYPE_INTERFACE, - "GIMarshallingTestsInterface2", - sizeof (GIMarshallingTestsInterface2Iface), - (GClassInitFunc) gi_marshalling_tests_interface2_class_init, - 0, NULL, 0); +gi_marshalling_tests_interface2_get_type (void) +{ + static GType type = 0; + if (type == 0) + { + type = g_type_register_static_simple (G_TYPE_INTERFACE, + "GIMarshallingTestsInterface2", + sizeof + (GIMarshallingTestsInterface2Iface), + (GClassInitFunc) gi_marshalling_tests_interface2_class_init, 0, NULL, 0); } - return type; + return type; } static void -gi_marshalling_tests_interface3_class_init(void *g_iface) +gi_marshalling_tests_interface3_class_init (void *g_iface) { } GType -gi_marshalling_tests_interface3_get_type(void) -{ - static GType type = 0; - if (type == 0) { - type = g_type_register_static_simple (G_TYPE_INTERFACE, - "GIMarshallingTestsInterface3", - sizeof (GIMarshallingTestsInterface3Iface), - (GClassInitFunc) gi_marshalling_tests_interface3_class_init, - 0, NULL, 0); +gi_marshalling_tests_interface3_get_type (void) +{ + static GType type = 0; + if (type == 0) + { + type = g_type_register_static_simple (G_TYPE_INTERFACE, + "GIMarshallingTestsInterface3", + sizeof + (GIMarshallingTestsInterface3Iface), + (GClassInitFunc) gi_marshalling_tests_interface3_class_init, 0, NULL, 0); } - return type; + return type; } /** @@ -4592,9 +4645,8 @@ gi_marshalling_tests_interface3_get_type(void) * @n_in: */ void -gi_marshalling_tests_interface3_test_variant_array_in (GIMarshallingTestsInterface3 *self, - GVariant **in, - gsize n_in) + gi_marshalling_tests_interface3_test_variant_array_in + (GIMarshallingTestsInterface3 *self, GVariant **in, gsize n_in) { GI_MARSHALLING_TESTS_INTERFACE3_GET_IFACE (self)->test_variant_array_in (self, in, n_in); } @@ -4607,8 +4659,8 @@ gi_marshalling_tests_interface3_test_variant_array_in (GIMarshallingTestsInterfa void gi_marshalling_tests_int_out_out (gint *int0, gint *int1) { - *int0 = 6; - *int1 = 7; + *int0 = 6; + *int1 = 7; } /** @@ -4621,12 +4673,11 @@ gi_marshalling_tests_int_out_out (gint *int0, gint *int1) * @out2: (out): */ void -gi_marshalling_tests_int_three_in_three_out(gint a, gint b, gint c, - gint *out0, gint *out1, gint *out2) +gi_marshalling_tests_int_three_in_three_out (gint a, gint b, gint c, gint *out0, gint *out1, gint *out2) { - *out0 = a; - *out1 = b; - *out2 = c; + *out0 = a; + *out1 = b; + *out2 = c; } /** @@ -4636,20 +4687,18 @@ gi_marshalling_tests_int_three_in_three_out(gint a, gint b, gint c, gint gi_marshalling_tests_int_return_out (gint *int_) { - *int_ = 7; - return 6; + *int_ = 7; + return 6; } /* GError */ void -gi_marshalling_tests_gerror(GError **error) +gi_marshalling_tests_gerror (GError **error) { - GQuark quark = g_quark_from_static_string(GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN); - g_set_error_literal(error, - quark, - GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE, - GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE); + GQuark quark = g_quark_from_static_string (GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN); + g_set_error_literal (error, quark, + GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE, GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE); } /** @@ -4657,13 +4706,11 @@ gi_marshalling_tests_gerror(GError **error) * @in_ints: (array zero-terminated=1): */ void -gi_marshalling_tests_gerror_array_in(gint *in_ints, GError **error) +gi_marshalling_tests_gerror_array_in (gint *in_ints, GError **error) { - GQuark quark = g_quark_from_static_string(GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN); - g_set_error_literal(error, - quark, - GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE, - GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE); + GQuark quark = g_quark_from_static_string (GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN); + g_set_error_literal (error, quark, + GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE, GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE); } /** @@ -4674,16 +4721,15 @@ gi_marshalling_tests_gerror_array_in(gint *in_ints, GError **error) * Inspired by gst_message_parse_error. */ void -gi_marshalling_tests_gerror_out(GError **error, gchar **debug) +gi_marshalling_tests_gerror_out (GError **error, gchar **debug) { - GQuark quark = g_quark_from_static_string(GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN); - g_set_error_literal(error, - quark, - GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE, - GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE); + GQuark quark = g_quark_from_static_string (GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN); + g_set_error_literal (error, quark, + GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE, GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE); - if (debug != NULL) { - *debug = g_strdup (GI_MARSHALLING_TESTS_CONSTANT_GERROR_DEBUG_MESSAGE); + if (debug != NULL) + { + *debug = g_strdup (GI_MARSHALLING_TESTS_CONSTANT_GERROR_DEBUG_MESSAGE); } } @@ -4696,14 +4742,15 @@ gi_marshalling_tests_gerror_out(GError **error, gchar **debug) * must not free. */ void -gi_marshalling_tests_gerror_out_transfer_none(GError **err, const gchar **debug) +gi_marshalling_tests_gerror_out_transfer_none (GError **err, const gchar **debug) { - static GError error = { 0, - GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE, - GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE }; - error.domain = g_quark_from_static_string(GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN); - *err = &error; - *debug = GI_MARSHALLING_TESTS_CONSTANT_GERROR_DEBUG_MESSAGE; + static GError error = { 0, + GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE, + GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE + }; + error.domain = g_quark_from_static_string (GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN); + *err = &error; + *debug = GI_MARSHALLING_TESTS_CONSTANT_GERROR_DEBUG_MESSAGE; } /** @@ -4714,57 +4761,57 @@ gi_marshalling_tests_gerror_out_transfer_none(GError **err, const gchar **debug) * Returns: (transfer full): a GError */ GError * -gi_marshalling_tests_gerror_return(void) +gi_marshalling_tests_gerror_return (void) { - GQuark quark = g_quark_from_static_string(GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN); + GQuark quark = g_quark_from_static_string (GI_MARSHALLING_TESTS_CONSTANT_GERROR_DOMAIN); - return g_error_new(quark, - GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE, - GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE); + return g_error_new (quark, GI_MARSHALLING_TESTS_CONSTANT_GERROR_CODE, GI_MARSHALLING_TESTS_CONSTANT_GERROR_MESSAGE); } static GIMarshallingTestsOverridesStruct * gi_marshalling_tests_overrides_struct_copy (GIMarshallingTestsOverridesStruct *struct_) { - GIMarshallingTestsOverridesStruct *new_struct; + GIMarshallingTestsOverridesStruct *new_struct; - new_struct = g_slice_new (GIMarshallingTestsOverridesStruct); + new_struct = g_slice_new (GIMarshallingTestsOverridesStruct); - *new_struct = *struct_; + *new_struct = *struct_; - return new_struct; + return new_struct; } static void gi_marshalling_tests_overrides_struct_free (GIMarshallingTestsOverridesStruct *struct_) { - g_slice_free (GIMarshallingTestsOverridesStruct, struct_); + g_slice_free (GIMarshallingTestsOverridesStruct, struct_); } GType gi_marshalling_tests_overrides_struct_get_type (void) { - static GType type = 0; + static GType type = 0; - if (type == 0) { - type = g_boxed_type_register_static ("GIMarshallingTestsOverridesStruct", - (GBoxedCopyFunc) gi_marshalling_tests_overrides_struct_copy, - (GBoxedFreeFunc) gi_marshalling_tests_overrides_struct_free); + if (type == 0) + { + type = + g_boxed_type_register_static ("GIMarshallingTestsOverridesStruct", + (GBoxedCopyFunc) + gi_marshalling_tests_overrides_struct_copy, + (GBoxedFreeFunc) gi_marshalling_tests_overrides_struct_free); } - return type; + return type; } GIMarshallingTestsOverridesStruct * gi_marshalling_tests_overrides_struct_new (void) { - return g_slice_new (GIMarshallingTestsOverridesStruct); + return g_slice_new (GIMarshallingTestsOverridesStruct); } -glong -gi_marshalling_tests_overrides_struct_method (GIMarshallingTestsOverridesStruct *struct_) +glong gi_marshalling_tests_overrides_struct_method (GIMarshallingTestsOverridesStruct *struct_) { - return 42; + return 42; } @@ -4776,7 +4823,7 @@ gi_marshalling_tests_overrides_struct_method (GIMarshallingTestsOverridesStruct GIMarshallingTestsOverridesStruct * gi_marshalling_tests_overrides_struct_returnv (void) { - return gi_marshalling_tests_overrides_struct_new(); + return gi_marshalling_tests_overrides_struct_new (); } @@ -4790,30 +4837,28 @@ gi_marshalling_tests_overrides_object_init (GIMarshallingTestsOverridesObject *o static void gi_marshalling_tests_overrides_object_finalize (GObject *object) { - G_OBJECT_CLASS (gi_marshalling_tests_overrides_object_parent_class)->finalize (object); + G_OBJECT_CLASS (gi_marshalling_tests_overrides_object_parent_class)->finalize (object); } -static void -gi_marshalling_tests_overrides_object_class_init (GIMarshallingTestsOverridesObjectClass *klass) +static void gi_marshalling_tests_overrides_object_class_init (GIMarshallingTestsOverridesObjectClass *klass) { - GObjectClass* object_class = G_OBJECT_CLASS (klass); + GObjectClass *object_class = G_OBJECT_CLASS (klass); #if 0 - GObjectClass* parent_class = G_OBJECT_CLASS (klass); + GObjectClass *parent_class = G_OBJECT_CLASS (klass); #endif - object_class->finalize = gi_marshalling_tests_overrides_object_finalize; + object_class->finalize = gi_marshalling_tests_overrides_object_finalize; } GIMarshallingTestsOverridesObject * gi_marshalling_tests_overrides_object_new (void) { - return g_object_new (GI_MARSHALLING_TESTS_TYPE_OVERRIDES_OBJECT, NULL); + return g_object_new (GI_MARSHALLING_TESTS_TYPE_OVERRIDES_OBJECT, NULL); } -glong -gi_marshalling_tests_overrides_object_method (GIMarshallingTestsOverridesObject *object) +glong gi_marshalling_tests_overrides_object_method (GIMarshallingTestsOverridesObject *object) { - return 42; + return 42; } /** @@ -4824,7 +4869,7 @@ gi_marshalling_tests_overrides_object_method (GIMarshallingTestsOverridesObject GIMarshallingTestsOverridesObject * gi_marshalling_tests_overrides_object_returnv (void) { - return g_object_new (GI_MARSHALLING_TESTS_TYPE_OVERRIDES_OBJECT, NULL); + return g_object_new (GI_MARSHALLING_TESTS_TYPE_OVERRIDES_OBJECT, NULL); } /** @@ -4835,7 +4880,7 @@ gi_marshalling_tests_overrides_object_returnv (void) GSList * gi_marshalling_tests_filename_list_return (void) { - return NULL; + return NULL; } /** @@ -4844,9 +4889,9 @@ gi_marshalling_tests_filename_list_return (void) void gi_marshalling_tests_param_spec_in_bool (const GParamSpec *param) { - g_assert (G_IS_PARAM_SPEC (param)); - g_assert_cmpint (G_PARAM_SPEC_TYPE (param), ==, G_TYPE_BOOLEAN); - g_assert_cmpstr (g_param_spec_get_name((GParamSpec*) param), ==, "mybool"); + g_assert (G_IS_PARAM_SPEC (param)); + g_assert_cmpint (G_PARAM_SPEC_TYPE (param), ==, G_TYPE_BOOLEAN); + g_assert_cmpstr (g_param_spec_get_name ((GParamSpec *) param), ==, "mybool"); } /** @@ -4857,7 +4902,7 @@ gi_marshalling_tests_param_spec_in_bool (const GParamSpec *param) GParamSpec * gi_marshalling_tests_param_spec_return (void) { - return g_param_spec_string ("test-param", "test", "This is a test", "42", G_PARAM_READABLE); + return g_param_spec_string ("test-param", "test", "This is a test", "42", G_PARAM_READABLE); } /** @@ -4865,235 +4910,277 @@ gi_marshalling_tests_param_spec_return (void) * @param: (out): */ void -gi_marshalling_tests_param_spec_out(GParamSpec **param) +gi_marshalling_tests_param_spec_out (GParamSpec **param) { - *param = g_param_spec_string("test-param", "test", "This is a test", "42", G_PARAM_READABLE); + *param = g_param_spec_string ("test-param", "test", "This is a test", "42", G_PARAM_READABLE); } -enum { - DUMMY_PROPERTY, - SOME_BOOLEAN_PROPERTY, - SOME_CHAR_PROPERTY, - SOME_UCHAR_PROPERTY, - SOME_INT_PROPERTY, - SOME_UINT_PROPERTY, - SOME_LONG_PROPERTY, - SOME_ULONG_PROPERTY, - SOME_INT64_PROPERTY, - SOME_UINT64_PROPERTY, - SOME_FLOAT_PROPERTY, - SOME_DOUBLE_PROPERTY, - SOME_STRV_PROPERTY, - SOME_BOXED_STRUCT_PROPERTY, - SOME_VARIANT_PROPERTY, - SOME_BOXED_GLIST_PROPERTY, - SOME_OBJECT_PROPERTY, +enum +{ + DUMMY_PROPERTY, + SOME_BOOLEAN_PROPERTY, + SOME_CHAR_PROPERTY, + SOME_UCHAR_PROPERTY, + SOME_INT_PROPERTY, + SOME_UINT_PROPERTY, + SOME_LONG_PROPERTY, + SOME_ULONG_PROPERTY, + SOME_INT64_PROPERTY, + SOME_UINT64_PROPERTY, + SOME_FLOAT_PROPERTY, + SOME_DOUBLE_PROPERTY, + SOME_STRV_PROPERTY, + SOME_BOXED_STRUCT_PROPERTY, + SOME_VARIANT_PROPERTY, + SOME_BOXED_GLIST_PROPERTY, + SOME_OBJECT_PROPERTY, }; G_DEFINE_TYPE (GIMarshallingTestsPropertiesObject, gi_marshalling_tests_properties_object, G_TYPE_OBJECT); -static void -gi_marshalling_tests_properties_object_init (GIMarshallingTestsPropertiesObject * self) +static void gi_marshalling_tests_properties_object_init (GIMarshallingTestsPropertiesObject *self) { } static void -gi_marshalling_tests_properties_object_finalize (GObject* obj) +gi_marshalling_tests_properties_object_finalize (GObject *obj) { - G_OBJECT_CLASS (gi_marshalling_tests_properties_object_parent_class)->finalize (obj); + G_OBJECT_CLASS (gi_marshalling_tests_properties_object_parent_class)->finalize (obj); } static void -gi_marshalling_tests_properties_object_get_property (GObject * object, guint property_id, GValue * value, GParamSpec * pspec) -{ - GIMarshallingTestsPropertiesObject * self; - self = GI_MARSHALLING_TESTS_PROPERTIES_OBJECT (object); - switch (property_id) { - case SOME_BOOLEAN_PROPERTY: - g_value_set_boolean (value, self->some_boolean); - break; - case SOME_CHAR_PROPERTY: - g_value_set_schar (value, self->some_char); - break; - case SOME_UCHAR_PROPERTY: - g_value_set_uchar (value, self->some_uchar); - break; - case SOME_INT_PROPERTY: - g_value_set_int (value, self->some_int); - break; - case SOME_UINT_PROPERTY: - g_value_set_uint (value, self->some_uint); - break; - case SOME_LONG_PROPERTY: - g_value_set_long (value, self->some_long); - break; - case SOME_ULONG_PROPERTY: - g_value_set_ulong (value, self->some_ulong); - break; - case SOME_INT64_PROPERTY: - g_value_set_int64 (value, self->some_int64); - break; - case SOME_UINT64_PROPERTY: - g_value_set_uint64 (value, self->some_uint64); - break; - case SOME_FLOAT_PROPERTY: - g_value_set_float (value, self->some_float); - break; - case SOME_DOUBLE_PROPERTY: - g_value_set_double (value, self->some_double); - break; - case SOME_STRV_PROPERTY: - g_value_set_boxed (value, self->some_strv); - break; - case SOME_BOXED_STRUCT_PROPERTY: - g_value_set_boxed (value, self->some_boxed_struct); - break; - case SOME_BOXED_GLIST_PROPERTY: - g_value_set_boxed (value, self->some_boxed_glist); - break; - case SOME_VARIANT_PROPERTY: - g_value_set_variant (value, self->some_variant); - break; - case SOME_OBJECT_PROPERTY: - g_value_set_object (value, self->some_object); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; +gi_marshalling_tests_properties_object_get_property (GObject *object, + guint property_id, GValue *value, GParamSpec *pspec) +{ + GIMarshallingTestsPropertiesObject *self; + self = GI_MARSHALLING_TESTS_PROPERTIES_OBJECT (object); + switch (property_id) + { + case SOME_BOOLEAN_PROPERTY: + g_value_set_boolean (value, self->some_boolean); + break; + case SOME_CHAR_PROPERTY: + g_value_set_schar (value, self->some_char); + break; + case SOME_UCHAR_PROPERTY: + g_value_set_uchar (value, self->some_uchar); + break; + case SOME_INT_PROPERTY: + g_value_set_int (value, self->some_int); + break; + case SOME_UINT_PROPERTY: + g_value_set_uint (value, self->some_uint); + break; + case SOME_LONG_PROPERTY: + g_value_set_long (value, self->some_long); + break; + case SOME_ULONG_PROPERTY: + g_value_set_ulong (value, self->some_ulong); + break; + case SOME_INT64_PROPERTY: + g_value_set_int64 (value, self->some_int64); + break; + case SOME_UINT64_PROPERTY: + g_value_set_uint64 (value, self->some_uint64); + break; + case SOME_FLOAT_PROPERTY: + g_value_set_float (value, self->some_float); + break; + case SOME_DOUBLE_PROPERTY: + g_value_set_double (value, self->some_double); + break; + case SOME_STRV_PROPERTY: + g_value_set_boxed (value, self->some_strv); + break; + case SOME_BOXED_STRUCT_PROPERTY: + g_value_set_boxed (value, self->some_boxed_struct); + break; + case SOME_BOXED_GLIST_PROPERTY: + g_value_set_boxed (value, self->some_boxed_glist); + break; + case SOME_VARIANT_PROPERTY: + g_value_set_variant (value, self->some_variant); + break; + case SOME_OBJECT_PROPERTY: + g_value_set_object (value, self->some_object); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; } } static void -gi_marshalling_tests_properties_object_set_property (GObject * object, guint property_id, const GValue * value, GParamSpec * pspec) -{ - GIMarshallingTestsPropertiesObject * self; - self = GI_MARSHALLING_TESTS_PROPERTIES_OBJECT (object); - switch (property_id) { - case SOME_BOOLEAN_PROPERTY: - self->some_boolean = g_value_get_boolean (value); - break; - case SOME_CHAR_PROPERTY: - self->some_char = g_value_get_schar (value); - break; - case SOME_UCHAR_PROPERTY: - self->some_uchar = g_value_get_uchar (value); - break; - case SOME_INT_PROPERTY: - self->some_int = g_value_get_int (value); - break; - case SOME_UINT_PROPERTY: - self->some_uint = g_value_get_uint (value); - break; - case SOME_LONG_PROPERTY: - self->some_long = g_value_get_long (value); - break; - case SOME_ULONG_PROPERTY: - self->some_ulong = g_value_get_ulong (value); - break; - case SOME_INT64_PROPERTY: - self->some_int64 = g_value_get_int64 (value); - break; - case SOME_UINT64_PROPERTY: - self->some_uint64 = g_value_get_uint64 (value); - break; - case SOME_FLOAT_PROPERTY: - self->some_float = g_value_get_float (value); - break; - case SOME_DOUBLE_PROPERTY: - self->some_double = g_value_get_double (value); - break; - case SOME_STRV_PROPERTY: - g_strfreev (self->some_strv); - self->some_strv = g_strdupv (g_value_get_boxed (value)); - break; - case SOME_BOXED_STRUCT_PROPERTY: - gi_marshalling_tests_boxed_struct_free (self->some_boxed_struct); - self->some_boxed_struct = gi_marshalling_tests_boxed_struct_copy (g_value_get_boxed (value)); - break; - case SOME_BOXED_GLIST_PROPERTY: - g_list_free (self->some_boxed_glist); - self->some_boxed_glist = g_list_copy (g_value_get_boxed (value)); - break; - case SOME_VARIANT_PROPERTY: - if (self->some_variant != NULL) - g_variant_unref (self->some_variant); - self->some_variant = g_value_get_variant (value); - if (self->some_variant != NULL) - g_variant_ref (self->some_variant); - break; - case SOME_OBJECT_PROPERTY: - if (self->some_object != NULL) - g_object_unref (self->some_object); - self->some_object = g_value_dup_object (value); - break; - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); - break; +gi_marshalling_tests_properties_object_set_property (GObject *object, + guint property_id, const GValue *value, GParamSpec *pspec) +{ + GIMarshallingTestsPropertiesObject *self; + self = GI_MARSHALLING_TESTS_PROPERTIES_OBJECT (object); + switch (property_id) + { + case SOME_BOOLEAN_PROPERTY: + self->some_boolean = g_value_get_boolean (value); + break; + case SOME_CHAR_PROPERTY: + self->some_char = g_value_get_schar (value); + break; + case SOME_UCHAR_PROPERTY: + self->some_uchar = g_value_get_uchar (value); + break; + case SOME_INT_PROPERTY: + self->some_int = g_value_get_int (value); + break; + case SOME_UINT_PROPERTY: + self->some_uint = g_value_get_uint (value); + break; + case SOME_LONG_PROPERTY: + self->some_long = g_value_get_long (value); + break; + case SOME_ULONG_PROPERTY: + self->some_ulong = g_value_get_ulong (value); + break; + case SOME_INT64_PROPERTY: + self->some_int64 = g_value_get_int64 (value); + break; + case SOME_UINT64_PROPERTY: + self->some_uint64 = g_value_get_uint64 (value); + break; + case SOME_FLOAT_PROPERTY: + self->some_float = g_value_get_float (value); + break; + case SOME_DOUBLE_PROPERTY: + self->some_double = g_value_get_double (value); + break; + case SOME_STRV_PROPERTY: + g_strfreev (self->some_strv); + self->some_strv = g_strdupv (g_value_get_boxed (value)); + break; + case SOME_BOXED_STRUCT_PROPERTY: + gi_marshalling_tests_boxed_struct_free (self->some_boxed_struct); + self->some_boxed_struct = gi_marshalling_tests_boxed_struct_copy (g_value_get_boxed (value)); + break; + case SOME_BOXED_GLIST_PROPERTY: + g_list_free (self->some_boxed_glist); + self->some_boxed_glist = g_list_copy (g_value_get_boxed (value)); + break; + case SOME_VARIANT_PROPERTY: + if (self->some_variant != NULL) + g_variant_unref (self->some_variant); + self->some_variant = g_value_get_variant (value); + if (self->some_variant != NULL) + g_variant_ref (self->some_variant); + break; + case SOME_OBJECT_PROPERTY: + if (self->some_object != NULL) + g_object_unref (self->some_object); + self->some_object = g_value_dup_object (value); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); + break; } } -static void -gi_marshalling_tests_properties_object_class_init (GIMarshallingTestsPropertiesObjectClass * klass) -{ - GObjectClass* object_class = G_OBJECT_CLASS (klass); - - object_class->finalize = gi_marshalling_tests_properties_object_finalize; - object_class->get_property = gi_marshalling_tests_properties_object_get_property; - object_class->set_property = gi_marshalling_tests_properties_object_set_property; - - g_object_class_install_property (object_class, SOME_BOOLEAN_PROPERTY, - g_param_spec_boolean ("some-boolean", "some-boolean", "some-boolean", FALSE, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (object_class, SOME_CHAR_PROPERTY, - g_param_spec_char ("some-char", "some-char", "some-char", G_MININT8, G_MAXINT8, 0, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (object_class, SOME_UCHAR_PROPERTY, - g_param_spec_uchar ("some-uchar", "some-uchar", "some-uchar", 0, G_MAXUINT8, 0, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (object_class, SOME_INT_PROPERTY, - g_param_spec_int ("some-int", "some-int", "some-int", G_MININT, G_MAXINT, 0, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (object_class, SOME_UINT_PROPERTY, - g_param_spec_uint ("some-uint", "some-uint", "some-uint", 0, G_MAXUINT, 0, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (object_class, SOME_LONG_PROPERTY, - g_param_spec_long ("some-long", "some-long", "some-long", G_MINLONG, G_MAXLONG, 0, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (object_class, SOME_ULONG_PROPERTY, - g_param_spec_ulong ("some-ulong", "some-ulong", "some-ulong", 0, G_MAXULONG, 0, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (object_class, SOME_INT64_PROPERTY, - g_param_spec_int64 ("some-int64", "some-int64", "some-int64", G_MININT64, G_MAXINT64, 0, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (object_class, SOME_UINT64_PROPERTY, - g_param_spec_uint64 ("some-uint64", "some-uint64", "some-uint64", 0, G_MAXUINT64, 0, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (object_class, SOME_FLOAT_PROPERTY, - g_param_spec_float ("some-float", "some-float", "some-float", -1 * G_MAXFLOAT, G_MAXFLOAT, 0, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (object_class, SOME_DOUBLE_PROPERTY, - g_param_spec_double ("some-double", "some-double", "some-double", -1 * G_MAXDOUBLE, G_MAXDOUBLE, 0, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (object_class, SOME_STRV_PROPERTY, - g_param_spec_boxed ("some-strv", "some-strv", "some-strv", G_TYPE_STRV, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (object_class, SOME_BOXED_STRUCT_PROPERTY, - g_param_spec_boxed ("some-boxed-struct", "some-boxed-struct", "some-boxed-struct", - gi_marshalling_tests_boxed_struct_get_type(), - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); +static void gi_marshalling_tests_properties_object_class_init (GIMarshallingTestsPropertiesObjectClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + + object_class->finalize = gi_marshalling_tests_properties_object_finalize; + object_class->get_property = gi_marshalling_tests_properties_object_get_property; + object_class->set_property = gi_marshalling_tests_properties_object_set_property; + + g_object_class_install_property (object_class, SOME_BOOLEAN_PROPERTY, + g_param_spec_boolean ("some-boolean", + "some-boolean", + "some-boolean", + FALSE, + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, SOME_CHAR_PROPERTY, + g_param_spec_char ("some-char", + "some-char", + "some-char", G_MININT8, + G_MAXINT8, 0, + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, SOME_UCHAR_PROPERTY, + g_param_spec_uchar ("some-uchar", + "some-uchar", + "some-uchar", 0, + G_MAXUINT8, 0, + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, SOME_INT_PROPERTY, + g_param_spec_int ("some-int", "some-int", + "some-int", G_MININT, + G_MAXINT, 0, + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, SOME_UINT_PROPERTY, + g_param_spec_uint ("some-uint", + "some-uint", + "some-uint", 0, + G_MAXUINT, 0, + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, SOME_LONG_PROPERTY, + g_param_spec_long ("some-long", + "some-long", + "some-long", G_MINLONG, + G_MAXLONG, 0, + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, SOME_ULONG_PROPERTY, + g_param_spec_ulong ("some-ulong", + "some-ulong", + "some-ulong", 0, + G_MAXULONG, 0, + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, SOME_INT64_PROPERTY, + g_param_spec_int64 ("some-int64", + "some-int64", + "some-int64", + G_MININT64, G_MAXINT64, + 0, G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, SOME_UINT64_PROPERTY, + g_param_spec_uint64 ("some-uint64", + "some-uint64", + "some-uint64", 0, + G_MAXUINT64, 0, + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, SOME_FLOAT_PROPERTY, + g_param_spec_float ("some-float", + "some-float", + "some-float", + -1 * G_MAXFLOAT, + G_MAXFLOAT, 0, + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, SOME_DOUBLE_PROPERTY, + g_param_spec_double ("some-double", + "some-double", + "some-double", + -1 * G_MAXDOUBLE, + G_MAXDOUBLE, 0, + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, SOME_STRV_PROPERTY, + g_param_spec_boxed ("some-strv", + "some-strv", + "some-strv", + G_TYPE_STRV, + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, SOME_BOXED_STRUCT_PROPERTY, + g_param_spec_boxed ("some-boxed-struct", + "some-boxed-struct", + "some-boxed-struct", + gi_marshalling_tests_boxed_struct_get_type + (), G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); /** * GIMarshallingTestsPropertiesObject:some-boxed-glist: @@ -5101,23 +5188,31 @@ gi_marshalling_tests_properties_object_class_init (GIMarshallingTestsPropertiesO * Type: GLib.List(gint) * Transfer: none */ - g_object_class_install_property (object_class, SOME_BOXED_GLIST_PROPERTY, - g_param_spec_boxed ("some-boxed-glist", "some-boxed-glist", "some-boxed-glist", - gi_marshalling_tests_boxed_glist_get_type(), - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (object_class, SOME_VARIANT_PROPERTY, - g_param_spec_variant ("some-variant", "some-variant", "some-variant", - G_VARIANT_TYPE_ANY, NULL, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (object_class, SOME_OBJECT_PROPERTY, - g_param_spec_object ("some-object", "some-object", "some-object", G_TYPE_OBJECT, - G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); -} - -GIMarshallingTestsPropertiesObject* + g_object_class_install_property (object_class, SOME_BOXED_GLIST_PROPERTY, + g_param_spec_boxed ("some-boxed-glist", + "some-boxed-glist", + "some-boxed-glist", + gi_marshalling_tests_boxed_glist_get_type + (), G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, SOME_VARIANT_PROPERTY, + g_param_spec_variant ("some-variant", + "some-variant", + "some-variant", + G_VARIANT_TYPE_ANY, + NULL, + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); + + g_object_class_install_property (object_class, SOME_OBJECT_PROPERTY, + g_param_spec_object ("some-object", + "some-object", + "some-object", + G_TYPE_OBJECT, + G_PARAM_READABLE | G_PARAM_WRITABLE | G_PARAM_CONSTRUCT)); +} + +GIMarshallingTestsPropertiesObject * gi_marshalling_tests_properties_object_new (void) { - return g_object_new (GI_MARSHALLING_TESTS_TYPE_PROPERTIES_OBJECT, NULL); + return g_object_new (GI_MARSHALLING_TESTS_TYPE_PROPERTIES_OBJECT, NULL); } diff --git a/tests/repository/gitypelibtest.c b/tests/repository/gitypelibtest.c index e078699a..565c95c3 100644 --- a/tests/repository/gitypelibtest.c +++ b/tests/repository/gitypelibtest.c @@ -1,5 +1,5 @@ -/* -*- Mode: C; c-basic-offset: 4 -*- - * vim: tabstop=4 shiftwidth=4 expandtab +/* -*- Mode: C; c-basic-offset: 2 -*- + * vim: shiftwidth=2 expandtab */ #include "girepository.h" @@ -9,287 +9,289 @@ #include static void -test_enum_and_flags_cidentifier(GIRepository *repo) +test_enum_and_flags_cidentifier (GIRepository * repo) { - GITypelib *ret; - GError *error = NULL; - gint n_infos, i; + GITypelib *ret; + GError *error = NULL; + gint n_infos, i; - ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error); - if (!ret) - g_error ("%s", error->message); + ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error); + if (!ret) + g_error ("%s", error->message); - n_infos = g_irepository_get_n_infos (repo, "GIMarshallingTests"); + n_infos = g_irepository_get_n_infos (repo, "GIMarshallingTests"); - for (i = 0; i < n_infos; i++) { - GIBaseInfo *info; + for (i = 0; i < n_infos; i++) + { + GIBaseInfo *info; - info = g_irepository_get_info (repo, "GIMarshallingTests", i); + info = g_irepository_get_info (repo, "GIMarshallingTests", i); - /* both GI_INFO_TYPE_ENUM and GI_INFO_TYPE_FLAGS use GIEnumInfo */ - if (GI_IS_ENUM_INFO (info)) { - gint n_values, j; + /* both GI_INFO_TYPE_ENUM and GI_INFO_TYPE_FLAGS use GIEnumInfo */ + if (GI_IS_ENUM_INFO (info)) + { + gint n_values, j; - n_values = g_enum_info_get_n_values ((GIEnumInfo *) info); - for (j = 0; j < n_values; j++) { - GIValueInfo *value_info; - const gchar *c_identifier = NULL; + n_values = g_enum_info_get_n_values ((GIEnumInfo *) info); + for (j = 0; j < n_values; j++) + { + GIValueInfo *value_info; + const gchar *c_identifier = NULL; - value_info = g_enum_info_get_value ((GIEnumInfo *) info, j); - c_identifier = g_base_info_get_attribute ((GIBaseInfo *) value_info, "c:identifier"); + value_info = g_enum_info_get_value ((GIEnumInfo *) info, j); + c_identifier = g_base_info_get_attribute ((GIBaseInfo *) value_info, "c:identifier"); - if (c_identifier == NULL) { - g_error ("Error: no 'c:identifier' attribute on GIMarshallingTests.%s.%s\n", - g_base_info_get_name (info), - g_base_info_get_name ((GIBaseInfo *) value_info)); + if (c_identifier == NULL) + { + g_error + ("Error: no 'c:identifier' attribute on GIMarshallingTests.%s.%s\n", + g_base_info_get_name (info), g_base_info_get_name ((GIBaseInfo *) value_info)); } - g_base_info_unref ((GIBaseInfo *) value_info); + g_base_info_unref ((GIBaseInfo *) value_info); } } - g_base_info_unref (info); + g_base_info_unref (info); } } static void -_check_enum_methods (GIBaseInfo *info, const gchar *name, const gchar *prefix) +_check_enum_methods (GIBaseInfo * info, const gchar * name, const gchar * prefix) { - gint n_methods, i; - - n_methods = g_enum_info_get_n_methods ((GIEnumInfo *) info); - if (n_methods <= 0) - g_error ("%s should have methods", name); - - for (i = 0; i < n_methods; i += n_methods-1) { - GIBaseInfo *function_info; - GIFunctionInfoFlags flags; - const gchar *symbol; - function_info = g_enum_info_get_method ((GIEnumInfo *) info, i); - if (!function_info) - g_error ("Could not find %s method nr. %d", name, i+1); - flags = g_function_info_get_flags ((GIFunctionInfo *) function_info); - if (flags != 0) - g_error ("%s methods should be static", name); - symbol = g_function_info_get_symbol ((GIFunctionInfo *) function_info); - if (!symbol || !g_str_has_prefix (symbol, prefix)) - g_error ("Could not find valid function symbol"); - g_base_info_unref (function_info); + gint n_methods, i; + + n_methods = g_enum_info_get_n_methods ((GIEnumInfo *) info); + if (n_methods <= 0) + g_error ("%s should have methods", name); + + for (i = 0; i < n_methods; i += n_methods - 1) + { + GIBaseInfo *function_info; + GIFunctionInfoFlags flags; + const gchar *symbol; + function_info = g_enum_info_get_method ((GIEnumInfo *) info, i); + if (!function_info) + g_error ("Could not find %s method nr. %d", name, i + 1); + flags = g_function_info_get_flags ((GIFunctionInfo *) function_info); + if (flags != 0) + g_error ("%s methods should be static", name); + symbol = g_function_info_get_symbol ((GIFunctionInfo *) function_info); + if (!symbol || !g_str_has_prefix (symbol, prefix)) + g_error ("Could not find valid function symbol"); + g_base_info_unref (function_info); } } static void -test_enum_and_flags_static_methods(GIRepository *repo) +test_enum_and_flags_static_methods (GIRepository * repo) { - GITypelib *ret; - GError *error = NULL; - GIBaseInfo *enum_info; - - ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error); - if (!ret) - g_error ("%s", error->message); - - enum_info = g_irepository_find_by_name (repo, "GIMarshallingTests", "GEnum"); - if (!enum_info) - g_error ("Could not find GIMarshallingTests.GEnum"); - _check_enum_methods (enum_info, - "GIMarshallingTests.GEnum", - "gi_marshalling_tests_genum_"); - g_base_info_unref (enum_info); - - enum_info = g_irepository_find_by_name (repo, "GIMarshallingTests", "Flags"); - if (!enum_info) - g_error ("Could not find GIMarshallingTests.Flags"); - _check_enum_methods (enum_info, - "GIMarshallingTests.Flags", - "gi_marshalling_tests_flags_"); - g_base_info_unref (enum_info); + GITypelib *ret; + GError *error = NULL; + GIBaseInfo *enum_info; + + ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error); + if (!ret) + g_error ("%s", error->message); + + enum_info = g_irepository_find_by_name (repo, "GIMarshallingTests", "GEnum"); + if (!enum_info) + g_error ("Could not find GIMarshallingTests.GEnum"); + _check_enum_methods (enum_info, "GIMarshallingTests.GEnum", "gi_marshalling_tests_genum_"); + g_base_info_unref (enum_info); + + enum_info = g_irepository_find_by_name (repo, "GIMarshallingTests", "Flags"); + if (!enum_info) + g_error ("Could not find GIMarshallingTests.Flags"); + _check_enum_methods (enum_info, "GIMarshallingTests.Flags", "gi_marshalling_tests_flags_"); + g_base_info_unref (enum_info); } static void -test_size_of_gvalue(GIRepository *repo) +test_size_of_gvalue (GIRepository * repo) { - GIBaseInfo *struct_info; + GIBaseInfo *struct_info; - struct_info = g_irepository_find_by_name (repo, "GObject", "Value"); - if (!struct_info) - g_error ("Could not find GObject.Value"); - g_assert_cmpuint (g_struct_info_get_size (struct_info), ==, sizeof (GValue)); - g_base_info_unref (struct_info); + struct_info = g_irepository_find_by_name (repo, "GObject", "Value"); + if (!struct_info) + g_error ("Could not find GObject.Value"); + g_assert_cmpuint (g_struct_info_get_size (struct_info), ==, sizeof (GValue)); + g_base_info_unref (struct_info); } static void -test_is_pointer_for_struct_arg (GIRepository *repo) +test_is_pointer_for_struct_arg (GIRepository * repo) { - GITypelib *ret; - GError *error = NULL; - GIStructInfo *variant_info; - GIFunctionInfo *equal_info; - GIArgInfo *arg_info; - GITypeInfo *type_info; - - ret = g_irepository_require (repo, "GLib", NULL, 0, &error); - if (!ret) - g_error ("%s", error->message); - - variant_info = g_irepository_find_by_name (repo, "GLib", "Variant"); - if (!variant_info) - g_error ("Could not find GLib.Variant"); - - equal_info = g_struct_info_find_method (variant_info, "equal"); - if (!equal_info) - g_error ("Could not find GLib.Variant.equal()"); - - arg_info = g_callable_info_get_arg (equal_info, 0); - if (!arg_info) - g_error ("Could not find 1st arg of GLib.Variant.equal()"); - - type_info = g_arg_info_get_type (arg_info); - if (!type_info) - g_error ("Could not find typeinfo of 1st arg of GLib.Variant.equal()"); - - g_assert (g_type_info_is_pointer (type_info)); - - g_base_info_unref (type_info); - g_base_info_unref (arg_info); - g_base_info_unref (equal_info); - g_base_info_unref (variant_info); + GITypelib *ret; + GError *error = NULL; + GIStructInfo *variant_info; + GIFunctionInfo *equal_info; + GIArgInfo *arg_info; + GITypeInfo *type_info; + + ret = g_irepository_require (repo, "GLib", NULL, 0, &error); + if (!ret) + g_error ("%s", error->message); + + variant_info = g_irepository_find_by_name (repo, "GLib", "Variant"); + if (!variant_info) + g_error ("Could not find GLib.Variant"); + + equal_info = g_struct_info_find_method (variant_info, "equal"); + if (!equal_info) + g_error ("Could not find GLib.Variant.equal()"); + + arg_info = g_callable_info_get_arg (equal_info, 0); + if (!arg_info) + g_error ("Could not find 1st arg of GLib.Variant.equal()"); + + type_info = g_arg_info_get_type (arg_info); + if (!type_info) + g_error ("Could not find typeinfo of 1st arg of GLib.Variant.equal()"); + + g_assert (g_type_info_is_pointer (type_info)); + + g_base_info_unref (type_info); + g_base_info_unref (arg_info); + g_base_info_unref (equal_info); + g_base_info_unref (variant_info); } static void -test_fundamental_get_ref_function_pointer (GIRepository *repo) +test_fundamental_get_ref_function_pointer (GIRepository * repo) { - GIObjectInfo *info; + GIObjectInfo *info; - g_assert (g_irepository_require (repo, "Regress", NULL, 0, NULL)); - info = g_irepository_find_by_name (repo, "Regress", - "TestFundamentalObject"); - g_object_info_get_ref_function_pointer (info); - g_base_info_unref (info); + g_assert (g_irepository_require (repo, "Regress", NULL, 0, NULL)); + info = g_irepository_find_by_name (repo, "Regress", "TestFundamentalObject"); + g_object_info_get_ref_function_pointer (info); + g_base_info_unref (info); } static void -test_hash_with_cairo_typelib (GIRepository *repo) +test_hash_with_cairo_typelib (GIRepository * repo) { - GIBaseInfo *info; + GIBaseInfo *info; - g_assert (g_irepository_require (repo, "cairo", NULL, 0, NULL)); - info = g_irepository_find_by_name (repo, "cairo", "region"); - g_assert (info == NULL); + g_assert (g_irepository_require (repo, "cairo", NULL, 0, NULL)); + info = g_irepository_find_by_name (repo, "cairo", "region"); + g_assert (info == NULL); } static GIPropertyInfo * -lookup_property (GIObjectInfo *info, const gchar *name) +lookup_property (GIObjectInfo * info, const gchar * name) { - gssize n_props; - gssize i; - GIPropertyInfo *property_info; - - n_props = g_object_info_get_n_properties (info); - for (i = 0; i < n_props; i++) { - property_info = g_object_info_get_property (info, i); - if (strcmp (name, g_base_info_get_name (property_info)) == 0) - return property_info; - g_base_info_unref (property_info); + gssize n_props; + gssize i; + GIPropertyInfo *property_info; + + n_props = g_object_info_get_n_properties (info); + for (i = 0; i < n_props; i++) + { + property_info = g_object_info_get_property (info, i); + if (strcmp (name, g_base_info_get_name (property_info)) == 0) + return property_info; + g_base_info_unref (property_info); } - return NULL; + return NULL; } static void -test_char_types (GIRepository *repo) +test_char_types (GIRepository * repo) { - GITypelib *ret; - GError *error = NULL; - GIBaseInfo *prop_obj; - GIPropertyInfo *prop_info; - GITypeInfo *type_info; - - ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error); - if (!ret) - g_error ("%s", error->message); - - prop_obj = g_irepository_find_by_name (repo, "GIMarshallingTests", "PropertiesObject"); - g_assert (prop_obj != NULL); - g_assert (GI_IS_OBJECT_INFO (prop_obj)); - - /* unsigned char */ - prop_info = lookup_property ((GIObjectInfo *) prop_obj, "some-uchar"); - g_assert (prop_info != NULL); - type_info = g_property_info_get_type (prop_info); - g_assert_cmpuint (g_type_info_get_tag (type_info), ==, GI_TYPE_TAG_UINT8); - g_base_info_unref (type_info); - g_base_info_unref (prop_info); - - /* signed char */ - prop_info = lookup_property ((GIObjectInfo *) prop_obj, "some-char"); - g_assert (prop_info != NULL); - type_info = g_property_info_get_type (prop_info); - g_assert_cmpuint (g_type_info_get_tag (type_info), ==, GI_TYPE_TAG_INT8); - g_base_info_unref (type_info); - g_base_info_unref (prop_info); - - g_base_info_unref (prop_obj); + GITypelib *ret; + GError *error = NULL; + GIBaseInfo *prop_obj; + GIPropertyInfo *prop_info; + GITypeInfo *type_info; + + ret = g_irepository_require (repo, "GIMarshallingTests", NULL, 0, &error); + if (!ret) + g_error ("%s", error->message); + + prop_obj = g_irepository_find_by_name (repo, "GIMarshallingTests", "PropertiesObject"); + g_assert (prop_obj != NULL); + g_assert (GI_IS_OBJECT_INFO (prop_obj)); + + /* unsigned char */ + prop_info = lookup_property ((GIObjectInfo *) prop_obj, "some-uchar"); + g_assert (prop_info != NULL); + type_info = g_property_info_get_type (prop_info); + g_assert_cmpuint (g_type_info_get_tag (type_info), ==, GI_TYPE_TAG_UINT8); + g_base_info_unref (type_info); + g_base_info_unref (prop_info); + + /* signed char */ + prop_info = lookup_property ((GIObjectInfo *) prop_obj, "some-char"); + g_assert (prop_info != NULL); + type_info = g_property_info_get_type (prop_info); + g_assert_cmpuint (g_type_info_get_tag (type_info), ==, GI_TYPE_TAG_INT8); + g_base_info_unref (type_info); + g_base_info_unref (prop_info); + + g_base_info_unref (prop_obj); } static void -test_signal_array_len (GIRepository *repo) +test_signal_array_len (GIRepository * repo) { - GIObjectInfo *testobj_info; - GISignalInfo *sig_info; - GIArgInfo arg_info; - GITypeInfo type_info; - int i; - - g_assert (g_irepository_require (repo, "Regress", NULL, 0, NULL)); - testobj_info = g_irepository_find_by_name (repo, "Regress", "TestObj"); - g_assert (testobj_info != NULL); - - /* find sig-with-array-len-prop signal */ - for (i = g_object_info_get_n_signals (testobj_info) - 1; i >= 0; --i) { - sig_info = g_object_info_get_signal (testobj_info, i); - g_assert (sig_info != NULL); - if (strcmp (g_base_info_get_name (sig_info), "sig-with-array-len-prop") == 0) - break; - g_base_info_unref (sig_info); + GIObjectInfo *testobj_info; + GISignalInfo *sig_info; + GIArgInfo arg_info; + GITypeInfo type_info; + int i; + + g_assert (g_irepository_require (repo, "Regress", NULL, 0, NULL)); + testobj_info = g_irepository_find_by_name (repo, "Regress", "TestObj"); + g_assert (testobj_info != NULL); + + /* find sig-with-array-len-prop signal */ + for (i = g_object_info_get_n_signals (testobj_info) - 1; i >= 0; --i) + { + sig_info = g_object_info_get_signal (testobj_info, i); + g_assert (sig_info != NULL); + if (strcmp (g_base_info_get_name (sig_info), "sig-with-array-len-prop") == 0) + break; + g_base_info_unref (sig_info); } - g_assert (i >= 0); + g_assert (i >= 0); - g_assert_cmpint (g_callable_info_get_n_args (sig_info), ==, 2); + g_assert_cmpint (g_callable_info_get_n_args (sig_info), ==, 2); - /* verify array argument */ - g_callable_info_load_arg (sig_info, 0, &arg_info); - g_assert_cmpstr (g_base_info_get_name (&arg_info), ==, "arr"); - g_arg_info_load_type (&arg_info, &type_info); - g_assert_cmpint (g_type_info_get_tag (&type_info), ==, GI_TYPE_TAG_ARRAY); - g_assert_cmpint (g_type_info_get_array_type (&type_info), ==, GI_ARRAY_TYPE_C); - g_assert (!g_type_info_is_zero_terminated (&type_info)); - g_assert_cmpint (g_type_info_get_array_length (&type_info), ==, 1); + /* verify array argument */ + g_callable_info_load_arg (sig_info, 0, &arg_info); + g_assert_cmpstr (g_base_info_get_name (&arg_info), ==, "arr"); + g_arg_info_load_type (&arg_info, &type_info); + g_assert_cmpint (g_type_info_get_tag (&type_info), ==, GI_TYPE_TAG_ARRAY); + g_assert_cmpint (g_type_info_get_array_type (&type_info), ==, GI_ARRAY_TYPE_C); + g_assert (!g_type_info_is_zero_terminated (&type_info)); + g_assert_cmpint (g_type_info_get_array_length (&type_info), ==, 1); - /* verify array length argument */ - g_callable_info_load_arg (sig_info, 1, &arg_info); - g_assert_cmpstr (g_base_info_get_name (&arg_info), ==, "len"); + /* verify array length argument */ + g_callable_info_load_arg (sig_info, 1, &arg_info); + g_assert_cmpstr (g_base_info_get_name (&arg_info), ==, "len"); - g_base_info_unref (sig_info); - g_base_info_unref (testobj_info); + g_base_info_unref (sig_info); + g_base_info_unref (testobj_info); } int -main(int argc, char **argv) +main (int argc, char **argv) { - GIRepository *repo; + GIRepository *repo; - repo = g_irepository_get_default (); + repo = g_irepository_get_default (); - /* do tests */ - test_enum_and_flags_cidentifier (repo); - test_enum_and_flags_static_methods (repo); - test_size_of_gvalue (repo); - test_is_pointer_for_struct_arg (repo); - test_fundamental_get_ref_function_pointer (repo); - test_hash_with_cairo_typelib (repo); - test_char_types (repo); - test_signal_array_len (repo); + /* do tests */ + test_enum_and_flags_cidentifier (repo); + test_enum_and_flags_static_methods (repo); + test_size_of_gvalue (repo); + test_is_pointer_for_struct_arg (repo); + test_fundamental_get_ref_function_pointer (repo); + test_hash_with_cairo_typelib (repo); + test_char_types (repo); + test_signal_array_len (repo); - exit(0); + exit (0); } diff --git a/tests/scanner/gettype.c b/tests/scanner/gettype.c index cd816735..a3c2d6be 100644 --- a/tests/scanner/gettype.c +++ b/tests/scanner/gettype.c @@ -1,14 +1,14 @@ #include "gettype.h" -G_DEFINE_TYPE(GetTypeObject, gettype_object, G_TYPE_OBJECT); +G_DEFINE_TYPE (GetTypeObject, gettype_object, G_TYPE_OBJECT); static void -gettype_object_class_init (GetTypeObjectClass *klass) +gettype_object_class_init (GetTypeObjectClass * klass) { } static void -gettype_object_init (GetTypeObject *object) +gettype_object_init (GetTypeObject * object) { } @@ -28,9 +28,9 @@ gettype_object_new (void) * Returns: 0 */ GType -gettype_object_nonmeta1_get_type (GetTypeObject *obj) +gettype_object_nonmeta1_get_type (GetTypeObject * obj) { - return 0; + return 0; } /** @@ -44,7 +44,7 @@ gettype_object_nonmeta1_get_type (GetTypeObject *obj) gboolean gettype_object_nonmeta2_get_type (void) { - return TRUE; + return TRUE; } /** @@ -58,5 +58,5 @@ gettype_object_nonmeta2_get_type (void) gboolean gettype_object_nonmeta_get_gtype (void) { - return TRUE; + return TRUE; } -- cgit v1.2.1 From 9c1d1813223346b17cfee0383bf026b2c93c385f Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 27 Feb 2013 11:09:30 -0500 Subject: scanner: Don't re-parse includes we already found This fixes the Pango build where it has a chain of two --include-uninstalled. https://bugzilla.gnome.org/show_bug.cgi?id=694593 --- giscanner/transformer.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/giscanner/transformer.py b/giscanner/transformer.py index e8cbf3d9..3513fc8c 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -206,8 +206,9 @@ None.""" self._cachestore.store(filename, parser) for include in parser.get_namespace().includes: - dep_filename = self._find_include(include) - self._parse_include(dep_filename) + if include.name not in self._parsed_includes: + dep_filename = self._find_include(include) + self._parse_include(dep_filename) if not uninstalled: for pkg in parser.get_namespace().exported_packages: -- cgit v1.2.1 From a49d4b3f64d5d37d3844ad0107968124c0a1d503 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 4 Mar 2013 10:59:22 +0100 Subject: tests: Fix memory leak in gi_marshalling_tests_init_function() In gi_marshalling_tests_init_function(), free the array string element before removing it. This fixes the memory leak in PyGObject's test_gi.TestArray.test_init_function test. --- tests/gimarshallingtests.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index 0869a9a2..dc7fabd6 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -1156,6 +1156,8 @@ gi_marshalling_tests_init_function (gint *n_args, char ***argv) return TRUE; (*n_args)--; g_assert (argv != NULL); + /* we have transfer ownership full, so we need to free the element ourself */ + g_free ((*argv)[*n_args]); (*argv)[*n_args] = NULL; return TRUE; } -- cgit v1.2.1 From 513376b826fe027f8ae6c36e42566de2a73e4881 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 4 Mar 2013 11:14:44 +0100 Subject: tests: Fix memory leak in gi_marshalling_tests_ghashtable_utf8_full_return For the "transfer full" case we need to supply free functions for the created hash table in gi_marshalling_tests_ghashtable_utf8_full_return(). --- tests/gimarshallingtests.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index dc7fabd6..f6fd630a 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -2933,7 +2933,7 @@ gi_marshalling_tests_ghashtable_utf8_full_return (void) { GHashTable *hash_table = NULL; - hash_table = g_hash_table_new (g_str_hash, g_str_equal); + hash_table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); g_hash_table_insert (hash_table, g_strdup ("-1"), g_strdup ("1")); g_hash_table_insert (hash_table, g_strdup ("0"), g_strdup ("0")); g_hash_table_insert (hash_table, g_strdup ("1"), g_strdup ("-1")); -- cgit v1.2.1 From 3ff297fa04adf585ebf8c9d5593b71640649d9d1 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 4 Mar 2013 11:17:59 +0100 Subject: tests: Fix memory leak in gi_marshalling_tests_ghashtable_utf8_container_out Similarly to the previous commit, we need to provide free functions for (transfer full) returned hash tables. --- tests/gimarshallingtests.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index f6fd630a..4931778d 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -3010,7 +3010,7 @@ gi_marshalling_tests_ghashtable_utf8_container_out (GHashTable **hash_table) void gi_marshalling_tests_ghashtable_utf8_full_out (GHashTable **hash_table) { - *hash_table = g_hash_table_new (g_str_hash, g_str_equal); + *hash_table = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free); g_hash_table_insert (*hash_table, g_strdup ("-1"), g_strdup ("1")); g_hash_table_insert (*hash_table, g_strdup ("0"), g_strdup ("0")); g_hash_table_insert (*hash_table, g_strdup ("1"), g_strdup ("-1")); -- cgit v1.2.1 From 8c2129f22f6c3eb9eb89f36a59e151794edbf4bb Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 4 Mar 2013 13:00:51 +0100 Subject: tests: Fix memory leak in GIMarshallingTestsPropertiesObject Free the some_strv property on finalization. Detected by PyGObject's test_gi.TestPropertiesObject.test_strv test case. --- tests/gimarshallingtests.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index 4931778d..2851c4d1 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -4948,6 +4948,14 @@ static void gi_marshalling_tests_properties_object_init (GIMarshallingTestsPrope static void gi_marshalling_tests_properties_object_finalize (GObject *obj) { + GIMarshallingTestsPropertiesObject *self; + self = GI_MARSHALLING_TESTS_PROPERTIES_OBJECT (obj); + + if (self->some_strv != NULL) { + g_strfreev (self->some_strv); + self->some_strv = NULL; + } + G_OBJECT_CLASS (gi_marshalling_tests_properties_object_parent_class)->finalize (obj); } -- cgit v1.2.1 From 557d6bfd6b5e9554cf21173b6831899ff59b7c33 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 4 Mar 2013 17:37:48 +0100 Subject: Update annotations from glib git --- gir/gio-2.0.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 67581370..d7759a77 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -11055,9 +11055,12 @@ * non-zero then the default main context is iterated until the use count * falls to zero, at which point 0 is returned. * - * If the %G_APPLICATION_IS_SERVICE flag is set, then the exiting at - * use count of zero is delayed for a while (ie: the instance stays - * around to provide its service to others). + * If the %G_APPLICATION_IS_SERVICE flag is set, then the service will + * run for as much as 10 seconds with a use count of zero while waiting + * for the message that caused the activation to arrive. After that, + * if the use count falls to zero the application will exit immediately, + * except in the case that g_application_set_inactivity_timeout() is in + * use. * * Returns: the exit status * Since: 2.28 -- cgit v1.2.1 From 8f7acc600b45ea5bf8ea1d6ce1fbedb5c6f9cfd5 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 5 Mar 2013 12:33:49 -0500 Subject: build: Bump version and GLib requirement in preparation for release --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 83e86aec..399d98d4 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl the gi version number m4_define(gi_major_version, 1) m4_define(gi_minor_version, 35) -m4_define(gi_micro_version, 8) +m4_define(gi_micro_version, 9) m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version) AC_PREREQ([2.63]) @@ -124,7 +124,7 @@ GIR_DIR="$EXPANDED_DATADIR/$GIR_SUFFIX" AC_SUBST(GIR_DIR) AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Director prefix for gir installation]) -PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.35.0]) +PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.35.9]) PKG_CHECK_MODULES(GOBJECT, [gobject-2.0]) PKG_CHECK_MODULES(GMODULE, [gmodule-2.0]) PKG_CHECK_MODULES(GIO, [gio-2.0]) -- cgit v1.2.1 From 95b03cf87efbd4fea4b7d55601c9752cefd29bfc Mon Sep 17 00:00:00 2001 From: Tim Lunn Date: Sun, 24 Feb 2013 17:34:56 +1100 Subject: gi-r-scanner: add support for raw CFLAGS flags option gi-r-scanner chokes when gir_CFLAGS have an '-include
' since this is not a recognised option. This commit adds a new --cflags option that passes cflags directly to the spawned gcc. https://bugzilla.gnome.org/show_bug.cgi?id=695182 --- Makefile.introspection | 2 +- giscanner/scannermain.py | 6 +++++- giscanner/sourcescanner.py | 4 +++- tests/warn/warningtester.py | 3 ++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Makefile.introspection b/Makefile.introspection index 567d5e96..8424c738 100644 --- a/Makefile.introspection +++ b/Makefile.introspection @@ -142,7 +142,7 @@ $(1): $$($(_gir_name)_FILES) $(_gir_program) \ $(_gir_libraries) \ $($(_gir_name)_SCANNERFLAGS) \ - $($(_gir_name)_CFLAGS) \ + --cflags="$($(_gir_name)_CFLAGS)" \ $($(_gir_name)_LDFLAGS) \ $$^ \ --output $(1) diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py index 5fa370ce..8b4363bf 100755 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -44,6 +44,9 @@ from . import utils def get_preprocessor_option_group(parser): group = optparse.OptionGroup(parser, "Preprocessor options") + group.add_option("--cflags", help="Pre-processor cflags", + action="store", dest="cpp_cflags", + default="") group.add_option("-I", help="Pre-processor include file", action="append", dest="cpp_includes", default=[]) @@ -351,7 +354,8 @@ def create_source_scanner(options, args): # Run the preprocessor, tokenize and construct simple # objects representing the raw C symbols ss = SourceScanner() - ss.set_cpp_options(options.cpp_includes, + ss.set_cpp_options(options.cpp_cflags, + options.cpp_includes, options.cpp_defines, options.cpp_undefines) ss.parse_files(filenames) diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py index 9eb4ab4f..795c46a8 100644 --- a/giscanner/sourcescanner.py +++ b/giscanner/sourcescanner.py @@ -223,7 +223,9 @@ class SourceScanner(object): # Public API - def set_cpp_options(self, includes, defines, undefines): + def set_cpp_options(self, cflags, includes, defines, undefines): + if cflags: + self._cpp_options = cflags.split() for prefix, args in [('-I', includes), ('-D', defines), ('-U', undefines)]: diff --git a/tests/warn/warningtester.py b/tests/warn/warningtester.py index 27e0a5e6..fba8f0ce 100644 --- a/tests/warn/warningtester.py +++ b/tests/warn/warningtester.py @@ -40,6 +40,7 @@ class ChunkedIO(object): class Options: def __init__(self): + self.cpp_cflags = "" self.cpp_includes = [] self.cpp_defines = [] self.cpp_undefines = [] @@ -110,7 +111,7 @@ def check(args): exit_code = process_packages(options, ['gobject-2.0']) if exit_code: sys.exit(exit_code) - ss.set_cpp_options(options.cpp_includes, options.cpp_defines, options.cpp_undefines) + ss.set_cpp_options(options.cpp_cflags, options.cpp_includes, options.cpp_defines, options.cpp_undefines) ss.parse_files([filename]) ss.parse_macros([filename]) transformer.parse(ss.get_symbols()) -- cgit v1.2.1 From b051c92cdfbe8255de27bba658a5a95d626accb9 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 5 Mar 2013 18:23:25 -0500 Subject: Revert "gi-r-scanner: add support for raw CFLAGS flags option" Doesn't work with arguments that have shell quotes. This reverts commit 95b03cf87efbd4fea4b7d55601c9752cefd29bfc. --- Makefile.introspection | 2 +- giscanner/scannermain.py | 6 +----- giscanner/sourcescanner.py | 4 +--- tests/warn/warningtester.py | 3 +-- 4 files changed, 4 insertions(+), 11 deletions(-) diff --git a/Makefile.introspection b/Makefile.introspection index 8424c738..567d5e96 100644 --- a/Makefile.introspection +++ b/Makefile.introspection @@ -142,7 +142,7 @@ $(1): $$($(_gir_name)_FILES) $(_gir_program) \ $(_gir_libraries) \ $($(_gir_name)_SCANNERFLAGS) \ - --cflags="$($(_gir_name)_CFLAGS)" \ + $($(_gir_name)_CFLAGS) \ $($(_gir_name)_LDFLAGS) \ $$^ \ --output $(1) diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py index 8b4363bf..5fa370ce 100755 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -44,9 +44,6 @@ from . import utils def get_preprocessor_option_group(parser): group = optparse.OptionGroup(parser, "Preprocessor options") - group.add_option("--cflags", help="Pre-processor cflags", - action="store", dest="cpp_cflags", - default="") group.add_option("-I", help="Pre-processor include file", action="append", dest="cpp_includes", default=[]) @@ -354,8 +351,7 @@ def create_source_scanner(options, args): # Run the preprocessor, tokenize and construct simple # objects representing the raw C symbols ss = SourceScanner() - ss.set_cpp_options(options.cpp_cflags, - options.cpp_includes, + ss.set_cpp_options(options.cpp_includes, options.cpp_defines, options.cpp_undefines) ss.parse_files(filenames) diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py index 795c46a8..9eb4ab4f 100644 --- a/giscanner/sourcescanner.py +++ b/giscanner/sourcescanner.py @@ -223,9 +223,7 @@ class SourceScanner(object): # Public API - def set_cpp_options(self, cflags, includes, defines, undefines): - if cflags: - self._cpp_options = cflags.split() + def set_cpp_options(self, includes, defines, undefines): for prefix, args in [('-I', includes), ('-D', defines), ('-U', undefines)]: diff --git a/tests/warn/warningtester.py b/tests/warn/warningtester.py index fba8f0ce..27e0a5e6 100644 --- a/tests/warn/warningtester.py +++ b/tests/warn/warningtester.py @@ -40,7 +40,6 @@ class ChunkedIO(object): class Options: def __init__(self): - self.cpp_cflags = "" self.cpp_includes = [] self.cpp_defines = [] self.cpp_undefines = [] @@ -111,7 +110,7 @@ def check(args): exit_code = process_packages(options, ['gobject-2.0']) if exit_code: sys.exit(exit_code) - ss.set_cpp_options(options.cpp_cflags, options.cpp_includes, options.cpp_defines, options.cpp_undefines) + ss.set_cpp_options(options.cpp_includes, options.cpp_defines, options.cpp_undefines) ss.parse_files([filename]) ss.parse_macros([filename]) transformer.parse(ss.get_symbols()) -- cgit v1.2.1 From b16490ce2c4a48e0c6db91ea4cfa584648b914e6 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 5 Mar 2013 18:37:11 -0500 Subject: regress: Add a test case for passing -Dquoted_string https://bugzilla.gnome.org/show_bug.cgi?id=695182 --- tests/scanner/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index c0fd3e3b..773a221d 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -34,6 +34,8 @@ libregress_la_SOURCES = \ $(srcdir)/foo.c $(srcdir)/foo.h \ $(srcdir)/drawable.c $(srcdir)/drawable.h \ $(NULL) +REGRESS_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f" +libregress_la_CPPFLAGS = -DREGRESS_PRINT_PREVIEW_COMMAND=\"$(REGRESS_PRINT_PREVIEW_COMMAND)\" libregress_la_LIBADD = $(GIO_LIBS) if HAVE_CAIRO libregress_la_LIBADD += $(CAIRO_LIBS) @@ -47,7 +49,6 @@ libgettype_la_SOURCES = $(srcdir)/gettype.c $(srcdir)/gettype.h testsdir = $(datadir)/gobject-introspection-1.0/tests tests_DATA = $(libregress_la_SOURCES) $(libwarnlib_la_SOURCES) $(libutility_la_SOURCES) -libregress_la_CPPFLAGS = if !HAVE_CAIRO libregress_la_CPPFLAGS += -D_GI_DISABLE_CAIRO endif @@ -80,6 +81,7 @@ GIRS += SLetter-1.0.gir Regress-1.0.gir: $(top_builddir)/Gio-2.0.gir Utility-1.0.gir libregress.la Regress_1_0_gir_LIBS = libregress.la +Regress_1_0_gir_CFLAGS = $(libregress_la_CPPFLAGS) $(libregress_la_CFLAGS) Regress_1_0_gir_INCLUDES = Gio-2.0 Utility-1.0 if HAVE_CAIRO Regress_1_0_gir_INCLUDES += cairo-1.0 -- cgit v1.2.1 From 3b6de4492d03e69bb29b09b4b1db9960cee9c7d0 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 6 Mar 2013 12:13:24 -0500 Subject: tests: Remove duplicate specification of CPPFLAGS for Regress Previous commit introduced the flaw. --- tests/scanner/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index 773a221d..d3f2c6c4 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -34,7 +34,7 @@ libregress_la_SOURCES = \ $(srcdir)/foo.c $(srcdir)/foo.h \ $(srcdir)/drawable.c $(srcdir)/drawable.h \ $(NULL) -REGRESS_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f" +REGRESS_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings '%s' '%f'" libregress_la_CPPFLAGS = -DREGRESS_PRINT_PREVIEW_COMMAND=\"$(REGRESS_PRINT_PREVIEW_COMMAND)\" libregress_la_LIBADD = $(GIO_LIBS) if HAVE_CAIRO @@ -87,7 +87,7 @@ if HAVE_CAIRO Regress_1_0_gir_INCLUDES += cairo-1.0 endif Regress_1_0_gir_FILES = $(libregress_la_SOURCES) -Regress_1_0_gir_SCANNERFLAGS = --c-include="regress.h" --warn-error $(libregress_la_CPPFLAGS) +Regress_1_0_gir_SCANNERFLAGS = --c-include="regress.h" --warn-error GIRS += Regress-1.0.gir WarnLib-1.0.gir: $(top_builddir)/Gio-2.0.gir libwarnlib.la -- cgit v1.2.1 From 7639a440b43ea1197de96035304404b0c87db608 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 6 Mar 2013 12:16:24 -0500 Subject: scanner: Allow CFLAGS to contain arbitrary preprocessor commands like -include Newer spidermonkey .pc file contains a -include argument, which g-ir-scanner doesn't understand. Rather than us attempting to replicate all of cpp's options, use wrapper arguments in Makefile.introspection to pass them through. https://bugzilla.gnome.org/show_bug.cgi?id=695182 --- Makefile.introspection | 2 ++ giscanner/scannermain.py | 18 +++++++++++++++++- giscanner/sourcescanner.py | 3 ++- 3 files changed, 21 insertions(+), 2 deletions(-) diff --git a/Makefile.introspection b/Makefile.introspection index 567d5e96..b3473377 100644 --- a/Makefile.introspection +++ b/Makefile.introspection @@ -142,7 +142,9 @@ $(1): $$($(_gir_name)_FILES) $(_gir_program) \ $(_gir_libraries) \ $($(_gir_name)_SCANNERFLAGS) \ + --cflags-begin \ $($(_gir_name)_CFLAGS) \ + --cflags-end \ $($(_gir_name)_LDFLAGS) \ $$^ \ --output $(1) diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py index 5fa370ce..42867f08 100755 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -42,8 +42,23 @@ from giscanner.sourcescanner import SourceScanner from giscanner.transformer import Transformer from . import utils +def process_cflags_begin(option, opt, value, parser): + cflags = getattr(parser.values, option.dest) + while len(parser.rargs) > 0 and parser.rargs[0] != '--cflags-end': + cflags.append(parser.rargs.pop(0)) + +def process_cflags_end(option, opt, value, parser): + pass + def get_preprocessor_option_group(parser): group = optparse.OptionGroup(parser, "Preprocessor options") + group.add_option("", "--cflags-begin", + help="Start preprocessor/compiler flags", + dest="cflags", default=[], + action="callback", callback=process_cflags_begin) + group.add_option("", "--cflags-end", + help="End preprocessor/compiler flags", + action="callback", callback=process_cflags_end) group.add_option("-I", help="Pre-processor include file", action="append", dest="cpp_includes", default=[]) @@ -353,7 +368,8 @@ def create_source_scanner(options, args): ss = SourceScanner() ss.set_cpp_options(options.cpp_includes, options.cpp_defines, - options.cpp_undefines) + options.cpp_undefines, + cflags=options.cflags) ss.parse_files(filenames) ss.parse_macros(filenames) return ss diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py index 9eb4ab4f..de137767 100644 --- a/giscanner/sourcescanner.py +++ b/giscanner/sourcescanner.py @@ -223,7 +223,8 @@ class SourceScanner(object): # Public API - def set_cpp_options(self, includes, defines, undefines): + def set_cpp_options(self, includes, defines, undefines, cflags=[]): + self._cpp_options.extend(cflags) for prefix, args in [('-I', includes), ('-D', defines), ('-U', undefines)]: -- cgit v1.2.1 From de4385923073afaf04687d43d7cb4c6ca43f0af9 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 6 Mar 2013 12:15:20 -0500 Subject: tests: Add more torture CPPFLAGS for Regress This helps reproduce the issue with spidermonkey's .pc file using -include. Also add a single quote test case. https://bugzilla.gnome.org/show_bug.cgi?id=695182 --- tests/scanner/Makefile.am | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index d3f2c6c4..31487a6b 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -34,8 +34,9 @@ libregress_la_SOURCES = \ $(srcdir)/foo.c $(srcdir)/foo.h \ $(srcdir)/drawable.c $(srcdir)/drawable.h \ $(NULL) -REGRESS_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings '%s' '%f'" -libregress_la_CPPFLAGS = -DREGRESS_PRINT_PREVIEW_COMMAND=\"$(REGRESS_PRINT_PREVIEW_COMMAND)\" +REGRESS_PRINT_PREVIEW_COMMAND="evince --unlink-tempfile --preview --print-settings %s %f" +libregress_la_CPPFLAGS = -DREGRESS_PRINT_PREVIEW_COMMAND=\"$(REGRESS_PRINT_PREVIEW_COMMAND)\" \ + -DREGRESS_SOME_CHAR=\'c\' libregress_la_LIBADD = $(GIO_LIBS) if HAVE_CAIRO libregress_la_LIBADD += $(CAIRO_LIBS) @@ -81,7 +82,7 @@ GIRS += SLetter-1.0.gir Regress-1.0.gir: $(top_builddir)/Gio-2.0.gir Utility-1.0.gir libregress.la Regress_1_0_gir_LIBS = libregress.la -Regress_1_0_gir_CFLAGS = $(libregress_la_CPPFLAGS) $(libregress_la_CFLAGS) +Regress_1_0_gir_CFLAGS = $(libregress_la_CPPFLAGS) $(libregress_la_CFLAGS) -include "glib.h" Regress_1_0_gir_INCLUDES = Gio-2.0 Utility-1.0 if HAVE_CAIRO Regress_1_0_gir_INCLUDES += cairo-1.0 -- cgit v1.2.1 From f196c61b1691bb063a27289438c6ecdf247af798 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 12 Mar 2013 17:36:37 +0800 Subject: Visual Studio builds: Process cairo-1.0.gir.in Use a simple Python script that uses Python REGEX abilities to create cairo-1.0.gir from cairo-1.0.gir.in with the correct values for Cairo, for use in the Visual Studio builds of g-i. It can be later extended if needed. Also dist this, and call this script from gengir.bat so that cairo-1.0.gir and cairo-1.0.typelib can be built and "installed" https://bugzilla.gnome.org/show_bug.cgi?id=692165 --- build/win32/Makefile.am | 1 + build/win32/create_nonglib_gir.py | 72 +++++++++++++++++++++++++++++++++++++++ build/win32/gengir.bat | 2 ++ 3 files changed, 75 insertions(+) create mode 100644 build/win32/create_nonglib_gir.py diff --git a/build/win32/Makefile.am b/build/win32/Makefile.am index 499c5cff..f404aa16 100644 --- a/build/win32/Makefile.am +++ b/build/win32/Makefile.am @@ -5,6 +5,7 @@ EXTRA_DIST = \ everything.def \ foo.def \ gengir.bat \ + create_nonglib_gir.py \ gettype.def \ gimarshallingtests.def \ gtkfrob.def \ diff --git a/build/win32/create_nonglib_gir.py b/build/win32/create_nonglib_gir.py new file mode 100644 index 00000000..e3df7148 --- /dev/null +++ b/build/win32/create_nonglib_gir.py @@ -0,0 +1,72 @@ +#!/usr/bin/python +# +# Expand the bundled *.gir.in files +# for use in Visual C++ builds of G-I +# +# Author: Fan, Chun-wei +# Date: January 21, 2013 +# +# (Adapted from setup.py in +# $(glib_src_root)/build/win32/setup.py written by Shixin Zeng) + +import os +import sys +import re +import string +import subprocess +import optparse + +def process_in(src, dest, vars): + RE_VARS = re.compile(r'%(\w+?)%') + with open(src, 'r') as s: + with open(dest, 'w') as d: + for i in s: + i = RE_VARS.sub(lambda x: str(vars[x.group(1)]), i) + d.write(i) + +def get_vsver(vsver): + return { + '9': '9', + '10': '10', + '11': '11', + '2008': '9', + '2010': '10', + '2012': '11', + }.get(vsver, '0') + +def parent_dir(path): + if not os.path.isabs(path): + path = os.path.abspath(path) + if os.path.isfile(path): + path = os.path.dirname(path) + return os.path.split(path)[0] + +def setup_vars_cairo(src, dest, vsver): + vars = {} + vars['CAIRO_GIR_PACKAGE'] = 'cairo-gobject' + vars['CAIRO_SHARED_LIBRARY'] = '%s-vs%s.dll' % (vars['CAIRO_GIR_PACKAGE'], vsver) + process_in (src, dest, vars) + +def main(argv): + parser = optparse.OptionParser() + parser.add_option('--vsver', dest='vsver', action='store', help='Version of Visual Studio used, 9 or 2008 for VS 2008, 10 or 2010 for VS2010, 11 or 2012 for VS2012') + opt, args = parser.parse_args(argv) + if opt.vsver is None: + print ('vsver must be specified. Please use %s -h to see the valid values' % os.path.basename(__file__)) + sys.exit() + vsver = get_vsver(opt.vsver) + if vsver is '0': + print ('You must specify a valid vsver. Please use %s -h to see the valid values' % os.path.basename(__file__)) + sys.exit() + + # Get the srcroot and the path where the bundled .gir files reside in the package + srcroot = parent_dir(parent_dir(__file__)) + preset_gir_path = os.path.join(srcroot, 'gir') + + # Set up variables in cairo-1.0.gir.in to produce cairo-1.0.gir + setup_vars_cairo(os.path.join(preset_gir_path, 'cairo-1.0.gir.in'), + os.path.join(preset_gir_path, 'cairo-1.0.gir'), + vsver) + +if __name__ == '__main__': + sys.exit(main(sys.argv)) diff --git a/build/win32/gengir.bat b/build/win32/gengir.bat index 70c5b854..c5984cb3 100644 --- a/build/win32/gengir.bat +++ b/build/win32/gengir.bat @@ -257,8 +257,10 @@ g-ir-compiler --includedir=. --debug --verbose Gio-2.0.gir -o Gio-2.0.typelib g-ir-compiler --includedir=. --debug --verbose GIRepository-2.0.gir -o GIRepository-2.0.typelib rem Now process the bundled .gir files +python create_nonglib_gir.py --vsver=%VSVER% set CURRDIR=%CD% cd ..\..\gir +g-ir-compiler --includedir=. --debug --verbose cairo-1.0.gir -o cairo-1.0.typelib g-ir-compiler --includedir=. --debug --verbose freetype2-2.0.gir -o freetype2-2.0.typelib g-ir-compiler --includedir=. --debug --verbose GL-1.0.gir -o GL-1.0.typelib g-ir-compiler --includedir=. --debug --verbose libxml2-2.0.gir -o libxml2-2.0.typelib -- cgit v1.2.1 From b5cd5c07a1b059d3d90d86d04426d72eedcfaa39 Mon Sep 17 00:00:00 2001 From: Simon Feltman Date: Sun, 17 Mar 2013 23:03:46 -0700 Subject: gimarshallingtests: Add tests for enum returned from vfunc Add vfuncs and methods for an object returning an enum or using one as an output argument. https://bugzilla.gnome.org/show_bug.cgi?id=637832 --- tests/gimarshallingtests.c | 28 ++++++++++++++++++++++++++++ tests/gimarshallingtests.h | 15 +++++++++++++-- 2 files changed, 41 insertions(+), 2 deletions(-) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index 2851c4d1..1998161b 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -4350,6 +4350,34 @@ gi_marshalling_tests_object_vfunc_meth_with_error (GIMarshallingTestsObject *sel return ret; } +/** + * gi_marshalling_tests_object_vfunc_return_enum: + */ +GIMarshallingTestsEnum +gi_marshalling_tests_object_vfunc_return_enum (GIMarshallingTestsObject *self) +{ + /* make sure that local variables don't get smashed */ + GIMarshallingTestsEnum return_value; + glong local = 0x12345678; + return_value = GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_return_enum (self); + g_assert_cmpint (local, ==, 0x12345678); + return return_value; +} + +/** + * gi_marshalling_tests_object_vfunc_out_enum: + * @_enum: (out): + */ +void +gi_marshalling_tests_object_vfunc_out_enum (GIMarshallingTestsObject *self, GIMarshallingTestsEnum *_enum) +{ + /* make sure that local variables don't get smashed */ + gulong local = 0x12345678; + GI_MARSHALLING_TESTS_OBJECT_GET_CLASS (self)->vfunc_out_enum (self, _enum); + g_assert_cmpint (local, ==, 0x12345678); +} + + /* NOTE: * * The following (get_ref_info_for_*) methods are designed to call vfuncs related diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index a361de02..67c2f70e 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -804,6 +804,16 @@ struct _GIMarshallingTestsObjectClass */ gboolean (*vfunc_meth_with_err) (GIMarshallingTestsObject *object, gint x, GError **error); + /** + * GIMarshallingTestsObjectClass::vfunc_return_enum: + */ + GIMarshallingTestsFlags (* vfunc_return_enum) (GIMarshallingTestsObject *self); + + /** + * GIMarshallingTestsObjectClass::vfunc_out_enum: + * @_enum: (out): + */ + void (* vfunc_out_enum) (GIMarshallingTestsObject *self, GIMarshallingTestsEnum *_enum); /** * GIMarshallingTestsObjectClass::vfunc_return_object_transfer_none: @@ -842,8 +852,6 @@ struct _GIMarshallingTestsObjectClass * @object: (in) (transfer full): */ void (* vfunc_in_object_transfer_full) (GIMarshallingTestsObject *self, GObject *object); - - }; struct _GIMarshallingTestsObject @@ -881,6 +889,9 @@ glong gi_marshalling_tests_object_vfunc_return_value_and_one_out_parameter (GIMa glong gi_marshalling_tests_object_vfunc_return_value_and_multiple_out_parameters (GIMarshallingTestsObject *self, glong *a, glong *b); gboolean gi_marshalling_tests_object_vfunc_meth_with_error (GIMarshallingTestsObject *object, gint x, GError **error); +GIMarshallingTestsEnum gi_marshalling_tests_object_vfunc_return_enum (GIMarshallingTestsObject *self); +void gi_marshalling_tests_object_vfunc_out_enum (GIMarshallingTestsObject *self, GIMarshallingTestsEnum *_enum); + void gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_none (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating); void gi_marshalling_tests_object_get_ref_info_for_vfunc_return_object_transfer_full (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating); void gi_marshalling_tests_object_get_ref_info_for_vfunc_out_object_transfer_none (GIMarshallingTestsObject *self, guint *ref_count, gboolean *is_floating); -- cgit v1.2.1 From 82e39026acfeb46b02fa11ef37380b247db2b5f2 Mon Sep 17 00:00:00 2001 From: Martin Pitt Date: Mon, 18 Mar 2013 13:22:57 +0100 Subject: Update annotations from glib git --- gir/glib-2.0.c | 10 ++++++---- gir/gobject-2.0.c | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index ae5aaf4c..347dbf2f 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -9522,7 +9522,9 @@ * @text: zero-terminated string with base64 text to decode * @out_len: (out): The length of the decoded data is written here * - * Decode a sequence of Base-64 encoded text into binary data + * Decode a sequence of Base-64 encoded text into binary data. Note + * that the returned binary data is not necessarily zero-terminated, + * so it should not be used as a character string. * * Returns: (transfer full) (array length=out_len) (element-type guint8): newly allocated buffer containing the binary data that @text represents. The returned buffer must be freed with g_free(). * Since: 2.12 @@ -15049,8 +15051,8 @@ * g_hash_table_get_keys: * @hash_table: a #GHashTable * - * Retrieves every key inside @hash_table. The returned data - * is valid until @hash_table is modified. + * Retrieves every key inside @hash_table. The returned data is valid + * until changes to the hash release those keys. * * Returns: a #GList containing all the keys inside the hash table. The content of the list is owned by the hash table and should not be modified or freed. Use g_list_free() when done using the list. * Since: 2.14 @@ -26953,7 +26955,7 @@ * characters of the strings. * * Returns: 0 if the strings match, a negative value if @s1 < @s2, or a positive value if @s1 > @s2. - * Deprecated: 2.2: The problem with g_strncasecmp() is that it does the comparison by calling toupper()/tolower(). These functions are locale-specific and operate on single bytes. However, it is impossible to handle things correctly from an I18N standpoint by operating on bytes, since characters may be multibyte. Thus g_strncasecmp() is broken if your string is guaranteed to be ASCII, since it's locale-sensitive, and it's broken if your string is localized, since it doesn't work on many encodings at all, including UTF-8, EUC-JP, etc. There are therefore two replacement functions: g_ascii_strncasecmp(), which only works on ASCII and is not locale-sensitive, and g_utf8_casefold(), which is good for case-insensitive sorting of UTF-8. + * Deprecated: 2.2: The problem with g_strncasecmp() is that it does the comparison by calling toupper()/tolower(). These functions are locale-specific and operate on single bytes. However, it is impossible to handle things correctly from an I18N standpoint by operating on bytes, since characters may be multibyte. Thus g_strncasecmp() is broken if your string is guaranteed to be ASCII, since it's locale-sensitive, and it's broken if your string is localized, since it doesn't work on many encodings at all, including UTF-8, EUC-JP, etc. There are therefore two replacement techniques: g_ascii_strncasecmp(), which only works on ASCII and is not locale-sensitive, and g_utf8_casefold() followed by strcmp() on the resulting strings, which is good for case-insensitive sorting of UTF-8. */ diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c index 23faa5f6..05d5ee09 100644 --- a/gir/gobject-2.0.c +++ b/gir/gobject-2.0.c @@ -3588,7 +3588,7 @@ * ensures that the @gobject stays alive during the call to @c_handler * by temporarily adding a reference count to @gobject. * - * When the object is destroyed the signal handler will be automatically + * When the @gobject is destroyed the signal handler will be automatically * disconnected. Note that this is not currently threadsafe (ie: * emitting a signal while @gobject is being destroyed in another thread * is not safe). -- cgit v1.2.1 From 1e06a8e091c752b87abf617bb972ac873c3ba261 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Wed, 20 Mar 2013 18:50:58 +0800 Subject: Update gengir.bat for Visual Studio builds Copy cairo-1.0.gir, which is now built during the introspection building process. --- build/win32/gengir.bat | 1 + 1 file changed, 1 insertion(+) diff --git a/build/win32/gengir.bat b/build/win32/gengir.bat index c5984cb3..f7eedbf1 100644 --- a/build/win32/gengir.bat +++ b/build/win32/gengir.bat @@ -273,6 +273,7 @@ move /y *.gir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\share\gir-1.0\ copy /y ..\..\gir\freetype2-2.0.gir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\share\gir-1.0\ copy /y ..\..\gir\GL-1.0.gir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\share\gir-1.0\ copy /y ..\..\gir\libxml2-2.0.gir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\share\gir-1.0\ +copy /y ..\..\gir\cairo-1.0.gir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\share\gir-1.0\ mkdir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\lib\girepository-1.0 move /y *.typelib ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\lib\girepository-1.0\ -- cgit v1.2.1 From ef1df66aeb9983f401ef2fe4113afdc955d271af Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 21 Mar 2013 12:14:19 -0400 Subject: Update GLib annotations to 2.35.9 --- gir/gio-2.0.c | 1452 -------------------------------------------------------- gir/glib-2.0.c | 2 +- 2 files changed, 1 insertion(+), 1453 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index d7759a77..2e516f5c 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -3299,15 +3299,6 @@ */ -/** - * SECTION:_GFreedesktopDBus - * @title: _GFreedesktopDBus - * @short_description: Generated C code for the org.freedesktop.DBus D-Bus interface - * - * This section contains code for working with the org.freedesktop.DBus D-Bus interface in C. - */ - - /** * SECTION:extensionpoints * @short_description: Extension Points @@ -7913,1449 +7904,6 @@ */ -/** - * _GFreedesktopDBus: - * - * Abstract interface type for the D-Bus interface org.freedesktop.DBus. - */ - - -/** - * _GFreedesktopDBus::handle-add-match: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_rule: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the AddMatch() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_add_match() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-get-connection-selinux-security-context: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_name: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the GetConnectionSELinuxSecurityContext() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_get_connection_selinux_security_context() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-get-connection-unix-process-id: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_name: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the GetConnectionUnixProcessID() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_get_connection_unix_process_id() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-get-connection-unix-user: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_name: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the GetConnectionUnixUser() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_get_connection_unix_user() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-get-id: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the GetId() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_get_id() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-get-name-owner: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_name: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the GetNameOwner() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_get_name_owner() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-hello: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the Hello() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_hello() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-list-activatable-names: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the ListActivatableNames() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_list_activatable_names() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-list-names: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the ListNames() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_list_names() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-list-queued-owners: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_name: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the ListQueuedOwners() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_list_queued_owners() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-name-has-owner: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_name: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the NameHasOwner() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_name_has_owner() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-release-name: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_name: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the ReleaseName() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_release_name() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-reload-config: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the ReloadConfig() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_reload_config() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-remove-match: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_rule: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the RemoveMatch() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_remove_match() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-request-name: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_name: Argument passed by remote caller. - * @arg_flags: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the RequestName() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_request_name() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-start-service-by-name: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_name: Argument passed by remote caller. - * @arg_flags: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the StartServiceByName() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_start_service_by_name() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-update-activation-environment: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_environment: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the UpdateActivationEnvironment() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_update_activation_environment() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::name-acquired: - * @object: A #_GFreedesktopDBus. - * @arg_name: Argument. - * - * On the client-side, this signal is emitted whenever the D-Bus signal "NameAcquired" is received. - * - * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal. - */ - - -/** - * _GFreedesktopDBus::name-lost: - * @object: A #_GFreedesktopDBus. - * @arg_name: Argument. - * - * On the client-side, this signal is emitted whenever the D-Bus signal "NameLost" is received. - * - * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal. - */ - - -/** - * _GFreedesktopDBus::name-owner-changed: - * @object: A #_GFreedesktopDBus. - * @arg_name: Argument. - * @arg_old_owner: Argument. - * @arg_new_owner: Argument. - * - * On the client-side, this signal is emitted whenever the D-Bus signal "NameOwnerChanged" is received. - * - * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal. - */ - - -/** - * _GFreedesktopDBusIface: - * @parent_iface: The parent interface. - * @handle_add_match: Handler for the #_GFreedesktopDBus::handle-add-match signal. - * @handle_get_connection_selinux_security_context: Handler for the #_GFreedesktopDBus::handle-get-connection-selinux-security-context signal. - * @handle_get_connection_unix_process_id: Handler for the #_GFreedesktopDBus::handle-get-connection-unix-process-id signal. - * @handle_get_connection_unix_user: Handler for the #_GFreedesktopDBus::handle-get-connection-unix-user signal. - * @handle_get_id: Handler for the #_GFreedesktopDBus::handle-get-id signal. - * @handle_get_name_owner: Handler for the #_GFreedesktopDBus::handle-get-name-owner signal. - * @handle_hello: Handler for the #_GFreedesktopDBus::handle-hello signal. - * @handle_list_activatable_names: Handler for the #_GFreedesktopDBus::handle-list-activatable-names signal. - * @handle_list_names: Handler for the #_GFreedesktopDBus::handle-list-names signal. - * @handle_list_queued_owners: Handler for the #_GFreedesktopDBus::handle-list-queued-owners signal. - * @handle_name_has_owner: Handler for the #_GFreedesktopDBus::handle-name-has-owner signal. - * @handle_release_name: Handler for the #_GFreedesktopDBus::handle-release-name signal. - * @handle_reload_config: Handler for the #_GFreedesktopDBus::handle-reload-config signal. - * @handle_remove_match: Handler for the #_GFreedesktopDBus::handle-remove-match signal. - * @handle_request_name: Handler for the #_GFreedesktopDBus::handle-request-name signal. - * @handle_start_service_by_name: Handler for the #_GFreedesktopDBus::handle-start-service-by-name signal. - * @handle_update_activation_environment: Handler for the #_GFreedesktopDBus::handle-update-activation-environment signal. - * @name_acquired: Handler for the #_GFreedesktopDBus::name-acquired signal. - * @name_lost: Handler for the #_GFreedesktopDBus::name-lost signal. - * @name_owner_changed: Handler for the #_GFreedesktopDBus::name-owner-changed signal. - * - * Virtual table for the D-Bus interface org.freedesktop.DBus. - */ - - -/** - * _GFreedesktopDBusProxy: - * - * The #_GFreedesktopDBusProxy structure contains only private data and should only be accessed using the provided API. - */ - - -/** - * _GFreedesktopDBusProxyClass: - * @parent_class: The parent class. - * - * Class structure for #_GFreedesktopDBusProxy. - */ - - -/** - * _GFreedesktopDBusSkeleton: - * - * The #_GFreedesktopDBusSkeleton structure contains only private data and should only be accessed using the provided API. - */ - - -/** - * _GFreedesktopDBusSkeletonClass: - * @parent_class: The parent class. - * - * Class structure for #_GFreedesktopDBusSkeleton. - */ - - -/** - * _g_freedesktop_dbus_call_add_match: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_rule: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the AddMatch() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_add_match_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_add_match_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_add_match_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_add_match(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_add_match(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_add_match_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_rule: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the AddMatch() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_add_match() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_get_connection_selinux_security_context: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the GetConnectionSELinuxSecurityContext() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_get_connection_selinux_security_context_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_get_connection_selinux_security_context_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_get_connection_selinux_security_context_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_security_context: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_get_connection_selinux_security_context(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_get_connection_selinux_security_context(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_get_connection_selinux_security_context_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @out_security_context: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the GetConnectionSELinuxSecurityContext() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_get_connection_selinux_security_context() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_get_connection_unix_process_id: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the GetConnectionUnixProcessID() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_get_connection_unix_process_id_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_get_connection_unix_process_id_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_get_connection_unix_process_id_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_pid: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_get_connection_unix_process_id(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_get_connection_unix_process_id(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_get_connection_unix_process_id_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @out_pid: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the GetConnectionUnixProcessID() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_get_connection_unix_process_id() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_get_connection_unix_user: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the GetConnectionUnixUser() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_get_connection_unix_user_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_get_connection_unix_user_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_get_connection_unix_user_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_uid: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_get_connection_unix_user(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_get_connection_unix_user(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_get_connection_unix_user_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @out_uid: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the GetConnectionUnixUser() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_get_connection_unix_user() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_get_id: - * @proxy: A #_GFreedesktopDBusProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the GetId() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_get_id_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_get_id_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_get_id_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_unique_id: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_get_id(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_get_id(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_get_id_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_unique_id: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the GetId() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_get_id() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_get_name_owner: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the GetNameOwner() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_get_name_owner_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_get_name_owner_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_get_name_owner_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_unique_name: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_get_name_owner(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_get_name_owner(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_get_name_owner_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @out_unique_name: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the GetNameOwner() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_get_name_owner() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_hello: - * @proxy: A #_GFreedesktopDBusProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the Hello() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_hello_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_hello_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_hello_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_assigned_name: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_hello(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_hello(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_hello_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_assigned_name: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the Hello() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_hello() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_list_activatable_names: - * @proxy: A #_GFreedesktopDBusProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the ListActivatableNames() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_list_activatable_names_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_list_activatable_names_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_list_activatable_names_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_activatable_names: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_list_activatable_names(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_list_activatable_names(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_list_activatable_names_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_activatable_names: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the ListActivatableNames() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_list_activatable_names() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_list_names: - * @proxy: A #_GFreedesktopDBusProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the ListNames() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_list_names_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_list_names_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_list_names_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_names: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_list_names(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_list_names(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_list_names_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_names: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the ListNames() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_list_names() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_list_queued_owners: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the ListQueuedOwners() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_list_queued_owners_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_list_queued_owners_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_list_queued_owners_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_queued_owners: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_list_queued_owners(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_list_queued_owners(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_list_queued_owners_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @out_queued_owners: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the ListQueuedOwners() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_list_queued_owners() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_name_has_owner: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the NameHasOwner() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_name_has_owner_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_name_has_owner_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_name_has_owner_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_has_owner: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_name_has_owner(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_name_has_owner(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_name_has_owner_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @out_has_owner: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the NameHasOwner() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_name_has_owner() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_release_name: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the ReleaseName() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_release_name_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_release_name_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_release_name_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_value: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_release_name(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_release_name(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_release_name_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @out_value: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the ReleaseName() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_release_name() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_reload_config: - * @proxy: A #_GFreedesktopDBusProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the ReloadConfig() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_reload_config_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_reload_config_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_reload_config_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_reload_config(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_reload_config(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_reload_config_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the ReloadConfig() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_reload_config() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_remove_match: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_rule: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the RemoveMatch() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_remove_match_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_remove_match_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_remove_match_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_remove_match(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_remove_match(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_remove_match_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_rule: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the RemoveMatch() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_remove_match() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_request_name: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @arg_flags: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the RequestName() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_request_name_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_request_name_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_request_name_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_value: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_request_name(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_request_name(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_request_name_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @arg_flags: Argument to pass with the method invocation. - * @out_value: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the RequestName() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_request_name() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_start_service_by_name: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @arg_flags: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the StartServiceByName() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_start_service_by_name_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_start_service_by_name_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_start_service_by_name_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_value: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_start_service_by_name(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_start_service_by_name(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_start_service_by_name_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @arg_flags: Argument to pass with the method invocation. - * @out_value: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the StartServiceByName() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_start_service_by_name() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_update_activation_environment: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_environment: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the UpdateActivationEnvironment() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_update_activation_environment_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_update_activation_environment_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_update_activation_environment_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_update_activation_environment(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_update_activation_environment(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_update_activation_environment_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_environment: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the UpdateActivationEnvironment() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_update_activation_environment() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_complete_add_match: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * - * Helper function used in service implementations to finish handling invocations of the AddMatch() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_get_connection_selinux_security_context: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @security_context: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the GetConnectionSELinuxSecurityContext() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_get_connection_unix_process_id: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @pid: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the GetConnectionUnixProcessID() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_get_connection_unix_user: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @uid: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the GetConnectionUnixUser() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_get_id: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @unique_id: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the GetId() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_get_name_owner: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @unique_name: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the GetNameOwner() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_hello: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @assigned_name: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the Hello() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_list_activatable_names: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @activatable_names: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the ListActivatableNames() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_list_names: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @names: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the ListNames() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_list_queued_owners: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @queued_owners: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the ListQueuedOwners() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_name_has_owner: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @has_owner: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the NameHasOwner() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_release_name: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @value: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the ReleaseName() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_reload_config: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * - * Helper function used in service implementations to finish handling invocations of the ReloadConfig() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_remove_match: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * - * Helper function used in service implementations to finish handling invocations of the RemoveMatch() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_request_name: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @value: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the RequestName() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_start_service_by_name: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @value: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the StartServiceByName() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_update_activation_environment: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * - * Helper function used in service implementations to finish handling invocations of the UpdateActivationEnvironment() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_emit_name_acquired: - * @object: A #_GFreedesktopDBus. - * @arg_name: Argument to pass with the signal. - * - * Emits the "NameAcquired" D-Bus signal. - */ - - -/** - * _g_freedesktop_dbus_emit_name_lost: - * @object: A #_GFreedesktopDBus. - * @arg_name: Argument to pass with the signal. - * - * Emits the "NameLost" D-Bus signal. - */ - - -/** - * _g_freedesktop_dbus_emit_name_owner_changed: - * @object: A #_GFreedesktopDBus. - * @arg_name: Argument to pass with the signal. - * @arg_old_owner: Argument to pass with the signal. - * @arg_new_owner: Argument to pass with the signal. - * - * Emits the "NameOwnerChanged" D-Bus signal. - */ - - -/** - * _g_freedesktop_dbus_interface_info: - * - * Gets a machine-readable description of the org.freedesktop.DBus D-Bus interface. - * - * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free. - */ - - -/** - * _g_freedesktop_dbus_override_properties: - * @klass: The class structure for a #GObject-derived class. - * @property_id_begin: The property id to assign to the first overridden property. - * - * Overrides all #GObject properties in the #_GFreedesktopDBus interface for a concrete class. - * The properties are overridden in the order they are defined. - * - * Returns: The last property id. - */ - - -/** - * _g_freedesktop_dbus_proxy_new: - * @connection: A #GDBusConnection. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. - * @object_path: An object path. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied. - * @user_data: User data to pass to @callback. - * - * Asynchronously creates a proxy for the D-Bus interface org.freedesktop.DBus. See g_dbus_proxy_new() for more details. - * - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_proxy_new_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_proxy_new_sync() for the synchronous, blocking version of this constructor. - */ - - -/** - * _g_freedesktop_dbus_proxy_new_finish: - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_proxy_new(). - * @error: Return location for error or %NULL - * - * Finishes an operation started with _g_freedesktop_dbus_proxy_new(). - * - * Returns: (transfer full) (type _GFreedesktopDBusProxy): The constructed proxy object or %NULL if @error is set. - */ - - -/** - * _g_freedesktop_dbus_proxy_new_for_bus: - * @bus_type: A #GBusType. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: A bus name (well-known or unique). - * @object_path: An object path. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied. - * @user_data: User data to pass to @callback. - * - * Like _g_freedesktop_dbus_proxy_new() but takes a #GBusType instead of a #GDBusConnection. - * - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_proxy_new_for_bus_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor. - */ - - -/** - * _g_freedesktop_dbus_proxy_new_for_bus_finish: - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_proxy_new_for_bus(). - * @error: Return location for error or %NULL - * - * Finishes an operation started with _g_freedesktop_dbus_proxy_new_for_bus(). - * - * Returns: (transfer full) (type _GFreedesktopDBusProxy): The constructed proxy object or %NULL if @error is set. - */ - - -/** - * _g_freedesktop_dbus_proxy_new_for_bus_sync: - * @bus_type: A #GBusType. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: A bus name (well-known or unique). - * @object_path: An object path. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL - * - * Like _g_freedesktop_dbus_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection. - * - * The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_proxy_new_for_bus() for the asynchronous version of this constructor. - * - * Returns: (transfer full) (type _GFreedesktopDBusProxy): The constructed proxy object or %NULL if @error is set. - */ - - -/** - * _g_freedesktop_dbus_proxy_new_sync: - * @connection: A #GDBusConnection. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. - * @object_path: An object path. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL - * - * Synchronously creates a proxy for the D-Bus interface org.freedesktop.DBus. See g_dbus_proxy_new_sync() for more details. - * - * The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_proxy_new() for the asynchronous version of this constructor. - * - * Returns: (transfer full) (type _GFreedesktopDBusProxy): The constructed proxy object or %NULL if @error is set. - */ - - -/** - * _g_freedesktop_dbus_skeleton_new: - * - * Creates a skeleton object for the D-Bus interface org.freedesktop.DBus. - * - * Returns: (transfer full) (type _GFreedesktopDBusSkeleton): The skeleton object. - */ - - /** * _g_io_module_get_default: * @extension_point: the name of an extension point diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 347dbf2f..dc98af0d 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -20573,7 +20573,7 @@ /** * g_option_context_new: - * @parameter_string: a string which is displayed in the first line of output, after the usage summary programname [OPTION...] + * @parameter_string: (allow-none): a string which is displayed in the first line of output, after the usage summary programname [OPTION...] * * Creates a new option context. * -- cgit v1.2.1 From 06e92f30bc25d771e269780d838b79e2f4e52812 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 25 Mar 2013 20:24:49 -0400 Subject: Update GLib annotations to 2.36.0 --- gir/gio-2.0.c | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 2e516f5c..d78bfdc6 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -7421,6 +7421,81 @@ * * A helper class for testing code which uses D-Bus without touching the user's * session bus. + * + * + * Creating unit tests using GTestDBus + * + * Testing of D-Bus services can be tricky because normally we only ever run + * D-Bus services over an existing instance of the D-Bus daemon thus we + * usually don't activate D-Bus services that are not yet installed into the + * target system. The #GTestDBus object makes this easier for us by taking care + * of the lower level tasks such as running a private D-Bus daemon and looking + * up uninstalled services in customizable locations, typically in your source code tree. + * + * + * The first thing you will need is a separate service description file for the + * D-Bus daemon. Typically a 'services' subdirectory of your 'tests' directory + * is a good place to put this file. + * + * + * The service file should list your service along with an absolute path to the + * uninstalled service executable in your source tree. Using autotools we would + * achieve this by adding a file such as 'my-server.service.in' in the services + * directory and have it processed by configure. + * + * [D-BUS Service] + * Name=org.gtk.GDBus.Examples.ObjectManager + * Exec=@abs_top_builddir@/gio/tests/gdbus-example-objectmanager-server + * + * You will also need to indicate this service directory in your test + * fixtures, so you will need to pass the path while compiling your + * test cases. Typically this is done with autotools with an added + * preprocessor flag specified to compile your tests such as: + * + * -DTEST_SERVICES=\""$(abs_top_builddir)/tests/services"\" + * + * + * + * Once you have a service definition file which is local to your source tree, + * you can proceed to setup a GTest fixture using the GTestDBus scaffolding. + * + * Test Fixture for D-Bus services + * + * + * FIXME: MISSING XINCLUDE CONTENT + * + * + * + * + * + * Note that these examples only deal with isolating the D-Bus aspect of your + * service. To successfully run isolated unit tests on your service you may need + * some additional modifications to your test case fixture. For example; if your + * service uses GSettings and installs a schema then it is important that your test service + * not load the schema in the ordinary installed location (chances are that your service + * and schema files are not yet installed, or worse; there is an older version of the + * schema file sitting in the install location). + * + * + * Most of the time we can work around these obstacles using the environment. Since the + * environment is inherited by the D-Bus daemon created by GTestDBus and then in turn + * inherited by any services the D-Bus daemon activates, using the setup routine for your + * fixture is a practical place to help sandbox your runtime environment. For the rather + * typical GSettings case we can work around this by setting GSETTINGS_SCHEMA_DIR to the + * in tree directory holding your schemas in the above fixture_setup() routine. + * + * + * The GSettings schemas need to be locally pre-compiled for this to work. This can be achieved + * by compiling the schemas locally as a step before running test cases, an autotools setup might + * do the following in the directory holding schemas: + * + * all-am: + * $(GLIB_COMPILE_SCHEMAS) . + * + * CLEANFILES += gschemas.compiled + * + * + * */ -- cgit v1.2.1 From 0e708e9fb76b53f41422360f502b873e88baac41 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 25 Mar 2013 20:26:05 -0400 Subject: Release 1.36.0 --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 399d98d4..3537af1a 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,8 @@ dnl the gi version number m4_define(gi_major_version, 1) -m4_define(gi_minor_version, 35) -m4_define(gi_micro_version, 9) +m4_define(gi_minor_version, 36) +m4_define(gi_micro_version, 0) m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version) AC_PREREQ([2.63]) @@ -124,7 +124,7 @@ GIR_DIR="$EXPANDED_DATADIR/$GIR_SUFFIX" AC_SUBST(GIR_DIR) AC_DEFINE_UNQUOTED(GIR_DIR, "$GIR_DIR", [Director prefix for gir installation]) -PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.35.9]) +PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.36.0]) PKG_CHECK_MODULES(GOBJECT, [gobject-2.0]) PKG_CHECK_MODULES(GMODULE, [gmodule-2.0]) PKG_CHECK_MODULES(GIO, [gio-2.0]) -- cgit v1.2.1 From 49b80bb567115b95c1051d2f01da7679e4e08154 Mon Sep 17 00:00:00 2001 From: Jasper Lievisse Adriaanse Date: Thu, 28 Mar 2013 11:49:01 +0100 Subject: Unbreak giscanner on OpenBSD. Commit 9a1e0c63c13f3567e75553d2d07dd914d5b81287 broke this as os.name doesn't return 'OpenBSD', but 'posix' https://bugzilla.gnome.org/show_bug.cgi?id=696765 --- giscanner/shlibs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py index 6c583a4b..4f622db3 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py @@ -68,7 +68,7 @@ def _resolve_non_libtool(options, binary, libraries): if not libraries: return [] - if os.name == 'OpenBSD': + if platform.platform().startswith('OpenBSD'): # Hack for OpenBSD when using the ports' libtool which uses slightly # different directories to store the libraries in. So rewite binary.args[0] # by inserting '.libs/'. -- cgit v1.2.1 From 4b1bf70c93acb3446c1e9049ac422d911a10762d Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 19 Nov 2012 21:42:44 -0500 Subject: girepository: Use g_atomic for refcounting They could be freed in separate threads (e.g. language binding GC thread). But no particular reason to change other than noticing it during code inspection for a different bug. https://bugzilla.gnome.org/show_bug.cgi?id=688694 --- girepository/gibaseinfo.c | 25 ++++++++++++------------- girepository/girepository-private.h | 9 +++++++-- 2 files changed, 19 insertions(+), 15 deletions(-) diff --git a/girepository/gibaseinfo.c b/girepository/gibaseinfo.c index ff9c9395..37893e6c 100644 --- a/girepository/gibaseinfo.c +++ b/girepository/gibaseinfo.c @@ -226,7 +226,7 @@ g_base_info_ref (GIBaseInfo *info) GIRealInfo *rinfo = (GIRealInfo*)info; g_assert (rinfo->ref_count != INVALID_REFCOUNT); - ((GIRealInfo*)info)->ref_count++; + g_atomic_int_inc (&rinfo->ref_count); return info; } @@ -244,21 +244,20 @@ g_base_info_unref (GIBaseInfo *info) GIRealInfo *rinfo = (GIRealInfo*)info; g_assert (rinfo->ref_count > 0 && rinfo->ref_count != INVALID_REFCOUNT); - rinfo->ref_count--; - if (!rinfo->ref_count) - { - if (rinfo->container && ((GIRealInfo *) rinfo->container)->ref_count != INVALID_REFCOUNT) - g_base_info_unref (rinfo->container); + if (!g_atomic_int_dec_and_test (&rinfo->ref_count)) + return; - if (rinfo->repository) - g_object_unref (rinfo->repository); + if (rinfo->container && ((GIRealInfo *) rinfo->container)->ref_count != INVALID_REFCOUNT) + g_base_info_unref (rinfo->container); - if (rinfo->type == GI_INFO_TYPE_UNRESOLVED) - g_slice_free (GIUnresolvedInfo, (GIUnresolvedInfo *) rinfo); - else - g_slice_free (GIRealInfo, rinfo); - } + if (rinfo->repository) + g_object_unref (rinfo->repository); + + if (rinfo->type == GI_INFO_TYPE_UNRESOLVED) + g_slice_free (GIUnresolvedInfo, (GIUnresolvedInfo *) rinfo); + else + g_slice_free (GIRealInfo, rinfo); } /** diff --git a/girepository/girepository-private.h b/girepository/girepository-private.h index 275776d8..bbd34e3e 100644 --- a/girepository/girepository-private.h +++ b/girepository/girepository-private.h @@ -33,6 +33,11 @@ typedef struct _GIRealInfo GIRealInfo; +/* We changed a gint32 -> gint in the structure below, which should be + * valid everywhere we care about. + */ +G_STATIC_ASSERT (sizeof (int) == sizeof (gint32)); + /* * We just use one structure for all of the info object * types; in general, we should be reading data directly @@ -43,7 +48,7 @@ struct _GIRealInfo { /* Keep this part in sync with GIUnresolvedInfo below */ gint32 type; - gint32 ref_count; + volatile gint ref_count; GIRepository *repository; GIBaseInfo *container; @@ -62,7 +67,7 @@ struct _GIUnresolvedInfo { /* Keep this part in sync with GIBaseInfo above */ gint32 type; - gint32 ref_count; + volatile gint ref_count; GIRepository *repository; GIBaseInfo *container; -- cgit v1.2.1 From dbb622812b29e5e67da8841409489d1d242a12b6 Mon Sep 17 00:00:00 2001 From: Simon Feltman Date: Thu, 4 Apr 2013 20:47:18 -0700 Subject: gimarshallingtests: Fix vfunc_return_enum type Change mistaken return type of GIMarshallingTestsFlags to GIMarshallingTestsEnum in vfunc_return_enum. https://bugzilla.gnome.org/show_bug.cgi?id=637832 --- tests/gimarshallingtests.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index 67c2f70e..56c6a0f2 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -807,7 +807,7 @@ struct _GIMarshallingTestsObjectClass /** * GIMarshallingTestsObjectClass::vfunc_return_enum: */ - GIMarshallingTestsFlags (* vfunc_return_enum) (GIMarshallingTestsObject *self); + GIMarshallingTestsEnum (* vfunc_return_enum) (GIMarshallingTestsObject *self); /** * GIMarshallingTestsObjectClass::vfunc_out_enum: -- cgit v1.2.1 From 60fd253d795e312eae91c9ed32930e3304170176 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Sun, 7 Apr 2013 16:32:58 -0400 Subject: scannermodule: Fix a bad check Spotted by Coverity --- giscanner/giscannermodule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giscanner/giscannermodule.c b/giscanner/giscannermodule.c index 0ece7f7a..a5686ea3 100644 --- a/giscanner/giscannermodule.c +++ b/giscanner/giscannermodule.c @@ -695,7 +695,7 @@ pygi_collect_attributes (PyObject *self, goto out; } - if (!PyTuple_Size (tuple) == 2) + if (PyTuple_Size (tuple) != 2) { PyErr_SetString(PyExc_IndexError, "attribute item must be a tuple of length 2"); -- cgit v1.2.1 From 99a7287bb152dc4df299255f42b04ab1766ca6a6 Mon Sep 17 00:00:00 2001 From: Daniel Drake Date: Tue, 19 Mar 2013 11:04:42 -0600 Subject: Optimize g_irepository_find_by_gtype When g_irepository_find_by_gtype() doesn't succeed on a simple prefix match (the current 'fastpass' mechanism), it ends up taking a considerable amount of CPU time, traversing the contents of all typelibs. I imagine that the reasons to have the exhaustive search fallback are not as strong as they used to be. For example, the case mentioned (Clutter including Cogl) no longer seems to be true. Also, typelibs (as generated by g-ir-scanner) now provide comma-separated C prefix info for cases when the typelib includes introspection info for multiple prefixes. For example, the Sugar typelib has a c_prefix string of Sugar,EggSM,Gsm,Acme. So I imagine there are not many remaining justified cases where the exhaustive search is needed. With that in mind, I found two ways to optimize this function: 1. Support comma-separated C prefixes 2. Don't bother with an exhaustive search if we did find a typelib claiming support for the prefix. For example, if we're looking for GdkDeviceManagerXI2 (currently non-introspectable) and we already found typelib files providing the 'Gdk' prefix that didn't offer this, lets not bother with the exhaustive search, we aren't going to find anything. --- girepository/girepository.c | 105 ++++++++++++++++++++++++++------------ girepository/gitypelib-internal.h | 8 +-- girepository/gitypelib.c | 84 +++++++++++++++--------------- 3 files changed, 118 insertions(+), 79 deletions(-) diff --git a/girepository/girepository.c b/girepository/girepository.c index ccdd3611..0922fb09 100644 --- a/girepository/girepository.c +++ b/girepository/girepository.c @@ -593,28 +593,39 @@ g_irepository_get_info (GIRepository *repository, } typedef struct { - GIRepository *repository; - GType type; - - gboolean fastpass; + const gchar *gtype_name; GITypelib *result_typelib; - DirEntry *result; + gboolean found_prefix; } FindByGTypeData; -static void -find_by_gtype_foreach (gpointer key, - gpointer value, - gpointer datap) +static DirEntry * +find_by_gtype (GHashTable *table, FindByGTypeData *data, gboolean check_prefix) { - GITypelib *typelib = (GITypelib*)value; - FindByGTypeData *data = datap; + GHashTableIter iter; + gpointer key, value; + DirEntry *ret; - if (data->result != NULL) - return; + g_hash_table_iter_init (&iter, table); + while (g_hash_table_iter_next (&iter, &key, &value)) + { + GITypelib *typelib = (GITypelib*)value; + if (check_prefix) + { + if (!g_typelib_matches_gtype_name_prefix (typelib, data->gtype_name)) + continue; - data->result = g_typelib_get_dir_entry_by_gtype (typelib, data->fastpass, data->type); - if (data->result) - data->result_typelib = typelib; + data->found_prefix = TRUE; + } + + ret = g_typelib_get_dir_entry_by_gtype_name (typelib, data->gtype_name); + if (ret) + { + data->result_typelib = typelib; + return ret; + } + } + + return NULL; } /** @@ -637,6 +648,7 @@ g_irepository_find_by_gtype (GIRepository *repository, { FindByGTypeData data; GIBaseInfo *cached; + DirEntry *entry; repository = get_repository (repository); @@ -646,30 +658,55 @@ g_irepository_find_by_gtype (GIRepository *repository, if (cached != NULL) return g_base_info_ref (cached); - data.repository = repository; - data.fastpass = TRUE; - data.type = gtype; + data.gtype_name = g_type_name (gtype); data.result_typelib = NULL; - data.result = NULL; + data.found_prefix = FALSE; + + /* There is a corner case regarding GdkRectangle. GdkRectangle is a + * boxed type, but it is just an alias to boxed struct + * CairoRectangleInt. Scanner automatically converts all references + * to GdkRectangle to CairoRectangleInt, so GdkRectangle does not + * appear in the typelibs at all, although user code might query it. + * So if we get such query, we also change it to lookup of + * CairoRectangleInt. + * https://bugzilla.gnome.org/show_bug.cgi?id=655423 + */ + if (G_UNLIKELY (!strcmp (data.gtype_name, "GdkRectangle"))) + data.gtype_name = "CairoRectangleInt"; + + /* Inside each typelib, we include the "C prefix" which acts as + * a namespace mechanism. For GtkTreeView, the C prefix is Gtk. + * Given the assumption that GTypes for a library also use the + * C prefix, we know we can skip examining a typelib if our + * target type does not have this typelib's C prefix. Use this + * assumption as our first attempt at locating the DirEntry. + */ + entry = find_by_gtype (repository->priv->typelibs, &data, TRUE); + if (entry == NULL) + entry = find_by_gtype (repository->priv->lazy_typelibs, &data, TRUE); - g_hash_table_foreach (repository->priv->typelibs, find_by_gtype_foreach, &data); - if (data.result == NULL) - g_hash_table_foreach (repository->priv->lazy_typelibs, find_by_gtype_foreach, &data); + /* If we have no result, but we did find a typelib claiming to + * offer bindings for such a prefix, bail out now on the assumption + * that a more exhaustive search would not produce any results. + */ + if (entry == NULL && data.found_prefix) + return NULL; - /* We do two passes; see comment in find_interface */ - if (data.result == NULL) - { - data.fastpass = FALSE; - g_hash_table_foreach (repository->priv->typelibs, find_by_gtype_foreach, &data); - } - if (data.result == NULL) - g_hash_table_foreach (repository->priv->lazy_typelibs, find_by_gtype_foreach, &data); + /* Not ever class library necessarily specifies a correct c_prefix, + * so take a second pass. This time we will try a global lookup, + * ignoring prefixes. + * See http://bugzilla.gnome.org/show_bug.cgi?id=564016 + */ + if (entry == NULL) + entry = find_by_gtype (repository->priv->typelibs, &data, FALSE); + if (entry == NULL) + entry = find_by_gtype (repository->priv->lazy_typelibs, &data, FALSE); - if (data.result != NULL) + if (entry != NULL) { - cached = _g_info_new_full (data.result->blob_type, + cached = _g_info_new_full (entry->blob_type, repository, - NULL, data.result_typelib, data.result->offset); + NULL, data.result_typelib, entry->offset); g_hash_table_insert (repository->priv->info_by_gtype, (gpointer) gtype, diff --git a/girepository/gitypelib-internal.h b/girepository/gitypelib-internal.h index 04662b4a..ac71008d 100644 --- a/girepository/gitypelib-internal.h +++ b/girepository/gitypelib-internal.h @@ -1126,13 +1126,15 @@ DirEntry *g_typelib_get_dir_entry (GITypelib *typelib, DirEntry *g_typelib_get_dir_entry_by_name (GITypelib *typelib, const char *name); -DirEntry *g_typelib_get_dir_entry_by_gtype (GITypelib *typelib, - gboolean fastpass, - GType gtype); +DirEntry *g_typelib_get_dir_entry_by_gtype_name (GITypelib *typelib, + const gchar *gtype_name); DirEntry *g_typelib_get_dir_entry_by_error_domain (GITypelib *typelib, GQuark error_domain); +gboolean g_typelib_matches_gtype_name_prefix (GITypelib *typelib, + const gchar *gtype_name); + void g_typelib_check_sanity (void); #define g_typelib_get_string(typelib,offset) ((const gchar*)&(typelib->data)[(offset)]) diff --git a/girepository/gitypelib.c b/girepository/gitypelib.c index 76a55de8..2512e524 100644 --- a/girepository/gitypelib.c +++ b/girepository/gitypelib.c @@ -198,55 +198,17 @@ g_typelib_get_dir_entry_by_name (GITypelib *typelib, } DirEntry * -g_typelib_get_dir_entry_by_gtype (GITypelib *typelib, - gboolean fastpass, - GType gtype) +g_typelib_get_dir_entry_by_gtype_name (GITypelib *typelib, + const gchar *gtype_name) { Header *header = (Header *)typelib->data; - guint n_entries = header->n_local_entries; - const char *gtype_name = g_type_name (gtype); - DirEntry *entry; guint i; - const char *c_prefix; - /* There is a corner case regarding GdkRectangle. GdkRectangle is a - boxed type, but it is just an alias to boxed struct - CairoRectangleInt. Scanner automatically converts all references - to GdkRectangle to CairoRectangleInt, so GdkRectangle does not - appear in the typelibs at all, although user code might query it. - So if we get such query, we also change it to lookup of - CairoRectangleInt. - https://bugzilla.gnome.org/show_bug.cgi?id=655423 */ - if (!fastpass && !strcmp (gtype_name, "GdkRectangle")) - gtype_name = "CairoRectangleInt"; - - /* Inside each typelib, we include the "C prefix" which acts as - * a namespace mechanism. For GtkTreeView, the C prefix is Gtk. - * Given the assumption that GTypes for a library also use the - * C prefix, we know we can skip examining a typelib if our - * target type does not have this typelib's C prefix. - * - * However, not every class library necessarily conforms to this, - * e.g. Clutter has Cogl inside it. So, we split this into two - * passes. First we try a lookup, skipping things which don't - * have the prefix. If that fails then we try a global lookup, - * ignoring the prefix. - * - * See http://bugzilla.gnome.org/show_bug.cgi?id=564016 - */ - c_prefix = g_typelib_get_string (typelib, header->c_prefix); - if (fastpass && c_prefix != NULL) - { - if (g_ascii_strncasecmp (c_prefix, gtype_name, strlen (c_prefix)) != 0) - return NULL; - } - - for (i = 1; i <= n_entries; i++) + for (i = 1; i <= header->n_local_entries; i++) { RegisteredTypeBlob *blob; const char *type; - - entry = g_typelib_get_dir_entry (typelib, i); + DirEntry *entry = g_typelib_get_dir_entry (typelib, i); if (!BLOB_IS_REGISTERED_TYPE (entry)) continue; @@ -261,6 +223,44 @@ g_typelib_get_dir_entry_by_gtype (GITypelib *typelib, return NULL; } +gboolean +g_typelib_matches_gtype_name_prefix (GITypelib *typelib, + const gchar *gtype_name) +{ + Header *header = (Header *)typelib->data; + const char *c_prefix; + gchar **prefixes; + gchar **prefix; + gboolean ret = FALSE; + + c_prefix = g_typelib_get_string (typelib, header->c_prefix); + if (c_prefix == NULL) + return FALSE; + + /* c_prefix is a comma separated string of supported prefixes + * in the typelib. + * We match the specified gtype_name if the gtype_name starts + * with the prefix, and is followed by a capital letter. + * For example, a typelib offering the 'Gdk' prefix does match + * GdkX11Cursor, however a typelib offering the 'G' prefix does not. + */ + prefixes = g_strsplit (c_prefix, ",", 0); + for (prefix = prefixes; *prefix; prefix++) + { + size_t len = strlen (*prefix); + if (strncmp (*prefix, gtype_name, len)) + continue; + + if (strlen (gtype_name) > len && g_ascii_isupper (gtype_name[len])) + { + ret = TRUE; + break; + } + } + g_strfreev(prefixes); + return ret; +} + DirEntry * g_typelib_get_dir_entry_by_error_domain (GITypelib *typelib, GQuark error_domain) -- cgit v1.2.1 From d5f26ced508bd1f91e769329b46ee1989fd4134a Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 7 Apr 2013 13:18:29 -0400 Subject: typelib: Only malloc once during string iteration Just more efficient. --- girepository/gitypelib.c | 68 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 60 insertions(+), 8 deletions(-) diff --git a/girepository/gitypelib.c b/girepository/gitypelib.c index 2512e524..10bb98e0 100644 --- a/girepository/gitypelib.c +++ b/girepository/gitypelib.c @@ -223,20 +223,68 @@ g_typelib_get_dir_entry_by_gtype_name (GITypelib *typelib, return NULL; } +typedef struct { + const char *s; + const char *separator; + GString buf; +} StrSplitIter; + +static void +strsplit_iter_init (StrSplitIter *iter, + const char *s, + const char *separator) +{ + iter->s = s; + iter->separator = separator; + iter->buf.str = NULL; + iter->buf.len = 0; + iter->buf.allocated_len = 0; +} + +static gboolean +strsplit_iter_next (StrSplitIter *iter, + char **out_val) +{ + const char *s = iter->s; + const char *next; + gsize len; + + if (!s) + return FALSE; + next = strstr (s, iter->separator); + iter->s = next; + if (next) + len = next - s; + else + len = strlen (s); + g_string_overwrite_len (&iter->buf, 0, s, (gssize)len); + *out_val = iter->buf.str; + return TRUE; +} + +static void +strsplit_iter_clear (StrSplitIter *iter) +{ + g_free (iter->buf.str); +} + gboolean g_typelib_matches_gtype_name_prefix (GITypelib *typelib, const gchar *gtype_name) { Header *header = (Header *)typelib->data; const char *c_prefix; - gchar **prefixes; - gchar **prefix; + gchar *prefix; gboolean ret = FALSE; + StrSplitIter split_iter; + gsize gtype_name_len; c_prefix = g_typelib_get_string (typelib, header->c_prefix); if (c_prefix == NULL) return FALSE; + gtype_name_len = strlen (gtype_name); + /* c_prefix is a comma separated string of supported prefixes * in the typelib. * We match the specified gtype_name if the gtype_name starts @@ -244,20 +292,24 @@ g_typelib_matches_gtype_name_prefix (GITypelib *typelib, * For example, a typelib offering the 'Gdk' prefix does match * GdkX11Cursor, however a typelib offering the 'G' prefix does not. */ - prefixes = g_strsplit (c_prefix, ",", 0); - for (prefix = prefixes; *prefix; prefix++) + strsplit_iter_init (&split_iter, c_prefix, ","); + while (strsplit_iter_next (&split_iter, &prefix)) { - size_t len = strlen (*prefix); - if (strncmp (*prefix, gtype_name, len)) + size_t len = strlen (prefix); + + if (gtype_name_len < len) + continue; + + if (strncmp (prefix, gtype_name, len) != 0) continue; - if (strlen (gtype_name) > len && g_ascii_isupper (gtype_name[len])) + if (g_ascii_isupper (gtype_name[len])) { ret = TRUE; break; } } - g_strfreev(prefixes); + strsplit_iter_clear (&split_iter); return ret; } -- cgit v1.2.1 From 3cfad15a57bb16cc7a0ee3655c8e0d4bdab0a056 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 8 Apr 2013 14:44:32 -0400 Subject: typelib: Fix logic error in previous commit --- girepository/gitypelib.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/girepository/gitypelib.c b/girepository/gitypelib.c index 10bb98e0..f7d07e3f 100644 --- a/girepository/gitypelib.c +++ b/girepository/gitypelib.c @@ -252,11 +252,16 @@ strsplit_iter_next (StrSplitIter *iter, if (!s) return FALSE; next = strstr (s, iter->separator); - iter->s = next; if (next) - len = next - s; + { + iter->s = next + 1; + len = next - s; + } else - len = strlen (s); + { + iter->s = NULL; + len = strlen (s); + } g_string_overwrite_len (&iter->buf, 0, s, (gssize)len); *out_val = iter->buf.str; return TRUE; -- cgit v1.2.1 From d03bbfa52c328f2250b40777077b464e6978d47f Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 8 Apr 2013 15:32:15 -0400 Subject: gitypelib: And another fix for empty strings --- girepository/gitypelib.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/girepository/gitypelib.c b/girepository/gitypelib.c index f7d07e3f..a643cde1 100644 --- a/girepository/gitypelib.c +++ b/girepository/gitypelib.c @@ -226,6 +226,7 @@ g_typelib_get_dir_entry_by_gtype_name (GITypelib *typelib, typedef struct { const char *s; const char *separator; + gsize sep_len; GString buf; } StrSplitIter; @@ -236,6 +237,7 @@ strsplit_iter_init (StrSplitIter *iter, { iter->s = s; iter->separator = separator; + iter->sep_len = strlen (separator); iter->buf.str = NULL; iter->buf.len = 0; iter->buf.allocated_len = 0; @@ -254,7 +256,7 @@ strsplit_iter_next (StrSplitIter *iter, next = strstr (s, iter->separator); if (next) { - iter->s = next + 1; + iter->s = next + iter->sep_len; len = next - s; } else @@ -262,8 +264,15 @@ strsplit_iter_next (StrSplitIter *iter, iter->s = NULL; len = strlen (s); } - g_string_overwrite_len (&iter->buf, 0, s, (gssize)len); - *out_val = iter->buf.str; + if (len == 0) + { + *out_val = ""; + } + else + { + g_string_overwrite_len (&iter->buf, 0, s, (gssize)len); + *out_val = iter->buf.str; + } return TRUE; } -- cgit v1.2.1 From 516c1877af22b4376e8010eb2e0f9a6fba002d81 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 20 Mar 2013 16:54:26 +0100 Subject: tests: Restore intentional mixed tab/space indentation Removed by accident in 2df621c53cdffbc3c43c3745947ee859020c8338 https://bugzilla.gnome.org/show_bug.cgi?id=697612 --- tests/scanner/annotation.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/scanner/annotation.c b/tests/scanner/annotation.c index f3cfb424..7d74b702 100644 --- a/tests/scanner/annotation.c +++ b/tests/scanner/annotation.c @@ -174,14 +174,14 @@ regress_annotation_object_class_init (RegressAnnotationObjectClass *klass) "This property is a function pointer", G_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - /** - * RegressAnnotationObject:tab-property: - * - * This is a property regress_annotation intentionally indented with a mix - * of tabs and strings to test the tab handling capabilities of the scanner. - * - * Since: 1.2 - */ + /** + * RegressAnnotationObject:tab-property: + * + * This is a property regress_annotation intentionally indented with a mix + * of tabs and strings to test the tab handling capabilities of the scanner. + * + * Since: 1.2 + */ g_object_class_install_property (gobject_class, PROP_TAB_PROPERTY, g_param_spec_string ("tab-property", -- cgit v1.2.1 From 9625f52b5205f5c6f35b8300d60782a6ad6cb237 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 20 Mar 2013 16:54:53 +0100 Subject: tests: fix a too wide search/replace Changed by accident in 2df621c53cdffbc3c43c3745947ee859020c8338 https://bugzilla.gnome.org/show_bug.cgi?id=697613 --- .../Regress.AnnotationObject-tab-property.page | 2 +- .../Regress.AnnotationObject.page | 2 +- .../Regress.AnnotationObject.watch_full.page | 2 +- .../Regress.annotation_custom_destroy.page | 2 +- .../Regress.AnnotationObject-tab-property.page | 2 +- .../Regress.AnnotationObject.page | 2 +- .../Regress.AnnotationObject.watch_full.page | 2 +- .../Regress.annotation_custom_destroy.page | 2 +- .../Regress.AnnotationObject-tab-property.page | 2 +- .../Regress.AnnotationObject.page | 2 +- .../Regress.AnnotationObject.watch_full.page | 2 +- .../Regress.annotation_custom_destroy.page | 2 +- tests/scanner/Regress-1.0-expected.gir | 23 +++++++++++----------- tests/scanner/annotation.c | 16 +++++++-------- tests/scanner/annotation.h | 2 +- 15 files changed, 32 insertions(+), 33 deletions(-) diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page index 2366f205..446729b7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page @@ -15,7 +15,7 @@ -

This is a property regress_annotation intentionally indented with a mix +

This is a property annotation intentionally indented with a mix of tabs and strings to test the tab handling capabilities of the scanner.

diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page index 80e25466..80d4339e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page @@ -14,7 +14,7 @@ -

This is an object used to test regress_annotations.

+

This is an object used to test annotations.

diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page index 5de06c0c..1fe2080c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page @@ -42,7 +42,7 @@ void regress_annotation_object_watch_full (RegressAnnotationObject* object, -

Test overriding via the "Rename To" regress_annotation.

+

Test overriding via the "Rename To" annotation.

diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page index 8e08a23b..2a474a5e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page @@ -38,7 +38,7 @@ void regress_annotation_custom_destroy (RegressAnnotationCallback callback,

Test messing up the heuristic of closure/destroy-notification -detection, and fixing it via regress_annotations.

+detection, and fixing it via annotations.

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page index 9c797278..c2444fa4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page @@ -18,7 +18,7 @@ -

This is a property regress_annotation intentionally indented with a mix +

This is a property annotation intentionally indented with a mix of tabs and strings to test the tab handling capabilities of the scanner.

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page index 95675a60..f4f01301 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page @@ -23,7 +23,7 @@ let annotation_object = new Regress.AnnotationObject({ -

This is an object used to test regress_annotations.

+

This is an object used to test annotations.

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page index a5ccad47..99bfaf1b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page @@ -29,7 +29,7 @@ function watch_full(func:Regress.AnnotationForeachFunc):void { -

Test overriding via the "Rename To" regress_annotation.

+

Test overriding via the "Rename To" annotation.

diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page index 4cc018c0..c3e96530 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page @@ -30,7 +30,7 @@ function annotation_custom_destroy(callback:Regress.AnnotationCallback):void {

Test messing up the heuristic of closure/destroy-notification -detection, and fixing it via regress_annotations.

+detection, and fixing it via annotations.

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page index ed219fe5..c417d1ee 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page @@ -18,7 +18,7 @@ -

This is a property regress_annotation intentionally indented with a mix +

This is a property annotation intentionally indented with a mix of tabs and strings to test the tab handling capabilities of the scanner.

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page index ec6a11f8..006766fc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page @@ -18,7 +18,7 @@ from gi.repository import Regress annotation_object = Regress.AnnotationObject(function_property=value, string_property=value, tab_property=value) -

This is an object used to test regress_annotations.

+

This is an object used to test annotations.

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page index 28ca71af..66a53d54 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page @@ -42,7 +42,7 @@ def watch_full(self, func, user_data, destroy): -

Test overriding via the "Rename To" regress_annotation.

+

Test overriding via the "Rename To" annotation.

diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page index 7afb97ce..860107f1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page @@ -39,7 +39,7 @@ def annotation_custom_destroy(callback, destroy, data):

Test messing up the heuristic of closure/destroy-notification -detection, and fixing it via regress_annotations.

+detection, and fixing it via annotations.

diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 53773cae..48b4ef7a 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -143,7 +143,7 @@ and/or use gtk-doc annotations. --> glib:get-type="regress_annotation_object_get_type" glib:type-struct="AnnotationObjectClass"> - This is an object used to test regress_annotations. + This is an object used to test annotations. @@ -689,7 +689,7 @@ regress_annotation_object_watch_full(). - Test overriding via the "Rename To" regress_annotation. + Test overriding via the "Rename To" annotation. @@ -753,7 +753,7 @@ regress_annotation_object_watch_full(). writable="1" construct="1" transfer-ownership="none"> - This is a property regress_annotation intentionally indented with a mix + This is a property annotation intentionally indented with a mix of tabs and strings to test the tab handling capabilities of the scanner. @@ -763,18 +763,18 @@ of tabs and strings to test the tab handling capabilities of the scanner. This signal tests a signal with attributes. - + the return value - + a value - + another value @@ -3996,9 +3996,8 @@ the introspection client langage. - - + + The return value. @@ -4008,8 +4007,8 @@ the introspection client langage. - - + + Some data. @@ -4018,7 +4017,7 @@ the introspection client langage. Test messing up the heuristic of closure/destroy-notification -detection, and fixing it via regress_annotations. +detection, and fixing it via annotations. diff --git a/tests/scanner/annotation.c b/tests/scanner/annotation.c index 7d74b702..0a92d3a1 100644 --- a/tests/scanner/annotation.c +++ b/tests/scanner/annotation.c @@ -128,12 +128,12 @@ regress_annotation_object_class_init (RegressAnnotationObjectClass *klass) /** * RegressAnnotationObject::attribute-signal: * @regress_annotation: the regress_annotation object - * @arg1: (attribute some.regress_annotation.foo1 val1): a value - * @arg2: (attribute some.regress_annotation.foo2 val2): another value + * @arg1: (attribute some.annotation.foo1 val1): a value + * @arg2: (attribute some.annotation.foo2 val2): another value * * This signal tests a signal with attributes. * - * Returns: (attribute some.regress_annotation.foo3 val3): the return value + * Returns: (attribute some.annotation.foo3 val3): the return value */ regress_annotation_object_signals[ATTRIBUTE_SIGNAL] = g_signal_new ("attribute-signal", @@ -177,7 +177,7 @@ regress_annotation_object_class_init (RegressAnnotationObjectClass *klass) /** * RegressAnnotationObject:tab-property: * - * This is a property regress_annotation intentionally indented with a mix + * This is a property annotation intentionally indented with a mix * of tabs and strings to test the tab handling capabilities of the scanner. * * Since: 1.2 @@ -622,7 +622,7 @@ regress_annotation_object_watch (RegressAnnotationObject *object, * @user_data: The callback data * @destroy: Destroy notification * - * Test overriding via the "Rename To" regress_annotation. + * Test overriding via the "Rename To" annotation. * * Rename to: regress_annotation_object_watch */ @@ -721,7 +721,7 @@ regress_annotation_object_extra_annos (RegressAnnotationObject *object) * @callback: (destroy destroy) (closure data): Destroy notification * * Test messing up the heuristic of closure/destroy-notification - * detection, and fixing it via regress_annotations. + * detection, and fixing it via annotations. */ void regress_annotation_custom_destroy (RegressAnnotationCallback callback, @@ -763,9 +763,9 @@ regress_annotation_ptr_array (GPtrArray *array) /** * regress_annotation_attribute_func: * @object: A #RegressAnnotationObject. - * @data: (attribute some.regress_annotation value) (attribute another.regress_annotation blahvalue): Some data. + * @data: (attribute some.annotation value) (attribute another.annotation blahvalue): Some data. * - * Returns: (attribute some.other.regress_annotation value2) (attribute yet.another.regress_annotation another_value): The return value. + * Returns: (attribute some.other.annotation value2) (attribute yet.another.annotation another_value): The return value. */ gint regress_annotation_attribute_func (RegressAnnotationObject *object, diff --git a/tests/scanner/annotation.h b/tests/scanner/annotation.h index 154b0d88..66470cbb 100644 --- a/tests/scanner/annotation.h +++ b/tests/scanner/annotation.h @@ -39,7 +39,7 @@ typedef void (*RegressAnnotationNotifyFunc) (gpointer data); /** * RegressAnnotationObject: * - * This is an object used to test regress_annotations. + * This is an object used to test annotations. * * Attributes: (org.example.Test cows) */ -- cgit v1.2.1 From f9f5452209597e0c3724ad962a68b678dbbc72cf Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Thu, 14 Feb 2013 17:44:13 +0100 Subject: giscanner: fix string formatting tuples During review Colin Walters mentioned: """ One thing I should probably explain is my habit of *always* passing a tuple for %. The reason is pretty simple...a long time ago I had an error handler that did: print "unexpected data: %s" % foo. And I'd changed the type of "foo" from a string to a tuple at some point. But this obviously caused "print" to fail because it was expecting multiple format strings. Basically always using tuples is safer in case you change the type of a variable to a tuple. """ This fixes violations of this rule introduced up until now. https://bugzilla.gnome.org/show_bug.cgi?id=697614 --- giscanner/annotationparser.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index 9c0ce5a4..23144576 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -500,7 +500,7 @@ class DocTag(object): if value is not None and value.length() > 1: message.warn( 'closure takes at most 1 value, %d given' % ( - value.length()), self.position) + value.length(), ), self.position) def _validate_element_type(self, option, value): self._validate_option(option, value, required=True) @@ -512,7 +512,7 @@ class DocTag(object): if value.length() > 2: message.warn( 'element-type takes at most 2 values, %d given' % ( - value.length()), self.position) + value.length(), ), self.position) return def _validate_out(self, option, value): @@ -521,13 +521,13 @@ class DocTag(object): if value.length() > 1: message.warn( 'out annotation takes at most 1 value, %d given' % ( - value.length()), self.position) + value.length(), ), self.position) return value_str = value.one() if value_str not in [OPT_OUT_CALLEE_ALLOCATES, OPT_OUT_CALLER_ALLOCATES]: message.warn("out annotation value is invalid: %r" % ( - value_str), self.position) + value_str, ), self.position) return def _get_gtk_doc_value(self): @@ -783,7 +783,7 @@ class AnnotationParser(object): # emit a warning. if comment_block.name in comment_blocks: message.warn("multiple comment blocks documenting '%s:' identifier." % - (comment_block.name), + (comment_block.name, ), comment_block.position) comment_blocks[comment_block.name] = comment_block @@ -892,14 +892,14 @@ class AnnotationParser(object): result = SECTION_RE.match(line) if result: identifier = IDENTIFIER_SECTION - identifier_name = 'SECTION:%s' % (result.group('section_name')) + identifier_name = 'SECTION:%s' % (result.group('section_name'), ) column = result.start('section_name') + column_offset if not identifier: result = SYMBOL_RE.match(line) if result: identifier = IDENTIFIER_SYMBOL - identifier_name = '%s' % (result.group('symbol_name')) + identifier_name = '%s' % (result.group('symbol_name'), ) column = result.start('symbol_name') + column_offset if not identifier: @@ -985,7 +985,7 @@ class AnnotationParser(object): returns_seen = True else: message.warn("encountered multiple 'Returns' parameters or tags for " - "'%s'." % (comment_block.name), + "'%s'." % (comment_block.name, ), position) elif param_name in comment_block.params.keys(): column = result.start('parameter_name') + column_offset @@ -1063,7 +1063,7 @@ class AnnotationParser(object): returns_seen = True else: message.warn("encountered multiple 'Returns' parameters or tags for " - "'%s'." % (comment_block.name), + "'%s'." % (comment_block.name, ), position) tag = DocTag(comment_block, TAG_RETURNS) @@ -1090,7 +1090,7 @@ class AnnotationParser(object): tag.options = self.parse_options(tag, tag_annotations) else: message.warn("annotations not supported for tag '%s:'." % - (tag_name), + (tag_name, ), position) comment_block.tags[tag_name.lower()] = tag current_tag = tag -- cgit v1.2.1 From 93ea709aa40f84e9c5677a7faab345a30072a968 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Fri, 15 Feb 2013 07:06:18 +0100 Subject: giscanner: remove unused variables and imports https://bugzilla.gnome.org/show_bug.cgi?id=697615 --- giscanner/docwriter.py | 6 +++--- giscanner/maintransformer.py | 4 +--- giscanner/sectionparser.py | 1 - 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py index 7924b2d3..b3716ec6 100644 --- a/giscanner/docwriter.py +++ b/giscanner/docwriter.py @@ -219,7 +219,7 @@ class DocFormatter(object): try: prop = self._find_thing(type_node.properties, props['property_name']) - except (AttributeError, KeyError), e: + except (AttributeError, KeyError): return match return self.format_xref(prop) @@ -231,7 +231,7 @@ class DocFormatter(object): try: signal = self._find_thing(type_node.signals, props['signal_name']) - except (AttributeError, KeyError), e: + except (AttributeError, KeyError): return match return self.format_xref(signal) @@ -260,7 +260,7 @@ class DocFormatter(object): def _process_parameter(self, node, match, props): try: parameter = node.get_parameter(props['param_name']) - except (AttributeError, ValueError), e: + except (AttributeError, ValueError): return match return '%s' % (self.format_parameter_name(node, parameter), ) diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py index 049ba9ba..8cfb80f8 100644 --- a/giscanner/maintransformer.py +++ b/giscanner/maintransformer.py @@ -35,9 +35,7 @@ from .annotationparser import (OPT_ALLOW_NONE, OPT_ARRAY, OPT_ATTRIBUTE, OPT_ARRAY_LENGTH, OPT_ARRAY_ZERO_TERMINATED, OPT_CONSTRUCTOR, OPT_METHOD, OPT_TRANSFER_NONE, OPT_TRANSFER_FLOATING) -from .annotationparser import AnnotationParser -from .transformer import TransformerException -from .utils import to_underscores, to_underscores_noprefix +from .utils import to_underscores_noprefix class MainTransformer(object): diff --git a/giscanner/sectionparser.py b/giscanner/sectionparser.py index caf6bf2d..330471b2 100644 --- a/giscanner/sectionparser.py +++ b/giscanner/sectionparser.py @@ -18,7 +18,6 @@ # import re -import sys class SectionFile(object): def __init__(self, sections): -- cgit v1.2.1 From 2806ee7c7db81be0ad164caf68b70163df24386d Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 31 Oct 2012 17:37:47 +0100 Subject: giscanner: prefer "except X as e" over "except X, e" It's more readable and as an added bonus Python 3 compatible. https://bugzilla.gnome.org/show_bug.cgi?id=697616 --- giscanner/cachestore.py | 16 ++++++++-------- giscanner/dumper.py | 8 ++++---- giscanner/gdumpparser.py | 14 +++++++------- giscanner/scannermain.py | 6 +++--- giscanner/transformer.py | 24 ++++++++++++------------ 5 files changed, 34 insertions(+), 34 deletions(-) diff --git a/giscanner/cachestore.py b/giscanner/cachestore.py index 44e3b04c..5f66b66a 100644 --- a/giscanner/cachestore.py +++ b/giscanner/cachestore.py @@ -73,7 +73,7 @@ class CacheStore(object): def __init__(self): try: self._directory = _get_cachedir() - except OSError, e: + except OSError as e: if e.errno != errno.EPERM: raise self._directory = None @@ -88,7 +88,7 @@ class CacheStore(object): version = os.path.join(self._directory, _CACHE_VERSION_FILENAME) try: cache_hash = open(version).read() - except IOError, e: + except IOError as e: # File does not exist if e.errno == errno.ENOENT: cache_hash = 0 @@ -101,7 +101,7 @@ class CacheStore(object): self._clean() try: fp = open(version, 'w') - except IOError, e: + except IOError as e: # Permission denied if e.errno == errno.EACCES: return @@ -126,13 +126,13 @@ class CacheStore(object): def _remove_filename(self, filename): try: os.unlink(filename) - except IOError, e: + except IOError as e: # Permission denied if e.errno == errno.EACCES: return else: raise - except OSError, e: + except OSError as e: # File does not exist if e.errno == errno.ENOENT: return @@ -157,7 +157,7 @@ class CacheStore(object): tmp_fd, tmp_filename = tempfile.mkstemp(prefix='g-ir-scanner-cache-') try: cPickle.dump(data, os.fdopen(tmp_fd, 'w')) - except IOError, e: + except IOError as e: # No space left on device if e.errno == errno.ENOSPC: self._remove_filename(tmp_filename) @@ -167,7 +167,7 @@ class CacheStore(object): try: shutil.move(tmp_filename, store_filename) - except IOError, e: + except IOError as e: # Permission denied if e.errno == errno.EACCES: self._remove_filename(tmp_filename) @@ -180,7 +180,7 @@ class CacheStore(object): return try: fd = open(store_filename) - except IOError, e: + except IOError as e: if e.errno == errno.ENOENT: return None else: diff --git a/giscanner/dumper.py b/giscanner/dumper.py index d95ea6ba..f5346a40 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py @@ -166,14 +166,14 @@ class DumpCompiler(object): try: self._compile(o_path, c_path) - except CompilerError, e: + except CompilerError as e: if not utils.have_debug_flag('save-temps'): shutil.rmtree(tmpdir) raise SystemExit('compilation of temporary binary failed:' + str(e)) try: self._link(bin_path, o_path) - except LinkerError, e: + except LinkerError as e: if not utils.have_debug_flag('save-temps'): shutil.rmtree(tmpdir) raise SystemExit('linking of temporary binary failed: ' + str(e)) @@ -236,7 +236,7 @@ class DumpCompiler(object): sys.stdout.flush() try: subprocess.check_call(args) - except subprocess.CalledProcessError, e: + except subprocess.CalledProcessError as e: raise CompilerError(e) def _link(self, output, *sources): @@ -290,7 +290,7 @@ class DumpCompiler(object): sys.stdout.flush() try: subprocess.check_call(args) - except subprocess.CalledProcessError, e: + except subprocess.CalledProcessError as e: raise LinkerError(e) def _add_link_internal_args(self, args, libtool): diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py index c0b13f4a..79525030 100644 --- a/giscanner/gdumpparser.py +++ b/giscanner/gdumpparser.py @@ -165,7 +165,7 @@ blob containing data gleaned from GObject's primitive introspection.""" try: try: subprocess.check_call(args, stdout=sys.stdout, stderr=sys.stderr) - except subprocess.CalledProcessError, e: + except subprocess.CalledProcessError as e: # Clean up temporaries raise SystemExit(e) return parse(out_path) @@ -251,7 +251,7 @@ blob containing data gleaned from GObject's primitive introspection.""" (get_type, c_symbol_prefix) = self._split_type_and_symbol_prefix(xmlnode) try: enum_name = self._transformer.strip_identifier(type_name) - except TransformerException, e: + except TransformerException as e: message.fatal(e) # The scanned member values are more accurate than the values that the @@ -316,7 +316,7 @@ different --identifier-prefix.""" % (xmlnode.attrib['name'], self._namespace.ide (get_type, c_symbol_prefix) = self._split_type_and_symbol_prefix(xmlnode) try: object_name = self._transformer.strip_identifier(type_name) - except TransformerException, e: + except TransformerException as e: message.fatal(e) node = ast.Class(object_name, None, gtype_name=type_name, @@ -346,7 +346,7 @@ different --identifier-prefix.""" % (xmlnode.attrib['name'], self._namespace.ide (get_type, c_symbol_prefix) = self._split_type_and_symbol_prefix(xmlnode) try: interface_name = self._transformer.strip_identifier(type_name) - except TransformerException, e: + except TransformerException as e: message.fatal(e) node = ast.Interface(interface_name, None, gtype_name=type_name, @@ -391,7 +391,7 @@ different --identifier-prefix.""" % (xmlnode.attrib['name'], self._namespace.ide try: name = self._transformer.strip_identifier(type_name) - except TransformerException, e: + except TransformerException as e: message.fatal(e) # This one doesn't go in the main namespace; we associate it with # the struct or union @@ -465,7 +465,7 @@ different --identifier-prefix.""" % (xmlnode.attrib['name'], self._namespace.ide (get_type, c_symbol_prefix) = self._split_type_and_symbol_prefix(xmlnode) try: fundamental_name = self._transformer.strip_identifier(type_name) - except TransformerException, e: + except TransformerException as e: message.warn(e) return @@ -509,7 +509,7 @@ different --identifier-prefix.""" % (xmlnode.attrib['name'], self._namespace.ide def _pair_boxed_type(self, boxed): try: name = self._transformer.strip_identifier(boxed.gtype_name) - except TransformerException, e: + except TransformerException as e: message.fatal(e) pair_node = self._namespace.get(name) if not pair_node: diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py index 42867f08..b068f6fb 100755 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -393,7 +393,7 @@ def write_output(data, options): os.unlink(temp_f_name) try: shutil.move(main_f_name, options.output) - except OSError, e: + except OSError as e: if e.errno == errno.EPERM: os.unlink(main_f_name) return 0 @@ -402,12 +402,12 @@ def write_output(data, options): else: try: output = open(options.output, "w") - except IOError, e: + except IOError as e: _error("opening output for writing: %s" % (e.strerror, )) try: output.write(data) - except IOError, e: + except IOError as e: _error("while writing output: %s" % (e.strerror, )) def scanner_main(args): diff --git a/giscanner/transformer.py b/giscanner/transformer.py index 3513fc8c..2708f0a6 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -289,7 +289,7 @@ raise ValueError.""" ident = ident[1:] try: matches = self.split_ctype_namespaces(ident) - except ValueError, e: + except ValueError as e: raise TransformerException(str(e)) for ns, name in matches: if ns is self._namespace: @@ -309,7 +309,7 @@ raise ValueError.""" ident = ident[1:] try: (ns, name) = self.split_csymbol(ident) - except ValueError, e: + except ValueError as e: raise TransformerException(str(e)) if ns != self._namespace: raise TransformerException( @@ -383,7 +383,7 @@ raise ValueError.""" # prefix. try: name = self._strip_symbol(child) - except TransformerException, e: + except TransformerException as e: message.warn_symbol(symbol, e) return None members.append(ast.Member(name.lower(), @@ -393,7 +393,7 @@ raise ValueError.""" try: enum_name = self.strip_identifier(symbol.ident) - except TransformerException, e: + except TransformerException as e: message.warn_symbol(symbol, e) return None if symbol.base_type.is_bitfield: @@ -412,7 +412,7 @@ raise ValueError.""" return_ = self._create_return(symbol.base_type.base_type) try: name = self._strip_symbol(symbol) - except TransformerException, e: + except TransformerException as e: message.warn_symbol(symbol, e) return None func = ast.Function(name, return_, parameters, False, symbol.ident) @@ -580,7 +580,7 @@ raise ValueError.""" CTYPE_VOID): try: name = self.strip_identifier(symbol.ident) - except TransformerException, e: + except TransformerException as e: message.warn(e) return None if symbol.base_type.name: @@ -723,7 +723,7 @@ raise ValueError.""" return None try: name = self._strip_symbol(symbol) - except TransformerException, e: + except TransformerException as e: message.warn_symbol(symbol, e) return None if symbol.const_string is not None: @@ -765,7 +765,7 @@ raise ValueError.""" def _create_typedef_struct(self, symbol, disguised=False): try: name = self.strip_identifier(symbol.ident) - except TransformerException, e: + except TransformerException as e: message.warn_symbol(symbol, e) return None struct = ast.Record(name, symbol.ident, disguised=disguised) @@ -777,7 +777,7 @@ raise ValueError.""" def _create_typedef_union(self, symbol): try: name = self.strip_identifier(symbol.ident) - except TransformerException, e: + except TransformerException as e: message.warn(e) return None union = ast.Union(name, symbol.ident) @@ -825,7 +825,7 @@ raise ValueError.""" else: try: name = self.strip_identifier(symbol.ident) - except TransformerException, e: + except TransformerException as e: message.warn(e) return None compound = klass(name, symbol.ident) @@ -855,13 +855,13 @@ raise ValueError.""" elif symbol.ident.find('_') > 0: try: name = self._strip_symbol(symbol) - except TransformerException, e: + except TransformerException as e: message.warn_symbol(symbol, e) return None else: try: name = self.strip_identifier(symbol.ident) - except TransformerException, e: + except TransformerException as e: message.warn(e) return None callback = ast.Callback(name, retval, parameters, False, -- cgit v1.2.1 From 2734e9a3334db0304c07bd892a863db076c3a543 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 13 Feb 2013 17:23:10 +0100 Subject: giscanner: don't shadow built-in 'type' symbol use the documented __exit__ signature instead https://bugzilla.gnome.org/show_bug.cgi?id=697619 --- giscanner/libtoolimporter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giscanner/libtoolimporter.py b/giscanner/libtoolimporter.py index 20bd0053..0d26b0c5 100644 --- a/giscanner/libtoolimporter.py +++ b/giscanner/libtoolimporter.py @@ -72,5 +72,5 @@ class LibtoolImporter(object): sys.meta_path.append(cls) @classmethod - def __exit__(cls, type, value, traceback): + def __exit__(cls, exc_type, exc_val, exc_tb): sys.meta_path.remove(cls) -- cgit v1.2.1 From 5ed56c0b62f917b448d28bf4742300fa173dbd90 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Thu, 14 Feb 2013 17:41:49 +0100 Subject: giscanner: use SqlAlchemy's OrderedDict implementation g-ir-scanner can be a bit on the slow side. While true we now do a bit more work parsing GTK-Doc comment blocks and more is still to come, one of the biggest hotspots besides what's going on in _giscanner.SourceScanner() comes from the OrderedDict implementations we have been using. For example, time needed to build Gtk-3.0.gir on a relatively slow machine using "python2 -m cProfile -o $prefix/bin/g-ir-scanner ...": 1) Our original DictMixin sublass: 92,79867 seconds 2) Python's collections.OrderedDict class: 88,65786 seconds 3) Larosa/Foord implementation from http://www.voidspace.org.uk/python/odict.html : 71,64323 seconds 4) SqlAlchemy's implementation: 66,12449 seconds Looks like we have a clear winner with the SqlAclchemy implementation, which comes in at around 20 seconds without profiling on the same machine. Not bad. https://bugzilla.gnome.org/show_bug.cgi?id=697620 --- giscanner/annotationparser.py | 8 +-- giscanner/ast.py | 4 +- giscanner/odict.py | 111 +++++++++++++++++++++++++++++++++--------- 3 files changed, 95 insertions(+), 28 deletions(-) diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index 23144576..f722346c 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -26,7 +26,7 @@ import re from . import message -from .odict import odict +from .odict import OrderedDict # GTK-Doc comment block parts @@ -367,9 +367,9 @@ class DocBlock(object): self.name = name self.options = DocOptions() self.value = None - self.tags = odict() + self.tags = OrderedDict() self.comment = None - self.params = odict() + self.params = OrderedDict() self.position = None def __cmp__(self, other): @@ -655,7 +655,7 @@ class DocOption(object): def __init__(self, tag, option): self.tag = tag self._array = [] - self._dict = odict() + self._dict = OrderedDict() # (annotation option1=value1 option2=value2) etc for p in option.split(' '): if '=' in p: diff --git a/giscanner/ast.py b/giscanner/ast.py index 58540912..d307b553 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -25,7 +25,7 @@ from itertools import chain from . import message from .message import Position -from .odict import odict +from .odict import OrderedDict from .utils import to_underscores class Type(object): @@ -367,7 +367,7 @@ class Namespace(object): self.symbol_prefixes = [to_underscores(p).lower() for p in ps] # cache upper-cased versions self._ucase_symbol_prefixes = [p.upper() for p in self.symbol_prefixes] - self.names = odict() # Maps from GIName -> node + self.names = OrderedDict() # Maps from GIName -> node self.aliases = {} # Maps from GIName -> GIName self.type_names = {} # Maps from GTName -> node self.ctypes = {} # Maps from CType -> node diff --git a/giscanner/odict.py b/giscanner/odict.py index fa164c31..f9558954 100644 --- a/giscanner/odict.py +++ b/giscanner/odict.py @@ -16,35 +16,102 @@ # License along with this library; if not, write to the # Free Software Foundation, Inc., 59 Temple Place - Suite 330, # Boston, MA 02111-1307, USA. + + +# Borrowed from: +# http://hg.sqlalchemy.org/sqlalchemy/raw-file/77e2264283d4/lib/sqlalchemy/util/_collections.py +# http://hg.sqlalchemy.org/sqlalchemy/raw-file/77e2264283d4/AUTHORS +# +# util/_collections.py +# Copyright (C) 2005-2012 the SQLAlchemy authors and contributors # +# This module is part of SQLAlchemy and is released under +# the MIT License: http://www.opensource.org/licenses/mit-license.php +class OrderedDict(dict): + """A dict that returns keys/values/items in the order they were added.""" + + def __init__(self, ____sequence=None, **kwargs): + self._list = [] + if ____sequence is None: + if kwargs: + self.update(**kwargs) + else: + self.update(____sequence, **kwargs) + + def clear(self): + self._list = [] + dict.clear(self) + + def copy(self): + return self.__copy__() + + def __copy__(self): + return OrderedDict(self) + + def sort(self, *arg, **kw): + self._list.sort(*arg, **kw) + + def update(self, ____sequence=None, **kwargs): + if ____sequence is not None: + if hasattr(____sequence, 'keys'): + for key in ____sequence.keys(): + self.__setitem__(key, ____sequence[key]) + else: + for key, value in ____sequence: + self[key] = value + if kwargs: + self.update(kwargs) + + def setdefault(self, key, value): + if key not in self: + self.__setitem__(key, value) + return value + else: + return self.__getitem__(key) + + def __iter__(self): + return iter(self._list) + + def values(self): + return [self[key] for key in self._list] -"""odict - an ordered dictionary""" + def itervalues(self): + return iter([self[key] for key in self._list]) -try: - # Starting with Python 2.7 we can use collections.OrderedDict - from collections import OrderedDict as odict -except ImportError: - # But we still support Python 2.5 and 2.6 - from UserDict import DictMixin + def keys(self): + return list(self._list) + def iterkeys(self): + return iter(self.keys()) - class odict(DictMixin): + def items(self): + return [(key, self[key]) for key in self.keys()] - def __init__(self): - self._items = {} - self._keys = [] + def iteritems(self): + return iter(self.items()) - def __setitem__(self, key, value): - if key not in self._items: - self._keys.append(key) - self._items[key] = value + def __setitem__(self, key, obj): + if key not in self: + try: + self._list.append(key) + except AttributeError: + # work around Python pickle loads() with + # dict subclass (seems to ignore __setstate__?) + self._list = [key] + dict.__setitem__(self, key, obj) - def __getitem__(self, key): - return self._items[key] + def __delitem__(self, key): + dict.__delitem__(self, key) + self._list.remove(key) - def __delitem__(self, key): - del self._items[key] - self._keys.remove(key) + def pop(self, key, *default): + present = key in self + value = dict.pop(self, key, *default) + if present: + self._list.remove(key) + return value - def keys(self): - return self._keys[:] + def popitem(self): + item = dict.popitem(self) + self._list.remove(item[0]) + return item -- cgit v1.2.1 From e4b98d842ee34bf06e1afd22966ffe56885f546b Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Fri, 28 Dec 2012 13:24:55 +0100 Subject: giscanner: fix broken xml:whitespace attributes in .gir files The XML specification clearly states it's xml:space http://www.w3.org/TR/xml/#sec-white-space https://bugzilla.gnome.org/show_bug.cgi?id=628739 --- giscanner/girwriter.py | 2 +- tests/scanner/Foo-1.0-expected.gir | 54 +-- tests/scanner/GetType-1.0-expected.gir | 14 +- tests/scanner/Regress-1.0-expected.gir | 648 ++++++++++++++++----------------- 4 files changed, 359 insertions(+), 359 deletions(-) diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py index d6b3485b..2578a331 100644 --- a/giscanner/girwriter.py +++ b/giscanner/girwriter.py @@ -126,7 +126,7 @@ and/or use gtk-doc annotations. ''') for key, value in node.attributes: self.write_tag('attribute', [('name', key), ('value', value)]) if hasattr(node, 'doc') and node.doc: - self.write_tag('doc', [('xml:whitespace', 'preserve')], + self.write_tag('doc', [('xml:space', 'preserve')], node.doc) def _append_node_generic(self, node, attrs): diff --git a/tests/scanner/Foo-1.0-expected.gir b/tests/scanner/Foo-1.0-expected.gir index 40186dfd..8ef7c203 100644 --- a/tests/scanner/Foo-1.0-expected.gir +++ b/tests/scanner/Foo-1.0-expected.gir @@ -440,10 +440,10 @@ and/or use gtk-doc annotations. --> - This function is intended to match clutter_stage_get_default which + This function is intended to match clutter_stage_get_default which uses a C sugar return type. - The global #FooSubobject + The global #FooSubobject @@ -453,7 +453,7 @@ uses a C sugar return type. - Read some stuff. + Read some stuff. @@ -462,11 +462,11 @@ uses a C sugar return type. - offset + offset - length + length @@ -486,7 +486,7 @@ uses a C sugar return type. - This shouldn't be scanned as a constructor. + This shouldn't be scanned as a constructor. @@ -511,12 +511,12 @@ uses a C sugar return type. - %NULL always + %NULL always - a #FooObject + a #FooObject @@ -560,7 +560,7 @@ uses a C sugar return type. - Not sure why this test is here... + Not sure why this test is here... @@ -574,21 +574,21 @@ uses a C sugar return type. - Read some stuff. + Read some stuff. - obj + obj - offset + offset - length + length @@ -596,13 +596,13 @@ uses a C sugar return type. - This is only useful from C. + This is only useful from C. - obj + obj @@ -719,11 +719,11 @@ uses a C sugar return type. - offset + offset - length + length @@ -773,17 +773,17 @@ uses a C sugar return type. direction="inout" caller-allocates="0" transfer-ownership="full"> - add to this rect + add to this rect - source rectangle + source rectangle - This is a C convenience constructor; we have to (skip) + This is a C convenience constructor; we have to (skip) it because it's not a boxed type. @@ -808,13 +808,13 @@ it because it's not a boxed type. - Some type that is only interesting from C and should not be + Some type that is only interesting from C and should not be exposed to language bindings. - a skippable enum value + a skippable enum value - another skippable enum value + another skippable enum value @@ -1213,7 +1213,7 @@ exposed to language bindings. - This should be scanned as a top-level function, and shouldn't cause + This should be scanned as a top-level function, and shouldn't cause a "Can't find matching type for constructor" warning. @@ -1223,7 +1223,7 @@ a "Can't find matching type for constructor" warning. c:identifier="foo_rectangle_new" moved-to="Rectangle.new" introspectable="0"> - This is a C convenience constructor; we have to (skip) + This is a C convenience constructor; we have to (skip) it because it's not a boxed type. @@ -1244,14 +1244,14 @@ it because it's not a boxed type. - Does something that's only interesting from C and should not be + Does something that's only interesting from C and should not be exposed to language bindings. - a #FooSkippable + a #FooSkippable diff --git a/tests/scanner/GetType-1.0-expected.gir b/tests/scanner/GetType-1.0-expected.gir index 7d5c1bca..ae17525d 100644 --- a/tests/scanner/GetType-1.0-expected.gir +++ b/tests/scanner/GetType-1.0-expected.gir @@ -28,33 +28,33 @@ and/or use gtk-doc annotations. --> - This shouldn't be scanned as a *_get_type function because it doesn't return + This shouldn't be scanned as a *_get_type function because it doesn't return a GType. It will generate a warning. - true + true - This shouldn't be scanned as a *_get_type function because it doesn't return + This shouldn't be scanned as a *_get_type function because it doesn't return a GType. It will generate a warning. - true + true - This shouldn't be scanned as a *_get_type function because it takes + This shouldn't be scanned as a *_get_type function because it takes arguments. - 0 + 0 - self + self diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 48b4ef7a..2d8091b5 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -16,7 +16,7 @@ and/or use gtk-doc annotations. --> c:identifier-prefixes="Regress" c:symbol-prefixes="regress"> - Typedef TestBoxed to test caller-allocates correctness + Typedef TestBoxed to test caller-allocates correctness @@ -26,18 +26,18 @@ and/or use gtk-doc annotations. --> - Compatibility typedef, like telepathy-glib's TpIntSet + Compatibility typedef, like telepathy-glib's TpIntSet - Typedef'd GPtrArray for some reason + Typedef'd GPtrArray for some reason - Typedef'd va_list for additional reasons + Typedef'd va_list for additional reasons value="10000000000UL" c:type="REGRESS_ANNOTATION_CALCULATED_LARGE" version="1.4"> - Constant to define a calculated large value + Constant to define a calculated large value - Constant to define a calculated large value + Constant to define a calculated large value - This is a callback. + This is a callback. - array of ints + array of ints - array of ints + array of ints @@ -106,16 +106,16 @@ and/or use gtk-doc annotations. --> - This is a callback taking a list. + This is a callback taking a list. - list of strings + list of strings - list of strings + list of strings @@ -123,14 +123,14 @@ and/or use gtk-doc annotations. --> - This is a callback with a 'closure' argument that is not named + This is a callback with a 'closure' argument that is not named 'user_data' and hence has to be annotated. - The user data + The user data @@ -143,16 +143,16 @@ and/or use gtk-doc annotations. --> glib:get-type="regress_annotation_object_get_type" glib:type-struct="AnnotationObjectClass"> - This is an object used to test annotations. + This is an object used to test annotations. - %NULL always + %NULL always - a #GObject + a #GObject @@ -162,66 +162,66 @@ and/or use gtk-doc annotations. --> - This is a test for out arguments; GObject defaults to transfer + This is a test for out arguments; GObject defaults to transfer - an int + an int - a #GObject + a #GObject - a #GObject + a #GObject - This is a test for out arguments, one transferred, other not + This is a test for out arguments, one transferred, other not - an int + an int - a #GObject + a #GObject - a #GObject + a #GObject - a #GObject + a #GObject - Test taking a zero-terminated array + Test taking a zero-terminated array - a #GObject + a #GObject - Sequence of numbers + Sequence of numbers @@ -230,60 +230,60 @@ and/or use gtk-doc annotations. --> - Test taking an array with length parameter + Test taking an array with length parameter - a #GObject + a #GObject - Sequence of numbers that are zero-terminated + Sequence of numbers that are zero-terminated - Length of number array + Length of number array - Test taking a zero-terminated array with length parameter + Test taking a zero-terminated array with length parameter - a #RegressAnnotationObject + a #RegressAnnotationObject - Sequence of numbers that are zero-terminated + Sequence of numbers that are zero-terminated - Length of number array + Length of number array - Test returning a caller-owned object + Test returning a caller-owned object - The object + The object - a #GObject + a #GObject @@ -293,12 +293,12 @@ and/or use gtk-doc annotations. --> deprecated="Use regress_annotation_object_create_object() instead." deprecated-version="0.12"> - %NULL always + %NULL always - a #GObject + a #GObject @@ -316,35 +316,35 @@ and/or use gtk-doc annotations. --> - Test taking a call-scoped callback + Test taking a call-scoped callback - a #RegressAnnotationObject + a #RegressAnnotationObject - Callback to invoke + Callback to invoke - Callback user data + Callback user data - This is a test for returning a hash table mapping strings to + This is a test for returning a hash table mapping strings to objects. - hash table + hash table @@ -352,42 +352,42 @@ objects. - a #GObject + a #GObject - This is a test for returning a list of objects. + This is a test for returning a list of objects. The list itself should be freed, but not the internal objects, intentionally similar example to gtk_container_get_children - list of objects + list of objects - a #GObject + a #GObject - This is a test for returning a list of strings, where + This is a test for returning a list of strings, where each string needs to be freed. - list of strings + list of strings - a #GObject + a #GObject @@ -399,77 +399,77 @@ each string needs to be freed. - A #RegressAnnotationObject + A #RegressAnnotationObject - This is a test for in arguments + This is a test for in arguments - an int + an int - a #GObject + a #GObject - This is an argument test + This is an argument test - This is a test for out arguments + This is a test for out arguments - an int + an int - a #GObject + a #GObject - This is an argument test + This is an argument test - This is a second test for out arguments + This is a second test for out arguments - an int + an int - a #GObject + a #GObject - This is an argument test + This is an argument test - This is a 3th test for out arguments + This is a 3th test for out arguments - an int + an int - a #GObject + a #GObject caller-allocates="0" transfer-ownership="full" allow-none="1"> - This is an argument test + This is an argument test - an int + an int - a #GObject + a #GObject - An object, not referenced + An object, not referenced - a #GObject + a #GObject - This is a test for out arguments + This is a test for out arguments - an int + an int - a #GObject + a #GObject - This is an argument test + This is an argument test - Test taking a zero-terminated array with length parameter + Test taking a zero-terminated array with length parameter - a #RegressAnnotationObject + a #RegressAnnotationObject - Length of the argument vector + Length of the argument vector - Argument vector + Argument vector @@ -557,91 +557,91 @@ each string needs to be freed. - Test taking a guchar * with a length. + Test taking a guchar * with a length. - a #RegressAnnotationObject + a #RegressAnnotationObject - The data + The data - Length of the data + Length of the data - Test taking a gchar * with a length. + Test taking a gchar * with a length. - a #RegressAnnotationObject + a #RegressAnnotationObject - The data + The data - Length of the data + Length of the data - Test taking a gchar * with a length, overriding the array element + Test taking a gchar * with a length, overriding the array element type. - a #RegressAnnotationObject + a #RegressAnnotationObject - The data + The data - Length of the data + Length of the data - Test returning a string as an out parameter + Test returning a string as an out parameter - some boolean + some boolean - a #RegressAnnotationObject + a #RegressAnnotationObject - string return value + string return value @@ -653,7 +653,7 @@ type. - a #GObject + a #GObject @@ -665,23 +665,23 @@ type. c:identifier="regress_annotation_object_watch" shadowed-by="watch_full" introspectable="0"> - This is here just for the sake of being overriden by its + This is here just for the sake of being overriden by its regress_annotation_object_watch_full(). - A #RegressAnnotationObject + A #RegressAnnotationObject - The callback + The callback - The callback data + The callback data @@ -689,13 +689,13 @@ regress_annotation_object_watch_full(). - Test overriding via the "Rename To" annotation. + Test overriding via the "Rename To" annotation. - A #RegressAnnotationObject + A #RegressAnnotationObject scope="notified" closure="1" destroy="2"> - The callback + The callback - The callback data + The callback data - Destroy notification + Destroy notification @@ -727,7 +727,7 @@ regress_annotation_object_watch_full(). - Opaque pointer handle + Opaque pointer handle @@ -745,7 +745,7 @@ regress_annotation_object_watch_full(). writable="1" construct="1" transfer-ownership="none"> - This is a property which is a string + This is a property which is a string writable="1" construct="1" transfer-ownership="none"> - This is a property annotation intentionally indented with a mix + This is a property annotation intentionally indented with a mix of tabs and strings to test the tab handling capabilities of the scanner. @@ -761,27 +761,27 @@ of tabs and strings to test the tab handling capabilities of the scanner. - This signal tests a signal with attributes. + This signal tests a signal with attributes. - the return value + the return value - a value + a value - another value + another value - This signal tests an empty document argument (@arg1) + This signal tests an empty document argument (@arg1) @@ -792,14 +792,14 @@ of tabs and strings to test the tab handling capabilities of the scanner. - This is a signal which takes a list of strings, but it's not + This is a signal which takes a list of strings, but it's not known by GObject as it's only marked as G_TYPE_POINTER - a list of strings + a list of strings @@ -811,14 +811,14 @@ known by GObject as it's only marked as G_TYPE_POINTER version="1.0" deprecated="Use other-signal instead" deprecated-version="1.2"> - This is a signal which has a broken signal handler, + This is a signal which has a broken signal handler, it says it's pointer but it's actually a string. - a string + a string @@ -832,7 +832,7 @@ it says it's pointer but it's actually a string. - This is a test of an array of object in an field of a struct. + This is a test of an array of object in an field of a struct. - This function is intended to match clutter_stage_get_default which + This function is intended to match clutter_stage_get_default which uses a C sugar return type. - The global #RegressFooSubobject + The global #RegressFooSubobject @@ -1300,7 +1300,7 @@ uses a C sugar return type. - Read some stuff. + Read some stuff. @@ -1309,11 +1309,11 @@ uses a C sugar return type. - offset + offset - length + length @@ -1333,7 +1333,7 @@ uses a C sugar return type. - This shouldn't be scanned as a constructor. + This shouldn't be scanned as a constructor. @@ -1359,12 +1359,12 @@ uses a C sugar return type. - %NULL always + %NULL always - a #RegressFooObject + a #RegressFooObject @@ -1410,7 +1410,7 @@ uses a C sugar return type. - Not sure why this test is here... + Not sure why this test is here... @@ -1424,21 +1424,21 @@ uses a C sugar return type. - Read some stuff. + Read some stuff. - obj + obj - offset + offset - length + length @@ -1446,13 +1446,13 @@ uses a C sugar return type. - This is only useful from C. + This is only useful from C. - obj + obj @@ -1570,11 +1570,11 @@ uses a C sugar return type. - offset + offset - length + length @@ -1621,11 +1621,11 @@ uses a C sugar return type. direction="inout" caller-allocates="0" transfer-ownership="full"> - add to this rect + add to this rect - source rectangle + source rectangle @@ -1633,7 +1633,7 @@ uses a C sugar return type. - This is a C convenience constructor; we have to (skip) + This is a C convenience constructor; we have to (skip) it because it's not a boxed type. @@ -1657,13 +1657,13 @@ it because it's not a boxed type. - Some type that is only interesting from C and should not be + Some type that is only interesting from C and should not be exposed to language bindings. - a skippable enum value + a skippable enum value - another skippable enum value + another skippable enum value @@ -1925,7 +1925,7 @@ exposed to language bindings. - Like telepathy-glib's TpIntset. + Like telepathy-glib's TpIntset. - This should be skipped, and moreover, all function which + This should be skipped, and moreover, all function which use it should be. @@ -2227,15 +2227,15 @@ use it should be. - the investment rate + the investment rate - how much money + how much money - Path to file + Path to file @@ -2257,7 +2257,7 @@ use it should be. - a hash table; will be modified + a hash table; will be modified @@ -2272,7 +2272,7 @@ use it should be. - GError instance; must be freed by the callback + GError instance; must be freed by the callback @@ -2307,18 +2307,18 @@ use it should be. glib:type-name="RegressTestEnum" glib:get-type="regress_test_enum_get_type" c:type="RegressTestEnum"> - By purpose, not all members have documentation + By purpose, not all members have documentation - value 1 + value 1 - value 2 + value 2 glib:type-struct="TestFloatingClass"> - A new floating #RegressTestFloating + A new floating #RegressTestFloating @@ -2449,7 +2449,7 @@ use it should be. glib:get-value-func="regress_test_value_get_fundamental_object"> - A new #RegressTestFundamentalObject + A new #RegressTestFundamentalObject @@ -2697,7 +2697,7 @@ use it should be. - A #RegressTestObj + A #RegressTestObj @@ -2746,7 +2746,7 @@ use it should be. caller-allocates="0" transfer-ownership="full" allow-none="1"> - A #RegressTestObj + A #RegressTestObj @@ -2785,13 +2785,13 @@ use it should be. - Another object + Another object - This method is virtual. Notably its name differs from the virtual + This method is virtual. Notably its name differs from the virtual slot name, which makes it useful for testing bindings handle this case. @@ -2802,13 +2802,13 @@ case. - Meaningless string + Meaningless string - This method is virtual. Notably its name differs from the virtual + This method is virtual. Notably its name differs from the virtual slot name, which makes it useful for testing bindings handle this case. @@ -2816,11 +2816,11 @@ case. - A #RegressTestObj + A #RegressTestObj - Meaningless string + Meaningless string @@ -2875,7 +2875,7 @@ case. - A #RegressTestObj + A #RegressTestObj @@ -2924,29 +2924,29 @@ case. - Check that the out value is skipped + Check that the out value is skipped - %TRUE if the call succeeds, %FALSE if @error is set. + %TRUE if the call succeeds, %FALSE if @error is set. - A #RegressTestObj. + A #RegressTestObj. - Parameter. + Parameter. - Return value. + Return value. - Other parameter. + Other parameter. caller-allocates="0" transfer-ownership="full" skip="1"> - Will be incremented. + Will be incremented. - Return value. + Return value. - Number. + Number. - Number. + Number. @@ -2977,18 +2977,18 @@ case. - Check that the out value is skipped + Check that the out value is skipped - %TRUE if the call succeeds, %FALSE if @error is set. + %TRUE if the call succeeds, %FALSE if @error is set. - A #RegressTestObj. + A #RegressTestObj. - Parameter. + Parameter. caller-allocates="0" transfer-ownership="full" skip="1"> - Return value. + Return value. - Other parameter. + Other parameter. - Will be incremented. + Will be incremented. - Return value. + Return value. - Number. + Number. - Number. + Number. @@ -3030,51 +3030,51 @@ case. - Check that a parameter is skipped + Check that a parameter is skipped - %TRUE if the call succeeds, %FALSE if @error is set. + %TRUE if the call succeeds, %FALSE if @error is set. - A #RegressTestObj. + A #RegressTestObj. - Parameter. + Parameter. - Return value. + Return value. - Other parameter. + Other parameter. - Will be incremented. + Will be incremented. - Return value. + Return value. - Number. + Number. - Number. + Number. @@ -3082,51 +3082,51 @@ case. - Check that the return value is skipped + Check that the return value is skipped - %TRUE if the call succeeds, %FALSE if @error is set. + %TRUE if the call succeeds, %FALSE if @error is set. - a #RegressTestObj + a #RegressTestObj - Parameter. + Parameter. - A return value. + A return value. - Other parameter. + Other parameter. - Will be incremented. + Will be incremented. - Return value. + Return value. - Number. + Number. - Number. + Number. @@ -3134,19 +3134,19 @@ case. - Check that the return value is skipped. Succeed if a is nonzero, otherwise + Check that the return value is skipped. Succeed if a is nonzero, otherwise raise an error. - %TRUE if the call succeeds, %FALSE if @error is set. + %TRUE if the call succeeds, %FALSE if @error is set. - a #RegressTestObj + a #RegressTestObj - Parameter. + Parameter. @@ -3158,7 +3158,7 @@ raise an error. - A #RegressTestObj + A #RegressTestObj @@ -3193,13 +3193,13 @@ raise an error. - This function throws an error if m is odd. + This function throws an error if m is odd. - A #RegressTestObj + A #RegressTestObj @@ -3332,32 +3332,32 @@ raise an error. - This test signal similar to GSettings::change-event + This test signal similar to GSettings::change-event - numbers, or %NULL + numbers, or %NULL - length of @arr, or 0 + length of @arr, or 0 - This test signal is like TelepathyGlib's + This test signal is like TelepathyGlib's TpChannel:: group-members-changed-detailed: - numbers + numbers @@ -3370,13 +3370,13 @@ raise an error. - A cairo context. + A cairo context. - This test signal is like TelepathyGlib's + This test signal is like TelepathyGlib's TpAccount::status-changed @@ -3391,14 +3391,14 @@ raise an error. - You can use this with regress_test_obj_emit_sig_with_int64, or raise from + You can use this with regress_test_obj_emit_sig_with_int64, or raise from the introspection client langage. - an integer + an integer @@ -3411,32 +3411,32 @@ the introspection client langage. - an integer + an integer - Test transfer none GObject as a param (tests refcounting). + Test transfer none GObject as a param (tests refcounting). Use with regress_test_obj_emit_sig_with_obj - A newly created RegressTestObj + A newly created RegressTestObj - Test GStrv as a param. + Test GStrv as a param. - strings + strings @@ -3444,14 +3444,14 @@ Use with regress_test_obj_emit_sig_with_obj - You can use this with regress_test_obj_emit_sig_with_uint64, or raise from + You can use this with regress_test_obj_emit_sig_with_uint64, or raise from the introspection client langage. - an integer + an integer @@ -3491,7 +3491,7 @@ the introspection client langage. - Meaningless string + Meaningless string @@ -3507,7 +3507,7 @@ the introspection client langage. - Another object + Another object @@ -3685,20 +3685,20 @@ the introspection client langage. - Make a copy of a RegressTestStructA + Make a copy of a RegressTestStructA - the structure + the structure - the cloned structure + the cloned structure @@ -3712,11 +3712,11 @@ the introspection client langage. direction="out" caller-allocates="1" transfer-ownership="none"> - the structure that is to be filled + the structure that is to be filled - ignored + ignored @@ -3730,20 +3730,20 @@ the introspection client langage. - Make a copy of a RegressTestStructB + Make a copy of a RegressTestStructB - the structure + the structure - the cloned structure + the cloned structure @@ -3998,25 +3998,25 @@ the introspection client langage. - The return value. + The return value. - A #RegressAnnotationObject. + A #RegressAnnotationObject. - Some data. + Some data. - Test messing up the heuristic of closure/destroy-notification + Test messing up the heuristic of closure/destroy-notification detection, and fixing it via annotations. @@ -4027,7 +4027,7 @@ detection, and fixing it via annotations. scope="notified" closure="2" destroy="1"> - Destroy notification + Destroy notification - Source file + Source file @@ -4058,14 +4058,14 @@ detection, and fixing it via annotations. direction="inout" caller-allocates="0" transfer-ownership="full"> - The number of args. + The number of args. - The arguments. + The arguments. @@ -4079,7 +4079,7 @@ detection, and fixing it via annotations. - some text (e.g. example) or else + some text (e.g. example) or else @@ -4091,7 +4091,7 @@ detection, and fixing it via annotations. - the array + the array @@ -4101,7 +4101,7 @@ detection, and fixing it via annotations. - The return value + The return value @@ -4111,7 +4111,7 @@ detection, and fixing it via annotations. direction="out" caller-allocates="0" transfer-ownership="full"> - Number of return values + Number of return values @@ -4119,7 +4119,7 @@ detection, and fixing it via annotations. - An annotated filename + An annotated filename @@ -4130,14 +4130,14 @@ detection, and fixing it via annotations. - Source file + Source file - Explicitly test having a space after the ** here. + Explicitly test having a space after the ** here. @@ -4161,7 +4161,7 @@ detection, and fixing it via annotations. - The return value + The return value @@ -4185,16 +4185,16 @@ detection, and fixing it via annotations. - See https://bugzilla.gnome.org/show_bug.cgi?id=630862 + See https://bugzilla.gnome.org/show_bug.cgi?id=630862 - An object, note the colon:in here + An object, note the colon:in here - A floating object + A floating object @@ -4323,7 +4323,7 @@ detection, and fixing it via annotations. - This should be scanned as a top-level function, and shouldn't cause + This should be scanned as a top-level function, and shouldn't cause a "Can't find matching type for constructor" warning. @@ -4333,7 +4333,7 @@ a "Can't find matching type for constructor" warning. c:identifier="regress_foo_rectangle_new" moved-to="FooRectangle.new" introspectable="0"> - This is a C convenience constructor; we have to (skip) + This is a C convenience constructor; we have to (skip) it because it's not a boxed type. @@ -4356,14 +4356,14 @@ it because it's not a boxed type. - Does something that's only interesting from C and should not be + Does something that's only interesting from C and should not be exposed to language bindings. - a #RegressFooSkippable + a #RegressFooSkippable @@ -4535,7 +4535,7 @@ exposed to language bindings. - A #RegressTestObj + A #RegressTestObj @@ -4550,25 +4550,25 @@ exposed to language bindings. direction="out" caller-allocates="0" transfer-ownership="full"> - A flags value + A flags value - This test case mirrors GnomeKeyringPasswordSchema from + This test case mirrors GnomeKeyringPasswordSchema from libgnome-keyring. - some int + some int - list of attributes + list of attributes @@ -4655,7 +4655,7 @@ libgnome-keyring. direction="out" caller-allocates="0" transfer-ownership="full"> - An array of #RegressTestObj + An array of #RegressTestObj @@ -4665,12 +4665,12 @@ libgnome-keyring. - the sum of the items in @ints + the sum of the items in @ints - a list of 5 integers + a list of 5 integers @@ -4687,7 +4687,7 @@ libgnome-keyring. direction="out" caller-allocates="0" transfer-ownership="full"> - a list of 5 integers ranging from 0 to 4 + a list of 5 integers ranging from 0 to 4 @@ -4697,7 +4697,7 @@ libgnome-keyring. - a list of 5 integers ranging from 0 to 4 + a list of 5 integers ranging from 0 to 4 @@ -4713,7 +4713,7 @@ libgnome-keyring. - List of ints + List of ints @@ -4730,7 +4730,7 @@ libgnome-keyring. - List of ints + List of ints @@ -4747,7 +4747,7 @@ libgnome-keyring. - List of ints + List of ints @@ -4764,7 +4764,7 @@ libgnome-keyring. - List of ints + List of ints @@ -4774,7 +4774,7 @@ libgnome-keyring. - string representation of provided types + string representation of provided types @@ -4782,7 +4782,7 @@ libgnome-keyring. - List of types + List of types @@ -4792,7 +4792,7 @@ libgnome-keyring. - a new array of integers. + a new array of integers. @@ -4802,7 +4802,7 @@ libgnome-keyring. direction="out" caller-allocates="0" transfer-ownership="full"> - length of the returned array. + length of the returned array. @@ -4817,7 +4817,7 @@ libgnome-keyring. - List of ints + List of ints @@ -4834,14 +4834,14 @@ libgnome-keyring. direction="inout" caller-allocates="0" transfer-ownership="full"> - the length of @ints + the length of @ints - a list of integers whose items will be increased by 1, except the first that will be dropped + a list of integers whose items will be increased by 1, except the first that will be dropped @@ -4851,7 +4851,7 @@ libgnome-keyring. - a static array of integers. + a static array of integers. @@ -4861,7 +4861,7 @@ libgnome-keyring. direction="out" caller-allocates="0" transfer-ownership="full"> - length of the returned array. + length of the returned array. @@ -4878,7 +4878,7 @@ libgnome-keyring. - length + length @@ -4902,7 +4902,7 @@ libgnome-keyring. direction="out" caller-allocates="0" transfer-ownership="full"> - length + length @@ -4917,14 +4917,14 @@ libgnome-keyring. direction="out" caller-allocates="0" transfer-ownership="full"> - the length of @ints + the length of @ints - a list of 5 integers, from 0 to 4 in consecutive order + a list of 5 integers, from 0 to 4 in consecutive order @@ -5064,7 +5064,7 @@ libgnome-keyring. - Notified - callback persists until a DestroyNotify delegate + Notified - callback persists until a DestroyNotify delegate is invoked. @@ -5088,7 +5088,7 @@ is invoked. - Adds a scope notified callback with no user data. This can invoke an error + Adds a scope notified callback with no user data. This can invoke an error condition in bindings which needs to be tested. @@ -5114,17 +5114,17 @@ condition in bindings which needs to be tested. - Invokes all callbacks installed by #test_callback_destroy_notify(), + Invokes all callbacks installed by #test_callback_destroy_notify(), adding up their return values, and removes them, invoking the corresponding destroy notfications. - Sum of the return values of the invoked callbacks. + Sum of the return values of the invoked callbacks. - Call - callback parameter persists for the duration of the method + Call - callback parameter persists for the duration of the method call and can be released on return. @@ -5169,16 +5169,16 @@ call and can be released on return. - the return value of @closure + the return value of @closure - GClosure which takes one GVariant and returns a GVariant + GClosure which takes one GVariant and returns a GVariant - a GVariant passed as argument to @closure + a GVariant passed as argument to @closure @@ -5227,7 +5227,7 @@ call and can be released on return. - list of strings + list of strings @@ -5295,7 +5295,7 @@ call and can be released on return. - the hash table returned by regress_test_ghash_gvalue_return(). + the hash table returned by regress_test_ghash_gvalue_return(). @@ -5314,7 +5314,7 @@ call and can be released on return. - Specify nested parameterized types directly with the (type ) annotation. + Specify nested parameterized types directly with the (type ) annotation. @@ -5327,7 +5327,7 @@ call and can be released on return. - Another way of specifying nested parameterized types: using the + Another way of specifying nested parameterized types: using the element-type annotation. @@ -5614,32 +5614,32 @@ element-type annotation. - New variant + New variant - New variant + New variant - New variant + New variant - New variant + New variant - New variant + New variant @@ -5650,7 +5650,7 @@ element-type annotation. - GHashTable that gets passed to callback + GHashTable that gets passed to callback @@ -5789,7 +5789,7 @@ element-type annotation. - This is a function. + This is a function. It has multiple lines in the documentation. @@ -5802,7 +5802,7 @@ You will give me your credit card number. - <informaltable> + <informaltable> <tgroup cols="3"> <thead> <row> @@ -5835,7 +5835,7 @@ What we're testing here is that the scanner ignores the @a nested inside XML. - An integer + An integer @@ -5907,14 +5907,14 @@ What we're testing here is that the scanner ignores the @a nested inside XML. - Should not emit a warning: + Should not emit a warning: https://bugzilla.gnome.org/show_bug.cgi?id=685399 - No annotation here + No annotation here @@ -5940,11 +5940,11 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399 direction="out" caller-allocates="1" transfer-ownership="none"> - the structure that is to be filled + the structure that is to be filled - ignored + ignored @@ -6052,7 +6052,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399 - This function throws an error if m is odd. + This function throws an error if m is odd. @@ -6247,7 +6247,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399 - UTF-8 string + UTF-8 string @@ -6267,7 +6267,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399 - UTF-8 string + UTF-8 string @@ -6313,7 +6313,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399 - a copy of "first" + a copy of "first" @@ -6321,7 +6321,7 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399 direction="out" caller-allocates="0" transfer-ownership="full"> - a copy of "second" + a copy of "second" @@ -6336,14 +6336,14 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399 direction="out" caller-allocates="0" transfer-ownership="full"> - a copy of "first" + a copy of "first" - a copy of "second" + a copy of "second" @@ -6364,12 +6364,12 @@ https://bugzilla.gnome.org/show_bug.cgi?id=685399 - the int wrapped in a GValue. + the int wrapped in a GValue. - an int + an int -- cgit v1.2.1 From e40d509f8247164ff8f893f516c6a7b37ce0a30f Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Fri, 15 Feb 2013 07:18:33 +0100 Subject: giscanner: make _pass_fixup_hidden_fields() more readable https://bugzilla.gnome.org/show_bug.cgi?id=697621 --- giscanner/maintransformer.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py index 8cfb80f8..fb199861 100644 --- a/giscanner/maintransformer.py +++ b/giscanner/maintransformer.py @@ -108,16 +108,13 @@ class MainTransformer(object): def _pass_fixup_hidden_fields(self, node, chain): """Hide all callbacks starting with _; the typical usage is void (*_gtk_reserved1)(void);""" - if not isinstance(node, (ast.Class, ast.Interface, - ast.Record, ast.Union)): - return True - for field in node.fields: - if field is None: - continue - if (field.name.startswith('_') + if isinstance(node, (ast.Class, ast.Interface, ast.Record, ast.Union)): + for field in node.fields: + if (field + and field.name.startswith('_') and field.anonymous_node is not None and isinstance(field.anonymous_node, ast.Callback)): - field.introspectable = False + field.introspectable = False return True def _get_validate_parameter_name(self, parent, param_name, origin): -- cgit v1.2.1 From 4894c75fcc5a0b33d5862ed8ea87eccc6f7cb4eb Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 20 Mar 2013 07:48:59 +0100 Subject: giscanner: use mkstemp() instead of mktemp() mktemp was deprecated in Python 2.3... https://bugzilla.gnome.org/show_bug.cgi?id=697624 --- giscanner/sourcescanner.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py index de137767..bd84a605 100644 --- a/giscanner/sourcescanner.py +++ b/giscanner/sourcescanner.py @@ -303,8 +303,8 @@ class SourceScanner(object): proc.stdin.write('#include <%s>\n' % (filename, )) proc.stdin.close() - tmp = tempfile.mktemp() - fp = open(tmp, 'w+') + tmp_fd, tmp_name = tempfile.mkstemp() + fp = os.fdopen(tmp_fd, 'w+b') while True: data = proc.stdout.read(4096) if data is None: @@ -321,4 +321,4 @@ class SourceScanner(object): self._scanner.parse_file(fp.fileno()) fp.close() - os.unlink(tmp) + os.unlink(tmp_name) -- cgit v1.2.1 From c0e748e1cdf8cf0803266f94c3c5ad154df504a8 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Fri, 5 Apr 2013 08:44:11 +0200 Subject: giscanner: only parse GTK-Doc comment blocks, ignore the rest For example, GTK+ has over 15.000 comment blocks (/* ... */) of which only about 5.000 are GTK-Doc comment blocks (/** ... */). No need to store and parse those +-10.000 comment blocks just to find out we don't care about them anyway. https://bugzilla.gnome.org/show_bug.cgi?id=697625 --- giscanner/scannerlexer.l | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/giscanner/scannerlexer.l b/giscanner/scannerlexer.l index a783ec06..65fa3c29 100644 --- a/giscanner/scannerlexer.l +++ b/giscanner/scannerlexer.l @@ -46,6 +46,7 @@ char linebuf[2000]; extern int yylex (GISourceScanner *scanner); #define YY_DECL int yylex (GISourceScanner *scanner) static int yywrap (void); +static void parse_gtk_doc_comment (GISourceScanner *scanner); static void parse_comment (GISourceScanner *scanner); static void parse_trigraph (GISourceScanner *scanner); static void process_linemarks (GISourceScanner *scanner); @@ -71,8 +72,10 @@ stringtext ([^\\\"])|(\\.) ++lineno; } "\\\n" { ++lineno; } + [\t\f\v\r ]+ { /* Ignore whitespace. */ } +"/**" { parse_gtk_doc_comment(scanner); } "/*" { parse_comment(scanner); } "/*"[\t ]?<[\t ,=A-Za-z0-9_]+>[\t ]?"*/" { parse_trigraph(scanner); } "//".* { /* Ignore C++ style comments. */ } @@ -212,9 +215,8 @@ yywrap (void) return 1; } - static void -parse_comment (GISourceScanner *scanner) +parse_gtk_doc_comment (GISourceScanner *scanner) { GString *string = NULL; int c1, c2; @@ -227,7 +229,7 @@ parse_comment (GISourceScanner *scanner) (GCompareFunc)g_strcmp0)) { skip = TRUE; } else { - string = g_string_new ("/*"); + string = g_string_new (yytext); } c1 = input(); @@ -262,6 +264,26 @@ parse_comment (GISourceScanner *scanner) comment); } +static void +parse_comment (GISourceScanner *scanner) +{ + int c1, c2; + + c1 = input(); + c2 = input(); + + while (c2 != EOF && !(c1 == '*' && c2 == '/')) + { + if (c1 == '\n') + lineno++; + + c1 = c2; + c2 = input(); + } + + return; +} + static int check_identifier (GISourceScanner *scanner, const char *s) -- cgit v1.2.1 From 40b267c0cf1ade076ee9b563405842ae06e34d3d Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 12 Apr 2013 13:31:53 -0400 Subject: girparser: Also honor legacy c:prefix vala generates this, and we need to honor it now that we're using the c:prefix as an optimization when searching for gtypes. https://bugzilla.gnome.org/697759 --- girepository/girparser.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/girepository/girparser.c b/girepository/girparser.c index 5aaa6dd0..f96cfb1e 100644 --- a/girepository/girparser.c +++ b/girepository/girparser.c @@ -2872,6 +2872,9 @@ start_element_handler (GMarkupParseContext *context, version = find_attribute ("version", attribute_names, attribute_values); shared_library = find_attribute ("shared-library", attribute_names, attribute_values); cprefix = find_attribute ("c:identifier-prefixes", attribute_names, attribute_values); + /* Backwards compatibility; vala currently still generates this */ + if (cprefix == NULL) + cprefix = find_attribute ("c:prefix", attribute_names, attribute_values); if (name == NULL) MISSING_ATTRIBUTE (context, error, element_name, "name"); -- cgit v1.2.1 From 80a13ef73bbb32c85e00ff8e7870a5d4723c2196 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 12 Apr 2013 13:39:21 -0400 Subject: typelib: Also ignore typelibs with empty c:prefix As seen in xlib.gir at least; this is something we should probably ban though. https://bugzilla.gnome.org/697759 --- girepository/gitypelib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/girepository/gitypelib.c b/girepository/gitypelib.c index a643cde1..d88924a6 100644 --- a/girepository/gitypelib.c +++ b/girepository/gitypelib.c @@ -294,7 +294,7 @@ g_typelib_matches_gtype_name_prefix (GITypelib *typelib, gsize gtype_name_len; c_prefix = g_typelib_get_string (typelib, header->c_prefix); - if (c_prefix == NULL) + if (c_prefix == NULL || strlen (c_prefix) == 0) return FALSE; gtype_name_len = strlen (gtype_name); -- cgit v1.2.1 From a09072bd1f75dfc7497ed599e03e331bff411fd4 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 19 Apr 2013 19:12:14 -0400 Subject: tests: Add a struct with fixed-size gchar See https://bugzilla.redhat.com/920595 --- tests/scanner/Regress-1.0-expected.gir | 21 +++++++++++++++++++++ tests/scanner/regress.c | 8 ++++++++ tests/scanner/regress.h | 7 +++++++ 3 files changed, 36 insertions(+) diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 2d8091b5..0dadc59c 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -1946,6 +1946,27 @@ exposed to language bindings. + + + + + + + + + + + + + + + + + + + + diff --git a/tests/scanner/regress.c b/tests/scanner/regress.c index f54c2f91..d32c52be 100644 --- a/tests/scanner/regress.c +++ b/tests/scanner/regress.c @@ -4007,3 +4007,11 @@ void regress_test_versioning (void) { } + +void +regress_like_xkl_config_item_set_name (RegressLikeXklConfigItem *self, + const char *name) +{ + strncpy (self->name, name, sizeof (self->name) - 1); + self->name[sizeof(self->name)-1] = '\0'; +} diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h index ba82ca83..adc05dbc 100644 --- a/tests/scanner/regress.h +++ b/tests/scanner/regress.h @@ -905,6 +905,13 @@ typedef struct { void regress_test_struct_fixed_array_frob (RegressTestStructFixedArray *str); +typedef struct { + gchar name[32]; +} RegressLikeXklConfigItem; + +void regress_like_xkl_config_item_set_name (RegressLikeXklConfigItem *self, + const char *name); + #define REGRESS_UTF8_CONSTANT "const \xe2\x99\xa5 utf8" #ifdef __GNUC__ -- cgit v1.2.1 From 82870258bb3e8a284d893ac46a6afc2dd426d49a Mon Sep 17 00:00:00 2001 From: Patrick Welche Date: Sat, 20 Apr 2013 10:29:44 +0100 Subject: test(1) uses '=' to test if strings are identical https://bugzilla.gnome.org/show_bug.cgi?id=698438 --- m4/python.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/m4/python.m4 b/m4/python.m4 index cdd586c4..ed5559da 100644 --- a/m4/python.m4 +++ b/m4/python.m4 @@ -63,7 +63,7 @@ AC_DEFUN([AM_CHECK_PYTHON_LIBS], [AC_REQUIRE([AM_CHECK_PYTHON_HEADERS]) AC_MSG_CHECKING(for libraries required to link against libpython) dnl deduce PYTHON_LIBS -if test "x$PYTHON_LIBS" == x; then +if test "x$PYTHON_LIBS" = x; then PYTHON_LIBS=`$PYTHON-config --ldflags --libs` fi AC_SUBST(PYTHON_LIBS) -- cgit v1.2.1 From 962ab98e926e886a476b76ad641c30718a0a6e84 Mon Sep 17 00:00:00 2001 From: Patrick Welche Date: Sat, 20 Apr 2013 12:34:15 +0100 Subject: giscanner/scannerlexer.l: Parse and ignore more __asm and __volatile In the spirit of c9708af2 also parse and ignore __asm [whitespace] volatile __asm__ [whitespace] volatile __volatile __volatile__ Ignoring __volatile is cosmetic, but the __asm cases avoid an unwanted VOLATILE token. Extension of https://bugzilla.gnome.org/show_bug.cgi?id=678794 --- giscanner/scannerlexer.l | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/giscanner/scannerlexer.l b/giscanner/scannerlexer.l index 65fa3c29..f8fd3703 100644 --- a/giscanner/scannerlexer.l +++ b/giscanner/scannerlexer.l @@ -137,6 +137,8 @@ stringtext ([^\\\"])|(\\.) "," { return ','; } "->" { return ARROW; } +"__asm"[\t\f\v\r ]+"volatile" { if (!parse_ignored_macro()) REJECT; } +"__asm__"[\t\f\v\r ]+"volatile" { if (!parse_ignored_macro()) REJECT; } "__asm" { if (!parse_ignored_macro()) REJECT; } "__asm__" { if (!parse_ignored_macro()) REJECT; } "__attribute__" { if (!parse_ignored_macro()) REJECT; } @@ -148,6 +150,8 @@ stringtext ([^\\\"])|(\\.) "__signed__" { return SIGNED; } "__restrict" { return RESTRICT; } "__typeof" { if (!parse_ignored_macro()) REJECT; } +"__volatile" { if (!parse_ignored_macro()) REJECT; } +"__volatile__" { if (!parse_ignored_macro()) REJECT; } "_Bool" { return BOOL; } "G_GINT64_CONSTANT" { return INTL_CONST; } -- cgit v1.2.1 From 0f207646c63c8ee919b3a99436a53b977aece094 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Fri, 5 Apr 2013 17:55:39 +0200 Subject: remove ./configure summary ${enable_tests} was removed in f5631640751b5a998b3616db78dd5dcd9ee62126 so there's nothing left to report about... https://bugzilla.gnome.org/show_bug.cgi?id=697669 --- configure.ac | 7 ------- 1 file changed, 7 deletions(-) diff --git a/configure.ac b/configure.ac index 3537af1a..fad88bc4 100644 --- a/configure.ac +++ b/configure.ac @@ -328,10 +328,3 @@ build/win32/Makefile build/win32/vs9/Makefile build/win32/vs10/Makefile]) AC_OUTPUT - -echo " - gobject-introspection $VERSION - =============== - - tests: ${enable_tests} -" -- cgit v1.2.1 From 274d4f28a00d1d2bbfc4a1fe4dbbd4ad545b1ec3 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 10 Apr 2013 00:00:37 +0200 Subject: fix "make distcheck" - Configure with --enable-doctool when running "make distcheck" - Remove $(top_builddir)/.make-check-passed as the pre-commit hook using this was removed in de84ea0cf212c251e099f456bb675492f664e93d - Fix CLEANFILES + manual rm invocations - Fix running warning tests uninstalled (VPATH build issue) https://bugzilla.gnome.org/show_bug.cgi?id=697669 --- Makefile.am | 3 +-- tests/Makefile.am | 2 ++ tests/scanner/Makefile.am | 9 ++++++--- tests/warn/Makefile.am | 4 ++-- tests/warn/warntestrunner | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/Makefile.am b/Makefile.am index 736f3adb..202464fa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -29,7 +29,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} SUBDIRS = . docs tests build DIST_SUBDIRS = m4 $(SUBDIRS) -DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc +DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-doctool man_MANS += \ docs/g-ir-compiler.1 \ @@ -63,7 +63,6 @@ check-local: PYTHONPATH="$(top_builddir):$(top_srcdir)" $(PYTHON) $(top_srcdir)/tests/scanner/annotationparser/test_patterns.py @echo "TEST: GTK-Doc Annotation Parser" PYTHONPATH="$(top_builddir):$(top_srcdir)" $(PYTHON) $(top_srcdir)/tests/scanner/annotationparser/test_parser.py - @touch $(top_builddir)/.make-check-passed check-pyflakes: @echo " CHECK Pyflakes" diff --git a/tests/Makefile.am b/tests/Makefile.am index b4985b90..56fc4796 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -28,7 +28,9 @@ BUILT_SOURCES += everything.c everything.h CLEANFILES += \ $(BUILT_SOURCES) \ everything-stamp.h \ + Everything-1.0.gir \ Everything-1.0.typelib \ + GIMarshallingTests-1.0.gir \ GIMarshallingTests-1.0.typelib everything-stamp.h: Makefile diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index 31487a6b..faf29470 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -142,6 +142,7 @@ GIRS += Bar-1.0.gir endif EXTRA_DIST += headeronly.h +CLEANFILES += Headeronly-1.0.gir Headeronly-1.0.gir: headeronly.h $(AM_V_GEN) $(INTROSPECTION_SCANNER) $(INTROSPECTION_SCANNER_ARGS) --warn-all --warn-error --reparse-validate --namespace=Headeronly --nsversion=1.0 --header-only --output=$@ $< @@ -153,21 +154,23 @@ if BUILD_DOCTOOL DOCGIRS = Regress-1.0.gir CHECKDOCS = $(DOCGIRS:.gir=-C.page.check) $(DOCGIRS:.gir=-Python.page.check) $(DOCGIRS:.gir=-Gjs.page.check) MALLARD_DIRS = $(DOCGIRS:.gir=-C) $(DOCGIRS:.gir=-Python) $(DOCGIRS:.gir=-Gjs) +MALLARD_CLEAN = $(DOCGIRS:.gir=-C)/* $(DOCGIRS:.gir=-Python)/* $(DOCGIRS:.gir=-Gjs)/* EXPECTED_MALLARD_DIRS = $(MALLARD_DIRS:=-expected) +CLEANFILES += $(MALLARD_CLEAN) %-C: %.gir $(AM_V_GEN) - $(AM_V_at)rm -f $*-C/*.page + $(AM_V_at)rm -rf $*-C $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language C $*.gir -o $*-C/ %-Python: %.gir $(AM_V_GEN) - $(AM_V_at)rm -f $*-Python/*.page + $(AM_V_at)rm -rf $*-Python $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language Python $*.gir -o $*-Python/ %-Gjs: %.gir $(AM_V_GEN) - $(AM_V_at)rm -f $*-Gjs/*.page + $(AM_V_at)rm -rf $*-Gjs $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language Gjs $*.gir -o $*-Gjs/ %-C.page.check: %-C diff --git a/tests/warn/Makefile.am b/tests/warn/Makefile.am index 875d8efe..bce45629 100644 --- a/tests/warn/Makefile.am +++ b/tests/warn/Makefile.am @@ -6,7 +6,6 @@ alltests = \ annotationparser.h \ callback-invalid-scope.h \ callback-missing-scope.h \ - return-gobject.h \ invalid-array.h \ invalid-closure.h \ invalid-constructor.h \ @@ -16,9 +15,10 @@ alltests = \ invalid-out.h \ invalid-transfer.h \ missing-element-type.h \ + return-gobject.h \ unknown-parameter.h \ unresolved-type.h -EXTRA_DIST = warningtester.py warntestrunner $(alltests) common.h $(TESTS) +EXTRA_DIST = warningtester.py $(alltests) common.h $(TESTS) TESTS_ENVIRONMENT = PYTHONPATH=$(top_builddir):$(top_srcdir) TOP_BUILDDIR=$(top_builddir) UNINSTALLED_INTROSPECTION_SRCDIR=$(top_srcdir) PYTHON=$(PYTHON) srcdir=$(srcdir) alltests="$(alltests)" diff --git a/tests/warn/warntestrunner b/tests/warn/warntestrunner index 3deb3814..d3a4e87a 100755 --- a/tests/warn/warntestrunner +++ b/tests/warn/warntestrunner @@ -4,5 +4,5 @@ set -e for testname in ${alltests}; do echo "Running warning test:" $testname - $PYTHON $srcdir/warningtester.py "$testname" + $PYTHON $srcdir/warningtester.py "$srcdir/$testname" done -- cgit v1.2.1 From df6abacef97c0f47fd64f92a8fc99c42f481ad73 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Mon, 22 Apr 2013 23:45:35 +0200 Subject: tests: add missing expected generated documentation a09072bd1f75dfc7497ed599e03e331bff411fd4 introduced new symbols in tests/scanner/regress.[ch] but was missing the expected generated documentation. https://bugzilla.gnome.org/show_bug.cgi?id=698616 --- .../Regress.LikeXklConfigItem.page | 25 ++++++++++ .../Regress.LikeXklConfigItem.set_name.page | 57 ++++++++++++++++++++++ .../Regress.LikeXklConfigItem.page | 25 ++++++++++ .../Regress.LikeXklConfigItem.set_name.page | 46 +++++++++++++++++ .../Regress.LikeXklConfigItem.page | 25 ++++++++++ .../Regress.LikeXklConfigItem.set_name.page | 55 +++++++++++++++++++++ 6 files changed, 233 insertions(+) create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.page create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.set_name.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem.set_name.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.set_name.page diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.page new file mode 100644 index 00000000..3b14aae6 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.LikeXklConfigItem + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.set_name.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.set_name.page new file mode 100644 index 00000000..0a4aecb6 --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LikeXklConfigItem.set_name.page @@ -0,0 +1,57 @@ + + + + + + + + void + + regress_like_xkl_config_item_set_name + + RegressLikeXklConfigItem* + self + + + const char* + name + + + + + regress_like_xkl_config_item_set_name + + +void regress_like_xkl_config_item_set_name (RegressLikeXklConfigItem* self, + const char* name); + + + + + + + + + + +<code>self</code> + + + +<code>name</code> + + + +<code>Returns</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem.page new file mode 100644 index 00000000..fb4831f5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.LikeXklConfigItem + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem.set_name.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem.set_name.page new file mode 100644 index 00000000..f81bc5df --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeXklConfigItem.set_name.page @@ -0,0 +1,46 @@ + + + + + + + + void + + regress_like_xkl_config_item_set_name + + String + name + + + + + Regress.LikeXklConfigItem.prototype.set_name + + +function set_name(name:String):void { + // Gjs wrapper for regress_like_xkl_config_item_set_name() +} + + + + + + + + + + +<code>name</code> + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.page new file mode 100644 index 00000000..fb4831f5 --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.LikeXklConfigItem + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.set_name.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.set_name.page new file mode 100644 index 00000000..a6815c8b --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeXklConfigItem.set_name.page @@ -0,0 +1,55 @@ + + + + + + + + none + + regress_like_xkl_config_item_set_name + + Regress.LikeXklConfigItem + self + + + unicode + name + + + + + Regress.LikeXklConfigItem.set_name + + +@accepts(Regress.LikeXklConfigItem, unicode) +@returns(none) +def set_name(self, name): + # Python wrapper for regress_like_xkl_config_item_set_name() + + + + + + + + + + +<code>self</code> + + + +<code>name</code> + + + + + + + -- cgit v1.2.1 From eaca1e68664c35981949a9b852936c3fd4d0fc82 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Mon, 22 Apr 2013 23:47:17 +0200 Subject: build: require Python 2.6 from now on Nobody is really known to still use g-i with python 2.5, support for 2.5 gets broken every now and then in the tree because nobody is paying much attention any more so just drop it. https://bugzilla.gnome.org/show_bug.cgi?id=698617 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index fad88bc4..14fc42fe 100644 --- a/configure.ac +++ b/configure.ac @@ -247,7 +247,7 @@ AC_CHECK_FUNCS([memchr strchr strspn strstr strtol strtoull]) AC_CHECK_FUNCS([backtrace backtrace_symbols]) # Python -AM_PATH_PYTHON([2.5]) +AM_PATH_PYTHON([2.6]) case "$host" in *-*-mingw*) # Change backslashes to forward slashes in pyexecdir to avoid -- cgit v1.2.1 From 35bfc13736904e6f8f9f2c8ff49fb1c9518e874a Mon Sep 17 00:00:00 2001 From: Giovanni Campagna Date: Tue, 23 Apr 2013 22:27:27 +0200 Subject: GIMarshallingTests: remove a function that does not exists It's breaking the gjs test suite https://bugzilla.gnome.org/show_bug.cgi?id=698698 --- tests/gimarshallingtests.h | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index 56c6a0f2..33f3b3e9 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -910,7 +910,6 @@ void gi_marshalling_tests_object_full_out (GIMarshallingTestsObject **object); void gi_marshalling_tests_object_none_inout (GIMarshallingTestsObject **object); void gi_marshalling_tests_object_full_inout (GIMarshallingTestsObject **object); -void gi_marshalling_tests_object_inout_same (GIMarshallingTestsObject **object); void gi_marshalling_tests_object_int8_in (GIMarshallingTestsObject *object, gint8 in); void gi_marshalling_tests_object_int8_out (GIMarshallingTestsObject *object, gint8 *out); -- cgit v1.2.1 From 70cc4b9479943ec95d3b95b1786b79c9bfd2cce0 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 24 Apr 2013 11:24:11 -0400 Subject: Update annotations from glib git --- gir/gio-2.0.c | 238 +++++++++++++++++++++++++++++++++++++++++++++++++++--- gir/glib-2.0.c | 48 +++++++---- gir/gobject-2.0.c | 31 +++++++ 3 files changed, 290 insertions(+), 27 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index d78bfdc6..5a92d00c 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -260,6 +260,13 @@ */ +/** + * GBytesIcon:bytes: + * + * The bytes containing the icon. + */ + + /** * GCancellable::cancelled: * @cancellable: a #GCancellable. @@ -4017,6 +4024,19 @@ */ +/** + * SECTION:gbytesicon + * @short_description: An icon stored in memory as a #GBytes + * @include: gio/gio.h + * @see_also: #GIcon, #GLoadableIcon, #GBytes + * + * #GBytesIcon specifies an image held in memory in a common format (usually + * png) to be used as icon. + * + * Since: 2.38 + */ + + /** * SECTION:gcancellable * @short_description: Thread-safe Operation Cancellation Stack @@ -5247,12 +5267,22 @@ * * To check if two #GIcons are equal, see g_icon_equal(). * - * For serializing a #GIcon, use g_icon_to_string() and - * g_icon_new_for_string(). + * For serializing a #GIcon, use g_icon_serialize() and + * g_icon_deserialize(). + * + * If you want to consume #GIcon (for example, in a toolkit) you must + * be prepared to handle at least the three following cases: + * #GLoadableIcon, #GThemedIcon and #GEmblemedIcon. It may also make + * sense to have fast-paths for other cases (like handling #GdkPixbuf + * directly, for example) but all compliant #GIcon implementations + * outside of GIO must implement #GLoadableIcon. * * If your application or library provides one or more #GIcon - * implementations you need to ensure that each #GType is registered - * with the type system prior to calling g_icon_new_for_string(). + * implementations you need to ensure that your new implementation also + * implements #GLoadableIcon. Additionally, you must provide an + * implementation of g_icon_serialize() that gives a result that is + * understood by g_icon_deserialize(), yielding one of the built-in icon + * types. */ @@ -7641,7 +7671,7 @@ * @include: gio/gio.h * * #GTlsFileDatabase is implemented by #GTlsDatabase objects which load - * their certificate information from a file. It is in interface which + * their certificate information from a file. It is an interface which * TLS library specific subtypes implement. * * Since: 2.30 @@ -8547,6 +8577,38 @@ */ +/** + * g_action_parse_detailed_name: + * @detailed_name: a detailed action name + * @action_name: (out): the action name + * @target_value: (out): the target value, or %NULL for no target + * @error: a pointer to a %NULL #GError, or %NULL + * + * Parses a detailed action name into its separate name and target + * components. + * + * Detailed action names can have three formats. + * + * The first format is used to represent an action name with no target + * value and consists of just an action name containing no whitespace + * nor the characters ':', '(' or ')'. For example: "app.action". + * + * The second format is used to represent an action with a string-typed + * target value. The action name and target value are separated by a + * double colon ("::"). For example: "app.action::target". + * + * The third format is used to represent an action with an + * arbitrarily-typed target value. The target value follows the action + * name, surrounded in parens. For example: "app.action(42)". The + * target value is parsed using g_variant_parse(). If a tuple-typed + * value is desired, it must be specified in the same way, resulting in + * two sets of parens, for example: "app.action((1,2,3))". + * + * Returns: %TRUE if successful, else %FALSE with @error set + * Since: 2.38 + */ + + /** * g_app_info_add_supports_type: * @appinfo: a #GAppInfo. @@ -9493,6 +9555,25 @@ */ +/** + * g_application_mark_busy: + * @application: a #GApplication + * + * Increases the busy count of @application. + * + * Use this function to indicate that the application is busy, for instance + * while a long running operation is pending. + * + * The busy state will be exposed to other processes, so a session shell will + * use that information to indicate the state to the user (e.g. with a + * spinner). + * + * To cancel the busy indication, use g_application_unmark_busy(). + * + * Since: 2.38 + */ + + /** * g_application_new: * @application_id: (allow-none): the application id @@ -9769,6 +9850,22 @@ */ +/** + * g_application_unmark_busy: + * @application: a #GApplication + * + * Decreases the busy count of @application. + * + * When the busy count reaches zero, the new state will be propagated + * to other processes. + * + * This function must only be called to cancel the effect of a previous + * call to g_application_mark_busy(). + * + * Since: 2.38 + */ + + /** * g_async_initable_init_async: * @initable: a #GAsyncInitable. @@ -10500,6 +10597,28 @@ */ +/** + * g_bytes_icon_get_bytes: + * @icon: a #GIcon. + * + * Gets the #GBytes associated with the given @icon. + * + * Returns: (transfer none): a #GBytes, or %NULL. + * Since: 2.38 + */ + + +/** + * g_bytes_icon_new: + * @bytes: a #GBytes. + * + * Creates a new icon for a bytes. + * + * Returns: (transfer full) (type GBytesIcon): a #GIcon for the given @bytes, or %NULL on error. + * Since: 2.38 + */ + + /** * g_cancellable_cancel: * @cancellable: a #GCancellable object. @@ -12963,6 +13082,11 @@ * tracking the name owner of the well-known name and use that when * processing the received signal. * + * If one of %G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_NAMESPACE or + * %G_DBUS_SIGNAL_FLAGS_MATCH_ARG0_PATH are given, @arg0 is + * interpreted as part of a namespace or path. The first argument + * of a signal is matched against that part as specified by D-Bus. + * * Returns: A subscription identifier that can be used with g_dbus_connection_signal_unsubscribe(). * Since: 2.26 */ @@ -17097,6 +17221,7 @@ * Finishes deleting a file started with g_file_delete_async(). * * Virtual: delete_file_finish + * Returns: %TRUE if the file was deleted. %FALSE otherwise. * Since: 2.34 */ @@ -18716,6 +18841,36 @@ */ +/** + * g_file_make_directory_async: + * @file: input #GFile + * @io_priority: the I/O priority of the request + * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore + * @callback: a #GAsyncReadyCallback to call when the request is satisfied + * @user_data: the data to pass to callback function + * + * Asynchronously creates a directory. + * + * Virtual: make_directory_async + * Since: 2.38 + */ + + +/** + * g_file_make_directory_finish: + * @file: input #GFile + * @result: a #GAsyncResult + * @error: a #GError, or %NULL + * + * Finishes an asynchronous directory creation, started with + * g_file_make_directory_async(). + * + * Virtual: make_directory_finish + * Returns: %TRUE on successful directory creation, %FALSE otherwise. + * Since: 2.38 + */ + + /** * g_file_make_directory_with_parents: * @file: input #GFile @@ -20196,7 +20351,38 @@ * triggering the cancellable object from another thread. If the operation * was cancelled, the error %G_IO_ERROR_CANCELLED will be returned. * + * Virtual: trash + * Returns: %TRUE on successful trash, %FALSE otherwise. + */ + + +/** + * g_file_trash_async: + * @file: input #GFile + * @io_priority: the I/O priority of the request + * @cancellable: (allow-none): optional #GCancellable object, %NULL to ignore + * @callback: a #GAsyncReadyCallback to call when the request is satisfied + * @user_data: the data to pass to callback function + * + * Asynchronously sends @file to the Trash location, if possible. + * + * Virtual: trash_async + * Since: 2.38 + */ + + +/** + * g_file_trash_finish: + * @file: input #GFile + * @result: a #GAsyncResult + * @error: a #GError, or %NULL + * + * Finishes an asynchronous file trashing operation, started with + * g_file_trash_async(). + * + * Virtual: trash_finish * Returns: %TRUE on successful trash, %FALSE otherwise. + * Since: 2.38 */ @@ -22632,14 +22818,8 @@ * * Sets the "action" and possibly the "target" attribute of @menu_item. * - * If @detailed_action contains a double colon ("::") then it is used as - * a separator between an action name and a target string. In this - * case, this call is equivalent to calling - * g_menu_item_set_action_and_target() with the part before the "::" and - * with a string-type #GVariant containing the part following the "::". - * - * If @detailed_action doesn't contain "::" then the action is set to - * the given string (verbatim) and the target value is unset. + * The format of @detailed_action is the same format parsed by + * g_action_parse_detailed_name(). * * See g_menu_item_set_action_and_target() or * g_menu_item_set_action_and_target_value() for more flexible (but @@ -22652,6 +22832,28 @@ */ +/** + * g_menu_item_set_icon: + * @menu_item: a #GMenuItem + * @icon: a #GIcon, or %NULL + * + * Sets (or unsets) the icon on @menu_item. + * + * This call is the same as calling g_icon_serialize() and using the + * result as the value to g_menu_item_set_attribute_value() for + * %G_MENU_ATTRIBUTE_ICON. + * + * This API is only intended for use with "noun" menu items; things like + * bookmarks or applications in an "Open With" menu. Don't use it on + * menu items corresponding to verbs (eg: stock icons for 'Save' or + * 'Quit'). + * + * If @icon is %NULL then the icon is unset. + * + * Since: 2.38 + */ + + /** * g_menu_item_set_label: * @menu_item: a #GMenuItem @@ -23031,6 +23233,16 @@ */ +/** + * g_menu_remove_all: + * @menu: a #GMenu + * + * Removes all items in the menu. + * + * Since: 2.38 + */ + + /** * g_mount_can_eject: * @mount: a #GMount. diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index dc98af0d..7cf2ffa0 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -1898,7 +1898,7 @@ /** * GTimeZone: * - * #GDateTime is an opaque structure whose members cannot be accessed + * #GTimeZone is an opaque structure whose members cannot be accessed * directly. * * Since: 2.26 @@ -9827,9 +9827,9 @@ * @bookmark: a #GBookmarkFile * @uri: a valid URI * @name: an application's name - * @exec: (allow-none): location for the command line of the application, or %NULL - * @count: (allow-none): return location for the registration count, or %NULL - * @stamp: (allow-none): return location for the last registration time, or %NULL + * @exec: (allow-none) (out): return location for the command line of the application, or %NULL + * @count: (allow-none) (out): return location for the registration count, or %NULL + * @stamp: (allow-none) (out): return location for the last registration time, or %NULL * @error: return location for a #GError, or %NULL * * Gets the registration informations of @app_name for the bookmark for @@ -9855,7 +9855,7 @@ * g_bookmark_file_get_applications: * @bookmark: a #GBookmarkFile * @uri: a valid URI - * @length: (allow-none): return location of the length of the returned list, or %NULL + * @length: (allow-none) (out): return location of the length of the returned list, or %NULL * @error: return location for a #GError, or %NULL * * Retrieves the names of the applications that have registered the @@ -9864,7 +9864,7 @@ * In the event the URI cannot be found, %NULL is returned and * @error is set to #G_BOOKMARK_FILE_ERROR_URI_NOT_FOUND. * - * Returns: a newly allocated %NULL-terminated array of strings. Use g_strfreev() to free it. + * Returns: (array length=length) (transfer full): a newly allocated %NULL-terminated array of strings. Use g_strfreev() to free it. * Since: 2.12 */ @@ -9889,7 +9889,7 @@ * g_bookmark_file_get_groups: * @bookmark: a #GBookmarkFile * @uri: a valid URI - * @length: (allow-none): return location for the length of the returned string, or %NULL + * @length: (allow-none) (out): return location for the length of the returned string, or %NULL * @error: return location for a #GError, or %NULL * * Retrieves the list of group names of the bookmark for @uri. @@ -9900,7 +9900,7 @@ * The returned array is %NULL terminated, so @length may optionally * be %NULL. * - * Returns: a newly allocated %NULL-terminated array of group names. Use g_strfreev() to free it. + * Returns: (array length=length) (transfer full): a newly allocated %NULL-terminated array of group names. Use g_strfreev() to free it. * Since: 2.12 */ @@ -9909,8 +9909,8 @@ * g_bookmark_file_get_icon: * @bookmark: a #GBookmarkFile * @uri: a valid URI - * @href: (allow-none): return location for the icon's location or %NULL - * @mime_type: (allow-none): return location for the icon's MIME type or %NULL + * @href: (allow-none) (out): return location for the icon's location or %NULL + * @mime_type: (allow-none) (out): return location for the icon's MIME type or %NULL * @error: return location for a #GError or %NULL * * Gets the icon of the bookmark for @uri. @@ -10007,13 +10007,13 @@ /** * g_bookmark_file_get_uris: * @bookmark: a #GBookmarkFile - * @length: (allow-none): return location for the number of returned URIs, or %NULL + * @length: (allow-none) (out): return location for the number of returned URIs, or %NULL * * Returns all URIs of the bookmarks in the bookmark file @bookmark. * The array of returned URIs will be %NULL-terminated, so @length may * optionally be %NULL. * - * Returns: a newly allocated %NULL-terminated array of strings. Use g_strfreev() to free it. + * Returns: (array length=length) (transfer full): a newly allocated %NULL-terminated array of strings. Use g_strfreev() to free it. * Since: 2.12 */ @@ -10412,7 +10412,7 @@ /** * g_bookmark_file_to_data: * @bookmark: a #GBookmarkFile - * @length: (allow-none): return location for the length of the returned string, or %NULL + * @length: (allow-none) (out): return location for the length of the returned string, or %NULL * @error: return location for a #GError, or %NULL * * This function outputs @bookmark as a string. @@ -32283,7 +32283,7 @@ * * A reference is taken on @bytes. * - * Returns: a new #GVariant with a floating reference + * Returns: (transfer none): a new #GVariant with a floating reference * Since: 2.36 */ @@ -32531,6 +32531,26 @@ */ +/** + * g_variant_new_take_string: (skip) + * @string: a normal utf8 nul-terminated string + * + * Creates a string #GVariant with the contents of @string. + * + * @string must be valid utf8. + * + * This function consumes @string. g_free() will be called on @string + * when it is no longer required. + * + * You must not modify or access @string in any other way after passing + * it to this function. It is even possible that @string is immediately + * freed. + * + * Returns: (transfer none): a floating reference to a new string #GVariant instance + * Since: 2.38 + */ + + /** * g_variant_new_tuple: * @children: (array length=n_children): the items to make the tuple out of diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c index 05d5ee09..3f568826 100644 --- a/gir/gobject-2.0.c +++ b/gir/gobject-2.0.c @@ -2697,6 +2697,19 @@ */ +/** + * g_param_get_default_value: + * @param: a #GParamSpec + * + * Gets the default value of @param as a pointer to a #GValue. + * + * The #GValue will remain value for the life of @param. + * + * Returns: a pointer to a #GValue which must not be modified + * Since: 2.38 + */ + + /** * g_param_spec_boolean: * @name: canonical name of the property specified @@ -4319,6 +4332,24 @@ */ +/** + * g_type_class_get_instance_private_offset: (skip) + * @g_class: a #GTypeClass + * + * Gets the offset of the private data for instances of @g_class. + * + * This is how many bytes you should add to the instance pointer of a + * class in order to get the private data for the type represented by + * @g_class. + * + * You can only call this function after you have registered a private + * data area for @g_class using g_type_class_add_private(). + * + * Returns: the offset, in bytes + * Since: 2.38 + */ + + /** * g_type_class_peek: * @type: Type ID of a classed type. -- cgit v1.2.1 From 61014888425590acc66e1f84fe22480d940c9ab8 Mon Sep 17 00:00:00 2001 From: Cosimo Cecchi Date: Wed, 24 Apr 2013 12:01:18 -0400 Subject: Update glib annotations --- gir/gio-2.0.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 5a92d00c..4280fd70 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -20565,6 +20565,17 @@ */ +/** + * g_icon_deserialize: + * @value: a #GVariant created with g_icon_serialize() + * + * Deserializes a #GIcon previously serialized using g_icon_serialize(). + * + * Returns: (transfer full): a #GIcon, or %NULL when deserialization fails. + * Since: 2.38 + */ + + /** * g_icon_equal: * @icon1: (allow-none): pointer to the first #GIcon. @@ -20604,6 +20615,21 @@ */ +/** + * g_icon_serialize: + * @icon: a #GIcon + * + * Serializes a #GIcon into a #GVariant. An equivalent #GIcon can be retrieved + * back by calling g_icon_deserialize() on the returned value. + * As serialization will avoid using raw icon data when possible, it only + * makes sense to transfer the #GVariant between processes on the same machine, + * (as opposed to over the network), and within the same file system namespace. + * + * Returns: (transfer full): a #GVariant, or %NULL when serialization fails. + * Since: 2.38 + */ + + /** * g_icon_to_string: * @icon: a #GIcon. -- cgit v1.2.1 From 863ceb7f5a5b5f6accfea23dcd47b5c74a53f68b Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 1 May 2013 18:49:01 -0700 Subject: Do not misdetect clang as the Microsoft C compiler Just because they both start with 'cl'. https://bugzilla.gnome.org/show_bug.cgi?id=698090 --- giscanner/dumper.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/giscanner/dumper.py b/giscanner/dumper.py index f5346a40..1ef1f4bf 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py @@ -89,8 +89,9 @@ class DumpCompiler(object): # Enable the --msvc-syntax pkg-config flag when # the Microsoft compiler is used # (This is the other way to check whether Visual C++ is used subsequently) - if 'cl' in self._compiler_cmd: - self._pkgconfig_msvc_flags = '--msvc-syntax' + if 'clang' not in self._compiler_cmd: + if 'cl' in self._compiler_cmd: + self._pkgconfig_msvc_flags = '--msvc-syntax' self._uninst_srcdir = os.environ.get( 'UNINSTALLED_INTROSPECTION_SRCDIR') self._packages = ['gio-2.0 gmodule-2.0'] -- cgit v1.2.1 From b055ddb89da79b5ae22c37ec79ab5009d7db4603 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Thu, 2 May 2013 00:52:42 -0700 Subject: Fix scanning libraries with no GObjects and linker using --as-needed https://bugzilla.gnome.org/show_bug.cgi?id=699442 --- giscanner/dumper.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/giscanner/dumper.py b/giscanner/dumper.py index 1ef1f4bf..992eb76f 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py @@ -319,6 +319,10 @@ class DumpCompiler(object): else: args.append('-Wl,-rpath=.') + # Ensure libraries are always linked as we are going to use ldd to work out their names later + if not libtool and self._pkgconfig_msvc_flags == '': + args.append('-Wl,--no-as-needed') + for library in self._options.libraries: # Visual C++: We have the needed .lib files now, and we need to link # to .lib files, not the .dll as the --library option specifies the -- cgit v1.2.1 From b5a8082396540037351f0c96c1403f6c470d0e5c Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Fri, 3 May 2013 11:21:36 +0200 Subject: giscanner: Fix for PEP-8 style check --- giscanner/dumper.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/giscanner/dumper.py b/giscanner/dumper.py index 992eb76f..b9f529ea 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py @@ -319,7 +319,8 @@ class DumpCompiler(object): else: args.append('-Wl,-rpath=.') - # Ensure libraries are always linked as we are going to use ldd to work out their names later + # Ensure libraries are always linked as we are going to use ldd to work + # out their names later if not libtool and self._pkgconfig_msvc_flags == '': args.append('-Wl,--no-as-needed') -- cgit v1.2.1 From 97072bb47148abc7ab94217a13e82f4281344875 Mon Sep 17 00:00:00 2001 From: Christian Persch Date: Sun, 21 Apr 2013 18:56:19 +0200 Subject: Add printf attribute This fixes a compiler warning when using -Wmissing-format-attribute. https://bugzilla.gnome.org/show_bug.cgi?id=698521 --- girepository/gdump.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/girepository/gdump.c b/girepository/gdump.c index 7e02d391..88942f3a 100644 --- a/girepository/gdump.c +++ b/girepository/gdump.c @@ -37,6 +37,9 @@ #include +static void +escaped_printf (GOutputStream *out, const char *fmt, ...) G_GNUC_PRINTF (2, 3); + static void escaped_printf (GOutputStream *out, const char *fmt, ...) { -- cgit v1.2.1 From 27989c20e98693accc10d7695e465dca0280529d Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Thu, 25 Apr 2013 16:58:30 +0200 Subject: Add generated Visual Studio project files to .gitignore https://bugzilla.gnome.org/show_bug.cgi?id=699531 --- .gitignore | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.gitignore b/.gitignore index c54f034d..97b881cb 100644 --- a/.gitignore +++ b/.gitignore @@ -89,6 +89,19 @@ tests/*/*.log tests/*/*.trs .make-check-passed +# Generated Visual Studio project files +build/win32/vs10/cmph.vcxproj +build/win32/vs10/cmph.vcxproj.filters +build/win32/vs10/gir.props +build/win32/vs10/g-ir-compiler.vcxproj +build/win32/vs10/g-ir-compiler.vcxproj.filters +build/win32/vs10/girepository.vcxproj +build/win32/vs10/girepository.vcxproj.filters +build/win32/vs9/cmph.vcproj +build/win32/vs9/gir.vsprops +build/win32/vs9/g-ir-compiler.vcproj +build/win32/vs9/girepository.vcproj + #yelp-build *.html C.css -- cgit v1.2.1 From c039cf4e35a861b15ac1e773374ddf1e62d151e7 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Thu, 25 Apr 2013 16:59:30 +0200 Subject: Add generated tarballs to .gitignore https://bugzilla.gnome.org/show_bug.cgi?id=699531 --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 97b881cb..7d1776db 100644 --- a/.gitignore +++ b/.gitignore @@ -89,6 +89,9 @@ tests/*/*.log tests/*/*.trs .make-check-passed +# tarballs +*.tar.xz + # Generated Visual Studio project files build/win32/vs10/cmph.vcxproj build/win32/vs10/cmph.vcxproj.filters -- cgit v1.2.1 From 452f1db1e52949e7fb883e69912ee64bb73a8743 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Thu, 18 Apr 2013 17:32:29 +0200 Subject: build: make it clear generated documentation goes in $(builddir) https://bugzilla.gnome.org/show_bug.cgi?id=699532 --- tests/scanner/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index faf29470..70dfef12 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -160,18 +160,18 @@ CLEANFILES += $(MALLARD_CLEAN) %-C: %.gir $(AM_V_GEN) - $(AM_V_at)rm -rf $*-C - $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language C $*.gir -o $*-C/ + $(AM_V_at)rm -rf $(builddir)/$*-C + $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language C $*.gir -o $(builddir)/$*-C/ %-Python: %.gir $(AM_V_GEN) - $(AM_V_at)rm -rf $*-Python - $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language Python $*.gir -o $*-Python/ + $(AM_V_at)rm -rf $(builddir)/$*-Python + $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language Python $*.gir -o $(builddir)/$*-Python/ %-Gjs: %.gir $(AM_V_GEN) - $(AM_V_at)rm -rf $*-Gjs - $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language Gjs $*.gir -o $*-Gjs/ + $(AM_V_at)rm -rf $(builddir)/$*-Gjs + $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language Gjs $*.gir -o $(builddir)/$*-Gjs/ %-C.page.check: %-C @diff -u -w -B -U 10 $(srcdir)/$*-C-expected $*-C && echo " TEST $*-C" -- cgit v1.2.1 From 82b9bb7a7551e22494648808448ccf4cd79c7e2a Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Thu, 18 Apr 2013 17:31:36 +0200 Subject: build: silence "make[5]: unlink: Regress-1.0-Python: Is a directory" https://bugzilla.gnome.org/show_bug.cgi?id=699532 --- tests/scanner/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index 70dfef12..ebffa51e 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -160,17 +160,17 @@ CLEANFILES += $(MALLARD_CLEAN) %-C: %.gir $(AM_V_GEN) - $(AM_V_at)rm -rf $(builddir)/$*-C + $(AM_V_at)-rm -rf $(builddir)/$*-C $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language C $*.gir -o $(builddir)/$*-C/ %-Python: %.gir $(AM_V_GEN) - $(AM_V_at)rm -rf $(builddir)/$*-Python + $(AM_V_at)-rm -rf $(builddir)/$*-Python $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language Python $*.gir -o $(builddir)/$*-Python/ %-Gjs: %.gir $(AM_V_GEN) - $(AM_V_at)rm -rf $(builddir)/$*-Gjs + $(AM_V_at)-rm -rf $(builddir)/$*-Gjs $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language Gjs $*.gir -o $(builddir)/$*-Gjs/ %-C.page.check: %-C -- cgit v1.2.1 From a29101c61598ff08e46a06378e52176db7e50101 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Thu, 18 Apr 2013 17:32:55 +0200 Subject: build: use diff -r when testing generated docs https://bugzilla.gnome.org/show_bug.cgi?id=699532 --- tests/scanner/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index ebffa51e..133dfaad 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -174,13 +174,13 @@ CLEANFILES += $(MALLARD_CLEAN) $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language Gjs $*.gir -o $(builddir)/$*-Gjs/ %-C.page.check: %-C - @diff -u -w -B -U 10 $(srcdir)/$*-C-expected $*-C && echo " TEST $*-C" + @diff -r -u -w -B -U 10 $(srcdir)/$*-C-expected $(builddir)/$*-C && echo " TEST $*-C" %-Python.page.check: %-Python - @diff -u -w -B -U 10 $(srcdir)/$*-Python-expected $*-Python && echo " TEST $*-Python" + @diff -r -u -w -B -U 10 $(srcdir)/$*-Python-expected $(builddir)/$*-Python && echo " TEST $*-Python" %-Gjs.page.check: %-Gjs - @diff -u -w -B -U 10 $(srcdir)/$*-Gjs-expected $*-Gjs && echo " TEST $*-Gjs" + @diff -r -u -w -B -U 10 $(srcdir)/$*-Gjs-expected $(builddir)/$*-Gjs && echo " TEST $*-Gjs" else CHECKDOCS = endif -- cgit v1.2.1 From 0cbfb74484ee49d568651d560783d83fa3c19ad7 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sun, 5 May 2013 14:53:21 -0400 Subject: scanner: Parse __int128 and friends as "int" This is a hack, but all we really want to do is ignore them for now. See https://mail.gnome.org/archives/gtk-devel-list/2013-May/msg00013.html https://bugzilla.gnome.org/show_bug.cgi?id=699722 --- giscanner/scannerlexer.l | 4 ++++ tests/scanner/Regress-1.0-expected.gir | 7 +++++++ tests/scanner/regress.h | 7 +++++++ 3 files changed, 18 insertions(+) diff --git a/giscanner/scannerlexer.l b/giscanner/scannerlexer.l index f8fd3703..554e2da7 100644 --- a/giscanner/scannerlexer.l +++ b/giscanner/scannerlexer.l @@ -177,6 +177,10 @@ stringtext ([^\\\"])|(\\.) "if" { return IF; } "inline" { return INLINE; } "int" { return INT; } +"__uint128_t" { return INT; } +"__int128_t" { return INT; } +"__uint128" { return INT; } +"__int128" { return INT; } "long" { return LONG; } "register" { return REGISTER; } "restrict" { return RESTRICT; } diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 0dadc59c..c4d196dc 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -1946,6 +1946,13 @@ exposed to language bindings. + + + + + + + diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h index adc05dbc..109c4fcd 100644 --- a/tests/scanner/regress.h +++ b/tests/scanner/regress.h @@ -7,6 +7,8 @@ #include #include #include +#include +#include void regress_set_abort_on_error (gboolean abort_on_error); @@ -948,4 +950,9 @@ typedef struct { #define REGRESS_MININT64 ((gint64) G_GINT64_CONSTANT(0x8000000000000000)) #define REGRESS_MAXUINT64 (G_GINT64_CONSTANT(0xffffffffffffffffU)) +/* https://mail.gnome.org/archives/gtk-devel-list/2013-May/msg00008.html */ +typedef struct { + __uint128_t vregs[32]; +} RegressLikeLinuxArmUAPI; + #endif /* __GITESTTYPES_H__ */ -- cgit v1.2.1 From ca93f8474c9f6ca184d0b5806a4e459ad3dcd132 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 7 May 2013 09:35:12 -0400 Subject: Add expected doc files for previous commit --- .../Regress.LikeLinuxArmUAPI.page | 25 ++++++++++++++++++++++ .../Regress.LikeLinuxArmUAPI.page | 25 ++++++++++++++++++++++ .../Regress.LikeLinuxArmUAPI.page | 25 ++++++++++++++++++++++ 3 files changed, 75 insertions(+) create mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.LikeLinuxArmUAPI.page create mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeLinuxArmUAPI.page create mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.LikeLinuxArmUAPI.page diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeLinuxArmUAPI.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeLinuxArmUAPI.page new file mode 100644 index 00000000..3a7df28c --- /dev/null +++ b/tests/scanner/Regress-1.0-C-expected/Regress.LikeLinuxArmUAPI.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.LikeLinuxArmUAPI + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeLinuxArmUAPI.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeLinuxArmUAPI.page new file mode 100644 index 00000000..ff3cb4bf --- /dev/null +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeLinuxArmUAPI.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.LikeLinuxArmUAPI + + + + + + + + + + + + diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeLinuxArmUAPI.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeLinuxArmUAPI.page new file mode 100644 index 00000000..ff3cb4bf --- /dev/null +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeLinuxArmUAPI.page @@ -0,0 +1,25 @@ + + + + + + + + Regress.LikeLinuxArmUAPI + + + + + + + + + + + + -- cgit v1.2.1 From 5460b7f12b3d7b5989307707c59a5d67aed69a44 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Tue, 7 May 2013 11:01:12 +0200 Subject: Update glib annotations --- gir/gio-2.0.c | 1462 +++++++++++++++++++++++++++++++++++++++++++++++++++++ gir/gobject-2.0.c | 18 + 2 files changed, 1480 insertions(+) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 4280fd70..26058de3 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -1903,6 +1903,16 @@ */ +/** + * GProxyAddressEnumerator:default-port: + * + * The default port to use if #GProxyAddressEnumerator:uri does not + * specify one. + * + * Since: 2.38 + */ + + /** * GProxyAddressEnumerator:proxy-resolver: * @@ -3306,6 +3316,15 @@ */ +/** + * SECTION:_GFreedesktopDBus + * @title: _GFreedesktopDBus + * @short_description: Generated C code for the org.freedesktop.DBus D-Bus interface + * + * This section contains code for working with the org.freedesktop.DBus D-Bus interface in C. + */ + + /** * SECTION:extensionpoints * @short_description: Extension Points @@ -8009,6 +8028,1449 @@ */ +/** + * _GFreedesktopDBus: + * + * Abstract interface type for the D-Bus interface org.freedesktop.DBus. + */ + + +/** + * _GFreedesktopDBus::handle-add-match: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_rule: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the AddMatch() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_add_match() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-get-connection-selinux-security-context: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_name: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the GetConnectionSELinuxSecurityContext() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_get_connection_selinux_security_context() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-get-connection-unix-process-id: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_name: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the GetConnectionUnixProcessID() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_get_connection_unix_process_id() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-get-connection-unix-user: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_name: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the GetConnectionUnixUser() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_get_connection_unix_user() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-get-id: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * + * Signal emitted when a remote caller is invoking the GetId() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_get_id() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-get-name-owner: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_name: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the GetNameOwner() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_get_name_owner() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-hello: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * + * Signal emitted when a remote caller is invoking the Hello() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_hello() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-list-activatable-names: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * + * Signal emitted when a remote caller is invoking the ListActivatableNames() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_list_activatable_names() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-list-names: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * + * Signal emitted when a remote caller is invoking the ListNames() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_list_names() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-list-queued-owners: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_name: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the ListQueuedOwners() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_list_queued_owners() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-name-has-owner: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_name: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the NameHasOwner() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_name_has_owner() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-release-name: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_name: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the ReleaseName() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_release_name() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-reload-config: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * + * Signal emitted when a remote caller is invoking the ReloadConfig() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_reload_config() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-remove-match: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_rule: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the RemoveMatch() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_remove_match() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-request-name: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_name: Argument passed by remote caller. + * @arg_flags: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the RequestName() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_request_name() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-start-service-by-name: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_name: Argument passed by remote caller. + * @arg_flags: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the StartServiceByName() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_start_service_by_name() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-update-activation-environment: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_environment: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the UpdateActivationEnvironment() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_update_activation_environment() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::name-acquired: + * @object: A #_GFreedesktopDBus. + * @arg_name: Argument. + * + * On the client-side, this signal is emitted whenever the D-Bus signal "NameAcquired" is received. + * + * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal. + */ + + +/** + * _GFreedesktopDBus::name-lost: + * @object: A #_GFreedesktopDBus. + * @arg_name: Argument. + * + * On the client-side, this signal is emitted whenever the D-Bus signal "NameLost" is received. + * + * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal. + */ + + +/** + * _GFreedesktopDBus::name-owner-changed: + * @object: A #_GFreedesktopDBus. + * @arg_name: Argument. + * @arg_old_owner: Argument. + * @arg_new_owner: Argument. + * + * On the client-side, this signal is emitted whenever the D-Bus signal "NameOwnerChanged" is received. + * + * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal. + */ + + +/** + * _GFreedesktopDBusIface: + * @parent_iface: The parent interface. + * @handle_add_match: Handler for the #_GFreedesktopDBus::handle-add-match signal. + * @handle_get_connection_selinux_security_context: Handler for the #_GFreedesktopDBus::handle-get-connection-selinux-security-context signal. + * @handle_get_connection_unix_process_id: Handler for the #_GFreedesktopDBus::handle-get-connection-unix-process-id signal. + * @handle_get_connection_unix_user: Handler for the #_GFreedesktopDBus::handle-get-connection-unix-user signal. + * @handle_get_id: Handler for the #_GFreedesktopDBus::handle-get-id signal. + * @handle_get_name_owner: Handler for the #_GFreedesktopDBus::handle-get-name-owner signal. + * @handle_hello: Handler for the #_GFreedesktopDBus::handle-hello signal. + * @handle_list_activatable_names: Handler for the #_GFreedesktopDBus::handle-list-activatable-names signal. + * @handle_list_names: Handler for the #_GFreedesktopDBus::handle-list-names signal. + * @handle_list_queued_owners: Handler for the #_GFreedesktopDBus::handle-list-queued-owners signal. + * @handle_name_has_owner: Handler for the #_GFreedesktopDBus::handle-name-has-owner signal. + * @handle_release_name: Handler for the #_GFreedesktopDBus::handle-release-name signal. + * @handle_reload_config: Handler for the #_GFreedesktopDBus::handle-reload-config signal. + * @handle_remove_match: Handler for the #_GFreedesktopDBus::handle-remove-match signal. + * @handle_request_name: Handler for the #_GFreedesktopDBus::handle-request-name signal. + * @handle_start_service_by_name: Handler for the #_GFreedesktopDBus::handle-start-service-by-name signal. + * @handle_update_activation_environment: Handler for the #_GFreedesktopDBus::handle-update-activation-environment signal. + * @name_acquired: Handler for the #_GFreedesktopDBus::name-acquired signal. + * @name_lost: Handler for the #_GFreedesktopDBus::name-lost signal. + * @name_owner_changed: Handler for the #_GFreedesktopDBus::name-owner-changed signal. + * + * Virtual table for the D-Bus interface org.freedesktop.DBus. + */ + + +/** + * _GFreedesktopDBusProxy: + * + * The #_GFreedesktopDBusProxy structure contains only private data and should only be accessed using the provided API. + */ + + +/** + * _GFreedesktopDBusProxyClass: + * @parent_class: The parent class. + * + * Class structure for #_GFreedesktopDBusProxy. + */ + + +/** + * _GFreedesktopDBusSkeleton: + * + * The #_GFreedesktopDBusSkeleton structure contains only private data and should only be accessed using the provided API. + */ + + +/** + * _GFreedesktopDBusSkeletonClass: + * @parent_class: The parent class. + * + * Class structure for #_GFreedesktopDBusSkeleton. + */ + + +/** + * _g_freedesktop_dbus_call_add_match: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_rule: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the AddMatch() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_add_match_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_add_match_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_add_match_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_add_match(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_add_match(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_add_match_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_rule: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the AddMatch() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_add_match() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_get_connection_selinux_security_context: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the GetConnectionSELinuxSecurityContext() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_get_connection_selinux_security_context_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_get_connection_selinux_security_context_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_get_connection_selinux_security_context_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_security_context: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_get_connection_selinux_security_context(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_get_connection_selinux_security_context(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_get_connection_selinux_security_context_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @out_security_context: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the GetConnectionSELinuxSecurityContext() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_get_connection_selinux_security_context() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_get_connection_unix_process_id: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the GetConnectionUnixProcessID() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_get_connection_unix_process_id_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_get_connection_unix_process_id_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_get_connection_unix_process_id_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_pid: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_get_connection_unix_process_id(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_get_connection_unix_process_id(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_get_connection_unix_process_id_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @out_pid: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the GetConnectionUnixProcessID() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_get_connection_unix_process_id() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_get_connection_unix_user: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the GetConnectionUnixUser() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_get_connection_unix_user_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_get_connection_unix_user_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_get_connection_unix_user_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_uid: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_get_connection_unix_user(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_get_connection_unix_user(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_get_connection_unix_user_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @out_uid: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the GetConnectionUnixUser() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_get_connection_unix_user() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_get_id: + * @proxy: A #_GFreedesktopDBusProxy. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the GetId() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_get_id_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_get_id_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_get_id_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_unique_id: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_get_id(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_get_id(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_get_id_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_unique_id: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the GetId() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_get_id() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_get_name_owner: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the GetNameOwner() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_get_name_owner_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_get_name_owner_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_get_name_owner_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_unique_name: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_get_name_owner(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_get_name_owner(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_get_name_owner_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @out_unique_name: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the GetNameOwner() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_get_name_owner() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_hello: + * @proxy: A #_GFreedesktopDBusProxy. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the Hello() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_hello_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_hello_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_hello_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_assigned_name: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_hello(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_hello(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_hello_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_assigned_name: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the Hello() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_hello() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_list_activatable_names: + * @proxy: A #_GFreedesktopDBusProxy. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the ListActivatableNames() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_list_activatable_names_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_list_activatable_names_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_list_activatable_names_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_activatable_names: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_list_activatable_names(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_list_activatable_names(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_list_activatable_names_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_activatable_names: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the ListActivatableNames() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_list_activatable_names() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_list_names: + * @proxy: A #_GFreedesktopDBusProxy. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the ListNames() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_list_names_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_list_names_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_list_names_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_names: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_list_names(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_list_names(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_list_names_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_names: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the ListNames() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_list_names() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_list_queued_owners: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the ListQueuedOwners() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_list_queued_owners_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_list_queued_owners_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_list_queued_owners_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_queued_owners: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_list_queued_owners(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_list_queued_owners(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_list_queued_owners_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @out_queued_owners: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the ListQueuedOwners() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_list_queued_owners() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_name_has_owner: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the NameHasOwner() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_name_has_owner_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_name_has_owner_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_name_has_owner_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_has_owner: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_name_has_owner(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_name_has_owner(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_name_has_owner_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @out_has_owner: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the NameHasOwner() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_name_has_owner() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_release_name: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the ReleaseName() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_release_name_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_release_name_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_release_name_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_value: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_release_name(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_release_name(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_release_name_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @out_value: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the ReleaseName() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_release_name() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_reload_config: + * @proxy: A #_GFreedesktopDBusProxy. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the ReloadConfig() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_reload_config_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_reload_config_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_reload_config_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_reload_config(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_reload_config(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_reload_config_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the ReloadConfig() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_reload_config() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_remove_match: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_rule: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the RemoveMatch() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_remove_match_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_remove_match_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_remove_match_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_remove_match(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_remove_match(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_remove_match_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_rule: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the RemoveMatch() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_remove_match() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_request_name: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @arg_flags: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the RequestName() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_request_name_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_request_name_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_request_name_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_value: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_request_name(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_request_name(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_request_name_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @arg_flags: Argument to pass with the method invocation. + * @out_value: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the RequestName() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_request_name() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_start_service_by_name: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @arg_flags: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the StartServiceByName() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_start_service_by_name_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_start_service_by_name_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_start_service_by_name_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_value: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_start_service_by_name(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_start_service_by_name(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_start_service_by_name_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @arg_flags: Argument to pass with the method invocation. + * @out_value: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the StartServiceByName() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_start_service_by_name() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_update_activation_environment: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_environment: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the UpdateActivationEnvironment() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_update_activation_environment_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_update_activation_environment_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_update_activation_environment_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_update_activation_environment(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_update_activation_environment(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_update_activation_environment_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_environment: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the UpdateActivationEnvironment() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_update_activation_environment() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_complete_add_match: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * + * Helper function used in service implementations to finish handling invocations of the AddMatch() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_get_connection_selinux_security_context: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @security_context: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the GetConnectionSELinuxSecurityContext() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_get_connection_unix_process_id: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @pid: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the GetConnectionUnixProcessID() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_get_connection_unix_user: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @uid: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the GetConnectionUnixUser() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_get_id: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @unique_id: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the GetId() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_get_name_owner: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @unique_name: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the GetNameOwner() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_hello: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @assigned_name: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the Hello() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_list_activatable_names: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @activatable_names: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the ListActivatableNames() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_list_names: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @names: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the ListNames() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_list_queued_owners: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @queued_owners: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the ListQueuedOwners() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_name_has_owner: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @has_owner: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the NameHasOwner() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_release_name: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @value: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the ReleaseName() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_reload_config: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * + * Helper function used in service implementations to finish handling invocations of the ReloadConfig() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_remove_match: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * + * Helper function used in service implementations to finish handling invocations of the RemoveMatch() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_request_name: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @value: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the RequestName() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_start_service_by_name: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @value: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the StartServiceByName() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_update_activation_environment: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * + * Helper function used in service implementations to finish handling invocations of the UpdateActivationEnvironment() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_emit_name_acquired: + * @object: A #_GFreedesktopDBus. + * @arg_name: Argument to pass with the signal. + * + * Emits the "NameAcquired" D-Bus signal. + */ + + +/** + * _g_freedesktop_dbus_emit_name_lost: + * @object: A #_GFreedesktopDBus. + * @arg_name: Argument to pass with the signal. + * + * Emits the "NameLost" D-Bus signal. + */ + + +/** + * _g_freedesktop_dbus_emit_name_owner_changed: + * @object: A #_GFreedesktopDBus. + * @arg_name: Argument to pass with the signal. + * @arg_old_owner: Argument to pass with the signal. + * @arg_new_owner: Argument to pass with the signal. + * + * Emits the "NameOwnerChanged" D-Bus signal. + */ + + +/** + * _g_freedesktop_dbus_interface_info: + * + * Gets a machine-readable description of the org.freedesktop.DBus D-Bus interface. + * + * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free. + */ + + +/** + * _g_freedesktop_dbus_override_properties: + * @klass: The class structure for a #GObject-derived class. + * @property_id_begin: The property id to assign to the first overridden property. + * + * Overrides all #GObject properties in the #_GFreedesktopDBus interface for a concrete class. + * The properties are overridden in the order they are defined. + * + * Returns: The last property id. + */ + + +/** + * _g_freedesktop_dbus_proxy_new: + * @connection: A #GDBusConnection. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied. + * @user_data: User data to pass to @callback. + * + * Asynchronously creates a proxy for the D-Bus interface org.freedesktop.DBus. See g_dbus_proxy_new() for more details. + * + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_proxy_new_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_proxy_new_sync() for the synchronous, blocking version of this constructor. + */ + + +/** + * _g_freedesktop_dbus_proxy_new_finish: + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_proxy_new(). + * @error: Return location for error or %NULL + * + * Finishes an operation started with _g_freedesktop_dbus_proxy_new(). + * + * Returns: (transfer full) (type _GFreedesktopDBusProxy): The constructed proxy object or %NULL if @error is set. + */ + + +/** + * _g_freedesktop_dbus_proxy_new_for_bus: + * @bus_type: A #GBusType. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: A bus name (well-known or unique). + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied. + * @user_data: User data to pass to @callback. + * + * Like _g_freedesktop_dbus_proxy_new() but takes a #GBusType instead of a #GDBusConnection. + * + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_proxy_new_for_bus_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor. + */ + + +/** + * _g_freedesktop_dbus_proxy_new_for_bus_finish: + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_proxy_new_for_bus(). + * @error: Return location for error or %NULL + * + * Finishes an operation started with _g_freedesktop_dbus_proxy_new_for_bus(). + * + * Returns: (transfer full) (type _GFreedesktopDBusProxy): The constructed proxy object or %NULL if @error is set. + */ + + +/** + * _g_freedesktop_dbus_proxy_new_for_bus_sync: + * @bus_type: A #GBusType. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: A bus name (well-known or unique). + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL + * + * Like _g_freedesktop_dbus_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection. + * + * The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_proxy_new_for_bus() for the asynchronous version of this constructor. + * + * Returns: (transfer full) (type _GFreedesktopDBusProxy): The constructed proxy object or %NULL if @error is set. + */ + + +/** + * _g_freedesktop_dbus_proxy_new_sync: + * @connection: A #GDBusConnection. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL + * + * Synchronously creates a proxy for the D-Bus interface org.freedesktop.DBus. See g_dbus_proxy_new_sync() for more details. + * + * The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_proxy_new() for the asynchronous version of this constructor. + * + * Returns: (transfer full) (type _GFreedesktopDBusProxy): The constructed proxy object or %NULL if @error is set. + */ + + +/** + * _g_freedesktop_dbus_skeleton_new: + * + * Creates a skeleton object for the D-Bus interface org.freedesktop.DBus. + * + * Returns: (transfer full) (type _GFreedesktopDBusSkeleton): The skeleton object. + */ + + /** * _g_io_module_get_default: * @extension_point: the name of an extension point diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c index 3f568826..46402f8a 100644 --- a/gir/gobject-2.0.c +++ b/gir/gobject-2.0.c @@ -210,6 +210,11 @@ * either one of the #GObject instances it refers to are finalized, or when * the #GBinding instance loses its last reference. * + * Bindings for languages with garbage collection can use + * g_binding_unbind() to explicitly release a binding between the source + * and target properties, instead of relying on the last reference on the + * binding, source, and target instances to drop. + * * #GBinding is available since GObject 2.26 */ @@ -763,6 +768,19 @@ */ +/** + * g_binding_unbind: + * @binding: a #GBinding + * + * Explicitly releases the binding between the source and the target + * property expressed by @binding. + * + * This function does not change the reference count of @binding. + * + * Since: 2.38 + */ + + /** * g_boxed_copy: * @boxed_type: The type of @src_boxed. -- cgit v1.2.1 From beadfeff33302a3012fb5df1a7197cb4fac8f6f6 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Tue, 9 Apr 2013 12:04:08 +0200 Subject: giscanner: make _pass_read_annotations2() more readable _apply_annotations2_function() is only ever called by _pass_read_annotations2() so there's no need to go and hide what's being done behind an extra method call. Also change the 'if not something; return' into a more readable 'if something: do something'... https://bugzilla.gnome.org/show_bug.cgi?id=697622 --- giscanner/maintransformer.py | 48 ++++++++++++++++++++------------------------ 1 file changed, 22 insertions(+), 26 deletions(-) diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py index fb199861..6cf5a006 100644 --- a/giscanner/maintransformer.py +++ b/giscanner/maintransformer.py @@ -831,34 +831,30 @@ usage is void (*_gtk_reserved1)(void);""" def _pass_read_annotations2(self, node, chain): if isinstance(node, ast.Function): - self._apply_annotations2_function(node, chain) + block = self._blocks.get(node.symbol) + + self._apply_annotation_rename_to(node, chain, block) + + # Handle virtual invokers + parent = chain[-1] if chain else None + if (block and parent): + virtual_annotation = block.get_tag(TAG_VFUNC) + if virtual_annotation: + invoker_name = virtual_annotation.value + matched = False + for vfunc in parent.virtual_methods: + if vfunc.name == invoker_name: + matched = True + vfunc.invoker = node.name + # Also merge in annotations + self._apply_annotations_callable(vfunc, [parent], block) + break + if not matched: + message.warn_node(node, + "Virtual slot %r not found for %r annotation" % (invoker_name, + TAG_VFUNC)) return True - def _apply_annotations2_function(self, node, chain): - block = self._blocks.get(node.symbol) - - self._apply_annotation_rename_to(node, chain, block) - - # Handle virtual invokers - parent = chain[-1] if chain else None - if not (block and parent): - return - virtual = block.get_tag(TAG_VFUNC) - if not virtual: - return - invoker_name = virtual.value - matched = False - for vfunc in parent.virtual_methods: - if vfunc.name == invoker_name: - matched = True - vfunc.invoker = node.name - # Also merge in annotations - self._apply_annotations_callable(vfunc, [parent], block) - break - if not matched: - message.warn_node(node, - "Virtual slot %r not found for %r annotation" % (invoker_name, TAG_VFUNC)) - def _resolve_and_filter_type_list(self, typelist): """Given a list of Type instances, return a new list of types with the ones that failed to resolve removed.""" -- cgit v1.2.1 From b70fe6a5649ed037f2554ae13067fd9929d841f8 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 24 Apr 2013 17:41:49 +0200 Subject: giscanner: Define source and header filename extensions only once Enables us to to use a more effecient list membership test instead of testing the end of some string multiple times. https://bugzilla.gnome.org/show_bug.cgi?id=699533 --- giscanner/scannermain.py | 7 ++----- giscanner/sourcescanner.py | 7 +++++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py index b068f6fb..deefcf99 100755 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -38,7 +38,7 @@ from giscanner.girparser import GIRParser from giscanner.girwriter import GIRWriter from giscanner.maintransformer import MainTransformer from giscanner.shlibs import resolve_shlibs -from giscanner.sourcescanner import SourceScanner +from giscanner.sourcescanner import SourceScanner, ALL_EXTS from giscanner.transformer import Transformer from . import utils @@ -253,10 +253,7 @@ def extract_filenames(args): for arg in args: # We don't support real C++ parsing yet, but we should be able # to understand C API implemented in C++ files. - if (arg.endswith('.c') or arg.endswith('.cpp') or - arg.endswith('.cc') or arg.endswith('.cxx') or - arg.endswith('.h') or arg.endswith('.hpp') or - arg.endswith('.hxx')): + if os.path.splitext(arg)[1] in ALL_EXTS: if not os.path.exists(arg): _error('%s: no such a file or directory' % (arg, )) # Make absolute, because we do comparisons inside scannerparser.c diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py index bd84a605..a1103a10 100644 --- a/giscanner/sourcescanner.py +++ b/giscanner/sourcescanner.py @@ -32,6 +32,10 @@ with LibtoolImporter(None, None): else: from giscanner._giscanner import SourceScanner as CSourceScanner +HEADER_EXTS = ['.h', '.hpp', '.hxx'] +SOURCE_EXTS = ['.c', '.cpp', '.cc', '.cxx'] +ALL_EXTS = SOURCE_EXTS + HEADER_EXTS + (CSYMBOL_TYPE_INVALID, CSYMBOL_TYPE_ELLIPSIS, CSYMBOL_TYPE_CONST, @@ -241,8 +245,7 @@ class SourceScanner(object): headers = [] for filename in filenames: - if (filename.endswith('.c') or filename.endswith('.cpp') or - filename.endswith('.cc') or filename.endswith('.cxx')): + if os.path.splitext(filename)[1] in SOURCE_EXTS: filename = os.path.abspath(filename) self._scanner.lex_filename(filename) else: -- cgit v1.2.1 From 44ff0d355021f527a518d320f403aa0717fd0bc8 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Fri, 12 Apr 2013 07:31:55 +0200 Subject: giscanner: small cpp_args cleanup No need for two variables... https://bugzilla.gnome.org/show_bug.cgi?id=699533 --- giscanner/sourcescanner.py | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py index a1103a10..736ddbd4 100644 --- a/giscanner/sourcescanner.py +++ b/giscanner/sourcescanner.py @@ -278,19 +278,17 @@ class SourceScanner(object): defines = ['__GI_SCANNER__'] undefs = [] - cpp_exec = os.environ.get('CC', 'cc').split() - # The Microsoft compiler/preprocessor (cl) does not accept - # source input from stdin (the '-' flag), so we need - # some help from gcc from MinGW/Cygwin or so. - # Note that the generated dumper program is - # still built and linked by Visual C++. - if 'cl' in cpp_exec: - cpp_args = 'gcc'.split() - else: - cpp_args = cpp_exec + cpp_args = os.environ.get('CC', 'cc').split() # support CC="ccache gcc" + if 'cl' in cpp_args: + # The Microsoft compiler/preprocessor (cl) does not accept + # source input from stdin (the '-' flag), so we need + # some help from gcc from MinGW/Cygwin or so. + # Note that the generated dumper program is + # still built and linked by Visual C++. + cpp_args = ['gcc'] cpp_args += ['-E', '-C', '-I.', '-'] - cpp_args += self._cpp_options + proc = subprocess.Popen(cpp_args, stdin=subprocess.PIPE, stdout=subprocess.PIPE) -- cgit v1.2.1 From 0dbd46680a7fac7ac74c2945e23b95dd04ff79dc Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Thu, 25 Apr 2013 17:08:56 +0200 Subject: giscanner: simplify the MainTransformer().transform() method The ast.Namespace.names instance attribute is an OrderedDict which itself is a specialised dict() subclass. There are any number of ways to test if a dict() is empty or not. Creating a copy of it's keys by iterating over them just to count the number of items in the copy is not the most elegant way though. https://bugzilla.gnome.org/show_bug.cgi?id=699533 --- giscanner/maintransformer.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py index 6cf5a006..d2a8be7b 100644 --- a/giscanner/maintransformer.py +++ b/giscanner/maintransformer.py @@ -48,12 +48,10 @@ class MainTransformer(object): # Public API def transform(self): - contents = list(self._namespace.itervalues()) - if len(contents) == 0: - message.fatal("""Namespace is empty; likely causes are: -* Not including .h files to be scanned -* Broken --identifier-prefix -""") + if not self._namespace.names: + message.fatal('Namespace is empty; likely causes are:\n' + '* Not including .h files to be scanned\n' + '* Broken --identifier-prefix') # Some initial namespace surgery self._namespace.walk(self._pass_fixup_hidden_fields) -- cgit v1.2.1 From bb482abafe4bc6d88cbbc4abc36967a3012e9f50 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Thu, 25 Apr 2013 00:22:59 +0200 Subject: giscanner: remove unneeded encode('utf-8').decode('utf-8') roundtrip line is a unicode() instance, xml.sax.saxutils.escape() does nothing more than call a couple of replace() methods on said unicode() instance so it makes little sense to encode line into a str() and decode the escaped result back into a unicode(). https://bugzilla.gnome.org/show_bug.cgi?id=699533 --- giscanner/xmlwriter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giscanner/xmlwriter.py b/giscanner/xmlwriter.py index 11f84859..4a1dc9fb 100755 --- a/giscanner/xmlwriter.py +++ b/giscanner/xmlwriter.py @@ -135,7 +135,7 @@ class XMLWriter(object): line = line.decode('utf-8') assert isinstance(line, unicode) if do_escape: - line = escape(line.encode('utf-8')).decode('utf-8') + line = escape(line) if indent: self._data.write('%s%s%s' % ( self._indent_char * self._indent, -- cgit v1.2.1 From e7e1ba84f31759cec59460be93bcbd01f1add62a Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Thu, 25 Apr 2013 17:28:55 +0200 Subject: giscanner: move odict.OrderedDict into a collections package because we'll add more related code to collections later on https://bugzilla.gnome.org/show_bug.cgi?id=699536 --- Makefile-giscanner.am | 10 ++- giscanner/annotationparser.py | 2 +- giscanner/ast.py | 2 +- giscanner/collections/__init__.py | 22 +++++++ giscanner/collections/ordereddict.py | 120 +++++++++++++++++++++++++++++++++++ giscanner/odict.py | 117 ---------------------------------- 6 files changed, 151 insertions(+), 122 deletions(-) create mode 100644 giscanner/collections/__init__.py create mode 100644 giscanner/collections/ordereddict.py delete mode 100644 giscanner/odict.py diff --git a/Makefile-giscanner.am b/Makefile-giscanner.am index e8def0ee..47750864 100644 --- a/Makefile-giscanner.am +++ b/Makefile-giscanner.am @@ -26,14 +26,14 @@ libgiscanner_la_CFLAGS = $(GOBJECT_CFLAGS) $(GIO_CFLAGS) # Python module pkgpyexecdir = $(pkglibdir)/giscanner pkgpyexec_LTLIBRARIES = _giscanner.la -pkgpyexec_PYTHON = \ +pkgpyexec_PYTHON = \ giscanner/__init__.py \ giscanner/annotationmain.py \ giscanner/annotationparser.py \ giscanner/ast.py \ giscanner/cachestore.py \ giscanner/codegen.py \ - giscanner/docmain.py \ + giscanner/docmain.py \ giscanner/docwriter.py \ giscanner/dumper.py \ giscanner/introspectablepass.py \ @@ -41,7 +41,6 @@ pkgpyexec_PYTHON = \ giscanner/girwriter.py \ giscanner/gdumpparser.py \ giscanner/libtoolimporter.py \ - giscanner/odict.py \ giscanner/maintransformer.py \ giscanner/message.py \ giscanner/shlibs.py \ @@ -53,6 +52,11 @@ pkgpyexec_PYTHON = \ giscanner/utils.py \ giscanner/xmlwriter.py +collectionsdir = $(pkgpyexecdir)/collections +collections_PYTHON = \ + giscanner/collections/__init__.py \ + giscanner/collections/ordereddict.py + templatedir = $(pkglibdir) nobase_dist_template_DATA = \ giscanner/doctemplates/base.tmpl \ diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index f722346c..ef9cd31d 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -26,7 +26,7 @@ import re from . import message -from .odict import OrderedDict +from .collections import OrderedDict # GTK-Doc comment block parts diff --git a/giscanner/ast.py b/giscanner/ast.py index d307b553..25184886 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -24,8 +24,8 @@ from itertools import chain from . import message +from .collections import OrderedDict from .message import Position -from .odict import OrderedDict from .utils import to_underscores class Type(object): diff --git a/giscanner/collections/__init__.py b/giscanner/collections/__init__.py new file mode 100644 index 00000000..29987a10 --- /dev/null +++ b/giscanner/collections/__init__.py @@ -0,0 +1,22 @@ +# -*- Mode: Python -*- +# GObject-Introspection - a framework for introspecting GObject libraries +# Copyright (C) 2013 Dieter Verfaillie +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. +# + + +from .ordereddict import OrderedDict diff --git a/giscanner/collections/ordereddict.py b/giscanner/collections/ordereddict.py new file mode 100644 index 00000000..0cb4b956 --- /dev/null +++ b/giscanner/collections/ordereddict.py @@ -0,0 +1,120 @@ +# -*- Mode: Python -*- +# GObject-Introspection - a framework for introspecting GObject libraries +# Copyright (C) 2008 Johan Dahlin +# Copyright (C) 2013 Dieter Verfaillie +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the +# Free Software Foundation, Inc., 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. + + +# Borrowed from: +# http://hg.sqlalchemy.org/sqlalchemy/raw-file/77e2264283d4/lib/sqlalchemy/util/_collections.py +# http://hg.sqlalchemy.org/sqlalchemy/raw-file/77e2264283d4/AUTHORS +# +# util/_collections.py +# Copyright (C) 2005-2012 the SQLAlchemy authors and contributors +# +# This module is part of SQLAlchemy and is released under +# the MIT License: http://www.opensource.org/licenses/mit-license.php + + +class OrderedDict(dict): + """A dict that returns keys/values/items in the order they were added.""" + + def __init__(self, ____sequence=None, **kwargs): + self._list = [] + if ____sequence is None: + if kwargs: + self.update(**kwargs) + else: + self.update(____sequence, **kwargs) + + def clear(self): + self._list = [] + dict.clear(self) + + def copy(self): + return self.__copy__() + + def __copy__(self): + return OrderedDict(self) + + def sort(self, *arg, **kw): + self._list.sort(*arg, **kw) + + def update(self, ____sequence=None, **kwargs): + if ____sequence is not None: + if hasattr(____sequence, 'keys'): + for key in ____sequence.keys(): + self.__setitem__(key, ____sequence[key]) + else: + for key, value in ____sequence: + self[key] = value + if kwargs: + self.update(kwargs) + + def setdefault(self, key, value): + if key not in self: + self.__setitem__(key, value) + return value + else: + return self.__getitem__(key) + + def __iter__(self): + return iter(self._list) + + def values(self): + return [self[key] for key in self._list] + + def itervalues(self): + return iter([self[key] for key in self._list]) + + def keys(self): + return list(self._list) + + def iterkeys(self): + return iter(self.keys()) + + def items(self): + return [(key, self[key]) for key in self.keys()] + + def iteritems(self): + return iter(self.items()) + + def __setitem__(self, key, obj): + if key not in self: + try: + self._list.append(key) + except AttributeError: + # work around Python pickle loads() with + # dict subclass (seems to ignore __setstate__?) + self._list = [key] + dict.__setitem__(self, key, obj) + + def __delitem__(self, key): + dict.__delitem__(self, key) + self._list.remove(key) + + def pop(self, key, *default): + present = key in self + value = dict.pop(self, key, *default) + if present: + self._list.remove(key) + return value + + def popitem(self): + item = dict.popitem(self) + self._list.remove(item[0]) + return item diff --git a/giscanner/odict.py b/giscanner/odict.py deleted file mode 100644 index f9558954..00000000 --- a/giscanner/odict.py +++ /dev/null @@ -1,117 +0,0 @@ -# -*- Mode: Python -*- -# GObject-Introspection - a framework for introspecting GObject libraries -# Copyright (C) 2008 Johan Dahlin -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the -# Free Software Foundation, Inc., 59 Temple Place - Suite 330, -# Boston, MA 02111-1307, USA. - - -# Borrowed from: -# http://hg.sqlalchemy.org/sqlalchemy/raw-file/77e2264283d4/lib/sqlalchemy/util/_collections.py -# http://hg.sqlalchemy.org/sqlalchemy/raw-file/77e2264283d4/AUTHORS -# -# util/_collections.py -# Copyright (C) 2005-2012 the SQLAlchemy authors and contributors -# -# This module is part of SQLAlchemy and is released under -# the MIT License: http://www.opensource.org/licenses/mit-license.php -class OrderedDict(dict): - """A dict that returns keys/values/items in the order they were added.""" - - def __init__(self, ____sequence=None, **kwargs): - self._list = [] - if ____sequence is None: - if kwargs: - self.update(**kwargs) - else: - self.update(____sequence, **kwargs) - - def clear(self): - self._list = [] - dict.clear(self) - - def copy(self): - return self.__copy__() - - def __copy__(self): - return OrderedDict(self) - - def sort(self, *arg, **kw): - self._list.sort(*arg, **kw) - - def update(self, ____sequence=None, **kwargs): - if ____sequence is not None: - if hasattr(____sequence, 'keys'): - for key in ____sequence.keys(): - self.__setitem__(key, ____sequence[key]) - else: - for key, value in ____sequence: - self[key] = value - if kwargs: - self.update(kwargs) - - def setdefault(self, key, value): - if key not in self: - self.__setitem__(key, value) - return value - else: - return self.__getitem__(key) - - def __iter__(self): - return iter(self._list) - - def values(self): - return [self[key] for key in self._list] - - def itervalues(self): - return iter([self[key] for key in self._list]) - - def keys(self): - return list(self._list) - - def iterkeys(self): - return iter(self.keys()) - - def items(self): - return [(key, self[key]) for key in self.keys()] - - def iteritems(self): - return iter(self.items()) - - def __setitem__(self, key, obj): - if key not in self: - try: - self._list.append(key) - except AttributeError: - # work around Python pickle loads() with - # dict subclass (seems to ignore __setstate__?) - self._list = [key] - dict.__setitem__(self, key, obj) - - def __delitem__(self, key): - dict.__delitem__(self, key) - self._list.remove(key) - - def pop(self, key, *default): - present = key in self - value = dict.pop(self, key, *default) - if present: - self._list.remove(key) - return value - - def popitem(self): - item = dict.popitem(self) - self._list.remove(item[0]) - return item -- cgit v1.2.1 From 97da62989712c1105198819c7a9481657d9d335b Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 7 May 2013 09:54:09 -0400 Subject: Revert addition of __int128 tests It's not available on 32 bit architectures, which is a pain for our testing because we can't easily make Regress architecture independent. This reverts commit ca93f8474c9f6ca184d0b5806a4e459ad3dcd132. --- .../Regress.LikeLinuxArmUAPI.page | 25 ---------------------- .../Regress.LikeLinuxArmUAPI.page | 25 ---------------------- .../Regress.LikeLinuxArmUAPI.page | 25 ---------------------- tests/scanner/Regress-1.0-expected.gir | 7 ------ tests/scanner/regress.h | 5 ----- 5 files changed, 87 deletions(-) delete mode 100644 tests/scanner/Regress-1.0-C-expected/Regress.LikeLinuxArmUAPI.page delete mode 100644 tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeLinuxArmUAPI.page delete mode 100644 tests/scanner/Regress-1.0-Python-expected/Regress.LikeLinuxArmUAPI.page diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.LikeLinuxArmUAPI.page b/tests/scanner/Regress-1.0-C-expected/Regress.LikeLinuxArmUAPI.page deleted file mode 100644 index 3a7df28c..00000000 --- a/tests/scanner/Regress-1.0-C-expected/Regress.LikeLinuxArmUAPI.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.LikeLinuxArmUAPI - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeLinuxArmUAPI.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeLinuxArmUAPI.page deleted file mode 100644 index ff3cb4bf..00000000 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.LikeLinuxArmUAPI.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.LikeLinuxArmUAPI - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeLinuxArmUAPI.page b/tests/scanner/Regress-1.0-Python-expected/Regress.LikeLinuxArmUAPI.page deleted file mode 100644 index ff3cb4bf..00000000 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.LikeLinuxArmUAPI.page +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - Regress.LikeLinuxArmUAPI - - - - - - - - - - - - diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index c4d196dc..0dadc59c 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -1946,13 +1946,6 @@ exposed to language bindings. - - - - - - - diff --git a/tests/scanner/regress.h b/tests/scanner/regress.h index 109c4fcd..274d0e4b 100644 --- a/tests/scanner/regress.h +++ b/tests/scanner/regress.h @@ -950,9 +950,4 @@ typedef struct { #define REGRESS_MININT64 ((gint64) G_GINT64_CONSTANT(0x8000000000000000)) #define REGRESS_MAXUINT64 (G_GINT64_CONSTANT(0xffffffffffffffffU)) -/* https://mail.gnome.org/archives/gtk-devel-list/2013-May/msg00008.html */ -typedef struct { - __uint128_t vregs[32]; -} RegressLikeLinuxArmUAPI; - #endif /* __GITESTTYPES_H__ */ -- cgit v1.2.1 From a0185528a17378b6e6e7bc458f34b1f3719cc420 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 27 Mar 2013 17:33:52 -0400 Subject: annotationparser: Remove get_tag/get_param They're useless if we can just access the dict directly. https://bugzilla.gnome.org/show_bug.cgi?id=688897 --- giscanner/annotationparser.py | 6 ------ giscanner/introspectablepass.py | 2 +- giscanner/maintransformer.py | 34 +++++++++++++++++----------------- 3 files changed, 18 insertions(+), 24 deletions(-) diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index ef9cd31d..c0b439a1 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -378,12 +378,6 @@ class DocBlock(object): def __repr__(self): return '' % (self.name, self.options) - def get_tag(self, name): - return self.tags.get(name) - - def get_param(self, name): - return self.params.get(name) - def to_gtk_doc(self): options = '' if self.options: diff --git a/giscanner/introspectablepass.py b/giscanner/introspectablepass.py index 460c8200..3e295391 100644 --- a/giscanner/introspectablepass.py +++ b/giscanner/introspectablepass.py @@ -58,7 +58,7 @@ class IntrospectablePass(object): else: context = "return value: " if block: - return_tag = block.get_tag(TAG_RETURNS) + return_tag = block.tags.get(TAG_RETURNS) if return_tag: position = return_tag.position message.warn_node(parent, prefix + context + text, diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py index d2a8be7b..28ffed36 100644 --- a/giscanner/maintransformer.py +++ b/giscanner/maintransformer.py @@ -135,7 +135,7 @@ usage is void (*_gtk_reserved1)(void);""" def _apply_annotation_rename_to(self, node, chain, block): if not block: return - rename_to = block.get_tag(TAG_RENAME_TO) + rename_to = block.tags.get(TAG_RENAME_TO) if not rename_to: return rename_to = rename_to.value @@ -227,13 +227,13 @@ usage is void (*_gtk_reserved1)(void);""" if isinstance(node, ast.Class): block = self._get_block(node) if block: - tag = block.get_tag(TAG_UNREF_FUNC) + tag = block.tags.get(TAG_UNREF_FUNC) node.unref_func = tag.value if tag else None - tag = block.get_tag(TAG_REF_FUNC) + tag = block.tags.get(TAG_REF_FUNC) node.ref_func = tag.value if tag else None - tag = block.get_tag(TAG_SET_VALUE_FUNC) + tag = block.tags.get(TAG_SET_VALUE_FUNC) node.set_value_func = tag.value if tag else None - tag = block.get_tag(TAG_GET_VALUE_FUNC) + tag = block.tags.get(TAG_GET_VALUE_FUNC) node.get_value_func = tag.value if tag else None if isinstance(node, ast.Constant): self._apply_annotations_constant(node) @@ -595,11 +595,11 @@ usage is void (*_gtk_reserved1)(void);""" node.doc = block.comment if block.comment else '' - since_tag = block.get_tag(TAG_SINCE) + since_tag = block.tags.get(TAG_SINCE) if since_tag is not None: node.version = since_tag.value - deprecated_tag = block.get_tag(TAG_DEPRECATED) + deprecated_tag = block.tags.get(TAG_DEPRECATED) if deprecated_tag is not None: value = deprecated_tag.value if ': ' in value: @@ -613,7 +613,7 @@ usage is void (*_gtk_reserved1)(void);""" if version is not None: node.deprecated_version = version - stability_tag = block.get_tag(TAG_STABILITY) + stability_tag = block.tags.get(TAG_STABILITY) if stability_tag is not None: stability = stability_tag.value.capitalize() if stability in ["Stable", "Unstable", "Private", "Internal"]: @@ -622,7 +622,7 @@ usage is void (*_gtk_reserved1)(void);""" message.warn('unknown value "%s" for Stability tag' % ( stability_tag.value), stability_tag.position) - annos_tag = block.get_tag(TAG_ATTRIBUTES) + annos_tag = block.tags.get(TAG_ATTRIBUTES) if annos_tag is not None: for key, value in annos_tag.options.items(): if value: @@ -684,7 +684,7 @@ usage is void (*_gtk_reserved1)(void);""" def _apply_annotations_return(self, parent, return_, block): if block: - tag = block.get_tag(TAG_RETURNS) + tag = block.tags.get(TAG_RETURNS) else: tag = None self._apply_annotations_param_ret_common(parent, return_, tag) @@ -695,7 +695,7 @@ usage is void (*_gtk_reserved1)(void);""" declparams.add(parent.instance_parameter.argname) for param in params: if block: - tag = block.get_param(param.argname) + tag = block.params.get(param.argname) else: tag = None self._apply_annotations_param(parent, param, tag) @@ -721,7 +721,7 @@ usage is void (*_gtk_reserved1)(void);""" text = ', should be one of %s' % ( ', '.join(repr(p) for p in unused), ) - tag = block.get_param(doc_name) + tag = block.params.get(doc_name) message.warn( '%s: unknown parameter %r in documentation comment%s' % ( block.name, doc_name, text), @@ -749,7 +749,7 @@ usage is void (*_gtk_reserved1)(void);""" def _apply_annotations_field(self, parent, block, field): if not block: return - tag = block.get_param(field.name) + tag = block.params.get(field.name) if not tag: return t = tag.options.get(OPT_TYPE) @@ -767,7 +767,7 @@ usage is void (*_gtk_reserved1)(void);""" self._apply_annotations_annotated(prop, block) if not block: return - transfer_tag = block.get_tag(TAG_TRANSFER) + transfer_tag = block.tags.get(TAG_TRANSFER) if transfer_tag is not None: transfer = transfer_tag.value if transfer == OPT_TRANSFER_FLOATING: @@ -775,7 +775,7 @@ usage is void (*_gtk_reserved1)(void);""" prop.transfer = transfer else: prop.transfer = self._get_transfer_default(parent, prop) - type_tag = block.get_tag(TAG_TYPE) + type_tag = block.tags.get(TAG_TYPE) if type_tag: prop.type = self._resolve_toplevel(type_tag.value, prop.type, prop, parent) @@ -814,7 +814,7 @@ usage is void (*_gtk_reserved1)(void);""" self._apply_annotations_annotated(node, block) - tag = block.get_tag(TAG_VALUE) + tag = block.tags.get(TAG_VALUE) if tag: node.value = tag.value @@ -836,7 +836,7 @@ usage is void (*_gtk_reserved1)(void);""" # Handle virtual invokers parent = chain[-1] if chain else None if (block and parent): - virtual_annotation = block.get_tag(TAG_VFUNC) + virtual_annotation = block.tags.get(TAG_VFUNC) if virtual_annotation: invoker_name = virtual_annotation.value matched = False -- cgit v1.2.1 From 2dfdfdf42516bc07a5c2159ae5c696038567b9a1 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 27 Mar 2013 16:28:36 -0400 Subject: transformer: Remove annotations The transformer doesn't need the annotations, so why are we giving it to it? https://bugzilla.gnome.org/show_bug.cgi?id=699854 --- giscanner/scannermain.py | 1 - giscanner/transformer.py | 4 ---- 2 files changed, 5 deletions(-) diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py index deefcf99..8ccd1f09 100755 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -452,7 +452,6 @@ def scanner_main(args): blocks = ap.parse(ss.get_comments()) # Transform the C symbols into AST nodes - transformer.set_annotations(blocks) transformer.parse(ss.get_symbols()) if not options.header_only: diff --git a/giscanner/transformer.py b/giscanner/transformer.py index 2708f0a6..f1aa165d 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -57,7 +57,6 @@ class Transformer(object): self._parsed_includes = {} # Namespace> self._includepaths = [] self._passthrough_mode = False - self._annotations = {} def get_pkgconfig_packages(self): return self._pkg_config_packages @@ -68,9 +67,6 @@ class Transformer(object): def set_passthrough_mode(self): self._passthrough_mode = True - def set_annotations(self, annotations): - self._annotations = annotations - def _append_new_node(self, node): original = self._namespace.get(node.name) # Special case constants here; we allow duplication to sort-of -- cgit v1.2.1 From 88c747c9bbc3c1216a526cc65f9860354cdab0a4 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 27 Mar 2013 15:02:40 -0400 Subject: sectionparser: Construct Subsections, not Sections Whoops! https://bugzilla.gnome.org/show_bug.cgi?id=699856 --- giscanner/sectionparser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giscanner/sectionparser.py b/giscanner/sectionparser.py index 330471b2..042a753f 100644 --- a/giscanner/sectionparser.py +++ b/giscanner/sectionparser.py @@ -68,7 +68,7 @@ def parse_sections_file(lines): match = re.match(line, r").*>") if match: - current_subsection = Section(match.groupdict['name']) + current_subsection = Subsection(match.groupdict['name']) current_section.subsections.append(current_subsection) continue -- cgit v1.2.1 From 40623576a2558fda814c0dcf135d397b8674f420 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 27 Mar 2013 15:48:50 -0400 Subject: sectionparser: Fix regex matching https://bugzilla.gnome.org/show_bug.cgi?id=699856 --- giscanner/sectionparser.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/giscanner/sectionparser.py b/giscanner/sectionparser.py index 042a753f..6230b5cc 100644 --- a/giscanner/sectionparser.py +++ b/giscanner/sectionparser.py @@ -56,17 +56,17 @@ def parse_sections_file(lines): current_section = None continue - match = re.match(line, r"(?P.*)") + match = re.match(r"(?P.*)", line) if match: current_section.file = match.groupdict['contents'] continue - match = re.match(line, r"(?P<contents>.*)") + match = re.match(r"(?P<contents>.*)", line) if match: current_section.title = match.groupdict['contents'] continue - match = re.match(line, r").*>") + match = re.match(r").*>", line) if match: current_subsection = Subsection(match.groupdict['name']) current_section.subsections.append(current_subsection) -- cgit v1.2.1 From a1a513a7a6adc7685a88be910efc92dd81fa21c0 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 27 Mar 2013 15:49:07 -0400 Subject: sectionparser: Fix subsection regex https://bugzilla.gnome.org/show_bug.cgi?id=699856 --- giscanner/sectionparser.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giscanner/sectionparser.py b/giscanner/sectionparser.py index 6230b5cc..273cdebe 100644 --- a/giscanner/sectionparser.py +++ b/giscanner/sectionparser.py @@ -66,7 +66,7 @@ def parse_sections_file(lines): current_section.title = match.groupdict['contents'] continue - match = re.match(r").*>", line) + match = re.match(r".*)>", line) if match: current_subsection = Subsection(match.groupdict['name']) current_section.subsections.append(current_subsection) -- cgit v1.2.1 From af0158ebabd6e2ceca4e33a9ab8d391025936dd1 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 27 Mar 2013 15:49:58 -0400 Subject: sectionparser: Allow subsections with no name https://bugzilla.gnome.org/show_bug.cgi?id=699856 --- giscanner/sectionparser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/giscanner/sectionparser.py b/giscanner/sectionparser.py index 273cdebe..f66d46ac 100644 --- a/giscanner/sectionparser.py +++ b/giscanner/sectionparser.py @@ -66,9 +66,9 @@ def parse_sections_file(lines): current_section.title = match.groupdict['contents'] continue - match = re.match(r".*)>", line) + match = re.match(r".*))?>", line) if match: - current_subsection = Subsection(match.groupdict['name']) + current_subsection = Subsection(match.groupdict.get('name', None)) current_section.subsections.append(current_subsection) continue -- cgit v1.2.1 From 6c6b787aeb7d2ac08f37c93e6d1c16318d8ec29c Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 27 Mar 2013 15:03:11 -0400 Subject: sectionparser: Rename It's called a sections file, not a section file. https://bugzilla.gnome.org/show_bug.cgi?id=699856 --- giscanner/sectionparser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/giscanner/sectionparser.py b/giscanner/sectionparser.py index f66d46ac..85ef3a2e 100644 --- a/giscanner/sectionparser.py +++ b/giscanner/sectionparser.py @@ -19,7 +19,7 @@ import re -class SectionFile(object): +class SectionsFile(object): def __init__(self, sections): self.sections = sections @@ -74,4 +74,4 @@ def parse_sections_file(lines): current_subsection.symbols.append(line) - return SectionFile(sections) + return SectionsFile(sections) -- cgit v1.2.1 From 95b18d1db77119c575462006c4d58ba7a47c8732 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Wed, 27 Mar 2013 17:46:03 -0400 Subject: sectionparser: Add support for https://bugzilla.gnome.org/show_bug.cgi?id=699856 --- giscanner/sectionparser.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/giscanner/sectionparser.py b/giscanner/sectionparser.py index 85ef3a2e..ee023f31 100644 --- a/giscanner/sectionparser.py +++ b/giscanner/sectionparser.py @@ -27,6 +27,7 @@ class Section(object): def __init__(self): self.file = None self.title = None + self.includes = None self.main_subsection = Subsection(None) self.subsections = [] @@ -66,6 +67,11 @@ def parse_sections_file(lines): current_section.title = match.groupdict['contents'] continue + match = re.match(r"(?P.*)", line) + if match: + current_section.includes = match.groupdict['contents'] + continue + match = re.match(r".*))?>", line) if match: current_subsection = Subsection(match.groupdict.get('name', None)) -- cgit v1.2.1 From 190d9a50032eaf457f882f36fcfe9cb0d66fc8b8 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 28 Mar 2013 13:27:12 -0400 Subject: sectionparser: Remove the main subsection This isn't how subsections work https://bugzilla.gnome.org/show_bug.cgi?id=699856 --- giscanner/sectionparser.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/giscanner/sectionparser.py b/giscanner/sectionparser.py index ee023f31..9637c0e5 100644 --- a/giscanner/sectionparser.py +++ b/giscanner/sectionparser.py @@ -28,7 +28,6 @@ class Section(object): self.file = None self.title = None self.includes = None - self.main_subsection = Subsection(None) self.subsections = [] class Subsection(object): @@ -50,7 +49,8 @@ def parse_sections_file(lines): if line == "
": current_section = Section() sections.append(current_section) - current_subsection = current_section.main_subsection + current_subsection = Subsection(None) + current_section.subsections.append(current_subsection) continue if line == "
": -- cgit v1.2.1 From 348c72ae1a67fee6221445b9bbb491d0c2c5b37d Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 28 Mar 2013 13:42:32 -0400 Subject: sectionparser: Ignore other directives to gtk-doc https://bugzilla.gnome.org/show_bug.cgi?id=699856 --- giscanner/sectionparser.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/giscanner/sectionparser.py b/giscanner/sectionparser.py index 9637c0e5..0b013be1 100644 --- a/giscanner/sectionparser.py +++ b/giscanner/sectionparser.py @@ -78,6 +78,10 @@ def parse_sections_file(lines): current_section.subsections.append(current_subsection) continue + if line.startswith("<") and line.endswith(">"): + # Other directive to gtk-doc, not a symbol. + continue + current_subsection.symbols.append(line) return SectionsFile(sections) -- cgit v1.2.1 From a031129d8ab28e2f51e95e7266f1274bdc592557 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 9 Jan 2013 17:20:11 +0100 Subject: giscanner: emit 'incorrect number of parameters in comment block' warning instead of silently ignoring parameter names on signals when the number of parameters doesn't match our expectations. https://bugzilla.gnome.org/show_bug.cgi?id=697623 --- giscanner/maintransformer.py | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py index 28ffed36..8292f8eb 100644 --- a/giscanner/maintransformer.py +++ b/giscanner/maintransformer.py @@ -780,20 +780,26 @@ usage is void (*_gtk_reserved1)(void);""" prop.type = self._resolve_toplevel(type_tag.value, prop.type, prop, parent) def _apply_annotations_signal(self, parent, signal): + names = [] prefix = self._get_annotation_name(parent) block = self._blocks.get('%s::%s' % (prefix, signal.name)) - self._apply_annotations_annotated(signal, block) - # We're only attempting to name the signal parameters if - # the number of parameters (@foo) is the same or greater - # than the number of signal parameters - if block and len(block.params) > len(signal.parameters): - names = block.params.items() - # Resolve real parameter names early, so that in later - # phase we can refer to them while resolving annotations. - for i, param in enumerate(signal.parameters): - param.argname, tag = names[i+1] - else: - names = [] + + if block: + self._apply_annotations_annotated(signal, block) + + # We're only attempting to name the signal parameters if + # the number of parameters (@foo) is the same or greater + # than the number of signal parameters + if len(block.params) > len(signal.parameters): + names = block.params.items() + # Resolve real parameter names early, so that in later + # phase we can refer to them while resolving annotations. + for i, param in enumerate(signal.parameters): + param.argname, tag = names[i+1] + else: + message.warn("incorrect number of parameters in comment block, " + "parameter annotations will be ignored.", block.position) + for i, param in enumerate(signal.parameters): if names: name, tag = names[i+1] -- cgit v1.2.1 From c9e2d880011c530ff1454fe31a2d40d189860be5 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Wed, 24 Apr 2013 14:06:18 +0200 Subject: tests: Update misc/pep8.py to 1.4.5 Version in our tree is a wee bit outdated. For example, later work will introduce an utf8 encoded python source file which our old pep8.py does not yet understand (yeah, it really was *that* ancient)... Updated from: https://raw.github.com/jcrocholl/pep8/1.4.5/pep8.py Takes 552c1f1525e37a30376790151c1ba437776682c5, f941537d1c0a40f0906490ed160db6c79af572d3, 5a4afe2a77d0ff7d9fea13dd93c3304a6ca993de and a17f157e19bd6792c00321c8020dca5e5a281f45 into account... https://bugzilla.gnome.org/show_bug.cgi?id=699535 --- Makefile.am | 8 +- giscanner/annotationmain.py | 1 + giscanner/annotationparser.py | 65 +- giscanner/ast.py | 88 +- giscanner/cachestore.py | 5 +- giscanner/codegen.py | 12 +- giscanner/docmain.py | 1 + giscanner/docwriter.py | 23 +- giscanner/dumper.py | 13 +- giscanner/gdumpparser.py | 9 +- giscanner/girparser.py | 54 +- giscanner/girwriter.py | 21 +- giscanner/introspectablepass.py | 44 +- giscanner/maintransformer.py | 61 +- giscanner/message.py | 18 +- giscanner/scannermain.py | 30 +- giscanner/sectionparser.py | 4 + giscanner/shlibs.py | 4 + giscanner/sourcescanner.py | 8 +- giscanner/testcodegen.py | 3 + giscanner/transformer.py | 45 +- giscanner/utils.py | 9 + giscanner/xmlwriter.py | 18 +- misc/pep8.py | 1884 +++++++++++++++++++------ tests/scanner/annotationparser/test_parser.py | 3 +- tests/warn/warningtester.py | 16 +- 26 files changed, 1765 insertions(+), 682 deletions(-) diff --git a/Makefile.am b/Makefile.am index 202464fa..c04c05a0 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,10 +55,16 @@ EXTRA_DIST += \ misc/pep8.py \ misc/pyflakes.py +# Default pep8.py --exclude + emacs backup files +PEP8_EXCLUDES=--exclude='.svn,CVS,.bzr,.hg,.git,__pycache__,.\#*' + check-local: gtester --verbose $(GTESTER_PROGS) @echo "TEST: PEP-8 INQUISITION" - @find $(top_srcdir)/giscanner -name \*.py | sort | uniq | xargs $(PYTHON) $(top_srcdir)/misc/pep8.py --repeat --exclude=config.py + @find $(top_srcdir)/giscanner -name \*.py | sort | uniq | xargs \ + $(PYTHON) $(top_srcdir)/misc/pep8.py --max-line-length=99 --ignore=E128 $(PEP8_EXCLUDES) + @find $(top_srcdir)/tests -name \*.py | sort | uniq | xargs \ + $(PYTHON) $(top_srcdir)/misc/pep8.py --ignore=E127,E501 $(PEP8_EXCLUDES) @echo "TEST: Annotation pattern programs" PYTHONPATH="$(top_builddir):$(top_srcdir)" $(PYTHON) $(top_srcdir)/tests/scanner/annotationparser/test_patterns.py @echo "TEST: GTK-Doc Annotation Parser" diff --git a/giscanner/annotationmain.py b/giscanner/annotationmain.py index 4df6e831..304f5a32 100644 --- a/giscanner/annotationmain.py +++ b/giscanner/annotationmain.py @@ -26,6 +26,7 @@ from giscanner.scannermain import (get_preprocessor_option_group, create_source_scanner, process_packages) + def annotation_main(args): parser = optparse.OptionParser('%prog [options] sources') diff --git a/giscanner/annotationparser.py b/giscanner/annotationparser.py index c0b439a1..a0657dc4 100644 --- a/giscanner/annotationparser.py +++ b/giscanner/annotationparser.py @@ -141,7 +141,8 @@ OPT_TRANSFER_FLOATING = 'floating' # Program matching the start of a comment block. # # Results in 0 symbolic groups. -COMMENT_START_RE = re.compile(r''' +COMMENT_START_RE = re.compile( + r''' ^ # start [^\S\n\r]* # 0 or more whitespace characters / # 1 forward slash character @@ -157,7 +158,8 @@ COMMENT_START_RE = re.compile(r''' # # Results in 1 symbolic group: # - group 1 = description -COMMENT_END_RE = re.compile(r''' +COMMENT_END_RE = re.compile( + r''' ^ # start [^\S\n\r]* # 0 or more whitespace characters (?P.*?) # description text @@ -173,7 +175,8 @@ COMMENT_END_RE = re.compile(r''' # line inside a comment block. # # Results in 0 symbolic groups. -COMMENT_ASTERISK_RE = re.compile(r''' +COMMENT_ASTERISK_RE = re.compile( + r''' ^ # start [^\S\n\r]* # 0 or more whitespace characters \* # 1 asterisk character @@ -189,7 +192,8 @@ COMMENT_ASTERISK_RE = re.compile(r''' # # Results in 1 symbolic group: # - group 1 = indentation -COMMENT_INDENTATION_RE = re.compile(r''' +COMMENT_INDENTATION_RE = re.compile( + r''' ^ (?P[^\S\n\r]*) # 0 or more whitespace characters .* @@ -200,7 +204,8 @@ COMMENT_INDENTATION_RE = re.compile(r''' # Program matching an empty line. # # Results in 0 symbolic groups. -EMPTY_LINE_RE = re.compile(r''' +EMPTY_LINE_RE = re.compile( + r''' ^ # start [^\S\n\r]* # 0 or more whitespace characters $ # end @@ -212,7 +217,8 @@ EMPTY_LINE_RE = re.compile(r''' # Results in 2 symbolic groups: # - group 1 = colon # - group 2 = section_name -SECTION_RE = re.compile(r''' +SECTION_RE = re.compile( + r''' ^ # start [^\S\n\r]* # 0 or more whitespace characters SECTION # SECTION @@ -231,7 +237,8 @@ SECTION_RE = re.compile(r''' # - group 1 = symbol_name # - group 2 = colon # - group 3 = annotations -SYMBOL_RE = re.compile(r''' +SYMBOL_RE = re.compile( + r''' ^ # start [^\S\n\r]* # 0 or more whitespace characters (?P[\w-]*\w) # symbol name @@ -251,7 +258,8 @@ SYMBOL_RE = re.compile(r''' # - group 2 = property_name # - group 3 = colon # - group 4 = annotations -PROPERTY_RE = re.compile(r''' +PROPERTY_RE = re.compile( + r''' ^ # start [^\S\n\r]* # 0 or more whitespace characters (?P[\w]+) # class name @@ -275,7 +283,8 @@ PROPERTY_RE = re.compile(r''' # - group 2 = signal_name # - group 3 = colon # - group 4 = annotations -SIGNAL_RE = re.compile(r''' +SIGNAL_RE = re.compile( + r''' ^ # start [^\S\n\r]* # 0 or more whitespace characters (?P[\w]+) # class name @@ -299,7 +308,8 @@ SIGNAL_RE = re.compile(r''' # - group 2 = annotations # - group 3 = colon # - group 4 = description -PARAMETER_RE = re.compile(r''' +PARAMETER_RE = re.compile( + r''' ^ # start [^\S\n\r]* # 0 or more whitespace characters @ # @ character @@ -324,7 +334,8 @@ PARAMETER_RE = re.compile(r''' # - group 3 = colon # - group 4 = description _all_tags = '|'.join(_ALL_TAGS).replace(' ', '\\ ') -TAG_RE = re.compile(r''' +TAG_RE = re.compile( + r''' ^ # start [^\S\n\r]* # 0 or more whitespace characters (?P''' + _all_tags + r''') # tag name @@ -348,7 +359,8 @@ TAG_RE = re.compile(r''' # - group 2 = annotations # - group 3 = colon # - group 4 = description -MULTILINE_ANNOTATION_CONTINUATION_RE = re.compile(r''' +MULTILINE_ANNOTATION_CONTINUATION_RE = re.compile( + r''' ^ # start [^\S\n\r]* # 0 or more whitespace characters (?P(?:\(.*?\)[^\S\n\r]*)*) # annotations @@ -444,8 +456,8 @@ class DocTag(object): s = 'one value' else: s = '%d values' % (n_params, ) - if ((n_params > 0 and (value is None or value.length() != n_params)) or - n_params == 0 and value is not None): + if ((n_params > 0 and (value is None or value.length() != n_params)) + or n_params == 0 and value is not None): if value is None: length = 0 else: @@ -814,7 +826,7 @@ class AnnotationParser(object): if description: comment_lines[-1] = (line_offset, description) position = message.Position(filename, lineno + line_offset) - marker = ' '*result.end('description') + '^' + marker = ' ' * result.end('description') + '^' message.warn("Comments should end with */ on a new line:\n%s\n%s" % (line, marker), position) @@ -922,7 +934,7 @@ class AnnotationParser(object): if 'colon' in result.groupdict() and result.group('colon') != ':': colon_start = result.start('colon') colon_column = column_offset + colon_start - marker = ' '*colon_column + '^' + marker = ' ' * colon_column + '^' message.warn("missing ':' at column %s:\n%s\n%s" % (colon_column + 1, original_line, marker), position) @@ -942,7 +954,7 @@ class AnnotationParser(object): # right thing to do because sooner or later some long # descriptions will contain something matching an identifier # pattern by accident. - marker = ' '*column_offset + '^' + marker = ' ' * column_offset + '^' message.warn('ignoring unrecognized GTK-Doc comment block, identifier not ' 'found:\n%s\n%s' % (original_line, marker), position) @@ -965,7 +977,7 @@ class AnnotationParser(object): if in_part != PART_PARAMETERS: column = result.start('parameter_name') + column_offset - marker = ' '*column + '^' + marker = ' ' * column + '^' message.warn("'@%s' parameter unexpected at this location:\n%s\n%s" % (param_name, original_line, marker), position) @@ -983,7 +995,7 @@ class AnnotationParser(object): position) elif param_name in comment_block.params.keys(): column = result.start('parameter_name') + column_offset - marker = ' '*column + '^' + marker = ' ' * column + '^' message.warn("multiple '@%s' parameters for identifier '%s':\n%s\n%s" % (param_name, comment_block.name, original_line, marker), position) @@ -1007,8 +1019,7 @@ class AnnotationParser(object): # identifier (when there are no parameters) and encounter an empty # line, we must be parsing the comment block description. #################################################################### - if (EMPTY_LINE_RE.match(line) - and in_part in [PART_IDENTIFIER, PART_PARAMETERS]): + if (EMPTY_LINE_RE.match(line) and in_part in [PART_IDENTIFIER, PART_PARAMETERS]): in_part = PART_DESCRIPTION part_indent = line_indent continue @@ -1022,7 +1033,7 @@ class AnnotationParser(object): tag_annotations = result.group('annotations') tag_description = result.group('description') - marker = ' '*(result.start('tag_name') + column_offset) + '^' + marker = ' ' * (result.start('tag_name') + column_offset) + '^' # Deprecated GTK-Doc Description: tag if tag_name.lower() == TAG_DESCRIPTION: @@ -1047,7 +1058,7 @@ class AnnotationParser(object): if in_part != PART_TAGS: column = result.start('tag_name') + column_offset - marker = ' '*column + '^' + marker = ' ' * column + '^' message.warn("'%s:' tag unexpected at this location:\n%s\n%s" % (tag_name, original_line, marker), position) @@ -1071,7 +1082,7 @@ class AnnotationParser(object): else: if tag_name.lower() in comment_block.tags.keys(): column = result.start('tag_name') + column_offset - marker = ' '*column + '^' + marker = ' ' * column + '^' message.warn("multiple '%s:' tags for identifier '%s':\n%s\n%s" % (tag_name, comment_block.name, original_line, marker), position) @@ -1149,7 +1160,7 @@ class AnnotationParser(object): part.value = '' def _validate_multiline_annotation_continuation(self, line, original_line, - column_offset, position): + column_offset, position): ''' Validate parameters and tags (except the first line) and generate warnings about invalid annotations spanning multiple lines. @@ -1163,7 +1174,7 @@ class AnnotationParser(object): result = MULTILINE_ANNOTATION_CONTINUATION_RE.match(line) if result: column = result.start('annotations') + column_offset - marker = ' '*column + '^' + marker = ' ' * column + '^' message.warn('ignoring invalid multiline annotation continuation:\n' '%s\n%s' % (original_line, marker), position) @@ -1179,7 +1190,7 @@ class AnnotationParser(object): for i, c in enumerate(value): if c == '(' and opened == -1: - opened = i+1 + opened = i + 1 if c == ')' and opened != -1: segment = value[opened:i] parts = segment.split(' ', 1) diff --git a/giscanner/ast.py b/giscanner/ast.py index 25184886..4c54b548 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -28,15 +28,17 @@ from .collections import OrderedDict from .message import Position from .utils import to_underscores + class Type(object): - """A Type can be either: -* A reference to a node (target_giname) -* A reference to a "fundamental" type like 'utf8' -* A "foreign" type - this can be any string." -If none are specified, then it's in an "unresolved" state. An -unresolved type can have two data sources; a "ctype" which comes -from a C type string, or a gtype_name (from g_type_name()). -""" # ''' + """ + A Type can be either: + * A reference to a node (target_giname) + * A reference to a "fundamental" type like 'utf8' + * A "foreign" type - this can be any string." + If none are specified, then it's in an "unresolved" state. An + unresolved type can have two data sources; a "ctype" which comes + from a C type string, or a gtype_name (from g_type_name()). + """ def __init__(self, ctype=None, @@ -125,11 +127,12 @@ in contrast to the other create_type() functions.""" def __cmp__(self, other): if self.target_fundamental: return cmp(self.target_fundamental, other.target_fundamental) - if self.target_giname: + elif self.target_giname: return cmp(self.target_giname, other.target_giname) - if self.target_foreign: + elif self.target_foreign: return cmp(self.target_foreign, other.target_foreign) - return cmp(self.ctype, other.ctype) + else: + return cmp(self.ctype, other.ctype) def is_equiv(self, typeval): """Return True if the specified types are compatible at @@ -170,6 +173,7 @@ in contrast to the other create_type() functions.""" data = '' return '%s(%sctype=%s)' % (self.__class__.__name__, data, self.ctype) + class TypeUnknown(Type): def __init__(self): Type.__init__(self, _target_unknown=True) @@ -351,9 +355,7 @@ SIGNAL_MUST_COLLECT = 'must-collect' class Namespace(object): - def __init__(self, name, version, - identifier_prefixes=None, - symbol_prefixes=None): + def __init__(self, name, version, identifier_prefixes=None, symbol_prefixes=None): self.name = name self.version = version if identifier_prefixes is not None: @@ -367,15 +369,15 @@ class Namespace(object): self.symbol_prefixes = [to_underscores(p).lower() for p in ps] # cache upper-cased versions self._ucase_symbol_prefixes = [p.upper() for p in self.symbol_prefixes] - self.names = OrderedDict() # Maps from GIName -> node - self.aliases = {} # Maps from GIName -> GIName - self.type_names = {} # Maps from GTName -> node - self.ctypes = {} # Maps from CType -> node - self.symbols = {} # Maps from function symbols -> Function - self.includes = set() # Include - self.shared_libraries = [] # str - self.c_includes = [] # str - self.exported_packages = [] # str + self.names = OrderedDict() # Maps from GIName -> node + self.aliases = {} # Maps from GIName -> GIName + self.type_names = {} # Maps from GTName -> node + self.ctypes = {} # Maps from CType -> node + self.symbols = {} # Maps from function symbols -> Function + self.includes = set() # Include + self.shared_libraries = [] # str + self.c_includes = [] # str + self.exported_packages = [] # str def type_from_name(self, name, ctype=None): """Backwards compatibility method for older .gir files, which @@ -416,7 +418,7 @@ but adds it to things like ctypes, symbols, and type_names. if isinstance(node, (Class, Interface)): for m in chain(node.signals, node.properties): m.namespace = self - if isinstance(node, Enum) or isinstance(node, Bitfield): + if isinstance(node, (Enum, Bitfield)): for fn in node.static_methods: if not isinstance(fn, Function): continue @@ -482,6 +484,7 @@ functions via get_by_symbol().""" for node in self.itervalues(): node.walk(callback, []) + class Include(object): def __init__(self, name, version): @@ -504,6 +507,7 @@ class Include(object): def __str__(self): return '%s-%s' % (self.name, self.version) + class Annotated(object): """An object which has a few generic metadata properties.""" @@ -511,12 +515,13 @@ properties.""" self.version = None self.skip = False self.introspectable = True - self.attributes = [] # (key, value)* + self.attributes = [] # (key, value)* self.stability = None self.deprecated = None self.deprecated_version = None self.doc = None + class Node(Annotated): """A node is a type of object which is uniquely identified by its (namespace, name) pair. When combined with a ., this is called a @@ -527,7 +532,7 @@ GIName. It's possible for nodes to contain or point to other nodes.""" def __init__(self, name=None): Annotated.__init__(self) - self.namespace = None # Should be set later by Namespace.append() + self.namespace = None # Should be set later by Namespace.append() self.name = name self.foreign = False self.file_positions = set() @@ -596,8 +601,8 @@ class Callable(Node): self.retval = retval self.parameters = parameters self.throws = not not throws - self.instance_parameter = None # Parameter - self.parent = None # A Class or Interface + self.instance_parameter = None # Parameter + self.parent = None # A Class or Interface # Returns all parameters, including the instance parameter @property @@ -627,10 +632,10 @@ class Function(Callable): self.symbol = symbol self.is_method = False self.is_constructor = False - self.shadowed_by = None # C symbol string - self.shadows = None # C symbol string - self.moved_to = None # namespaced function name string - self.internal_skipped = False # if True, this func will not be written to GIR + self.shadowed_by = None # C symbol string + self.shadows = None # C symbol string + self.moved_to = None # namespaced function name string + self.internal_skipped = False # if True, this func will not be written to GIR def clone(self): clone = copy.copy(self) @@ -641,8 +646,7 @@ class Function(Callable): def is_type_meta_function(self): # Named correctly - if not (self.name.endswith('_get_type') or - self.name.endswith('_get_gtype')): + if not (self.name.endswith('_get_type') or self.name.endswith('_get_gtype')): return False # Doesn't have any parameters @@ -651,14 +655,13 @@ class Function(Callable): # Returns GType rettype = self.retval.type - if (not rettype.is_equiv(TYPE_GTYPE) and - rettype.target_giname != 'Gtk.Type'): - message.warn("function '%s' returns '%r', not a GType" % - (self.name, rettype)) + if (not rettype.is_equiv(TYPE_GTYPE) and rettype.target_giname != 'Gtk.Type'): + message.warn("function '%s' returns '%r', not a GType" % (self.name, rettype)) return False return True + class ErrorQuarkFunction(Function): def __init__(self, name, retval, parameters, throws, symbol, error_domain): @@ -679,7 +682,6 @@ class VFunction(Callable): return obj - class Varargs(Type): def __init__(self): @@ -715,6 +717,7 @@ class Array(Type): arr.size = self.size return arr + class List(Type): def __init__(self, name, element_type, **kwargs): @@ -727,6 +730,7 @@ class List(Type): def clone(self): return List(self.name, self.element_type) + class Map(Type): def __init__(self, key_type, value_type, **kwargs): @@ -739,6 +743,7 @@ class Map(Type): def clone(self): return Map(self.key_type, self.value_type) + class Alias(Node): def __init__(self, name, target, ctype=None): @@ -881,6 +886,7 @@ class Compound(Node, Registered): if field.anonymous_node is not None: field.anonymous_node.walk(callback, chain) + class Field(Annotated): def __init__(self, name, typenode, readable, writable, bits=None, @@ -894,7 +900,7 @@ class Field(Annotated): self.bits = bits self.anonymous_node = anonymous_node self.private = False - self.parent = None # a compound + self.parent = None # a compound def __cmp__(self, other): return cmp(self.name, other.name) @@ -1090,7 +1096,7 @@ class Property(Node): self.transfer = PARAM_TRANSFER_NONE else: self.transfer = transfer - self.parent = None # A Class or Interface + self.parent = None # A Class or Interface class Callback(Callable): diff --git a/giscanner/cachestore.py b/giscanner/cachestore.py index 5f66b66a..ad4c7a36 100644 --- a/giscanner/cachestore.py +++ b/giscanner/cachestore.py @@ -31,6 +31,7 @@ import giscanner _CACHE_VERSION_FILENAME = '.cache-version' + def _get_versionhash(): toplevel = os.path.dirname(giscanner.__file__) # Use pyc instead of py to avoid extra IO @@ -40,6 +41,7 @@ def _get_versionhash(): mtimes = (str(os.stat(source).st_mtime) for source in sources) return hashlib.sha1(''.join(mtimes)).hexdigest() + def _get_cachedir(): if 'GI_SCANNER_DISABLE_CACHE' in os.environ: return None @@ -150,8 +152,7 @@ class CacheStore(object): if store_filename is None: return - if (os.path.exists(store_filename) and - self._cache_is_valid(store_filename, filename)): + if (os.path.exists(store_filename) and self._cache_is_valid(store_filename, filename)): return None tmp_fd, tmp_filename = tempfile.mkstemp(prefix='g-ir-scanner-cache-') diff --git a/giscanner/codegen.py b/giscanner/codegen.py index b73a7da3..e9ed9415 100644 --- a/giscanner/codegen.py +++ b/giscanner/codegen.py @@ -24,6 +24,7 @@ from contextlib import contextmanager from . import ast + class CCodeGenerator(object): def __init__(self, namespace, out_h_filename, out_c_filename): self.out_h_filename = out_h_filename @@ -36,15 +37,16 @@ class CCodeGenerator(object): return '%s_%s' % (self.namespace.symbol_prefixes[0], name) def _typecontainer_to_ctype(self, param): - if (isinstance(param, ast.Parameter) and - param.direction in (ast.PARAM_DIRECTION_OUT, - ast.PARAM_DIRECTION_INOUT)): + if (isinstance(param, ast.Parameter) + and param.direction in (ast.PARAM_DIRECTION_OUT, ast.PARAM_DIRECTION_INOUT)): suffix = '*' else: suffix = '' - if (param.type.is_equiv((ast.TYPE_STRING, ast.TYPE_FILENAME)) and - param.transfer == ast.PARAM_TRANSFER_NONE): + + if (param.type.is_equiv((ast.TYPE_STRING, ast.TYPE_FILENAME)) + and param.transfer == ast.PARAM_TRANSFER_NONE): return "const gchar*" + suffix + return param.type.ctype + suffix def _write_prelude(self, out, func): diff --git a/giscanner/docmain.py b/giscanner/docmain.py index afd509ff..3287dcc6 100644 --- a/giscanner/docmain.py +++ b/giscanner/docmain.py @@ -24,6 +24,7 @@ import optparse from .docwriter import DocWriter from .transformer import Transformer + def doc_main(args): parser = optparse.OptionParser('%prog [options] GIR-file') diff --git a/giscanner/docwriter.py b/giscanner/docwriter.py index b3716ec6..982ab37c 100644 --- a/giscanner/docwriter.py +++ b/giscanner/docwriter.py @@ -31,6 +31,7 @@ from mako.lookup import TemplateLookup from . import ast, xmlwriter from .utils import to_underscores + def make_page_id(node, recursive=False): if isinstance(node, ast.Namespace): if recursive: @@ -51,6 +52,7 @@ def make_page_id(node, recursive=False): else: return '%s.%s' % (make_page_id(parent, recursive=True), node.name) + def get_node_kind(node): if isinstance(node, ast.Namespace): node_kind = 'namespace' @@ -78,6 +80,7 @@ def get_node_kind(node): return node_kind + class TemplatedScanner(object): def __init__(self, specs): self.specs = self.unmangle_specs(specs) @@ -141,6 +144,7 @@ class TemplatedScanner(object): if pos < len(text): yield ('other', text[pos:], None) + class DocstringScanner(TemplatedScanner): def __init__(self): specs = [ @@ -156,6 +160,7 @@ class DocstringScanner(TemplatedScanner): super(DocstringScanner, self).__init__(specs) + class DocFormatter(object): def __init__(self, transformer): self._transformer = transformer @@ -358,6 +363,7 @@ class DocFormatter(object): parent_chain.reverse() return parent_chain + class DocFormatterC(DocFormatter): language = "C" mime_type = "text/x-csrc" @@ -380,7 +386,7 @@ class DocFormatterC(DocFormatter): return getattr(node, 'ctype') def format_function_name(self, func): - if isinstance(func, (ast.Function)): + if isinstance(func, ast.Function): return func.symbol else: return func.name @@ -388,6 +394,7 @@ class DocFormatterC(DocFormatter): def get_parameters(self, node): return node.all_parameters + class DocFormatterIntrospectableBase(DocFormatter): def should_render_node(self, node): if isinstance(node, ast.Record) and node.is_gtype_struct_for is not None: @@ -398,6 +405,7 @@ class DocFormatterIntrospectableBase(DocFormatter): return super(DocFormatterIntrospectableBase, self).should_render_node(node) + class DocFormatterPython(DocFormatterIntrospectableBase): language = "Python" mime_type = "text/python" @@ -418,7 +426,7 @@ class DocFormatterPython(DocFormatterIntrospectableBase): if getattr(node, "is_method", False): return True - if isinstance(node, (ast.VFunction)): + if isinstance(node, ast.VFunction): return True return False @@ -451,8 +459,7 @@ class DocFormatterPython(DocFormatterIntrospectableBase): "GParam": "GLib.Param", "PyObject": "object", "GStrv": "[str]", - "GVariant": "GLib.Variant", - } + "GVariant": "GLib.Variant"} return fundamental_types.get(name, name) @@ -476,6 +483,7 @@ class DocFormatterPython(DocFormatterIntrospectableBase): def get_parameters(self, node): return node.all_parameters + class DocFormatterGjs(DocFormatterIntrospectableBase): language = "Gjs" mime_type = "text/x-gjs" @@ -490,7 +498,7 @@ class DocFormatterGjs(DocFormatterIntrospectableBase): if getattr(node, "is_method", False): return True - if isinstance(node, (ast.VFunction)): + if isinstance(node, ast.VFunction): return True return False @@ -514,8 +522,7 @@ class DocFormatterGjs(DocFormatterIntrospectableBase): "GParam": "GLib.Param", "PyObject": "Object", "GStrv": "[String]", - "GVariant": "GLib.Variant", - } + "GVariant": "GLib.Variant"} return fundamental_types.get(name, name) @@ -558,12 +565,14 @@ class DocFormatterGjs(DocFormatterIntrospectableBase): params.append(param) return params + LANGUAGES = { "c": DocFormatterC, "python": DocFormatterPython, "gjs": DocFormatterGjs, } + class DocWriter(object): def __init__(self, transformer, language): self._transformer = transformer diff --git a/giscanner/dumper.py b/giscanner/dumper.py index b9f529ea..157b24da 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py @@ -223,7 +223,7 @@ class DumpCompiler(object): # The Microsoft compiler uses different option flags for # compilation result output if self._pkgconfig_msvc_flags: - args.extend(['-c', '-Fe'+output, '-Fo'+output]) + args.extend(['-c', '-Fe' + output, '-Fo' + output]) else: args.extend(['-c', '-o', output]) for source in sources: @@ -254,7 +254,7 @@ class DumpCompiler(object): # We can use -o for the Microsoft compiler/linker, # but it is considered deprecated usage with that if self._pkgconfig_msvc_flags: - args.extend(['-Fe'+output]) + args.extend(['-Fe' + output]) else: args.extend(['-o', output]) if libtool: @@ -313,9 +313,9 @@ class DumpCompiler(object): if self._options.namespace_version: args.append(str.lower(self._options.namespace_name) + '-' + - self._options.namespace_version+'.lib') + self._options.namespace_version + '.lib') else: - args.append(str.lower(self._options.namespace_name)+'.lib') + args.append(str.lower(self._options.namespace_name) + '.lib') else: args.append('-Wl,-rpath=.') @@ -329,7 +329,7 @@ class DumpCompiler(object): # to .lib files, not the .dll as the --library option specifies the # .dll(s) the .gir file refers to if self._pkgconfig_msvc_flags == '': - if library.endswith(".la"): # explicitly specified libtool library + if library.endswith(".la"): # explicitly specified libtool library args.append(library) else: args.append('-l' + library) @@ -358,11 +358,12 @@ class DumpCompiler(object): # The --library option on Windows pass in the .dll file(s) the # .gir files refer to, so don't link to them on Visual C++ if self._pkgconfig_msvc_flags == '': - if library.endswith(".la"): # explicitly specified libtool library + if library.endswith(".la"): # explicitly specified libtool library args.append(library) else: args.append('-l' + library) + def compile_introspection_binary(options, get_type_functions, error_quark_functions): dc = DumpCompiler(options, get_type_functions, error_quark_functions) diff --git a/giscanner/gdumpparser.py b/giscanner/gdumpparser.py index 79525030..568777bd 100644 --- a/giscanner/gdumpparser.py +++ b/giscanner/gdumpparser.py @@ -203,8 +203,7 @@ blob containing data gleaned from GObject's primitive introspection.""" def _initparse_gobject_record(self, record): if (record.name.startswith('ParamSpec') - and not record.name in ('ParamSpecPool', 'ParamSpecClass', - 'ParamSpecTypeInfo')): + and not record.name in ('ParamSpecPool', 'ParamSpecClass', 'ParamSpecTypeInfo')): parent = None if record.name != 'ParamSpec': parent = ast.Type(target_giname='GObject.ParamSpec') @@ -280,7 +279,6 @@ blob containing data gleaned from GObject's primitive introspection.""" member.attrib['name'], member.attrib['nick'])) - if xmlnode.tag == 'flags': klass = ast.Bitfield else: @@ -437,7 +435,7 @@ different --identifier-prefix.""" % (xmlnode.attrib['name'], self._namespace.ide if i == 0: argname = 'object' else: - argname = 'p%s' % (i-1, ) + argname = 'p%s' % (i - 1, ) pctype = parameter.attrib['type'] ptype = ast.Type.create_from_gtype_name(pctype) param = ast.Parameter(argname, ptype) @@ -526,8 +524,7 @@ different --identifier-prefix.""" % (xmlnode.attrib['name'], self._namespace.ide return False def _strip_class_suffix(self, name): - if (name.endswith('Class') or - name.endswith('Iface')): + if (name.endswith('Class') or name.endswith('Iface')): return name[:-5] elif name.endswith('Interface'): return name[:-9] diff --git a/giscanner/girparser.py b/giscanner/girparser.py index 63a3fd02..2538036a 100644 --- a/giscanner/girparser.py +++ b/giscanner/girparser.py @@ -101,9 +101,8 @@ class GIRParser(object): assert root.tag == _corens('repository') version = root.attrib['version'] if version != COMPATIBLE_GIR_VERSION: - raise SystemExit("%s: Incompatible version %s (supported: %s)" \ - % (self._get_current_file(), - version, COMPATIBLE_GIR_VERSION)) + raise SystemExit("%s: Incompatible version %s (supported: %s)" % + (self._get_current_file(), version, COMPATIBLE_GIR_VERSION)) for node in root.getchildren(): if node.tag == _corens('include'): @@ -122,9 +121,9 @@ class GIRParser(object): if symbol_prefixes: symbol_prefixes = symbol_prefixes.split(',') self._namespace = ast.Namespace(ns.attrib['name'], - ns.attrib['version'], - identifier_prefixes=identifier_prefixes, - symbol_prefixes=symbol_prefixes) + ns.attrib['version'], + identifier_prefixes=identifier_prefixes, + symbol_prefixes=symbol_prefixes) if 'shared-library' in ns.attrib: self._namespace.shared_libraries = ns.attrib['shared-library'].split(',') self._namespace.includes = self._includes @@ -140,8 +139,7 @@ class GIRParser(object): _corens('interface'): self._parse_object_interface, _corens('record'): self._parse_record, _corens('union'): self._parse_union, - _glibns('boxed'): self._parse_boxed, - } + _glibns('boxed'): self._parse_boxed} if not self._types_only: parser_methods[_corens('constant')] = self._parse_constant @@ -153,8 +151,7 @@ class GIRParser(object): method(node) def _parse_include(self, node): - include = ast.Include(node.attrib['name'], - node.attrib['version']) + include = ast.Include(node.attrib['name'], node.attrib['version']) self._includes.add(include) def _parse_pkgconfig_package(self, node): @@ -165,9 +162,7 @@ class GIRParser(object): def _parse_alias(self, node): typeval = self._parse_type(node) - alias = ast.Alias(node.attrib['name'], - typeval, - node.attrib.get(_cns('type'))) + alias = ast.Alias(node.attrib['name'], typeval, node.attrib.get(_cns('type'))) self._parse_generic_attribs(node, alias) self._namespace.append(alias) @@ -427,7 +422,8 @@ class GIRParser(object): return ast.Type(ctype=ctype) elif name in ['GLib.List', 'GLib.SList']: subchild = self._find_first_child(typenode, - map(_corens, ('callback', 'array', 'varargs', 'type'))) + map(_corens, ('callback', 'array', + 'varargs', 'type'))) if subchild is not None: element_type = self._parse_type(typenode) else: @@ -438,9 +434,7 @@ class GIRParser(object): subchildren_types = map(self._parse_type_simple, subchildren) while len(subchildren_types) < 2: subchildren_types.append(ast.TYPE_ANY) - return ast.Map(subchildren_types[0], - subchildren_types[1], - ctype=ctype) + return ast.Map(subchildren_types[0], subchildren_types[1], ctype=ctype) else: return self._namespace.type_from_name(name, ctype) else: @@ -462,8 +456,8 @@ class GIRParser(object): lenidx = typenode.attrib.get('length') if lenidx is not None: idx = int(lenidx) - assert idx < len(parent.parameters), "%r %d >= %d" \ - % (parent, idx, len(parent.parameters)) + assert idx < len(parent.parameters), "%r %d >= %d" % (parent, idx, + len(parent.parameters)) typeval.length_param_name = parent.parameters[idx].argname def _parse_boxed(self, node): @@ -509,11 +503,11 @@ class GIRParser(object): assert node.tag == _corens('field'), node.tag type_node = self._parse_type(node) field = ast.Field(node.attrib.get('name'), - type_node, - node.attrib.get('readable') != '0', - node.attrib.get('writable') == '1', - node.attrib.get('bits'), - anonymous_node=anonymous_node) + type_node, + node.attrib.get('readable') != '0', + node.attrib.get('writable') == '1', + node.attrib.get('bits'), + anonymous_node=anonymous_node) field.private = node.attrib.get('private') == '1' field.parent = parent self._parse_generic_attribs(node, field) @@ -521,12 +515,12 @@ class GIRParser(object): def _parse_property(self, node, parent): prop = ast.Property(node.attrib['name'], - self._parse_type(node), - node.attrib.get('readable') != '0', - node.attrib.get('writable') == '1', - node.attrib.get('construct') == '1', - node.attrib.get('construct-only') == '1', - node.attrib.get('transfer-ownership')) + self._parse_type(node), + node.attrib.get('readable') != '0', + node.attrib.get('writable') == '1', + node.attrib.get('construct') == '1', + node.attrib.get('construct-only') == '1', + node.attrib.get('transfer-ownership')) self._parse_generic_attribs(node, prop) prop.parent = parent return prop diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py index 2578a331..e7af2533 100644 --- a/giscanner/girwriter.py +++ b/giscanner/girwriter.py @@ -28,14 +28,15 @@ from .xmlwriter import XMLWriter # Compatible changes we just make inline COMPATIBLE_GIR_VERSION = '1.2' + class GIRWriter(XMLWriter): def __init__(self, namespace): super(GIRWriter, self).__init__() self.write_comment( -'''This file was automatically generated from C sources - DO NOT EDIT! -To affect the contents of this file, edit the original C definitions, -and/or use gtk-doc annotations. ''') + 'This file was automatically generated from C sources - DO NOT EDIT!\n' + 'To affect the contents of this file, edit the original C definitions,\n' + 'and/or use gtk-doc annotations. ') self._write_repository(namespace) def _write_repository(self, namespace): @@ -43,8 +44,7 @@ and/or use gtk-doc annotations. ''') ('version', COMPATIBLE_GIR_VERSION), ('xmlns', 'http://www.gtk.org/introspection/core/1.0'), ('xmlns:c', 'http://www.gtk.org/introspection/c/1.0'), - ('xmlns:glib', 'http://www.gtk.org/introspection/glib/1.0'), - ] + ('xmlns:glib', 'http://www.gtk.org/introspection/glib/1.0')] with self.tagcontext('repository', attrs): for include in sorted(namespace.includes): self._write_include(include) @@ -292,8 +292,8 @@ and/or use gtk-doc annotations. ''') attrs.append(('fixed-size', '%d' % (ntype.size, ))) if ntype.length_param_name is not None: assert function - attrs.insert(0, ('length', '%d' - % (function.get_parameter_index(ntype.length_param_name, )))) + length = function.get_parameter_index(ntype.length_param_name) + attrs.insert(0, ('length', '%d' % (length, ))) with self.tagcontext('array', attrs): self._write_type(ntype.element_type) @@ -482,7 +482,7 @@ and/or use gtk-doc annotations. ''') attrs = list(extra_attrs) if record.name is not None: attrs.append(('name', record.name)) - if record.ctype is not None: # the record might be anonymous + if record.ctype is not None: # the record might be anonymous attrs.append(('c:type', record.ctype)) if record.disguised: attrs.append(('disguised', '1')) @@ -513,7 +513,7 @@ and/or use gtk-doc annotations. ''') attrs = [] if union.name is not None: attrs.append(('name', union.name)) - if union.ctype is not None: # the union might be anonymous + if union.ctype is not None: # the union might be anonymous attrs.append(('c:type', union.ctype)) self._append_version(union, attrs) self._append_node_generic(union, attrs) @@ -544,8 +544,7 @@ and/or use gtk-doc annotations. ''') elif isinstance(field.anonymous_node, ast.Union): self._write_union(field.anonymous_node) else: - raise AssertionError("Unknown field anonymous: %r" \ - % (field.anonymous_node, )) + raise AssertionError("Unknown field anonymous: %r" % (field.anonymous_node, )) else: attrs = [('name', field.name)] self._append_node_generic(field, attrs) diff --git a/giscanner/introspectablepass.py b/giscanner/introspectablepass.py index 3e295391..3d67c73e 100644 --- a/giscanner/introspectablepass.py +++ b/giscanner/introspectablepass.py @@ -21,6 +21,7 @@ from . import ast from . import message from .annotationparser import TAG_RETURNS + class IntrospectablePass(object): def __init__(self, transformer, blocks): @@ -79,7 +80,7 @@ class IntrospectablePass(object): if not node.type.resolved: self._parameter_warning(parent, node, -"Unresolved type: %r" % (node.type.unresolved_string, )) + "Unresolved type: %r" % (node.type.unresolved_string, )) parent.introspectable = False return @@ -88,22 +89,23 @@ class IntrospectablePass(object): return if (isinstance(node.type, (ast.List, ast.Array)) - and node.type.element_type == ast.TYPE_ANY): + and node.type.element_type == ast.TYPE_ANY): self._parameter_warning(parent, node, "Missing (element-type) annotation") parent.introspectable = False return if (is_parameter - and isinstance(target, ast.Callback) - and not node.type.target_giname in ('GLib.DestroyNotify', - 'Gio.AsyncReadyCallback') - and node.scope is None): - self._parameter_warning(parent, node, - ("Missing (scope) annotation for callback" + - " without GDestroyNotify (valid: %s, %s)") - % (ast.PARAM_SCOPE_CALL, ast.PARAM_SCOPE_ASYNC)) - parent.introspectable = False - return + and isinstance(target, ast.Callback) + and not node.type.target_giname in ('GLib.DestroyNotify', 'Gio.AsyncReadyCallback') + and node.scope is None): + self._parameter_warning( + parent, + node, + "Missing (scope) annotation for callback without " + "GDestroyNotify (valid: %s, %s)" % (ast.PARAM_SCOPE_CALL, ast.PARAM_SCOPE_ASYNC)) + + parent.introspectable = False + return if is_return and isinstance(target, ast.Callback): self._parameter_warning(parent, node, "Callbacks cannot be return values; use (skip)") @@ -111,12 +113,14 @@ class IntrospectablePass(object): return if (is_return - and isinstance(target, (ast.Record, ast.Union)) - and target.get_type is None - and not target.foreign): + and isinstance(target, (ast.Record, ast.Union)) + and target.get_type is None + and not target.foreign): if node.transfer != ast.PARAM_TRANSFER_NONE: - self._parameter_warning(parent, node, -"Invalid non-constant return of bare structure or union; register as boxed type or (skip)") + self._parameter_warning( + parent, node, + "Invalid non-constant return of bare structure or union; " + "register as boxed type or (skip)") parent.introspectable = False return @@ -143,10 +147,10 @@ class IntrospectablePass(object): # These are not introspectable pending us adding # larger type tags to the typelib (in theory these could # be 128 bit or larger) - if typeval.is_equiv((ast.TYPE_LONG_LONG, ast.TYPE_LONG_ULONG, - ast.TYPE_LONG_DOUBLE)): + elif typeval.is_equiv((ast.TYPE_LONG_LONG, ast.TYPE_LONG_ULONG, ast.TYPE_LONG_DOUBLE)): return False - return True + else: + return True target = self._transformer.lookup_typenode(typeval) if not target: return False diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py index 8292f8eb..6acc5947 100644 --- a/giscanner/maintransformer.py +++ b/giscanner/maintransformer.py @@ -37,6 +37,7 @@ from .annotationparser import (OPT_ALLOW_NONE, OPT_ARRAY, OPT_ATTRIBUTE, OPT_TRANSFER_NONE, OPT_TRANSFER_FLOATING) from .utils import to_underscores_noprefix + class MainTransformer(object): def __init__(self, transformer, blocks): @@ -105,7 +106,7 @@ class MainTransformer(object): def _pass_fixup_hidden_fields(self, node, chain): """Hide all callbacks starting with _; the typical -usage is void (*_gtk_reserved1)(void);""" + usage is void (*_gtk_reserved1)(void);""" if isinstance(node, (ast.Class, ast.Interface, ast.Record, ast.Union)): for field in node.fields: if (field @@ -204,7 +205,7 @@ usage is void (*_gtk_reserved1)(void);""" if isinstance(node, ast.Function): self._apply_annotations_function(node, chain) if isinstance(node, ast.Callback): - self._apply_annotations_callable(node, chain, block = self._get_block(node)) + self._apply_annotations_callable(node, chain, block=self._get_block(node)) if isinstance(node, (ast.Class, ast.Interface, ast.Union, ast.Enum, ast.Bitfield, ast.Callback)): self._apply_annotations_annotated(node, self._get_block(node)) @@ -257,7 +258,7 @@ usage is void (*_gtk_reserved1)(void);""" Use resolver() on each identifier, and combiner() on the parts of each complete type. (top_combiner is used on the top-most type.)""" bits = re.split(r'([,<>()])', type_str, 1) - first, sep, rest = [bits[0], '', ''] if (len(bits)==1) else bits + first, sep, rest = [bits[0], '', ''] if (len(bits) == 1) else bits args = [resolver(first)] if sep == '<' or sep == '(': lastsep = '>' if (sep == '<') else ')' @@ -268,9 +269,11 @@ usage is void (*_gtk_reserved1)(void);""" else: rest = sep + rest return top_combiner(*args), rest + def resolver(ident): res = self._transformer.create_type_from_user_string(ident) return res + def combiner(base, *rest): if not rest: return base @@ -281,6 +284,7 @@ usage is void (*_gtk_reserved1)(void);""" message.warn( "Too many parameters in type specification %r" % (type_str, )) return base + def top_combiner(base, *rest): if type_node is not None and isinstance(type_node, ast.Type): base.is_const = type_node.is_const @@ -327,24 +331,23 @@ usage is void (*_gtk_reserved1)(void);""" return block.position def _check_array_element_type(self, array, options): + array_type = array.array_type + element_type = array.element_type + # GPtrArrays are allowed to contain non basic types # (except enums and flags) or basic types that are # as big as a gpointer - if array.array_type == ast.Array.GLIB_PTRARRAY and \ - ((array.element_type in ast.BASIC_GIR_TYPES - and not array.element_type in ast.POINTER_TYPES) or - isinstance(array.element_type, ast.Enum) or - isinstance(array.element_type, ast.Bitfield)): - message.warn("invalid (element-type) for a GPtrArray, " - "must be a pointer", options.position) + if array_type == ast.Array.GLIB_PTRARRAY: + if ((element_type in ast.BASIC_GIR_TYPES and not element_type in ast.POINTER_TYPES) + or isinstance(element_type, (ast.Enum, ast.Bitfield))): + message.warn("invalid (element-type) for a GPtrArray, " + "must be a pointer", options.position) # GByteArrays have (element-type) guint8 by default - if array.array_type == ast.Array.GLIB_BYTEARRAY: - if array.element_type == ast.TYPE_ANY: + if array_type == ast.Array.GLIB_BYTEARRAY: + if element_type == ast.TYPE_ANY: array.element_type = ast.TYPE_UINT8 - elif not array.element_type in [ast.TYPE_UINT8, - ast.TYPE_INT8, - ast.TYPE_CHAR]: + elif not element_type in [ast.TYPE_UINT8, ast.TYPE_INT8, ast.TYPE_CHAR]: message.warn("invalid (element-type) for a GByteArray, " "must be one of guint8, gint8 or gchar", options.position) @@ -454,8 +457,8 @@ usage is void (*_gtk_reserved1)(void);""" def _get_transfer_default_returntype_basic(self, typeval): if (typeval.is_equiv(ast.BASIC_GIR_TYPES) - or typeval.is_const - or typeval.is_equiv(ast.TYPE_NONE)): + or typeval.is_const + or typeval.is_equiv(ast.TYPE_NONE)): return ast.PARAM_TRANSFER_NONE elif typeval.is_equiv(ast.TYPE_STRING): # Non-const strings default to FULL @@ -535,8 +538,7 @@ usage is void (*_gtk_reserved1)(void);""" caller_allocates = False annotated_direction = None - if (OPT_INOUT in options or - OPT_INOUT_ALT in options): + if (OPT_INOUT in options or OPT_INOUT_ALT in options): annotated_direction = ast.PARAM_DIRECTION_INOUT elif OPT_OUT in options: subtype = options[OPT_OUT] @@ -574,9 +576,9 @@ usage is void (*_gtk_reserved1)(void);""" self._adjust_container_type(parent, node, options) - if (OPT_ALLOW_NONE in options or - node.type.target_giname == 'Gio.AsyncReadyCallback' or - node.type.target_giname == 'Gio.Cancellable'): + if (OPT_ALLOW_NONE in options + or node.type.target_giname == 'Gio.AsyncReadyCallback' + or node.type.target_giname == 'Gio.Cancellable'): node.allow_none = True if tag is not None and tag.comment is not None: @@ -605,7 +607,7 @@ usage is void (*_gtk_reserved1)(void);""" if ': ' in value: colon = value.find(': ') version = value[:colon] - desc = value[colon+2:] + desc = value[colon + 2:] else: desc = value version = None @@ -718,8 +720,7 @@ usage is void (*_gtk_reserved1)(void);""" (param, ) = unused text = ', should be %r' % (param, ) else: - text = ', should be one of %s' % ( - ', '.join(repr(p) for p in unused), ) + text = ', should be one of %s' % (', '.join(repr(p) for p in unused), ) tag = block.params.get(doc_name) message.warn( @@ -795,14 +796,14 @@ usage is void (*_gtk_reserved1)(void);""" # Resolve real parameter names early, so that in later # phase we can refer to them while resolving annotations. for i, param in enumerate(signal.parameters): - param.argname, tag = names[i+1] + param.argname, tag = names[i + 1] else: message.warn("incorrect number of parameters in comment block, " "parameter annotations will be ignored.", block.position) for i, param in enumerate(signal.parameters): if names: - name, tag = names[i+1] + name, tag = names[i + 1] options = getattr(tag, 'options', {}) param_type = options.get(OPT_TYPE) if param_type: @@ -1164,9 +1165,9 @@ method or constructor of some type.""" origin_node = self._get_constructor_class(func, subsymbol) if origin_node is None: if func.is_constructor: - message.warn_node(func, - "Can't find matching type for constructor; symbol=%r" \ - % (func.symbol, )) + message.warn_node( + func, + "Can't find matching type for constructor; symbol=%r" % (func.symbol, )) return False # Some sanity checks; only objects and boxeds can have ctors diff --git a/giscanner/message.py b/giscanner/message.py index 8a948cd3..3a330afe 100644 --- a/giscanner/message.py +++ b/giscanner/message.py @@ -61,7 +61,7 @@ class Position(object): return '%s:' % (filename, ) def offset(self, offset): - return Position(self.filename, self.line+offset, self.column) + return Position(self.filename, self.line + offset, self.column) class MessageLogger(object): @@ -119,16 +119,14 @@ If the warning is related to a ast.Node type, see log_node().""" elif log_type == FATAL: error_type = "Fatal" if prefix: - text = ( -'''%s: %s: %s: %s: %s\n''' % (last_position, error_type, self._namespace.name, - prefix, text)) + text = ('%s: %s: %s: %s: %s\n' % (last_position, error_type, + self._namespace.name, prefix, text)) else: if self._namespace: - text = ( -'''%s: %s: %s: %s\n''' % (last_position, error_type, self._namespace.name, text)) + text = ('%s: %s: %s: %s\n' % (last_position, error_type, + self._namespace.name, text)) else: - text = ( -'''%s: %s: %s\n''' % (last_position, error_type, text)) + text = ('%s: %s: %s\n' % (last_position, error_type, text)) self._output.write(text) if log_type == FATAL: @@ -169,17 +167,21 @@ def log_node(log_type, node, text, context=None, positions=None): ml = MessageLogger.get() ml.log_node(log_type, node, text, context=context, positions=positions) + def warn(text, positions=None, prefix=None): ml = MessageLogger.get() ml.log(WARNING, text, positions, prefix) + def warn_node(node, text, context=None, positions=None): log_node(WARNING, node, text, context=context, positions=positions) + def warn_symbol(symbol, text): ml = MessageLogger.get() ml.log_symbol(WARNING, symbol, text) + def fatal(text, positions=None, prefix=None): ml = MessageLogger.get() ml.log(FATAL, text, positions, prefix) diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py index 8ccd1f09..00dc30d6 100755 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -42,14 +42,17 @@ from giscanner.sourcescanner import SourceScanner, ALL_EXTS from giscanner.transformer import Transformer from . import utils + def process_cflags_begin(option, opt, value, parser): cflags = getattr(parser.values, option.dest) while len(parser.rargs) > 0 and parser.rargs[0] != '--cflags-end': cflags.append(parser.rargs.pop(0)) + def process_cflags_end(option, opt, value, parser): pass + def get_preprocessor_option_group(parser): group = optparse.OptionGroup(parser, "Preprocessor options") group.add_option("", "--cflags-begin", @@ -71,6 +74,7 @@ def get_preprocessor_option_group(parser): group.add_option("-p", dest="", help="Ignored") return group + def get_windows_option_group(parser): group = optparse.OptionGroup(parser, "Machine Dependent Options") group.add_option("-m", help="some machine dependent option", @@ -79,13 +83,13 @@ def get_windows_option_group(parser): return group + def _get_option_parser(): parser = optparse.OptionParser('%prog [options] sources') parser.add_option('', "--quiet", action="store_true", dest="quiet", default=False, - help="If passed, do not print details of normal" \ - + " operation") + help="If passed, do not print details of normal operation") parser.add_option("", "--format", action="store", dest="format", default="gir", @@ -204,6 +208,7 @@ match the namespace prefix.""") def _error(msg): raise SystemExit('ERROR: %s' % (msg, )) + def passthrough_gir(path, f): parser = GIRParser() parser.parse(path) @@ -211,6 +216,7 @@ def passthrough_gir(path, f): writer = GIRWriter(parser.get_namespace()) f.write(writer.get_xml()) + def test_codegen(optstring): (namespace, out_h_filename, out_c_filename) = optstring.split(',') if namespace == 'Everything': @@ -221,6 +227,7 @@ def test_codegen(optstring): _error("Invaild namespace %r" % (namespace, )) return 0 + def process_options(output, allowed_flags): for option in output.split(): for flag in allowed_flags: @@ -229,6 +236,7 @@ def process_options(output, allowed_flags): yield option break + def process_packages(options, packages): args = ['pkg-config', '--cflags'] args.extend(packages) @@ -248,6 +256,7 @@ def process_packages(options, packages): options.cpp_defines.extend(pkg_options.cpp_defines) options.cpp_undefines.extend(pkg_options.cpp_undefines) + def extract_filenames(args): filenames = [] for arg in args: @@ -261,6 +270,7 @@ def extract_filenames(args): filenames.append(os.path.abspath(arg)) return filenames + def extract_filelist(options): filenames = [] if not os.path.exists(options.filelist): @@ -271,10 +281,10 @@ def extract_filelist(options): # We don't support real C++ parsing yet, but we should be able # to understand C API implemented in C++ files. filename = line.strip() - if (filename.endswith('.c') or filename.endswith('.cpp') or - filename.endswith('.cc') or filename.endswith('.cxx') or - filename.endswith('.h') or filename.endswith('.hpp') or - filename.endswith('.hxx')): + if (filename.endswith('.c') or filename.endswith('.cpp') + or filename.endswith('.cc') or filename.endswith('.cxx') + or filename.endswith('.h') or filename.endswith('.hpp') + or filename.endswith('.hxx')): if not os.path.exists(filename): _error('%s: Invalid filelist entry-no such file or directory' % (line, )) # Make absolute, because we do comparisons inside scannerparser.c @@ -282,6 +292,7 @@ def extract_filelist(options): filenames.append(os.path.abspath(filename)) return filenames + def create_namespace(options): if options.strip_prefix: print """g-ir-scanner: warning: Option --strip-prefix has been deprecated; @@ -310,6 +321,7 @@ see --identifier-prefix and --symbol-prefix.""" identifier_prefixes=identifier_prefixes, symbol_prefixes=symbol_prefixes) + def create_transformer(namespace, options): transformer = Transformer(namespace, accept_unprefixed=options.accept_unprefixed) @@ -331,6 +343,7 @@ def create_transformer(namespace, options): return transformer + def create_binary(transformer, options, args): # Transform the C AST nodes into higher level # GLib/GObject nodes @@ -341,7 +354,7 @@ def create_binary(transformer, options, args): gdump_parser.init_parse() if options.program: - args=[options.program] + args = [options.program] args.extend(options.program_args) binary = IntrospectionBinary(args) else: @@ -354,6 +367,7 @@ def create_binary(transformer, options, args): gdump_parser.parse() return shlibs + def create_source_scanner(options, args): if hasattr(options, 'filelist') and options.filelist: filenames = extract_filelist(options) @@ -371,6 +385,7 @@ def create_source_scanner(options, args): ss.parse_macros(filenames) return ss + def write_output(data, options): if options.output == "-": output = sys.stdout @@ -407,6 +422,7 @@ def write_output(data, options): except IOError as e: _error("while writing output: %s" % (e.strerror, )) + def scanner_main(args): parser = _get_option_parser() (options, args) = parser.parse_args(args) diff --git a/giscanner/sectionparser.py b/giscanner/sectionparser.py index 0b013be1..61763e45 100644 --- a/giscanner/sectionparser.py +++ b/giscanner/sectionparser.py @@ -19,10 +19,12 @@ import re + class SectionsFile(object): def __init__(self, sections): self.sections = sections + class Section(object): def __init__(self): self.file = None @@ -30,11 +32,13 @@ class Section(object): self.includes = None self.subsections = [] + class Subsection(object): def __init__(self, name): self.name = name self.symbols = [] + def parse_sections_file(lines): sections = [] current_section = None diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py index 4f622db3..1241827d 100644 --- a/giscanner/shlibs.py +++ b/giscanner/shlibs.py @@ -26,6 +26,7 @@ import subprocess from .utils import get_libtool_command, extract_libtool_shlib + # For .la files, the situation is easy. def _resolve_libtool(options, binary, libraries): shlibs = [] @@ -36,6 +37,7 @@ def _resolve_libtool(options, binary, libraries): return shlibs + # Assume ldd output is something vaguely like # # libpangoft2-1.0.so.0 => /usr/lib/libpangoft2-1.0.so.0 (0x006c1000) @@ -51,6 +53,7 @@ def _ldd_library_pattern(library_name): return re.compile("(? of -l) # against a library to find the shared library name. The shared # library name is suppose to be what you pass to dlopen() (or diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py index 736ddbd4..d5c43926 100644 --- a/giscanner/sourcescanner.py +++ b/giscanner/sourcescanner.py @@ -93,8 +93,7 @@ def symbol_type_name(symbol_type): CSYMBOL_TYPE_UNION: 'union', CSYMBOL_TYPE_ENUM: 'enum', CSYMBOL_TYPE_TYPEDEF: 'typedef', - CSYMBOL_TYPE_MEMBER: 'member', - }.get(symbol_type) + CSYMBOL_TYPE_MEMBER: 'member'}.get(symbol_type) def ctype_name(ctype): @@ -108,8 +107,7 @@ def ctype_name(ctype): CTYPE_ENUM: 'enum', CTYPE_POINTER: 'pointer', CTYPE_ARRAY: 'array', - CTYPE_FUNCTION: 'function', - }.get(ctype) + CTYPE_FUNCTION: 'function'}.get(ctype) class SourceType(object): @@ -266,7 +264,7 @@ class SourceScanner(object): return self._scanner.get_comments() def dump(self): - print '-'*30 + print '-' * 30 for symbol in self._scanner.get_symbols(): print symbol.ident, symbol.base_type.name, symbol.type diff --git a/giscanner/testcodegen.py b/giscanner/testcodegen.py index f304dc7a..1ed247c7 100644 --- a/giscanner/testcodegen.py +++ b/giscanner/testcodegen.py @@ -27,12 +27,14 @@ DEFAULT_C_VALUES = {ast.TYPE_ANY: 'NULL', ast.TYPE_FILENAME: '""', ast.TYPE_GTYPE: 'g_object_get_type ()'} + def get_default_for_typeval(typeval): default = DEFAULT_C_VALUES.get(typeval) if default: return default return "0" + def uscore_from_type(typeval): if typeval.target_fundamental: return typeval.target_fundamental.replace(' ', '_') @@ -41,6 +43,7 @@ def uscore_from_type(typeval): else: assert False, typeval + class EverythingCodeGenerator(object): def __init__(self, out_h_filename, out_c_filename): diff --git a/giscanner/transformer.py b/giscanner/transformer.py index f1aa165d..f70d756a 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -34,6 +34,7 @@ from .sourcescanner import ( CSYMBOL_TYPE_MEMBER, CSYMBOL_TYPE_ELLIPSIS, CSYMBOL_TYPE_CONST, TYPE_QUALIFIER_CONST, TYPE_QUALIFIER_VOLATILE) + class TransformerException(Exception): pass @@ -54,7 +55,7 @@ class Transformer(object): self._namespace = namespace self._pkg_config_packages = set() self._typedefs_ns = {} - self._parsed_includes = {} # Namespace> + self._parsed_includes = {} # Namespace> self._includepaths = [] self._passthrough_mode = False @@ -104,7 +105,7 @@ class Transformer(object): if not ns_compound: ns_compound = self._namespace.get('_' + compound.name) if (not ns_compound and isinstance(compound, (ast.Record, ast.Union)) - and len(compound.fields) == 0): + and len(compound.fields) == 0): disguised = ast.Record(compound.name, typedef, disguised=True) self._namespace.append(disguised) elif not ns_compound: @@ -126,8 +127,8 @@ class Transformer(object): def register_include_uninstalled(self, include_path): basename = os.path.basename(include_path) if not basename.endswith('.gir'): - raise SystemExit( -"Include path %r must be a filename path ending in .gir" % (include_path, )) + raise SystemExit("Include path %r must be a filename path " + "ending in .gir" % (include_path, )) girname = basename[:-4] include = ast.Include.from_string(girname) if include in self._namespace.includes: @@ -175,8 +176,7 @@ None.""" path = os.path.join(d, girname) if os.path.exists(path): return path - sys.stderr.write("Couldn't find include %r (search path: %r)\n"\ - % (girname, searchdirs)) + sys.stderr.write("Couldn't find include %r (search path: %r)\n" % (girname, searchdirs)) sys.exit(1) @classmethod @@ -228,7 +228,7 @@ currently-scanned namespace is first.""" def _split_c_string_for_namespace_matches(self, name, is_identifier=False): matches = [] # Namespaces which might contain this name - unprefixed_namespaces = [] # Namespaces with no prefix, last resort + unprefixed_namespaces = [] # Namespaces with no prefix, last resort for ns in self._iter_namespaces(): if is_identifier: prefixes = ns.identifier_prefixes @@ -502,8 +502,8 @@ raise ValueError.""" def _create_member(self, symbol, parent_symbol=None): source_type = symbol.base_type - if (source_type.type == CTYPE_POINTER and - symbol.base_type.base_type.type == CTYPE_FUNCTION): + if (source_type.type == CTYPE_POINTER + and symbol.base_type.base_type.type == CTYPE_FUNCTION): node = self._create_callback(symbol, member=True) elif source_type.type == CTYPE_STRUCT and source_type.name is None: node = self._create_struct(symbol, anonymous=True) @@ -519,8 +519,8 @@ raise ValueError.""" # to be able to properly calculate the size of the compound # type (e.g. GValue) that contains this array, see # . - if (source_type.base_type.type == CTYPE_UNION and - source_type.base_type.name is None): + if (source_type.base_type.type == CTYPE_UNION + and source_type.base_type.name is None): synthesized_type = self._synthesize_union_type(symbol, parent_symbol) ftype = ast.Array(None, synthesized_type, complete_ctype=complete_ctype) else: @@ -558,11 +558,9 @@ raise ValueError.""" def _create_typedef(self, symbol): ctype = symbol.base_type.type - if (ctype == CTYPE_POINTER and - symbol.base_type.base_type.type == CTYPE_FUNCTION): + if (ctype == CTYPE_POINTER and symbol.base_type.base_type.type == CTYPE_FUNCTION): node = self._create_typedef_callback(symbol) - elif (ctype == CTYPE_POINTER and - symbol.base_type.base_type.type == CTYPE_STRUCT): + elif (ctype == CTYPE_POINTER and symbol.base_type.base_type.type == CTYPE_STRUCT): node = self._create_typedef_struct(symbol, disguised=True) elif ctype == CTYPE_STRUCT: node = self._create_typedef_struct(symbol) @@ -627,8 +625,7 @@ raise ValueError.""" derefed_typename = canonical.replace('*', '') # Preserve "pointerness" of struct/union members - if (is_member and canonical.endswith('*') and - derefed_typename in ast.basic_type_names): + if (is_member and canonical.endswith('*') and derefed_typename in ast.basic_type_names): return 'gpointer' else: return derefed_typename @@ -714,8 +711,7 @@ raise ValueError.""" # Don't create constants for non-public things # http://bugzilla.gnome.org/show_bug.cgi?id=572790 - if (symbol.source_filename is None or - not symbol.source_filename.endswith('.h')): + if (symbol.source_filename is None or not symbol.source_filename.endswith('.h')): return None try: name = self._strip_symbol(symbol) @@ -738,13 +734,13 @@ raise ValueError.""" if isinstance(target, ast.Type): unaliased = target if unaliased == ast.TYPE_UINT64: - value = str(symbol.const_int % 2**64) + value = str(symbol.const_int % 2 ** 64) elif unaliased == ast.TYPE_UINT32: - value = str(symbol.const_int % 2**32) + value = str(symbol.const_int % 2 ** 32) elif unaliased == ast.TYPE_UINT16: - value = str(symbol.const_int % 2**16) + value = str(symbol.const_int % 2 ** 16) elif unaliased == ast.TYPE_UINT8: - value = str(symbol.const_int % 2**16) + value = str(symbol.const_int % 2 ** 16) else: value = str(symbol.const_int) elif symbol.const_double is not None: @@ -842,8 +838,7 @@ raise ValueError.""" # Mark the 'user_data' arguments for i, param in enumerate(parameters): - if (param.type.target_fundamental == 'gpointer' and - param.argname == 'user_data'): + if (param.type.target_fundamental == 'gpointer' and param.argname == 'user_data'): param.closure_name = param.argname if member: diff --git a/giscanner/utils.py b/giscanner/utils.py index 9adf6d93..77d05b9e 100644 --- a/giscanner/utils.py +++ b/giscanner/utils.py @@ -22,7 +22,10 @@ import re import os import subprocess + _debugflags = None + + def have_debug_flag(flag): """Check for whether a specific debugging feature is enabled. Well-known flags: @@ -38,6 +41,7 @@ Well-known flags: _debugflags.remove('') return flag in _debugflags + def break_on_debug_flag(flag): if have_debug_flag(flag): import pdb @@ -69,8 +73,10 @@ def to_underscores_noprefix(name): name = _upperstr_pat2.sub(r'\1_\2', name) return name + _libtool_pat = re.compile("dlname='([A-z0-9\.\-\+]+)'\n") + def _extract_dlname_field(la_file): f = open(la_file) data = f.read() @@ -81,6 +87,7 @@ def _extract_dlname_field(la_file): else: return None + # Returns the name that we would pass to dlopen() the library # corresponding to this .la file def extract_libtool_shlib(la_file): @@ -92,6 +99,7 @@ def extract_libtool_shlib(la_file): # a path rather than the raw dlname return os.path.basename(dlname) + def extract_libtool(la_file): dlname = _extract_dlname_field(la_file) if dlname is None: @@ -104,6 +112,7 @@ def extract_libtool(la_file): libname = libname.replace('.libs/.libs', '.libs') return libname + # Returns arguments for invoking libtool, if applicable, otherwise None def get_libtool_command(options): libtool_infection = not options.nolibtool diff --git a/giscanner/xmlwriter.py b/giscanner/xmlwriter.py index 4a1dc9fb..6efe684d 100755 --- a/giscanner/xmlwriter.py +++ b/giscanner/xmlwriter.py @@ -44,8 +44,7 @@ def _calc_attrs_length(attributes, indent, self_indent): return attr_length + indent + self_indent -def collect_attributes(tag_name, attributes, self_indent, - self_indent_char, indent=-1): +def collect_attributes(tag_name, attributes, self_indent, self_indent_char, indent=-1): if not attributes: return '' if _calc_attrs_length(attributes, indent, self_indent) > 79: @@ -68,6 +67,7 @@ def collect_attributes(tag_name, attributes, self_indent, first = False return attr_value + def build_xml_tag(tag_name, attributes=None, data=None, self_indent=0, self_indent_char=' '): if attributes is None: @@ -86,6 +86,7 @@ def build_xml_tag(tag_name, attributes=None, data=None, self_indent=0, len(prefix) + len(suffix)) return prefix + attrs + suffix + with LibtoolImporter(None, None): if 'UNINSTALLED_INTROSPECTION_SRCDIR' in os.environ: from _giscanner import collect_attributes @@ -108,10 +109,8 @@ class XMLWriter(object): def _open_tag(self, tag_name, attributes=None): if attributes is None: attributes = [] - attrs = collect_attributes( - tag_name, attributes, self._indent, - self._indent_char, - len(tag_name) + 2) + attrs = collect_attributes(tag_name, attributes, + self._indent, self._indent_char, len(tag_name) + 2) self.write_line(u'<%s%s>' % (tag_name, attrs)) def _close_tag(self, tag_name): @@ -137,10 +136,9 @@ class XMLWriter(object): if do_escape: line = escape(line) if indent: - self._data.write('%s%s%s' % ( - self._indent_char * self._indent, - line.encode('utf-8'), - self._newline_char)) + self._data.write('%s%s%s' % (self._indent_char * self._indent, + line.encode('utf-8'), + self._newline_char)) else: self._data.write('%s%s' % (line.encode('utf-8'), self._newline_char)) diff --git a/misc/pep8.py b/misc/pep8.py index 38906294..f99ae3a3 100644 --- a/misc/pep8.py +++ b/misc/pep8.py @@ -1,6 +1,7 @@ -#!/usr/bin/python +#!/usr/bin/env python # pep8.py - Check Python source code formatting, according to PEP 8 -# Copyright (C) 2006 Johann C. Rocholl +# Copyright (C) 2006-2009 Johann C. Rocholl +# Copyright (C) 2009-2013 Florent Xicluna # # Permission is hereby granted, free of charge, to any person # obtaining a copy of this software and associated documentation files @@ -22,7 +23,7 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE # SOFTWARE. -""" +r""" Check Python source code formatting, according to PEP 8: http://www.python.org/dev/peps/pep-0008/ @@ -30,8 +31,7 @@ For usage and a list of options, try this: $ python pep8.py -h This program and its regression test suite live here: -http://svn.browsershots.org/trunk/devtools/pep8/ -http://trac.browsershots.org/browser/trunk/devtools/pep8/ +http://github.com/jcrocholl/pep8 Groups of errors and warnings: E errors @@ -43,72 +43,72 @@ W warnings 500 line length 600 deprecation 700 statements - -You can add checks to this program by writing plugins. Each plugin is -a simple function that is called for each line of source code, either -physical or logical. - -Physical line: -- Raw line of text from the input file. - -Logical line: -- Multi-line statements converted to a single line. -- Stripped left and right. -- Contents of strings replaced with 'xxx' of same length. -- Comments removed. - -The check function requests physical or logical lines by the name of -the first argument: - -def maximum_line_length(physical_line) -def extraneous_whitespace(logical_line) -def blank_lines(logical_line, blank_lines, indent_level, line_number) - -The last example above demonstrates how check plugins can request -additional information with extra arguments. All attributes of the -Checker object are available. Some examples: - -lines: a list of the raw lines from the input file -tokens: the tokens that contribute to this logical line -line_number: line number in the input file -blank_lines: blank lines before this one -indent_char: first indentation character in this file (' ' or '\t') -indent_level: indentation (with tabs expanded to multiples of 8) -previous_indent_level: indentation on previous line -previous_logical: previous logical line - -The docstring of each check function shall be the relevant part of -text from PEP 8. It is printed if the user enables --show-pep8. - +900 syntax error """ +__version__ = '1.4.5' import os import sys import re import time import inspect +import keyword import tokenize from optparse import OptionParser -from keyword import iskeyword from fnmatch import fnmatch - -__version__ = '0.2.0' -__revision__ = '$Rev$' - -default_exclude = '.svn,CVS,*.pyc,*.pyo' - -indent_match = re.compile(r'([ \t]*)').match -raise_comma_match = re.compile(r'raise\s+\w+\s*(,)').match - -operators = """ -+ - * / % ^ & | = < > >> << -+= -= *= /= %= ^= &= |= == <= >= >>= <<= -!= <> : -in is or not and -""".split() - -options = None -args = None +try: + from configparser import RawConfigParser + from io import TextIOWrapper +except ImportError: + from ConfigParser import RawConfigParser + +DEFAULT_EXCLUDE = '.svn,CVS,.bzr,.hg,.git,__pycache__' +DEFAULT_IGNORE = 'E226,E24' +if sys.platform == 'win32': + DEFAULT_CONFIG = os.path.expanduser(r'~\.pep8') +else: + DEFAULT_CONFIG = os.path.join(os.getenv('XDG_CONFIG_HOME') or + os.path.expanduser('~/.config'), 'pep8') +PROJECT_CONFIG = ('.pep8', 'tox.ini', 'setup.cfg') +TESTSUITE_PATH = os.path.join(os.path.dirname(__file__), 'testsuite') +MAX_LINE_LENGTH = 79 +REPORT_FORMAT = { + 'default': '%(path)s:%(row)d:%(col)d: %(code)s %(text)s', + 'pylint': '%(path)s:%(row)d: [%(code)s] %(text)s', +} + +PyCF_ONLY_AST = 1024 +SINGLETONS = frozenset(['False', 'None', 'True']) +KEYWORDS = frozenset(keyword.kwlist + ['print']) - SINGLETONS +UNARY_OPERATORS = frozenset(['>>', '**', '*', '+', '-']) +ARITHMETIC_OP = frozenset(['**', '*', '/', '//', '+', '-']) +WS_OPTIONAL_OPERATORS = ARITHMETIC_OP.union(['^', '&', '|', '<<', '>>', '%']) +WS_NEEDED_OPERATORS = frozenset([ + '**=', '*=', '/=', '//=', '+=', '-=', '!=', '<>', '<', '>', + '%=', '^=', '&=', '|=', '==', '<=', '>=', '<<=', '>>=', '=']) +WHITESPACE = frozenset(' \t') +SKIP_TOKENS = frozenset([tokenize.COMMENT, tokenize.NL, tokenize.NEWLINE, + tokenize.INDENT, tokenize.DEDENT]) +BENCHMARK_KEYS = ['directories', 'files', 'logical lines', 'physical lines'] + +INDENT_REGEX = re.compile(r'([ \t]*)') +RAISE_COMMA_REGEX = re.compile(r'raise\s+\w+\s*,') +RERAISE_COMMA_REGEX = re.compile(r'raise\s+\w+\s*,\s*\w+\s*,\s*\w+') +ERRORCODE_REGEX = re.compile(r'\b[A-Z]\d{3}\b') +DOCSTRING_REGEX = re.compile(r'u?r?["\']') +EXTRANEOUS_WHITESPACE_REGEX = re.compile(r'[[({] | []}),;:]') +WHITESPACE_AFTER_COMMA_REGEX = re.compile(r'[,;:]\s*(?: |\t)') +COMPARE_SINGLETON_REGEX = re.compile(r'([=!]=)\s*(None|False|True)') +COMPARE_TYPE_REGEX = re.compile(r'(?:[=!]=|is(?:\s+not)?)\s*type(?:s.\w+Type' + r'|\s*\(\s*([^)]*[^ )])\s*\))') +KEYWORD_REGEX = re.compile(r'(\s*)\b(?:%s)\b(\s*)' % r'|'.join(KEYWORDS)) +OPERATOR_REGEX = re.compile(r'(?:[^,\s])(\s*)(?:[-+*/|!<=>%&^]+)(\s*)') +LAMBDA_REGEX = re.compile(r'\blambda\b') +HUNK_REGEX = re.compile(r'^@@ -\d+(?:,\d+)? \+(\d+)(?:,(\d+))? @@.*$') + +# Work around Python < 2.6 behaviour, which does not generate NL after +# a comment which is on a line by itself. +COMMENT_WITH_NL = tokenize.generate_tokens(['#\n'].pop).send(None)[1] == '#\n' ############################################################################## @@ -117,7 +117,7 @@ args = None def tabs_or_spaces(physical_line, indent_char): - """ + r""" Never mix tabs and spaces. The most popular way of indenting Python is with spaces only. The @@ -126,52 +126,81 @@ def tabs_or_spaces(physical_line, indent_char): invoking the Python command line interpreter with the -t option, it issues warnings about code that illegally mixes tabs and spaces. When using -tt these warnings become errors. These options are highly recommended! + + Okay: if a == 0:\n a = 1\n b = 1 + E101: if a == 0:\n a = 1\n\tb = 1 """ - indent = indent_match(physical_line).group(1) + indent = INDENT_REGEX.match(physical_line).group(1) for offset, char in enumerate(indent): if char != indent_char: return offset, "E101 indentation contains mixed spaces and tabs" def tabs_obsolete(physical_line): - """ + r""" For new projects, spaces-only are strongly recommended over tabs. Most editors have features that make this easy to do. + + Okay: if True:\n return + W191: if True:\n\treturn """ - indent = indent_match(physical_line).group(1) - if indent.count('\t'): + indent = INDENT_REGEX.match(physical_line).group(1) + if '\t' in indent: return indent.index('\t'), "W191 indentation contains tabs" def trailing_whitespace(physical_line): - """ + r""" JCR: Trailing whitespace is superfluous. + FBM: Except when it occurs as part of a blank line (i.e. the line is + nothing but whitespace). According to Python docs[1] a line with only + whitespace is considered a blank line, and is to be ignored. However, + matching a blank line to its indentation level avoids mistakenly + terminating a multi-line statement (e.g. class declaration) when + pasting code into the standard Python interpreter. + + [1] http://docs.python.org/reference/lexical_analysis.html#blank-lines + + The warning returned varies on whether the line itself is blank, for easier + filtering for those who want to indent their blank lines. + + Okay: spam(1)\n# + W291: spam(1) \n# + W293: class Foo(object):\n \n bang = 12 """ - physical_line = physical_line.rstrip('\n') # chr(10), newline - physical_line = physical_line.rstrip('\r') # chr(13), carriage return - physical_line = physical_line.rstrip('\x0c') # chr(12), form feed, ^L - stripped = physical_line.rstrip() + physical_line = physical_line.rstrip('\n') # chr(10), newline + physical_line = physical_line.rstrip('\r') # chr(13), carriage return + physical_line = physical_line.rstrip('\x0c') # chr(12), form feed, ^L + stripped = physical_line.rstrip(' \t\v') if physical_line != stripped: - return len(stripped), "W291 trailing whitespace" + if stripped: + return len(stripped), "W291 trailing whitespace" + else: + return 0, "W293 blank line contains whitespace" def trailing_blank_lines(physical_line, lines, line_number): - """ + r""" JCR: Trailing blank lines are superfluous. + + Okay: spam(1) + W391: spam(1)\n """ - if physical_line.strip() == '' and line_number == len(lines): + if not physical_line.rstrip() and line_number == len(lines): return 0, "W391 blank line at end of file" def missing_newline(physical_line): """ JCR: The last line should have a newline. + + Reports warning W292. """ if physical_line.rstrip() == physical_line: return len(physical_line), "W292 no newline at end of file" -def maximum_line_length(physical_line): +def maximum_line_length(physical_line, max_line_length): """ Limit all lines to a maximum of 79 characters. @@ -181,10 +210,23 @@ def maximum_line_length(physical_line): ugly. Therefore, please limit all lines to a maximum of 79 characters. For flowing long blocks of text (docstrings or comments), limiting the length to 72 characters is recommended. + + Reports error E501. """ - length = len(physical_line.rstrip()) - if length > 99: - return 79, "E501 line too long (%d characters)" % length + line = physical_line.rstrip() + length = len(line) + if length > max_line_length: + if noqa(line): + return + if hasattr(line, 'decode'): # Python 2 + # The line could contain multi-byte characters + try: + length = len(line.decode('utf-8')) + except UnicodeError: + pass + if length > max_line_length: + return (max_line_length, "E501 line too long " + "(%d > %d characters)" % (length, max_line_length)) ############################################################################## @@ -192,6 +234,44 @@ def maximum_line_length(physical_line): ############################################################################## +def blank_lines(logical_line, blank_lines, indent_level, line_number, + previous_logical, previous_indent_level): + r""" + Separate top-level function and class definitions with two blank lines. + + Method definitions inside a class are separated by a single blank line. + + Extra blank lines may be used (sparingly) to separate groups of related + functions. Blank lines may be omitted between a bunch of related + one-liners (e.g. a set of dummy implementations). + + Use blank lines in functions, sparingly, to indicate logical sections. + + Okay: def a():\n pass\n\n\ndef b():\n pass + Okay: def a():\n pass\n\n\n# Foo\n# Bar\n\ndef b():\n pass + + E301: class Foo:\n b = 0\n def bar():\n pass + E302: def a():\n pass\n\ndef b(n):\n pass + E303: def a():\n pass\n\n\n\ndef b(n):\n pass + E303: def a():\n\n\n\n pass + E304: @decorator\n\ndef a():\n pass + """ + if line_number < 3 and not previous_logical: + return # Don't expect blank lines before the first line + if previous_logical.startswith('@'): + if blank_lines: + yield 0, "E304 blank lines found after function decorator" + elif blank_lines > 2 or (indent_level and blank_lines == 2): + yield 0, "E303 too many blank lines (%d)" % blank_lines + elif logical_line.startswith(('def ', 'class ', '@')): + if indent_level: + if not (blank_lines or previous_indent_level < indent_level or + DOCSTRING_REGEX.match(previous_logical)): + yield 0, "E301 expected 1 blank line, found 0" + elif blank_lines != 2: + yield 0, "E302 expected 2 blank lines, found %d" % blank_lines + + def extraneous_whitespace(logical_line): """ Avoid extraneous whitespace in the following situations: @@ -199,51 +279,273 @@ def extraneous_whitespace(logical_line): - Immediately inside parentheses, brackets or braces. - Immediately before a comma, semicolon, or colon. + + Okay: spam(ham[1], {eggs: 2}) + E201: spam( ham[1], {eggs: 2}) + E201: spam(ham[ 1], {eggs: 2}) + E201: spam(ham[1], { eggs: 2}) + E202: spam(ham[1], {eggs: 2} ) + E202: spam(ham[1 ], {eggs: 2}) + E202: spam(ham[1], {eggs: 2 }) + + E203: if x == 4: print x, y; x, y = y , x + E203: if x == 4: print x, y ; x, y = y, x + E203: if x == 4 : print x, y; x, y = y, x """ line = logical_line - for char in '([{': - found = line.find(char + ' ') - if found > -1: - return found + 1, "E201 whitespace after '%s'" % char - for char in '}])': - found = line.find(' ' + char) - if found > -1 and line[found - 1] != ',': - return found, "E202 whitespace before '%s'" % char - for char in ',;:': - found = line.find(' ' + char) - if found > -1: - return found, "E203 whitespace before '%s'" % char + for match in EXTRANEOUS_WHITESPACE_REGEX.finditer(line): + text = match.group() + char = text.strip() + found = match.start() + if text == char + ' ': + # assert char in '([{' + yield found + 1, "E201 whitespace after '%s'" % char + elif line[found - 1] != ',': + code = ('E202' if char in '}])' else 'E203') # if char in ',;:' + yield found, "%s whitespace before '%s'" % (code, char) + + +def whitespace_around_keywords(logical_line): + r""" + Avoid extraneous whitespace around keywords. + + Okay: True and False + E271: True and False + E272: True and False + E273: True and\tFalse + E274: True\tand False + """ + for match in KEYWORD_REGEX.finditer(logical_line): + before, after = match.groups() + + if '\t' in before: + yield match.start(1), "E274 tab before keyword" + elif len(before) > 1: + yield match.start(1), "E272 multiple spaces before keyword" + + if '\t' in after: + yield match.start(2), "E273 tab after keyword" + elif len(after) > 1: + yield match.start(2), "E271 multiple spaces after keyword" def missing_whitespace(logical_line): """ JCR: Each comma, semicolon or colon should be followed by whitespace. + + Okay: [a, b] + Okay: (3,) + Okay: a[1:4] + Okay: a[:4] + Okay: a[1:] + Okay: a[1:4:2] + E231: ['a','b'] + E231: foo(bar,baz) + E231: [{'a':'b'}] """ line = logical_line for index in range(len(line) - 1): char = line[index] - if char in ',;:' and line[index + 1] != ' ': + if char in ',;:' and line[index + 1] not in WHITESPACE: before = line[:index] - if char == ':' and before.count('[') > before.count(']'): - continue # Slice syntax, no space required - return index, "E231 missing whitespace after '%s'" % char + if char == ':' and before.count('[') > before.count(']') and \ + before.rfind('{') < before.rfind('['): + continue # Slice syntax, no space required + if char == ',' and line[index + 1] == ')': + continue # Allow tuple with only one element: (3,) + yield index, "E231 missing whitespace after '%s'" % char def indentation(logical_line, previous_logical, indent_char, indent_level, previous_indent_level): - """ + r""" Use 4 spaces per indentation level. For really old code that you don't want to mess up, you can continue to use 8-space tabs. + + Okay: a = 1 + Okay: if a == 0:\n a = 1 + E111: a = 1 + + Okay: for item in items:\n pass + E112: for item in items:\npass + + Okay: a = 1\nb = 2 + E113: a = 1\n b = 2 """ if indent_char == ' ' and indent_level % 4: - return 0, "E111 indentation is not a multiple of four" + yield 0, "E111 indentation is not a multiple of four" indent_expect = previous_logical.endswith(':') if indent_expect and indent_level <= previous_indent_level: - return 0, "E112 expected an indented block" + yield 0, "E112 expected an indented block" if indent_level > previous_indent_level and not indent_expect: - return 0, "E113 unexpected indentation" + yield 0, "E113 unexpected indentation" + + +def continuation_line_indentation(logical_line, tokens, indent_level, verbose): + r""" + Continuation lines should align wrapped elements either vertically using + Python's implicit line joining inside parentheses, brackets and braces, or + using a hanging indent. + + When using a hanging indent the following considerations should be applied: + + - there should be no arguments on the first line, and + + - further indentation should be used to clearly distinguish itself as a + continuation line. + + Okay: a = (\n) + E123: a = (\n ) + + Okay: a = (\n 42) + E121: a = (\n 42) + E122: a = (\n42) + E123: a = (\n 42\n ) + E124: a = (24,\n 42\n) + E125: if (a or\n b):\n pass + E126: a = (\n 42) + E127: a = (24,\n 42) + E128: a = (24,\n 42) + """ + first_row = tokens[0][2][0] + nrows = 1 + tokens[-1][2][0] - first_row + if nrows == 1 or noqa(tokens[0][4]): + return + + # indent_next tells us whether the next block is indented; assuming + # that it is indented by 4 spaces, then we should not allow 4-space + # indents on the final continuation line; in turn, some other + # indents are allowed to have an extra 4 spaces. + indent_next = logical_line.endswith(':') + + row = depth = 0 + # remember how many brackets were opened on each line + parens = [0] * nrows + # relative indents of physical lines + rel_indent = [0] * nrows + # visual indents + indent_chances = {} + last_indent = tokens[0][2] + indent = [last_indent[1]] + if verbose >= 3: + print(">>> " + tokens[0][4].rstrip()) + + for token_type, text, start, end, line in tokens: + + newline = row < start[0] - first_row + if newline: + row = start[0] - first_row + newline = (not last_token_multiline and + token_type not in (tokenize.NL, tokenize.NEWLINE)) + + if newline: + # this is the beginning of a continuation line. + last_indent = start + if verbose >= 3: + print("... " + line.rstrip()) + + # record the initial indent. + rel_indent[row] = expand_indent(line) - indent_level + + if depth: + # a bracket expression in a continuation line. + # find the line that it was opened on + for open_row in range(row - 1, -1, -1): + if parens[open_row]: + break + else: + # an unbracketed continuation line (ie, backslash) + open_row = 0 + hang = rel_indent[row] - rel_indent[open_row] + visual_indent = indent_chances.get(start[1]) + + if token_type == tokenize.OP and text in ']})': + # this line starts with a closing bracket + if indent[depth]: + if start[1] != indent[depth]: + yield (start, "E124 closing bracket does not match " + "visual indentation") + elif hang: + yield (start, "E123 closing bracket does not match " + "indentation of opening bracket's line") + elif visual_indent is True: + # visual indent is verified + if not indent[depth]: + indent[depth] = start[1] + elif visual_indent in (text, str): + # ignore token lined up with matching one from a previous line + pass + elif indent[depth] and start[1] < indent[depth]: + # visual indent is broken + yield (start, "E128 continuation line " + "under-indented for visual indent") + elif hang == 4 or (indent_next and rel_indent[row] == 8): + # hanging indent is verified + pass + else: + # indent is broken + if hang <= 0: + error = "E122", "missing indentation or outdented" + elif indent[depth]: + error = "E127", "over-indented for visual indent" + elif hang % 4: + error = "E121", "indentation is not a multiple of four" + else: + error = "E126", "over-indented for hanging indent" + yield start, "%s continuation line %s" % error + + # look for visual indenting + if (parens[row] and token_type not in (tokenize.NL, tokenize.COMMENT) + and not indent[depth]): + indent[depth] = start[1] + indent_chances[start[1]] = True + if verbose >= 4: + print("bracket depth %s indent to %s" % (depth, start[1])) + # deal with implicit string concatenation + elif (token_type in (tokenize.STRING, tokenize.COMMENT) or + text in ('u', 'ur', 'b', 'br')): + indent_chances[start[1]] = str + # special case for the "if" statement because len("if (") == 4 + elif not indent_chances and not row and not depth and text == 'if': + indent_chances[end[1] + 1] = True + + # keep track of bracket depth + if token_type == tokenize.OP: + if text in '([{': + depth += 1 + indent.append(0) + parens[row] += 1 + if verbose >= 4: + print("bracket depth %s seen, col %s, visual min = %s" % + (depth, start[1], indent[depth])) + elif text in ')]}' and depth > 0: + # parent indents should not be more than this one + prev_indent = indent.pop() or last_indent[1] + for d in range(depth): + if indent[d] > prev_indent: + indent[d] = 0 + for ind in list(indent_chances): + if ind >= prev_indent: + del indent_chances[ind] + depth -= 1 + if depth: + indent_chances[indent[depth]] = True + for idx in range(row, -1, -1): + if parens[idx]: + parens[idx] -= 1 + break + assert len(indent) == depth + 1 + if start[1] not in indent_chances: + # allow to line up tokens + indent_chances[start[1]] = text + + last_token_multiline = (start[0] != end[0]) + + if indent_next and rel_indent[-1] == 4: + yield (last_indent, "E125 continuation line does not distinguish " + "itself from next logical line") def whitespace_before_parameters(logical_line, tokens): @@ -255,6 +557,13 @@ def whitespace_before_parameters(logical_line, tokens): - Immediately before the open parenthesis that starts an indexing or slicing. + + Okay: spam(1) + E211: spam (1) + + Okay: dict['key'] = list[index] + E211: dict ['key'] = list[index] + E211: dict['key'] = list [index] """ prev_type = tokens[0][0] prev_text = tokens[0][1] @@ -264,97 +573,391 @@ def whitespace_before_parameters(logical_line, tokens): if (token_type == tokenize.OP and text in '([' and start != prev_end and - prev_type == tokenize.NAME and + (prev_type == tokenize.NAME or prev_text in '}])') and + # Syntax "class A (B):" is allowed, but avoid it (index < 2 or tokens[index - 2][1] != 'class') and - (not iskeyword(prev_text))): - return prev_end, "E211 whitespace before '%s'" % text + # Allow "return (a.foo for a in range(5))" + not keyword.iskeyword(prev_text)): + yield prev_end, "E211 whitespace before '%s'" % text prev_type = token_type prev_text = text prev_end = end def whitespace_around_operator(logical_line): - """ + r""" Avoid extraneous whitespace in the following situations: - More than one space around an assignment (or other) operator to align it with another. + + Okay: a = 12 + 3 + E221: a = 4 + 5 + E222: a = 4 + 5 + E223: a = 4\t+ 5 + E224: a = 4 +\t5 """ - line = logical_line - for operator in operators: - found = line.find(' ' + operator) - if found > -1: - return found, "E221 multiple spaces before operator" - found = line.find(operator + ' ') - if found > -1: - return found, "E222 multiple spaces after operator" - found = line.find('\t' + operator) - if found > -1: - return found, "E223 tab before operator" - found = line.find(operator + '\t') - if found > -1: - return found, "E224 tab after operator" + for match in OPERATOR_REGEX.finditer(logical_line): + before, after = match.groups() + + if '\t' in before: + yield match.start(1), "E223 tab before operator" + elif len(before) > 1: + yield match.start(1), "E221 multiple spaces before operator" + + if '\t' in after: + yield match.start(2), "E224 tab after operator" + elif len(after) > 1: + yield match.start(2), "E222 multiple spaces after operator" + + +def missing_whitespace_around_operator(logical_line, tokens): + r""" + - Always surround these binary operators with a single space on + either side: assignment (=), augmented assignment (+=, -= etc.), + comparisons (==, <, >, !=, <>, <=, >=, in, not in, is, is not), + Booleans (and, or, not). + + - Use spaces around arithmetic operators. + + Okay: i = i + 1 + Okay: submitted += 1 + Okay: x = x * 2 - 1 + Okay: hypot2 = x * x + y * y + Okay: c = (a + b) * (a - b) + Okay: foo(bar, key='word', *args, **kwargs) + Okay: alpha[:-i] + + E225: i=i+1 + E225: submitted +=1 + E225: x = x /2 - 1 + E225: z = x **y + E226: c = (a+b) * (a-b) + E226: hypot2 = x*x + y*y + E227: c = a|b + E228: msg = fmt%(errno, errmsg) + """ + parens = 0 + need_space = False + prev_type = tokenize.OP + prev_text = prev_end = None + for token_type, text, start, end, line in tokens: + if token_type in (tokenize.NL, tokenize.NEWLINE, tokenize.ERRORTOKEN): + # ERRORTOKEN is triggered by backticks in Python 3 + continue + if text in ('(', 'lambda'): + parens += 1 + elif text == ')': + parens -= 1 + if need_space: + if start != prev_end: + # Found a (probably) needed space + if need_space is not True and not need_space[1]: + yield (need_space[0], + "E225 missing whitespace around operator") + need_space = False + elif text == '>' and prev_text in ('<', '-'): + # Tolerate the "<>" operator, even if running Python 3 + # Deal with Python 3's annotated return value "->" + pass + else: + if need_space is True or need_space[1]: + # A needed trailing space was not found + yield prev_end, "E225 missing whitespace around operator" + else: + code, optype = 'E226', 'arithmetic' + if prev_text == '%': + code, optype = 'E228', 'modulo' + elif prev_text not in ARITHMETIC_OP: + code, optype = 'E227', 'bitwise or shift' + yield (need_space[0], "%s missing whitespace " + "around %s operator" % (code, optype)) + need_space = False + elif token_type == tokenize.OP and prev_end is not None: + if text == '=' and parens: + # Allow keyword args or defaults: foo(bar=None). + pass + elif text in WS_NEEDED_OPERATORS: + need_space = True + elif text in UNARY_OPERATORS: + # Check if the operator is being used as a binary operator + # Allow unary operators: -123, -x, +1. + # Allow argument unpacking: foo(*args, **kwargs). + if prev_type == tokenize.OP: + binary_usage = (prev_text in '}])') + elif prev_type == tokenize.NAME: + binary_usage = (prev_text not in KEYWORDS) + else: + binary_usage = (prev_type not in SKIP_TOKENS) + + if binary_usage: + need_space = None + elif text in WS_OPTIONAL_OPERATORS: + need_space = None + + if need_space is None: + # Surrounding space is optional, but ensure that + # trailing space matches opening space + need_space = (prev_end, start != prev_end) + elif need_space and start == prev_end: + # A needed opening space was not found + yield prev_end, "E225 missing whitespace around operator" + need_space = False + prev_type = token_type + prev_text = text + prev_end = end def whitespace_around_comma(logical_line): - """ + r""" Avoid extraneous whitespace in the following situations: - More than one space around an assignment (or other) operator to align it with another. - JCR: This should also be applied around comma etc. + Note: these checks are disabled by default + + Okay: a = (1, 2) + E241: a = (1, 2) + E242: a = (1,\t2) """ line = logical_line - for separator in ',;:': - found = line.find(separator + ' ') - if found > -1: - return found + 1, "E241 multiple spaces after '%s'" % separator - found = line.find(separator + '\t') - if found > -1: - return found + 1, "E242 tab after '%s'" % separator + for m in WHITESPACE_AFTER_COMMA_REGEX.finditer(line): + found = m.start() + 1 + if '\t' in m.group(): + yield found, "E242 tab after '%s'" % m.group()[0] + else: + yield found, "E241 multiple spaces after '%s'" % m.group()[0] -def imports_on_separate_lines(logical_line): +def whitespace_around_named_parameter_equals(logical_line, tokens): + """ + Don't use spaces around the '=' sign when used to indicate a + keyword argument or a default parameter value. + + Okay: def complex(real, imag=0.0): + Okay: return magic(r=real, i=imag) + Okay: boolean(a == b) + Okay: boolean(a != b) + Okay: boolean(a <= b) + Okay: boolean(a >= b) + + E251: def complex(real, imag = 0.0): + E251: return magic(r = real, i = imag) + """ + parens = 0 + no_space = False + prev_end = None + message = "E251 unexpected spaces around keyword / parameter equals" + for token_type, text, start, end, line in tokens: + if no_space: + no_space = False + if start != prev_end: + yield (prev_end, message) + elif token_type == tokenize.OP: + if text == '(': + parens += 1 + elif text == ')': + parens -= 1 + elif parens and text == '=': + no_space = True + if start != prev_end: + yield (prev_end, message) + prev_end = end + + +def whitespace_before_inline_comment(logical_line, tokens): + """ + Separate inline comments by at least two spaces. + + An inline comment is a comment on the same line as a statement. Inline + comments should be separated by at least two spaces from the statement. + They should start with a # and a single space. + + Okay: x = x + 1 # Increment x + Okay: x = x + 1 # Increment x + E261: x = x + 1 # Increment x + E262: x = x + 1 #Increment x + E262: x = x + 1 # Increment x """ + prev_end = (0, 0) + for token_type, text, start, end, line in tokens: + if token_type == tokenize.COMMENT: + if not line[:start[1]].strip(): + continue + if prev_end[0] == start[0] and start[1] < prev_end[1] + 2: + yield (prev_end, + "E261 at least two spaces before inline comment") + symbol, sp, comment = text.partition(' ') + if symbol not in ('#', '#:') or comment[:1].isspace(): + yield start, "E262 inline comment should start with '# '" + elif token_type != tokenize.NL: + prev_end = end + + +def imports_on_separate_lines(logical_line): + r""" Imports should usually be on separate lines. + + Okay: import os\nimport sys + E401: import sys, os + + Okay: from subprocess import Popen, PIPE + Okay: from myclas import MyClass + Okay: from foo.bar.yourclass import YourClass + Okay: import myclass + Okay: import foo.bar.yourclass """ line = logical_line if line.startswith('import '): found = line.find(',') - if found > -1: - return found, "E401 multiple imports on one line" + if -1 < found and ';' not in line[:found]: + yield found, "E401 multiple imports on one line" def compound_statements(logical_line): - """ + r""" Compound statements (multiple statements on the same line) are generally discouraged. + + While sometimes it's okay to put an if/for/while with a small body + on the same line, never do this for multi-clause statements. Also + avoid folding such long lines! + + Okay: if foo == 'blah':\n do_blah_thing() + Okay: do_one() + Okay: do_two() + Okay: do_three() + + E701: if foo == 'blah': do_blah_thing() + E701: for x in lst: total += x + E701: while t < 10: t = delay() + E701: if foo == 'blah': do_blah_thing() + E701: else: do_non_blah_thing() + E701: try: something() + E701: finally: cleanup() + E701: if foo == 'blah': one(); two(); three() + + E702: do_one(); do_two(); do_three() + E703: do_four(); # useless semicolon """ line = logical_line + last_char = len(line) - 1 found = line.find(':') - if -1 < found < len(line) - 1: + if -1 < found < last_char: before = line[:found] - if (before.count('{') <= before.count('}') and # {'a': 1} (dict) - before.count('[') <= before.count(']') and # [1:2] (slice) - not re.search(r'\blambda\b', before)): # lambda x: x - return found, "E701 multiple statements on one line (colon)" + if (before.count('{') <= before.count('}') and # {'a': 1} (dict) + before.count('[') <= before.count(']') and # [1:2] (slice) + before.count('(') <= before.count(')') and # (Python 3 annotation) + not LAMBDA_REGEX.search(before)): # lambda x: x + yield found, "E701 multiple statements on one line (colon)" found = line.find(';') if -1 < found: - return found, "E702 multiple statements on one line (semicolon)" + if found < last_char: + yield found, "E702 multiple statements on one line (semicolon)" + else: + yield found, "E703 statement ends with a semicolon" -def python_3000_has_key(logical_line): +def explicit_line_join(logical_line, tokens): + r""" + Avoid explicit line join between brackets. + + The preferred way of wrapping long lines is by using Python's implied line + continuation inside parentheses, brackets and braces. Long lines can be + broken over multiple lines by wrapping expressions in parentheses. These + should be used in preference to using a backslash for line continuation. + + E502: aaa = [123, \\n 123] + E502: aaa = ("bbb " \\n "ccc") + + Okay: aaa = [123,\n 123] + Okay: aaa = ("bbb "\n "ccc") + Okay: aaa = "bbb " \\n "ccc" + """ + prev_start = prev_end = parens = 0 + for token_type, text, start, end, line in tokens: + if start[0] != prev_start and parens and backslash: + yield backslash, "E502 the backslash is redundant between brackets" + if end[0] != prev_end: + if line.rstrip('\r\n').endswith('\\'): + backslash = (end[0], len(line.splitlines()[-1]) - 1) + else: + backslash = None + prev_start = prev_end = end[0] + else: + prev_start = start[0] + if token_type == tokenize.OP: + if text in '([{': + parens += 1 + elif text in ')]}': + parens -= 1 + + +def comparison_to_singleton(logical_line): + """ + Comparisons to singletons like None should always be done + with "is" or "is not", never the equality operators. + + Okay: if arg is not None: + E711: if arg != None: + E712: if arg == True: + + Also, beware of writing if x when you really mean if x is not None -- + e.g. when testing whether a variable or argument that defaults to None was + set to some other value. The other value might have a type (such as a + container) that could be false in a boolean context! + """ + match = COMPARE_SINGLETON_REGEX.search(logical_line) + if match: + same = (match.group(1) == '==') + singleton = match.group(2) + msg = "'if cond is %s:'" % (('' if same else 'not ') + singleton) + if singleton in ('None',): + code = 'E711' + else: + code = 'E712' + nonzero = ((singleton == 'True' and same) or + (singleton == 'False' and not same)) + msg += " or 'if %scond:'" % ('' if nonzero else 'not ') + yield match.start(1), ("%s comparison to %s should be %s" % + (code, singleton, msg)) + + +def comparison_type(logical_line): """ - The {}.has_key() method will be removed in the future version of - Python. Use the 'in' operation instead, like: - d = {"a": 1, "b": 2} - if "b" in d: - print d["b"] + Object type comparisons should always use isinstance() instead of + comparing types directly. + + Okay: if isinstance(obj, int): + E721: if type(obj) is type(1): + + When checking if an object is a string, keep in mind that it might be a + unicode string too! In Python 2.3, str and unicode have a common base + class, basestring, so you can do: + + Okay: if isinstance(obj, basestring): + Okay: if type(a1) is type(b1): + """ + match = COMPARE_TYPE_REGEX.search(logical_line) + if match: + inst = match.group(1) + if inst and isidentifier(inst) and inst not in SINGLETONS: + return # Allow comparison for types which are not obvious + yield match.start(), "E721 do not compare types, use 'isinstance()'" + + +def python_3000_has_key(logical_line): + r""" + The {}.has_key() method is removed in the Python 3. + Use the 'in' operation instead. + + Okay: if "alph" in d:\n print d["alph"] + W601: assert d.has_key('alph') """ pos = logical_line.find('.has_key(') if pos > -1: - return pos, "W601 .has_key() is deprecated, use 'in'" + yield pos, "W601 .has_key() is deprecated, use 'in'" def python_3000_raise_comma(logical_line): @@ -365,11 +968,41 @@ def python_3000_raise_comma(logical_line): The paren-using form is preferred because when the exception arguments are long or include string formatting, you don't need to use line continuation characters thanks to the containing parentheses. The older - form will be removed in Python 3000. + form is removed in Python 3. + + Okay: raise DummyError("Message") + W602: raise DummyError, "Message" """ - match = raise_comma_match(logical_line) - if match: - return match.start(1), "W602 deprecated form of raising exception" + match = RAISE_COMMA_REGEX.match(logical_line) + if match and not RERAISE_COMMA_REGEX.match(logical_line): + yield match.end() - 1, "W602 deprecated form of raising exception" + + +def python_3000_not_equal(logical_line): + """ + != can also be written <>, but this is an obsolete usage kept for + backwards compatibility only. New code should always use !=. + The older syntax is removed in Python 3. + + Okay: if a != 'no': + W603: if a <> 'no': + """ + pos = logical_line.find('<>') + if pos > -1: + yield pos, "W603 '<>' is deprecated, use '!='" + + +def python_3000_backticks(logical_line): + """ + Backticks are removed in Python 3. + Use repr() instead. + + Okay: val = repr(1 + 2) + W604: val = `1 + 2` + """ + pos = logical_line.find('`') + if pos > -1: + yield pos, "W604 backticks are deprecated, use 'repr()'" ############################################################################## @@ -377,26 +1010,63 @@ def python_3000_raise_comma(logical_line): ############################################################################## +if '' == ''.encode(): + # Python 2: implicit encoding. + def readlines(filename): + f = open(filename) + try: + return f.readlines() + finally: + f.close() + + isidentifier = re.compile(r'[a-zA-Z_]\w*').match + stdin_get_value = sys.stdin.read +else: + # Python 3 + def readlines(filename): + f = open(filename, 'rb') + try: + coding, lines = tokenize.detect_encoding(f.readline) + f = TextIOWrapper(f, coding, line_buffering=True) + return [l.decode(coding) for l in lines] + f.readlines() + except (LookupError, SyntaxError, UnicodeError): + f.close() + # Fall back if files are improperly declared + f = open(filename, encoding='latin-1') + return f.readlines() + finally: + f.close() + + isidentifier = str.isidentifier + + def stdin_get_value(): + return TextIOWrapper(sys.stdin.buffer, errors='ignore').read() +readlines.__doc__ = " Read the source code." +noqa = re.compile(r'# no(?:qa|pep8)\b', re.I).search + + def expand_indent(line): - """ + r""" Return the amount of indentation. Tabs are expanded to the next multiple of 8. >>> expand_indent(' ') 4 - >>> expand_indent('\\t') + >>> expand_indent('\t') 8 - >>> expand_indent(' \\t') + >>> expand_indent(' \t') 8 - >>> expand_indent(' \\t') + >>> expand_indent(' \t') 8 - >>> expand_indent(' \\t') + >>> expand_indent(' \t') 16 """ + if '\t' not in line: + return len(line) - len(line.lstrip()) result = 0 for char in line: if char == '\t': - result = result / 8 * 8 + 8 + result = result // 8 * 8 + 8 elif char == ' ': result += 1 else: @@ -404,34 +1074,6 @@ def expand_indent(line): return result -############################################################################## -# Framework to run all checks -############################################################################## - - -def message(text): - """Print a message.""" - # print >> sys.stderr, options.prog + ': ' + text - # print >> sys.stderr, text - print text - - -def find_checks(argument_name): - """ - Find all globally visible functions where the first argument name - starts with argument_name. - """ - checks = [] - function_type = type(find_checks) - for name, function in globals().iteritems(): - if type(function) is function_type: - args = inspect.getargspec(function)[0] - if len(args) >= 1 and args[0].startswith(argument_name): - checks.append((name, function, args)) - checks.sort() - return checks - - def mute_string(text): """ Replace contents with 'xxx' to prevent syntax matching. @@ -443,32 +1085,135 @@ def mute_string(text): >>> mute_string("r'abc'") "r'xxx'" """ - start = 1 - end = len(text) - 1 # String modifiers (e.g. u or r) - if text.endswith('"'): - start += text.index('"') - elif text.endswith("'"): - start += text.index("'") + start = text.index(text[-1]) + 1 + end = len(text) - 1 # Triple quotes - if text.endswith('"""') or text.endswith("'''"): + if text[-3:] in ('"""', "'''"): start += 2 end -= 2 return text[:start] + 'x' * (end - start) + text[end:] -class Checker: +def parse_udiff(diff, patterns=None, parent='.'): + """Return a dictionary of matching lines.""" + # For each file of the diff, the entry key is the filename, + # and the value is a set of row numbers to consider. + rv = {} + path = nrows = None + for line in diff.splitlines(): + if nrows: + if line[:1] != '-': + nrows -= 1 + continue + if line[:3] == '@@ ': + hunk_match = HUNK_REGEX.match(line) + row, nrows = [int(g or '1') for g in hunk_match.groups()] + rv[path].update(range(row, row + nrows)) + elif line[:3] == '+++': + path = line[4:].split('\t', 1)[0] + if path[:2] == 'b/': + path = path[2:] + rv[path] = set() + return dict([(os.path.join(parent, path), rows) + for (path, rows) in rv.items() + if rows and filename_match(path, patterns)]) + + +def filename_match(filename, patterns, default=True): + """ + Check if patterns contains a pattern that matches filename. + If patterns is unspecified, this always returns True. + """ + if not patterns: + return default + return any(fnmatch(filename, pattern) for pattern in patterns) + + +############################################################################## +# Framework to run all checks +############################################################################## + + +_checks = {'physical_line': {}, 'logical_line': {}, 'tree': {}} + + +def register_check(check, codes=None): + """ + Register a new check object. + """ + def _add_check(check, kind, codes, args): + if check in _checks[kind]: + _checks[kind][check][0].extend(codes or []) + else: + _checks[kind][check] = (codes or [''], args) + if inspect.isfunction(check): + args = inspect.getargspec(check)[0] + if args and args[0] in ('physical_line', 'logical_line'): + if codes is None: + codes = ERRORCODE_REGEX.findall(check.__doc__ or '') + _add_check(check, args[0], codes, args) + elif inspect.isclass(check): + if inspect.getargspec(check.__init__)[0][:2] == ['self', 'tree']: + _add_check(check, 'tree', codes, None) + + +def init_checks_registry(): + """ + Register all globally visible functions where the first argument name + is 'physical_line' or 'logical_line'. + """ + mod = inspect.getmodule(register_check) + for (name, function) in inspect.getmembers(mod, inspect.isfunction): + register_check(function) +init_checks_registry() + + +class Checker(object): """ Load a Python source file, tokenize it, check coding style. """ - def __init__(self, filename): + def __init__(self, filename=None, lines=None, + options=None, report=None, **kwargs): + if options is None: + options = StyleGuide(kwargs).options + else: + assert not kwargs + self._io_error = None + self._physical_checks = options.physical_checks + self._logical_checks = options.logical_checks + self._ast_checks = options.ast_checks + self.max_line_length = options.max_line_length + self.verbose = options.verbose self.filename = filename - self.lines = file(filename).readlines() - self.physical_checks = find_checks('physical_line') - self.logical_checks = find_checks('logical_line') - options.counters['physical lines'] = \ - options.counters.get('physical lines', 0) + len(self.lines) + if filename is None: + self.filename = 'stdin' + self.lines = lines or [] + elif filename == '-': + self.filename = 'stdin' + self.lines = stdin_get_value().splitlines(True) + elif lines is None: + try: + self.lines = readlines(filename) + except IOError: + exc_type, exc = sys.exc_info()[:2] + self._io_error = '%s: %s' % (exc_type.__name__, exc) + self.lines = [] + else: + self.lines = lines + self.report = report or options.report + self.report_error = self.report.error + + def report_invalid_syntax(self): + exc_type, exc = sys.exc_info()[:2] + offset = exc.args[1] + if len(offset) > 2: + offset = offset[1:3] + self.report_error(offset[0], offset[1] or 0, + 'E901 %s: %s' % (exc_type.__name__, exc.args[0]), + self.report_invalid_syntax) + report_invalid_syntax.__doc__ = " Check if the syntax is valid." def readline(self): """ @@ -503,9 +1248,9 @@ class Checker: Run all physical checks on a raw input line. """ self.physical_line = line - if self.indent_char is None and len(line) and line[0] in ' \t': + if self.indent_char is None and line[:1] in WHITESPACE: self.indent_char = line[0] - for name, check, argument_names in self.physical_checks: + for name, check, argument_names in self._physical_checks: result = self.run_check(check, argument_names) if result is not None: offset, text = result @@ -521,21 +1266,21 @@ class Checker: previous = None for token in self.tokens: token_type, text = token[0:2] - if token_type in (tokenize.COMMENT, tokenize.NL, - tokenize.INDENT, tokenize.DEDENT, - tokenize.NEWLINE): + if token_type in SKIP_TOKENS: continue if token_type == tokenize.STRING: text = mute_string(text) if previous: - end_line, end = previous[3] - start_line, start = token[2] - if end_line != start_line: # different row - if self.lines[end_line - 1][end - 1] not in '{[(': + end_row, end = previous[3] + start_row, start = token[2] + if end_row != start_row: # different row + prev_text = self.lines[end_row - 1][end - 1] + if prev_text == ',' or (prev_text not in '{[(' + and text not in '}])'): logical.append(' ') length += 1 - elif end != start: # different column - fill = self.lines[end_line - 1][end:start] + elif end != start: # different column + fill = self.lines[end_row - 1][end:start] logical.append(fill) length += len(fill) self.mapping.append((length, token)) @@ -543,300 +1288,573 @@ class Checker: length += len(text) previous = token self.logical_line = ''.join(logical) - assert self.logical_line.lstrip() == self.logical_line - assert self.logical_line.rstrip() == self.logical_line + # With Python 2, if the line ends with '\r\r\n' the assertion fails + # assert self.logical_line.strip() == self.logical_line def check_logical(self): """ Build a line from tokens and run all logical checks on it. """ - options.counters['logical lines'] = \ - options.counters.get('logical lines', 0) + 1 self.build_tokens_line() + self.report.increment_logical_line() first_line = self.lines[self.mapping[0][1][2][0] - 1] indent = first_line[:self.mapping[0][1][2][1]] self.previous_indent_level = self.indent_level self.indent_level = expand_indent(indent) - if options.verbose >= 2: - print self.logical_line[:80].rstrip() - for name, check, argument_names in self.logical_checks: - if options.verbose >= 3: - print ' ', name - result = self.run_check(check, argument_names) - if result is not None: + if self.verbose >= 2: + print(self.logical_line[:80].rstrip()) + for name, check, argument_names in self._logical_checks: + if self.verbose >= 4: + print(' ' + name) + for result in self.run_check(check, argument_names): offset, text = result - if type(offset) is tuple: - original_number, original_offset = offset + if isinstance(offset, tuple): + orig_number, orig_offset = offset else: for token_offset, token in self.mapping: if offset >= token_offset: - original_number = token[2][0] - original_offset = (token[2][1] - + offset - token_offset) - self.report_error(original_number, original_offset, - text, check) + orig_number = token[2][0] + orig_offset = (token[2][1] + offset - token_offset) + self.report_error(orig_number, orig_offset, text, check) self.previous_logical = self.logical_line - def check_all(self): + def check_ast(self): + try: + tree = compile(''.join(self.lines), '', 'exec', PyCF_ONLY_AST) + except SyntaxError: + return self.report_invalid_syntax() + for name, cls, _ in self._ast_checks: + checker = cls(tree, self.filename) + for lineno, offset, text, check in checker.run(): + if not noqa(self.lines[lineno - 1]): + self.report_error(lineno, offset, text, check) + + def generate_tokens(self): + if self._io_error: + self.report_error(1, 0, 'E902 %s' % self._io_error, readlines) + tokengen = tokenize.generate_tokens(self.readline_check_physical) + try: + for token in tokengen: + yield token + except (SyntaxError, tokenize.TokenError): + self.report_invalid_syntax() + + def check_all(self, expected=None, line_offset=0): """ Run all checks on the input file. """ - self.file_errors = 0 + self.report.init_file(self.filename, self.lines, expected, line_offset) + if self._ast_checks: + self.check_ast() self.line_number = 0 self.indent_char = None self.indent_level = 0 self.previous_logical = '' - self.blank_lines = 0 self.tokens = [] + self.blank_lines = blank_lines_before_comment = 0 parens = 0 - for token in tokenize.generate_tokens(self.readline_check_physical): - # print tokenize.tok_name[token[0]], repr(token) + for token in self.generate_tokens(): self.tokens.append(token) token_type, text = token[0:2] - if token_type == tokenize.OP and text in '([{': - parens += 1 - if token_type == tokenize.OP and text in '}])': - parens -= 1 - if token_type == tokenize.NEWLINE and not parens: - self.check_logical() - self.blank_lines = 0 - self.tokens = [] - if token_type == tokenize.NL and not parens: - self.blank_lines += 1 - self.tokens = [] - if token_type == tokenize.COMMENT: - source_line = token[4] - token_start = token[2][1] - if source_line[:token_start].strip() == '': + if self.verbose >= 3: + if token[2][0] == token[3][0]: + pos = '[%s:%s]' % (token[2][1] or '', token[3][1]) + else: + pos = 'l.%s' % token[3][0] + print('l.%s\t%s\t%s\t%r' % + (token[2][0], pos, tokenize.tok_name[token[0]], text)) + if token_type == tokenize.OP: + if text in '([{': + parens += 1 + elif text in '}])': + parens -= 1 + elif not parens: + if token_type == tokenize.NEWLINE: + if self.blank_lines < blank_lines_before_comment: + self.blank_lines = blank_lines_before_comment + self.check_logical() + self.tokens = [] + self.blank_lines = blank_lines_before_comment = 0 + elif token_type == tokenize.NL: + if len(self.tokens) == 1: + # The physical line contains only this token. + self.blank_lines += 1 + self.tokens = [] + elif token_type == tokenize.COMMENT and len(self.tokens) == 1: + if blank_lines_before_comment < self.blank_lines: + blank_lines_before_comment = self.blank_lines self.blank_lines = 0 - return self.file_errors + if COMMENT_WITH_NL: + # The comment also ends a physical line + self.tokens = [] + return self.report.get_file_results() + + +class BaseReport(object): + """Collect the results of the checks.""" + print_filename = False + + def __init__(self, options): + self._benchmark_keys = options.benchmark_keys + self._ignore_code = options.ignore_code + # Results + self.elapsed = 0 + self.total_errors = 0 + self.counters = dict.fromkeys(self._benchmark_keys, 0) + self.messages = {} + + def start(self): + """Start the timer.""" + self._start_time = time.time() + + def stop(self): + """Stop the timer.""" + self.elapsed = time.time() - self._start_time + + def init_file(self, filename, lines, expected, line_offset): + """Signal a new file.""" + self.filename = filename + self.lines = lines + self.expected = expected or () + self.line_offset = line_offset + self.file_errors = 0 + self.counters['files'] += 1 + self.counters['physical lines'] += len(lines) - def report_error(self, line_number, offset, text, check): - """ - Report an error, according to options. - """ - if options.quiet == 1 and not self.file_errors: - message(self.filename) - self.file_errors += 1 + def increment_logical_line(self): + """Signal a new logical line.""" + self.counters['logical lines'] += 1 + + def error(self, line_number, offset, text, check): + """Report an error, according to options.""" code = text[:4] - options.counters[code] = options.counters.get(code, 0) + 1 - options.messages[code] = text[5:] - if options.quiet: + if self._ignore_code(code): return - if options.testsuite: - base = os.path.basename(self.filename)[:4] - if base == code: - return - if base[0] == 'E' and code[0] == 'W': - return - if ignore_code(code): + if code in self.counters: + self.counters[code] += 1 + else: + self.counters[code] = 1 + self.messages[code] = text[5:] + # Don't care about expected errors or warnings + if code in self.expected: return - if options.counters[code] == 1 or options.repeat: - message("%s:%s:%d: %s" % - (self.filename, line_number, offset + 1, text)) - if options.show_source: - line = self.lines[line_number - 1] - message(line.rstrip()) - message(' ' * offset + '^') - if options.show_pep8: - message(check.__doc__.lstrip('\n').rstrip()) - - -def input_file(filename): - """ - Run all checks on a Python source file. - """ - if excluded(filename) or not filename_match(filename): - return 0 - if options.verbose: - message('checking ' + filename) - options.counters['files'] = options.counters.get('files', 0) + 1 - errors = Checker(filename).check_all() - if options.testsuite and not errors: - message("%s: %s" % (filename, "no errors found")) - return errors - - -def input_dir(dirname): - """ - Check all Python source files in this directory and all subdirectories. - """ - dirname = dirname.rstrip('/') - if excluded(dirname): - return 0 - errors = 0 - for root, dirs, files in os.walk(dirname): - if options.verbose: - message('directory ' + root) - options.counters['directories'] = \ - options.counters.get('directories', 0) + 1 - dirs.sort() - for subdir in dirs: - if excluded(subdir): - dirs.remove(subdir) - files.sort() - for filename in files: - errors += input_file(os.path.join(root, filename)) - return errors - - -def excluded(filename): - """ - Check if options.exclude contains a pattern that matches filename. - """ - basename = os.path.basename(filename) - for pattern in options.exclude: - if fnmatch(basename, pattern): - # print basename, 'excluded because it matches', pattern - return True - - -def filename_match(filename): - """ - Check if options.filename contains a pattern that matches filename. - If options.filename is unspecified, this always returns True. - """ - if not options.filename: - return True - for pattern in options.filename: - if fnmatch(filename, pattern): - return True - - -def ignore_code(code): - """ - Check if options.ignore contains a prefix of the error code. - """ - for ignore in options.ignore: - if code.startswith(ignore): - return True - - -def get_error_statistics(): - """Get error statistics.""" - return get_statistics("E") + if self.print_filename and not self.file_errors: + print(self.filename) + self.file_errors += 1 + self.total_errors += 1 + return code + def get_file_results(self): + """Return the count of errors and warnings for this file.""" + return self.file_errors -def get_warning_statistics(): - """Get warning statistics.""" - return get_statistics("W") + def get_count(self, prefix=''): + """Return the total count of errors and warnings.""" + return sum([self.counters[key] + for key in self.messages if key.startswith(prefix)]) + def get_statistics(self, prefix=''): + """ + Get statistics for message codes that start with the prefix. -def get_statistics(prefix=''): - """ - Get statistics for message codes that start with the prefix. + prefix='' matches all errors and warnings + prefix='E' matches all errors + prefix='W' matches all warnings + prefix='E4' matches all errors that have to do with imports + """ + return ['%-7s %s %s' % (self.counters[key], key, self.messages[key]) + for key in sorted(self.messages) if key.startswith(prefix)] + + def print_statistics(self, prefix=''): + """Print overall statistics (number of errors and warnings).""" + for line in self.get_statistics(prefix): + print(line) + + def print_benchmark(self): + """Print benchmark numbers.""" + print('%-7.2f %s' % (self.elapsed, 'seconds elapsed')) + if self.elapsed: + for key in self._benchmark_keys: + print('%-7d %s per second (%d total)' % + (self.counters[key] / self.elapsed, key, + self.counters[key])) + + +class FileReport(BaseReport): + """Collect the results of the checks and print only the filenames.""" + print_filename = True + + +class StandardReport(BaseReport): + """Collect and print the results of the checks.""" + + def __init__(self, options): + super(StandardReport, self).__init__(options) + self._fmt = REPORT_FORMAT.get(options.format.lower(), + options.format) + self._repeat = options.repeat + self._show_source = options.show_source + self._show_pep8 = options.show_pep8 + + def init_file(self, filename, lines, expected, line_offset): + """Signal a new file.""" + self._deferred_print = [] + return super(StandardReport, self).init_file( + filename, lines, expected, line_offset) + + def error(self, line_number, offset, text, check): + """Report an error, according to options.""" + code = super(StandardReport, self).error(line_number, offset, + text, check) + if code and (self.counters[code] == 1 or self._repeat): + self._deferred_print.append( + (line_number, offset, code, text[5:], check.__doc__)) + return code + + def get_file_results(self): + """Print the result and return the overall count for this file.""" + self._deferred_print.sort() + for line_number, offset, code, text, doc in self._deferred_print: + print(self._fmt % { + 'path': self.filename, + 'row': self.line_offset + line_number, 'col': offset + 1, + 'code': code, 'text': text, + }) + if self._show_source: + if line_number > len(self.lines): + line = '' + else: + line = self.lines[line_number - 1] + print(line.rstrip()) + print(' ' * offset + '^') + if self._show_pep8 and doc: + print(doc.lstrip('\n').rstrip()) + return self.file_errors - prefix='' matches all errors and warnings - prefix='E' matches all errors - prefix='W' matches all warnings - prefix='E4' matches all errors that have to do with imports - """ - stats = [] - keys = options.messages.keys() - keys.sort() - for key in keys: - if key.startswith(prefix): - stats.append('%-7s %s %s' % - (options.counters[key], key, options.messages[key])) - return stats +class DiffReport(StandardReport): + """Collect and print the results for the changed lines only.""" -def print_statistics(prefix=''): - """Print overall statistics (number of errors and warnings).""" - for line in get_statistics(prefix): - print line + def __init__(self, options): + super(DiffReport, self).__init__(options) + self._selected = options.selected_lines + def error(self, line_number, offset, text, check): + if line_number not in self._selected[self.filename]: + return + return super(DiffReport, self).error(line_number, offset, text, check) + + +class StyleGuide(object): + """Initialize a PEP-8 instance with few options.""" + + def __init__(self, *args, **kwargs): + # build options from the command line + self.checker_class = kwargs.pop('checker_class', Checker) + parse_argv = kwargs.pop('parse_argv', False) + config_file = kwargs.pop('config_file', None) + parser = kwargs.pop('parser', None) + options, self.paths = process_options( + parse_argv=parse_argv, config_file=config_file, parser=parser) + if args or kwargs: + # build options from dict + options_dict = dict(*args, **kwargs) + options.__dict__.update(options_dict) + if 'paths' in options_dict: + self.paths = options_dict['paths'] + + self.runner = self.input_file + self.options = options + + if not options.reporter: + options.reporter = BaseReport if options.quiet else StandardReport + + for index, value in enumerate(options.exclude): + options.exclude[index] = value.rstrip('/') + options.select = tuple(options.select or ()) + if not (options.select or options.ignore or + options.testsuite or options.doctest) and DEFAULT_IGNORE: + # The default choice: ignore controversial checks + options.ignore = tuple(DEFAULT_IGNORE.split(',')) + else: + # Ignore all checks which are not explicitly selected + options.ignore = tuple(options.ignore or options.select and ('',)) + options.benchmark_keys = BENCHMARK_KEYS[:] + options.ignore_code = self.ignore_code + options.physical_checks = self.get_checks('physical_line') + options.logical_checks = self.get_checks('logical_line') + options.ast_checks = self.get_checks('tree') + self.init_report() + + def init_report(self, reporter=None): + """Initialize the report instance.""" + self.options.report = (reporter or self.options.reporter)(self.options) + return self.options.report + + def check_files(self, paths=None): + """Run all checks on the paths.""" + if paths is None: + paths = self.paths + report = self.options.report + runner = self.runner + report.start() + try: + for path in paths: + if os.path.isdir(path): + self.input_dir(path) + elif not self.excluded(path): + runner(path) + except KeyboardInterrupt: + print('... stopped') + report.stop() + return report + + def input_file(self, filename, lines=None, expected=None, line_offset=0): + """Run all checks on a Python source file.""" + if self.options.verbose: + print('checking %s' % filename) + fchecker = self.checker_class( + filename, lines=lines, options=self.options) + return fchecker.check_all(expected=expected, line_offset=line_offset) + + def input_dir(self, dirname): + """Check all files in this directory and all subdirectories.""" + dirname = dirname.rstrip('/') + if self.excluded(dirname): + return 0 + counters = self.options.report.counters + verbose = self.options.verbose + filepatterns = self.options.filename + runner = self.runner + for root, dirs, files in os.walk(dirname): + if verbose: + print('directory ' + root) + counters['directories'] += 1 + for subdir in sorted(dirs): + if self.excluded(os.path.join(root, subdir)): + dirs.remove(subdir) + for filename in sorted(files): + # contain a pattern that matches? + if ((filename_match(filename, filepatterns) and + not self.excluded(filename))): + runner(os.path.join(root, filename)) + + def excluded(self, filename): + """ + Check if options.exclude contains a pattern that matches filename. + """ + basename = os.path.basename(filename) + return any((filename_match(filename, self.options.exclude, + default=False), + filename_match(basename, self.options.exclude, + default=False))) -def print_benchmark(elapsed): - """ - Print benchmark numbers. - """ - print '%-7.2f %s' % (elapsed, 'seconds elapsed') - keys = ['directories', 'files', - 'logical lines', 'physical lines'] - for key in keys: - if key in options.counters: - print '%-7d %s per second (%d total)' % ( - options.counters[key] / elapsed, key, - options.counters[key]) + def ignore_code(self, code): + """ + Check if the error code should be ignored. + If 'options.select' contains a prefix of the error code, + return False. Else, if 'options.ignore' contains a prefix of + the error code, return True. + """ + return (code.startswith(self.options.ignore) and + not code.startswith(self.options.select)) -def process_options(arglist=None): - """ - Process options passed either via arglist or via command line args. - """ - global options, args - usage = "%prog [options] input ..." - parser = OptionParser(usage) + def get_checks(self, argument_name): + """ + Find all globally visible functions where the first argument name + starts with argument_name and which contain selected tests. + """ + checks = [] + for check, attrs in _checks[argument_name].items(): + (codes, args) = attrs + if any(not (code and self.ignore_code(code)) for code in codes): + checks.append((check.__name__, check, args)) + return sorted(checks) + + +def get_parser(prog='pep8', version=__version__): + parser = OptionParser(prog=prog, version=version, + usage="%prog [options] input ...") + parser.config_options = [ + 'exclude', 'filename', 'select', 'ignore', 'max-line-length', 'count', + 'format', 'quiet', 'show-pep8', 'show-source', 'statistics', 'verbose'] parser.add_option('-v', '--verbose', default=0, action='count', help="print status messages, or debug with -vv") parser.add_option('-q', '--quiet', default=0, action='count', help="report only file names, or nothing with -qq") - parser.add_option('--exclude', metavar='patterns', default=default_exclude, - help="skip matches (default %s)" % default_exclude) - parser.add_option('--filename', metavar='patterns', - help="only check matching files (e.g. *.py)") + parser.add_option('-r', '--repeat', default=True, action='store_true', + help="(obsolete) show all occurrences of the same error") + parser.add_option('--first', action='store_false', dest='repeat', + help="show first occurrence of each error") + parser.add_option('--exclude', metavar='patterns', default=DEFAULT_EXCLUDE, + help="exclude files or directories which match these " + "comma separated patterns (default: %default)") + parser.add_option('--filename', metavar='patterns', default='*.py', + help="when parsing directories, only check filenames " + "matching these comma separated patterns " + "(default: %default)") + parser.add_option('--select', metavar='errors', default='', + help="select errors and warnings (e.g. E,W6)") parser.add_option('--ignore', metavar='errors', default='', help="skip errors and warnings (e.g. E4,W)") - parser.add_option('--repeat', action='store_true', - help="show all occurrences of the same error") parser.add_option('--show-source', action='store_true', help="show source code for each error") parser.add_option('--show-pep8', action='store_true', - help="show text of PEP 8 for each error") + help="show text of PEP 8 for each error " + "(implies --first)") parser.add_option('--statistics', action='store_true', help="count errors and warnings") - parser.add_option('--benchmark', action='store_true', - help="measure processing speed") - parser.add_option('--testsuite', metavar='dir', - help="run regression tests from dir") - parser.add_option('--doctest', action='store_true', - help="run doctest on myself") + parser.add_option('--count', action='store_true', + help="print total number of errors and warnings " + "to standard error and set exit code to 1 if " + "total is not null") + parser.add_option('--max-line-length', type='int', metavar='n', + default=MAX_LINE_LENGTH, + help="set maximum allowed line length " + "(default: %default)") + parser.add_option('--format', metavar='format', default='default', + help="set the error format [default|pylint|]") + parser.add_option('--diff', action='store_true', + help="report only lines changed according to the " + "unified diff received on STDIN") + group = parser.add_option_group("Testing Options") + if os.path.exists(TESTSUITE_PATH): + group.add_option('--testsuite', metavar='dir', + help="run regression tests from dir") + group.add_option('--doctest', action='store_true', + help="run doctest on myself") + group.add_option('--benchmark', action='store_true', + help="measure processing speed") + return parser + + +def read_config(options, args, arglist, parser): + """Read both user configuration and local configuration.""" + config = RawConfigParser() + + user_conf = options.config + if user_conf and os.path.isfile(user_conf): + if options.verbose: + print('user configuration: %s' % user_conf) + config.read(user_conf) + + parent = tail = args and os.path.abspath(os.path.commonprefix(args)) + while tail: + for name in PROJECT_CONFIG: + local_conf = os.path.join(parent, name) + if os.path.isfile(local_conf): + break + else: + parent, tail = os.path.split(parent) + continue + if options.verbose: + print('local configuration: %s' % local_conf) + config.read(local_conf) + break + + pep8_section = parser.prog + if config.has_section(pep8_section): + option_list = dict([(o.dest, o.type or o.action) + for o in parser.option_list]) + + # First, read the default values + new_options, _ = parser.parse_args([]) + + # Second, parse the configuration + for opt in config.options(pep8_section): + if options.verbose > 1: + print(" %s = %s" % (opt, config.get(pep8_section, opt))) + if opt.replace('_', '-') not in parser.config_options: + print("Unknown option: '%s'\n not in [%s]" % + (opt, ' '.join(parser.config_options))) + sys.exit(1) + normalized_opt = opt.replace('-', '_') + opt_type = option_list[normalized_opt] + if opt_type in ('int', 'count'): + value = config.getint(pep8_section, opt) + elif opt_type == 'string': + value = config.get(pep8_section, opt) + else: + assert opt_type in ('store_true', 'store_false') + value = config.getboolean(pep8_section, opt) + setattr(new_options, normalized_opt, value) + + # Third, overwrite with the command-line options + options, _ = parser.parse_args(arglist, values=new_options) + options.doctest = options.testsuite = False + return options + + +def process_options(arglist=None, parse_argv=False, config_file=None, + parser=None): + """Process options passed either via arglist or via command line args.""" + if not arglist and not parse_argv: + # Don't read the command line if the module is used as a library. + arglist = [] + if not parser: + parser = get_parser() + if not parser.has_option('--config'): + if config_file is True: + config_file = DEFAULT_CONFIG + group = parser.add_option_group("Configuration", description=( + "The project options are read from the [%s] section of the " + "tox.ini file or the setup.cfg file located in any parent folder " + "of the path(s) being processed. Allowed options are: %s." % + (parser.prog, ', '.join(parser.config_options)))) + group.add_option('--config', metavar='path', default=config_file, + help="user config file location (default: %default)") options, args = parser.parse_args(arglist) - if options.testsuite: + options.reporter = None + + if options.ensure_value('testsuite', False): args.append(options.testsuite) - if len(args) == 0: - parser.error('input not specified') - options.prog = os.path.basename(sys.argv[0]) - options.exclude = options.exclude.split(',') - for index in range(len(options.exclude)): - options.exclude[index] = options.exclude[index].rstrip('/') + elif not options.ensure_value('doctest', False): + if parse_argv and not args: + if options.diff or any(os.path.exists(name) + for name in PROJECT_CONFIG): + args = ['.'] + else: + parser.error('input not specified') + options = read_config(options, args, arglist, parser) + options.reporter = parse_argv and options.quiet == 1 and FileReport + if options.filename: options.filename = options.filename.split(',') + options.exclude = options.exclude.split(',') + if options.select: + options.select = options.select.split(',') if options.ignore: options.ignore = options.ignore.split(',') - else: - options.ignore = [] - options.counters = {} - options.messages = {} + + if options.diff: + options.reporter = DiffReport + stdin = stdin_get_value() + options.selected_lines = parse_udiff(stdin, options.filename, args[0]) + args = sorted(options.selected_lines) return options, args def _main(): - """ - Parse options and run checks on Python source. - """ - options, args = process_options() - if options.doctest: - import doctest - return doctest.testmod() - start_time = time.time() - errors = 0 - for path in args: - # skip emacs backups - if path.startswith(".#"): - continue - if os.path.isdir(path): - errors += input_dir(path) - else: - errors += input_file(path) - elapsed = time.time() - start_time + """Parse options and run checks on Python source.""" + pep8style = StyleGuide(parse_argv=True, config_file=True) + options = pep8style.options + if options.doctest or options.testsuite: + from testsuite.support import run_tests + report = run_tests(pep8style) + else: + report = pep8style.check_files() if options.statistics: - print_statistics() + report.print_statistics() if options.benchmark: - print_benchmark(elapsed) - return errors > 0 + report.print_benchmark() + if options.testsuite and not options.quiet: + report.print_results() + if report.total_errors: + if options.count: + sys.stderr.write(str(report.total_errors) + '\n') + sys.exit(1) if __name__ == '__main__': - sys.exit(_main()) + _main() diff --git a/tests/scanner/annotationparser/test_parser.py b/tests/scanner/annotationparser/test_parser.py index a1c5866c..ce3ccd22 100644 --- a/tests/scanner/annotationparser/test_parser.py +++ b/tests/scanner/annotationparser/test_parser.py @@ -108,7 +108,7 @@ def parsed2tree(docblock): parsed += ' \n' for key, value in tag.options.values: parsed += ' \n' - parsed += ' %s\n' %(key, ) + parsed += ' %s\n' % (key, ) if value is not None: options = value.all() parsed += ' \n' @@ -130,6 +130,7 @@ def parsed2tree(docblock): return parsed + def expected2tree(docblock): # Note: this sucks, but we can't rely on etree.tostring() to generate useable output :( diff --git a/tests/warn/warningtester.py b/tests/warn/warningtester.py index 27e0a5e6..fc3c3d2d 100644 --- a/tests/warn/warningtester.py +++ b/tests/warn/warningtester.py @@ -61,23 +61,24 @@ def _diff(a, b): for line in a[i1:i2]: for l in line.split('\n'): if l != '': - retval += ' ' + l + '\n' + retval += ' ' + l + '\n' continue if tag in ('replace', 'delete'): for line in a[i1:i2]: for l in line.split('\n'): if l != '': - retval += '-' + l + '\n' + retval += '-' + l + '\n' if tag in ('replace', 'insert'): for line in b[j1:j2]: for l in line.split('\n'): if l != '': - retval += '+' + l + '\n' + retval += '+' + l + '\n' return retval + def _extract_expected(filename): fd = open(filename, 'rU') data = fd.read() @@ -92,6 +93,7 @@ def _extract_expected(filename): return retval + def check(args): filename = args[0] @@ -133,10 +135,10 @@ def check(args): if len(expected_warnings) != len(emitted_warnings): raise SystemExit('ERROR in %r: %d warnings were emitted, ' - 'expected %d:\n%s' %(os.path.basename(filename), - len(emitted_warnings), - len(expected_warnings), - _diff(expected_warnings, emitted_warnings))) + 'expected %d:\n%s' % (os.path.basename(filename), + len(emitted_warnings), + len(expected_warnings), + _diff(expected_warnings, emitted_warnings))) for emitted_warning, expected_warning in zip(emitted_warnings, expected_warnings): if expected_warning != emitted_warning: -- cgit v1.2.1 From 4613390bcfd6a814685a5862925b11338b797e48 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 7 May 2013 18:41:48 -0400 Subject: scanner: Only warn about signal parameters if there are some We don't want to emit a warning if there are actually no parameters. --- giscanner/maintransformer.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/giscanner/maintransformer.py b/giscanner/maintransformer.py index 6acc5947..11bfb4cb 100644 --- a/giscanner/maintransformer.py +++ b/giscanner/maintransformer.py @@ -797,7 +797,9 @@ class MainTransformer(object): # phase we can refer to them while resolving annotations. for i, param in enumerate(signal.parameters): param.argname, tag = names[i + 1] - else: + elif len(signal.parameters) != 0: + # Only warn about missing params if there are actually parameters + # besides implicit self. message.warn("incorrect number of parameters in comment block, " "parameter annotations will be ignored.", block.position) -- cgit v1.2.1 From a47345309cbb627c3a5a48f2a14a863cccdaae0a Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 28 May 2013 14:44:15 -0400 Subject: Update annotations from glib git --- gir/gio-2.0.c | 1449 ++++++++++++++++++++++++++++++++++++++++++++++++++++- gir/glib-2.0.c | 183 +++++-- gir/gobject-2.0.c | 6 +- 3 files changed, 1599 insertions(+), 39 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 26058de3..999b130b 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -6730,7 +6730,7 @@ * GSocketAddress *sockaddr; * GError *conn_error = NULL; * - * addr = g_network_address_new ("www.gnome.org", 80); + * addr = g_network_address_new (hostname, port); * enumerator = g_socket_connectable_enumerate (addr); * g_object_unref (addr); * @@ -9471,6 +9471,1449 @@ */ +/** + * _GFreedesktopDBus: + * + * Abstract interface type for the D-Bus interface org.freedesktop.DBus. + */ + + +/** + * _GFreedesktopDBus::handle-add-match: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_rule: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the AddMatch() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_add_match() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-get-connection-selinux-security-context: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_name: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the GetConnectionSELinuxSecurityContext() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_get_connection_selinux_security_context() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-get-connection-unix-process-id: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_name: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the GetConnectionUnixProcessID() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_get_connection_unix_process_id() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-get-connection-unix-user: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_name: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the GetConnectionUnixUser() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_get_connection_unix_user() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-get-id: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * + * Signal emitted when a remote caller is invoking the GetId() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_get_id() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-get-name-owner: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_name: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the GetNameOwner() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_get_name_owner() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-hello: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * + * Signal emitted when a remote caller is invoking the Hello() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_hello() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-list-activatable-names: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * + * Signal emitted when a remote caller is invoking the ListActivatableNames() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_list_activatable_names() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-list-names: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * + * Signal emitted when a remote caller is invoking the ListNames() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_list_names() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-list-queued-owners: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_name: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the ListQueuedOwners() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_list_queued_owners() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-name-has-owner: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_name: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the NameHasOwner() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_name_has_owner() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-release-name: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_name: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the ReleaseName() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_release_name() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-reload-config: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * + * Signal emitted when a remote caller is invoking the ReloadConfig() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_reload_config() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-remove-match: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_rule: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the RemoveMatch() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_remove_match() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-request-name: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_name: Argument passed by remote caller. + * @arg_flags: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the RequestName() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_request_name() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-start-service-by-name: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_name: Argument passed by remote caller. + * @arg_flags: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the StartServiceByName() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_start_service_by_name() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::handle-update-activation-environment: + * @object: A #_GFreedesktopDBus. + * @invocation: A #GDBusMethodInvocation. + * @arg_environment: Argument passed by remote caller. + * + * Signal emitted when a remote caller is invoking the UpdateActivationEnvironment() D-Bus method. + * + * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_update_activation_environment() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. + * + * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. + */ + + +/** + * _GFreedesktopDBus::name-acquired: + * @object: A #_GFreedesktopDBus. + * @arg_name: Argument. + * + * On the client-side, this signal is emitted whenever the D-Bus signal "NameAcquired" is received. + * + * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal. + */ + + +/** + * _GFreedesktopDBus::name-lost: + * @object: A #_GFreedesktopDBus. + * @arg_name: Argument. + * + * On the client-side, this signal is emitted whenever the D-Bus signal "NameLost" is received. + * + * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal. + */ + + +/** + * _GFreedesktopDBus::name-owner-changed: + * @object: A #_GFreedesktopDBus. + * @arg_name: Argument. + * @arg_old_owner: Argument. + * @arg_new_owner: Argument. + * + * On the client-side, this signal is emitted whenever the D-Bus signal "NameOwnerChanged" is received. + * + * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal. + */ + + +/** + * _GFreedesktopDBusIface: + * @parent_iface: The parent interface. + * @handle_add_match: Handler for the #_GFreedesktopDBus::handle-add-match signal. + * @handle_get_connection_selinux_security_context: Handler for the #_GFreedesktopDBus::handle-get-connection-selinux-security-context signal. + * @handle_get_connection_unix_process_id: Handler for the #_GFreedesktopDBus::handle-get-connection-unix-process-id signal. + * @handle_get_connection_unix_user: Handler for the #_GFreedesktopDBus::handle-get-connection-unix-user signal. + * @handle_get_id: Handler for the #_GFreedesktopDBus::handle-get-id signal. + * @handle_get_name_owner: Handler for the #_GFreedesktopDBus::handle-get-name-owner signal. + * @handle_hello: Handler for the #_GFreedesktopDBus::handle-hello signal. + * @handle_list_activatable_names: Handler for the #_GFreedesktopDBus::handle-list-activatable-names signal. + * @handle_list_names: Handler for the #_GFreedesktopDBus::handle-list-names signal. + * @handle_list_queued_owners: Handler for the #_GFreedesktopDBus::handle-list-queued-owners signal. + * @handle_name_has_owner: Handler for the #_GFreedesktopDBus::handle-name-has-owner signal. + * @handle_release_name: Handler for the #_GFreedesktopDBus::handle-release-name signal. + * @handle_reload_config: Handler for the #_GFreedesktopDBus::handle-reload-config signal. + * @handle_remove_match: Handler for the #_GFreedesktopDBus::handle-remove-match signal. + * @handle_request_name: Handler for the #_GFreedesktopDBus::handle-request-name signal. + * @handle_start_service_by_name: Handler for the #_GFreedesktopDBus::handle-start-service-by-name signal. + * @handle_update_activation_environment: Handler for the #_GFreedesktopDBus::handle-update-activation-environment signal. + * @name_acquired: Handler for the #_GFreedesktopDBus::name-acquired signal. + * @name_lost: Handler for the #_GFreedesktopDBus::name-lost signal. + * @name_owner_changed: Handler for the #_GFreedesktopDBus::name-owner-changed signal. + * + * Virtual table for the D-Bus interface org.freedesktop.DBus. + */ + + +/** + * _GFreedesktopDBusProxy: + * + * The #_GFreedesktopDBusProxy structure contains only private data and should only be accessed using the provided API. + */ + + +/** + * _GFreedesktopDBusProxyClass: + * @parent_class: The parent class. + * + * Class structure for #_GFreedesktopDBusProxy. + */ + + +/** + * _GFreedesktopDBusSkeleton: + * + * The #_GFreedesktopDBusSkeleton structure contains only private data and should only be accessed using the provided API. + */ + + +/** + * _GFreedesktopDBusSkeletonClass: + * @parent_class: The parent class. + * + * Class structure for #_GFreedesktopDBusSkeleton. + */ + + +/** + * _g_freedesktop_dbus_call_add_match: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_rule: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the AddMatch() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_add_match_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_add_match_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_add_match_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_add_match(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_add_match(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_add_match_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_rule: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the AddMatch() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_add_match() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_get_connection_selinux_security_context: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the GetConnectionSELinuxSecurityContext() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_get_connection_selinux_security_context_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_get_connection_selinux_security_context_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_get_connection_selinux_security_context_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_security_context: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_get_connection_selinux_security_context(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_get_connection_selinux_security_context(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_get_connection_selinux_security_context_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @out_security_context: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the GetConnectionSELinuxSecurityContext() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_get_connection_selinux_security_context() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_get_connection_unix_process_id: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the GetConnectionUnixProcessID() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_get_connection_unix_process_id_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_get_connection_unix_process_id_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_get_connection_unix_process_id_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_pid: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_get_connection_unix_process_id(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_get_connection_unix_process_id(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_get_connection_unix_process_id_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @out_pid: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the GetConnectionUnixProcessID() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_get_connection_unix_process_id() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_get_connection_unix_user: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the GetConnectionUnixUser() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_get_connection_unix_user_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_get_connection_unix_user_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_get_connection_unix_user_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_uid: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_get_connection_unix_user(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_get_connection_unix_user(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_get_connection_unix_user_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @out_uid: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the GetConnectionUnixUser() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_get_connection_unix_user() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_get_id: + * @proxy: A #_GFreedesktopDBusProxy. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the GetId() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_get_id_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_get_id_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_get_id_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_unique_id: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_get_id(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_get_id(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_get_id_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_unique_id: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the GetId() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_get_id() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_get_name_owner: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the GetNameOwner() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_get_name_owner_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_get_name_owner_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_get_name_owner_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_unique_name: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_get_name_owner(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_get_name_owner(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_get_name_owner_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @out_unique_name: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the GetNameOwner() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_get_name_owner() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_hello: + * @proxy: A #_GFreedesktopDBusProxy. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the Hello() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_hello_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_hello_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_hello_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_assigned_name: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_hello(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_hello(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_hello_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_assigned_name: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the Hello() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_hello() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_list_activatable_names: + * @proxy: A #_GFreedesktopDBusProxy. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the ListActivatableNames() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_list_activatable_names_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_list_activatable_names_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_list_activatable_names_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_activatable_names: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_list_activatable_names(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_list_activatable_names(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_list_activatable_names_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_activatable_names: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the ListActivatableNames() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_list_activatable_names() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_list_names: + * @proxy: A #_GFreedesktopDBusProxy. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the ListNames() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_list_names_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_list_names_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_list_names_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_names: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_list_names(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_list_names(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_list_names_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_names: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the ListNames() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_list_names() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_list_queued_owners: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the ListQueuedOwners() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_list_queued_owners_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_list_queued_owners_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_list_queued_owners_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_queued_owners: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_list_queued_owners(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_list_queued_owners(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_list_queued_owners_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @out_queued_owners: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the ListQueuedOwners() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_list_queued_owners() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_name_has_owner: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the NameHasOwner() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_name_has_owner_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_name_has_owner_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_name_has_owner_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_has_owner: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_name_has_owner(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_name_has_owner(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_name_has_owner_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @out_has_owner: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the NameHasOwner() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_name_has_owner() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_release_name: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the ReleaseName() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_release_name_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_release_name_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_release_name_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_value: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_release_name(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_release_name(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_release_name_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @out_value: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the ReleaseName() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_release_name() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_reload_config: + * @proxy: A #_GFreedesktopDBusProxy. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the ReloadConfig() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_reload_config_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_reload_config_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_reload_config_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_reload_config(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_reload_config(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_reload_config_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the ReloadConfig() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_reload_config() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_remove_match: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_rule: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the RemoveMatch() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_remove_match_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_remove_match_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_remove_match_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_remove_match(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_remove_match(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_remove_match_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_rule: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the RemoveMatch() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_remove_match() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_request_name: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @arg_flags: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the RequestName() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_request_name_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_request_name_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_request_name_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_value: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_request_name(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_request_name(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_request_name_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @arg_flags: Argument to pass with the method invocation. + * @out_value: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the RequestName() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_request_name() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_start_service_by_name: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @arg_flags: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the StartServiceByName() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_start_service_by_name_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_start_service_by_name_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_start_service_by_name_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @out_value: (out): Return location for return parameter or %NULL to ignore. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_start_service_by_name(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_start_service_by_name(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_start_service_by_name_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_name: Argument to pass with the method invocation. + * @arg_flags: Argument to pass with the method invocation. + * @out_value: (out): Return location for return parameter or %NULL to ignore. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the StartServiceByName() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_start_service_by_name() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_update_activation_environment: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_environment: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. + * @user_data: User data to pass to @callback. + * + * Asynchronously invokes the UpdateActivationEnvironment() D-Bus method on @proxy. + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_call_update_activation_environment_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_call_update_activation_environment_sync() for the synchronous, blocking version of this method. + */ + + +/** + * _g_freedesktop_dbus_call_update_activation_environment_finish: + * @proxy: A #_GFreedesktopDBusProxy. + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_update_activation_environment(). + * @error: Return location for error or %NULL. + * + * Finishes an operation started with _g_freedesktop_dbus_call_update_activation_environment(). + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_call_update_activation_environment_sync: + * @proxy: A #_GFreedesktopDBusProxy. + * @arg_environment: Argument to pass with the method invocation. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL. + * + * Synchronously invokes the UpdateActivationEnvironment() D-Bus method on @proxy. The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_call_update_activation_environment() for the asynchronous version of this method. + * + * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. + */ + + +/** + * _g_freedesktop_dbus_complete_add_match: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * + * Helper function used in service implementations to finish handling invocations of the AddMatch() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_get_connection_selinux_security_context: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @security_context: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the GetConnectionSELinuxSecurityContext() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_get_connection_unix_process_id: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @pid: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the GetConnectionUnixProcessID() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_get_connection_unix_user: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @uid: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the GetConnectionUnixUser() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_get_id: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @unique_id: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the GetId() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_get_name_owner: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @unique_name: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the GetNameOwner() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_hello: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @assigned_name: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the Hello() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_list_activatable_names: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @activatable_names: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the ListActivatableNames() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_list_names: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @names: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the ListNames() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_list_queued_owners: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @queued_owners: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the ListQueuedOwners() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_name_has_owner: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @has_owner: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the NameHasOwner() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_release_name: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @value: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the ReleaseName() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_reload_config: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * + * Helper function used in service implementations to finish handling invocations of the ReloadConfig() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_remove_match: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * + * Helper function used in service implementations to finish handling invocations of the RemoveMatch() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_request_name: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @value: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the RequestName() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_start_service_by_name: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * @value: Parameter to return. + * + * Helper function used in service implementations to finish handling invocations of the StartServiceByName() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_complete_update_activation_environment: + * @object: A #_GFreedesktopDBus. + * @invocation: (transfer full): A #GDBusMethodInvocation. + * + * Helper function used in service implementations to finish handling invocations of the UpdateActivationEnvironment() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * + * This method will free @invocation, you cannot use it afterwards. + */ + + +/** + * _g_freedesktop_dbus_emit_name_acquired: + * @object: A #_GFreedesktopDBus. + * @arg_name: Argument to pass with the signal. + * + * Emits the "NameAcquired" D-Bus signal. + */ + + +/** + * _g_freedesktop_dbus_emit_name_lost: + * @object: A #_GFreedesktopDBus. + * @arg_name: Argument to pass with the signal. + * + * Emits the "NameLost" D-Bus signal. + */ + + +/** + * _g_freedesktop_dbus_emit_name_owner_changed: + * @object: A #_GFreedesktopDBus. + * @arg_name: Argument to pass with the signal. + * @arg_old_owner: Argument to pass with the signal. + * @arg_new_owner: Argument to pass with the signal. + * + * Emits the "NameOwnerChanged" D-Bus signal. + */ + + +/** + * _g_freedesktop_dbus_interface_info: + * + * Gets a machine-readable description of the org.freedesktop.DBus D-Bus interface. + * + * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free. + */ + + +/** + * _g_freedesktop_dbus_override_properties: + * @klass: The class structure for a #GObject-derived class. + * @property_id_begin: The property id to assign to the first overridden property. + * + * Overrides all #GObject properties in the #_GFreedesktopDBus interface for a concrete class. + * The properties are overridden in the order they are defined. + * + * Returns: The last property id. + */ + + +/** + * _g_freedesktop_dbus_proxy_new: + * @connection: A #GDBusConnection. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied. + * @user_data: User data to pass to @callback. + * + * Asynchronously creates a proxy for the D-Bus interface org.freedesktop.DBus. See g_dbus_proxy_new() for more details. + * + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_proxy_new_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_proxy_new_sync() for the synchronous, blocking version of this constructor. + */ + + +/** + * _g_freedesktop_dbus_proxy_new_finish: + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_proxy_new(). + * @error: Return location for error or %NULL + * + * Finishes an operation started with _g_freedesktop_dbus_proxy_new(). + * + * Returns: (transfer full) (type _GFreedesktopDBusProxy): The constructed proxy object or %NULL if @error is set. + */ + + +/** + * _g_freedesktop_dbus_proxy_new_for_bus: + * @bus_type: A #GBusType. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: A bus name (well-known or unique). + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @callback: A #GAsyncReadyCallback to call when the request is satisfied. + * @user_data: User data to pass to @callback. + * + * Like _g_freedesktop_dbus_proxy_new() but takes a #GBusType instead of a #GDBusConnection. + * + * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. + * You can then call _g_freedesktop_dbus_proxy_new_for_bus_finish() to get the result of the operation. + * + * See _g_freedesktop_dbus_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor. + */ + + +/** + * _g_freedesktop_dbus_proxy_new_for_bus_finish: + * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_proxy_new_for_bus(). + * @error: Return location for error or %NULL + * + * Finishes an operation started with _g_freedesktop_dbus_proxy_new_for_bus(). + * + * Returns: (transfer full) (type _GFreedesktopDBusProxy): The constructed proxy object or %NULL if @error is set. + */ + + +/** + * _g_freedesktop_dbus_proxy_new_for_bus_sync: + * @bus_type: A #GBusType. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: A bus name (well-known or unique). + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL + * + * Like _g_freedesktop_dbus_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection. + * + * The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_proxy_new_for_bus() for the asynchronous version of this constructor. + * + * Returns: (transfer full) (type _GFreedesktopDBusProxy): The constructed proxy object or %NULL if @error is set. + */ + + +/** + * _g_freedesktop_dbus_proxy_new_sync: + * @connection: A #GDBusConnection. + * @flags: Flags from the #GDBusProxyFlags enumeration. + * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. + * @object_path: An object path. + * @cancellable: (allow-none): A #GCancellable or %NULL. + * @error: Return location for error or %NULL + * + * Synchronously creates a proxy for the D-Bus interface org.freedesktop.DBus. See g_dbus_proxy_new_sync() for more details. + * + * The calling thread is blocked until a reply is received. + * + * See _g_freedesktop_dbus_proxy_new() for the asynchronous version of this constructor. + * + * Returns: (transfer full) (type _GFreedesktopDBusProxy): The constructed proxy object or %NULL if @error is set. + */ + + +/** + * _g_freedesktop_dbus_skeleton_new: + * + * Creates a skeleton object for the D-Bus interface org.freedesktop.DBus. + * + * Returns: (transfer full) (type _GFreedesktopDBusSkeleton): The skeleton object. + */ + + /** * _g_io_module_get_default: * @extension_point: the name of an extension point @@ -9533,6 +10976,8 @@ * the parameter type given at construction time). If the parameter * type was %NULL then @parameter must also be %NULL. * + * If the @parameter GVariant is floating, it is consumed. + * * Since: 2.28 */ @@ -28779,6 +30224,8 @@ * property. Instead, they should call g_action_change_state() to * request the change. * + * If the @value GVariant is floating, it is consumed. + * * Since: 2.30 */ diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 7cf2ffa0..ac8f7796 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -429,7 +429,7 @@ * @G_FILE_ERROR_NFILE: There are too many distinct file openings in the entire system. * @G_FILE_ERROR_BADF: Bad file descriptor; for example, I/O on a descriptor that has been closed or reading from a descriptor open only for writing (or vice versa). * @G_FILE_ERROR_INVAL: Invalid argument. This is used to indicate various kinds of problems with passing the wrong argument to a library function. - * @G_FILE_ERROR_PIPE: Broken pipe; there is no process reading from the other end of a pipe. Every library function that returns this error code also generates a `SIGPIPE' signal; this signal terminates the program if not handled or blocked. Thus, your program will never actually see this code unless it has handled or blocked `SIGPIPE'. + * @G_FILE_ERROR_PIPE: Broken pipe; there is no process reading from the other end of a pipe. Every library function that returns this error code also generates a 'SIGPIPE' signal; this signal terminates the program if not handled or blocked. Thus, your program will never actually see this code unless it has handled or blocked 'SIGPIPE'. * @G_FILE_ERROR_AGAIN: Resource temporarily unavailable; the call might work if you try again later. * @G_FILE_ERROR_INTR: Interrupted function call; an asynchronous signal occurred and prevented completion of the call. When this happens, you should try the call again. * @G_FILE_ERROR_IO: Input/output error; usually used for physical read or write errors. i.e. the disk or other physical device hardware is returning errors. @@ -1789,6 +1789,19 @@ */ +/** + * GTestSubprocessFlags: + * @G_TEST_SUBPROCESS_INHERIT_STDIN: If this flag is given, the child process will inherit the parent's stdin. Otherwise, the child's stdin is redirected to /dev/null. + * @G_TEST_SUBPROCESS_INHERIT_STDOUT: If this flag is given, the child process will inherit the parent's stdout. Otherwise, the child's stdout will not be visible, but it will be captured to allow later tests with g_test_trap_assert_stdout(). + * @G_TEST_SUBPROCESS_INHERIT_STDERR: If this flag is given, the child process will inherit the parent's stderr. Otherwise, the child's stderr will not be visible, but it will be captured to allow later tests with g_test_trap_assert_stderr(). + * + * Flags to pass to g_test_trap_subprocess() to control input and output. + * + * Note that in contrast with g_test_trap_fork(), the default is to + * not show stdout and stderr. + */ + + /** * GTestSuite: * @@ -1800,10 +1813,12 @@ * GTestTrapFlags: * @G_TEST_TRAP_SILENCE_STDOUT: Redirect stdout of the test child to /dev/null so it cannot be observed on the console during test runs. The actual output is still captured though to allow later tests with g_test_trap_assert_stdout(). * @G_TEST_TRAP_SILENCE_STDERR: Redirect stderr of the test child to /dev/null so it cannot be observed on the console during test runs. The actual output is still captured though to allow later tests with g_test_trap_assert_stderr(). - * @G_TEST_TRAP_INHERIT_STDIN: If this flag is given, stdin of the forked child process is shared with stdin of its parent process. It is redirected to /dev/null otherwise. + * @G_TEST_TRAP_INHERIT_STDIN: If this flag is given, stdin of the child process is shared with stdin of its parent process. It is redirected to /dev/null otherwise. * * Test traps are guards around forked tests. * These flags determine what traps to set. + * + * Deprecated: #GTestTrapFlags is used only with g_test_trap_fork(), which is deprecated. g_test_trap_subprocess() uses #GTestTrapSubprocessFlags. */ @@ -2877,7 +2892,7 @@ * format function the same as they would have been for the unmodified * string). * - * Place the attribute after the function declaration, just after the + * Place the attribute after the function declaration, just before the * semicolon. * * See the GNU C documentation for more details. @@ -27201,6 +27216,11 @@ * slash-separated portions of @testpath. The @test_data argument * will be passed as first argument to @test_func. * + * If @testpath includes the component "subprocess" anywhere in it, + * the test will be skipped by default, and only run if explicitly + * required via the command-line option or + * g_test_trap_subprocess(). + * * Since: 2.16 */ @@ -27229,6 +27249,11 @@ * created on the fly and added to the root fixture, based on the * slash-separated portions of @testpath. * + * If @testpath includes the component "subprocess" anywhere in it, + * the test will be skipped by default, and only run if explicitly + * required via the command-line option or + * g_test_trap_subprocess(). + * * Since: 2.16 */ @@ -27349,7 +27374,7 @@ * * Note that you cannot use this to test g_error() messages, since * g_error() intentionally never returns even if the program doesn't - * abort; use g_test_trap_fork() in this case. + * abort; use g_test_trap_subprocess() in this case. * * Since: 2.34 */ @@ -27421,6 +27446,8 @@ * * * Execute all tests matching TESTPATH. + * This can also be used to force a test to run that would otherwise + * be skipped (ie, a test whose name contains "/subprocess"). * * * @@ -27451,8 +27478,8 @@ * undefined * * Tests for undefined behaviour, may provoke programming errors - * under g_test_trap_fork() to check that appropriate assertions - * or warnings are given + * under g_test_trap_subprocess() or g_test_expect_messages() to check + * that appropriate assertions or warnings are given * * * @@ -27765,6 +27792,17 @@ */ +/** + * g_test_subprocess: + * + * Returns %TRUE (after g_test_init() has been called) if the test + * program is running under g_test_trap_subprocess(). + * + * Returns: %TRUE if the test program is running under g_test_trap_subprocess(). + * Since: 2.38 + */ + + /** * g_test_suite_add: * @suite: a #GTestSuite @@ -27830,13 +27868,13 @@ /** * g_test_trap_assert_failed: * - * Assert that the last forked test failed. - * See g_test_trap_fork(). + * Assert that the last test subprocess failed. + * See g_test_trap_subprocess(). * * This is sometimes used to test situations that are formally considered to * be undefined behaviour, like inputs that fail a g_return_if_fail() * check. In these situations you should skip the entire test, including the - * call to g_test_trap_fork(), unless g_test_undefined() returns %TRUE + * call to g_test_trap_subprocess(), unless g_test_undefined() returns %TRUE * to indicate that undefined behaviour may be tested. * * Since: 2.16 @@ -27846,8 +27884,8 @@ /** * g_test_trap_assert_passed: * - * Assert that the last forked test passed. - * See g_test_trap_fork(). + * Assert that the last test subprocess passed. + * See g_test_trap_subprocess(). * * Since: 2.16 */ @@ -27857,14 +27895,15 @@ * g_test_trap_assert_stderr: * @serrpattern: a glob-style pattern * - * Assert that the stderr output of the last forked test - * matches @serrpattern. See g_test_trap_fork(). + * Assert that the stderr output of the last test subprocess + * matches @serrpattern. See g_test_trap_subprocess(). * - * This is sometimes used to test situations that are formally considered to - * be undefined behaviour, like inputs that fail a g_return_if_fail() - * check. In these situations you should skip the entire test, including the - * call to g_test_trap_fork(), unless g_test_undefined() returns %TRUE - * to indicate that undefined behaviour may be tested. + * This is sometimes used to test situations that are formally + * considered to be undefined behaviour, like code that hits a + * g_assert() or g_error(). In these situations you should skip the + * entire test, including the call to g_test_trap_subprocess(), unless + * g_test_undefined() returns %TRUE to indicate that undefined + * behaviour may be tested. * * Since: 2.16 */ @@ -27874,8 +27913,8 @@ * g_test_trap_assert_stderr_unmatched: * @serrpattern: a glob-style pattern * - * Assert that the stderr output of the last forked test - * does not match @serrpattern. See g_test_trap_fork(). + * Assert that the stderr output of the last test subprocess + * does not match @serrpattern. See g_test_trap_subprocess(). * * Since: 2.16 */ @@ -27885,8 +27924,8 @@ * g_test_trap_assert_stdout: * @soutpattern: a glob-style pattern * - * Assert that the stdout output of the last forked test matches - * @soutpattern. See g_test_trap_fork(). + * Assert that the stdout output of the last test subprocess matches + * @soutpattern. See g_test_trap_subprocess(). * * Since: 2.16 */ @@ -27896,8 +27935,8 @@ * g_test_trap_assert_stdout_unmatched: * @soutpattern: a glob-style pattern * - * Assert that the stdout output of the last forked test - * does not match @soutpattern. See g_test_trap_fork(). + * Assert that the stdout output of the last test subprocess + * does not match @soutpattern. See g_test_trap_subprocess(). * * Since: 2.16 */ @@ -27909,8 +27948,10 @@ * @test_trap_flags: Flags to modify forking behaviour. * * Fork the current test program to execute a test case that might - * not return or that might abort. The forked test case is aborted - * and considered failing if its run time exceeds @usec_timeout. + * not return or that might abort. + * + * If @usec_timeout is non-0, the forked test case is aborted and + * considered failing if its run time exceeds it. * * The forking behavior can be configured with the #GTestTrapFlags flags. * @@ -27929,25 +27970,24 @@ * g_printerr ("some stderr text: semagic43\n"); * exit (0); /* successful test run */ * } - * g_test_trap_assert_passed(); + * g_test_trap_assert_passed (); * g_test_trap_assert_stdout ("*somagic17*"); * g_test_trap_assert_stderr ("*semagic43*"); * } * ]| * - * This function is implemented only on Unix platforms. - * * Returns: %TRUE for the forked child and %FALSE for the executing parent process. * Since: 2.16 + * Deprecated: This function is implemented only on Unix platforms, and is not always reliable due to problems inherent in fork-without-exec. Use g_test_trap_subprocess() instead. */ /** * g_test_trap_has_passed: * - * Check the result of the last g_test_trap_fork() call. + * Check the result of the last g_test_trap_subprocess() call. * - * Returns: %TRUE if the last forked child terminated successfully. + * Returns: %TRUE if the last test subprocess terminated successfully. * Since: 2.16 */ @@ -27955,20 +27995,91 @@ /** * g_test_trap_reached_timeout: * - * Check the result of the last g_test_trap_fork() call. + * Check the result of the last g_test_trap_subprocess() call. * - * Returns: %TRUE if the last forked child got killed due to a fork timeout. + * Returns: %TRUE if the last test subprocess got killed due to a timeout. * Since: 2.16 */ +/** + * g_test_trap_subprocess: + * @test_name: Test to run in a subprocess + * @usec_timeout: Timeout for the subprocess test in micro seconds. + * @test_flags: Flags to modify subprocess behaviour. + * + * Respawns the test program to run only @test_name in a subprocess. + * This can be used for a test case that might not return, or that + * might abort. @test_name will normally be the name of the parent + * test, followed by "/subprocess/" and then a name + * for the specific subtest (or just ending with + * "/subprocess" if the test only has one child + * test); tests with names of this form will automatically be skipped + * in the parent process. + * + * If @usec_timeout is non-0, the test subprocess is aborted and + * considered failing if its run time exceeds it. + * + * The subprocess behavior can be configured with the + * #GTestSubprocessFlags flags. + * + * You can use methods such as g_test_trap_assert_passed(), + * g_test_trap_assert_failed(), and g_test_trap_assert_stderr() to + * check the results of the subprocess. (But note that + * g_test_trap_assert_stdout() and g_test_trap_assert_stderr() + * cannot be used if @test_flags specifies that the child should + * inherit the parent stdout/stderr.) + * + * If your main () needs to behave differently in + * the subprocess, you can call g_test_subprocess() (after calling + * g_test_init()) to see whether you are in a subprocess. + * + * The following example tests that calling + * my_object_new(1000000) will abort with an error + * message. + * + * |[ + * static void + * test_create_large_object_subprocess (void) + * { + * my_object_new (1000000); + * } + * + * static void + * test_create_large_object (void) + * { + * g_test_trap_subprocess ("/myobject/create_large_object/subprocess", 0, 0); + * g_test_trap_assert_failed (); + * g_test_trap_assert_stderr ("*ERROR*too large*"); + * } + * + * int + * main (int argc, char **argv) + * { + * g_test_init (&argc, &argv, NULL); + * + * g_test_add_func ("/myobject/create_large_object", + * test_create_large_object); + * /* Because of the '/subprocess' in the name, this test will + * * not be run by the g_test_run () call below. + * */ + * g_test_add_func ("/myobject/create_large_object/subprocess", + * test_create_large_object_subprocess); + * + * return g_test_run (); + * } + * ]| + * + * Since: 2.38 + */ + + /** * g_test_undefined: * * Returns %TRUE if tests may provoke assertions and other formally-undefined - * behaviour under g_test_trap_fork(), to verify that appropriate warnings - * are given. It can be useful to turn this off if running tests under - * valgrind. + * behaviour, to verify that appropriate warnings are given. It might, in some + * cases, be useful to turn this off if running tests under valgrind. * * Returns: %TRUE if tests may provoke programming errors */ diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c index 46402f8a..59892f03 100644 --- a/gir/gobject-2.0.c +++ b/gir/gobject-2.0.c @@ -5204,7 +5204,8 @@ * Sort @value_array using @compare_func to compare the elements according to * the semantics of #GCompareFunc. * - * The current implementation uses Quick-Sort as sorting algorithm. + * The current implementation uses the same sorting algorithm as standard + * C qsort() function. * * Returns: (transfer none): the #GValueArray passed in as @value_array * Deprecated: 2.32: Use #GArray and g_array_sort(). @@ -5220,7 +5221,8 @@ * Sort @value_array using @compare_func to compare the elements according * to the semantics of #GCompareDataFunc. * - * The current implementation uses Quick-Sort as sorting algorithm. + * The current implementation uses the same sorting algorithm as standard + * C qsort() function. * * Rename to: g_value_array_sort * Returns: (transfer none): the #GValueArray passed in as @value_array -- cgit v1.2.1 From 212a6a5e9fcaa40cc245f415a48015c3c38f6d3f Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 28 May 2013 14:46:05 -0400 Subject: Release 1.37.1 --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 14fc42fe..4a899c8f 100644 --- a/configure.ac +++ b/configure.ac @@ -3,8 +3,8 @@ dnl the gi version number m4_define(gi_major_version, 1) -m4_define(gi_minor_version, 36) -m4_define(gi_micro_version, 0) +m4_define(gi_minor_version, 37) +m4_define(gi_micro_version, 1) m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version) AC_PREREQ([2.63]) -- cgit v1.2.1 From bc6ccdeb603280430863e60683694419f8572222 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20K=C3=A5gedal=20Reimer?= Date: Wed, 5 Jun 2013 13:28:30 +0200 Subject: g_irepository_dump: Update doc to match code The input file no longer only consists of names of get_type-functions, instead begins with either "get-type:" or "error-quark:". https://bugzilla.gnome.org/show_bug.cgi?id=701639 --- girepository/gdump.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/girepository/gdump.c b/girepository/gdump.c index 88942f3a..a72841fe 100644 --- a/girepository/gdump.c +++ b/girepository/gdump.c @@ -425,8 +425,10 @@ dump_error_quark (GQuark quark, const char *symbol, GOutputStream *out) * * Argument specified is a comma-separated pair of filenames; i.e. of * the form "input.txt,output.xml". The input file should be a - * UTF-8 Unix-line-ending text file, with each line containing the name - * of a GType _get_type function. + * UTF-8 Unix-line-ending text file, with each line containing either + * "get-type:" followed by the name of a GType _get_type function, or + * "error-quark:" followed by the name of an error quark function. No + * extra whitespace is allowed. * * The output file should already exist, but be empty. This function will * overwrite its contents. -- cgit v1.2.1 From e2e16964ee6d68a7ef3b0bbcadb6922ce1e7f563 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Thu, 6 Jun 2013 10:00:58 +1200 Subject: Fix indentation on pretty printed Makefile rules https://bugzilla.gnome.org/show_bug.cgi?id=701679 --- Makefile.introspection | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.introspection b/Makefile.introspection index b3473377..bcfecba4 100644 --- a/Makefile.introspection +++ b/Makefile.introspection @@ -75,14 +75,14 @@ _gir_verbosity = $(if $(AM_DEFAULT_VERBOSITY),$(AM_DEFAULT_VERBOSITY),1) _gir_silent_scanner_prefix = $(_gir_silent_scanner_prefix_$(V)) _gir_silent_scanner_prefix_ = $(_gir_silent_scanner_prefix_$(_gir_verbosity)) -_gir_silent_scanner_prefix_0 = @echo " GISCAN $(1)"; +_gir_silent_scanner_prefix_0 = @echo " GISCAN $(1)"; _gir_silent_scanner_opts = $(_gir_silent_scanner_opts_$(V)) _gir_silent_scanner_opts_ = $(_gir_silent_scanner_opts_$(_gir_verbosity)) _gir_silent_scanner_opts_0 = --quiet _gir_silent_compiler = $(_gir_silent_compiler_$(V)) _gir_silent_compiler_ = $(_gir_silent_compiler_$(_gir_verbosity)) -_gir_silent_compiler_0 = @echo " GICOMP $(1)"; +_gir_silent_compiler_0 = @echo " GICOMP $(1)"; # # Creates a GIR by scanning C headers/sources -- cgit v1.2.1 From f0b95de7d521144113ff7ef7ff5946e35c90aae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simon=20K=C3=A5gedal=20Reimer?= Date: Mon, 10 Jun 2013 22:26:24 +0200 Subject: g-ir-scanner.1: Fix doc for --program Binary takes --introspect-dump argument, not --introspect. https://bugzilla.gnome.org/show_bug.cgi?id=701958 --- docs/g-ir-scanner.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/g-ir-scanner.1 b/docs/g-ir-scanner.1 index a3726f5c..591df47b 100644 --- a/docs/g-ir-scanner.1 +++ b/docs/g-ir-scanner.1 @@ -80,7 +80,7 @@ eg 2.0 for Gtk+, not 2.12.7. .B \-p, --program=PROGRAM Specifies a binary that will be introspected. This means that the *_get_type() functions in it will be called for GObject data types. -The binary must be modified to take a --introspect= option, and +The binary must be modified to take a --introspect-dump= option, and to pass the argument to this function to g_irepository_dump. .TP .B \--program-arg=ARG -- cgit v1.2.1 From 3ec52d6198a8afb6360bf9985cee03cdcbfdfb63 Mon Sep 17 00:00:00 2001 From: "Jasper St. Pierre" Date: Thu, 28 Mar 2013 16:14:48 -0400 Subject: giscanner: Add a simple automatic sections file generator This is a very basic sections file generator, and isn't too smart. It's simply intended to be a base to build docs on, and will be used if the user doesn't provide a sections file when calling g-ir-doc-tool, for convenience purposes. https://bugzilla.gnome.org/show_bug.cgi?id=699856 --- .gitignore | 2 + giscanner/docmain.py | 15 +- giscanner/sectionparser.py | 59 ++++ tests/scanner/Makefile.am | 10 +- tests/scanner/Regress-1.0-sections-expected.txt | 362 ++++++++++++++++++++++++ 5 files changed, 445 insertions(+), 3 deletions(-) create mode 100644 tests/scanner/Regress-1.0-sections-expected.txt diff --git a/.gitignore b/.gitignore index 7d1776db..1ed05a4a 100644 --- a/.gitignore +++ b/.gitignore @@ -133,3 +133,5 @@ docs/reference/version.xml #g-ir-doc-tool tests *.page !tests/scanner/*-expected/*.page +*-sections.txt +!tests/scanner/*-sections-expected.txt diff --git a/giscanner/docmain.py b/giscanner/docmain.py index 3287dcc6..e65b57a0 100644 --- a/giscanner/docmain.py +++ b/giscanner/docmain.py @@ -22,6 +22,7 @@ import os import optparse from .docwriter import DocWriter +from .sectionparser import generate_sections_file, write_sections_file from .transformer import Transformer @@ -38,6 +39,9 @@ def doc_main(args): parser.add_option("", "--add-include-path", action="append", dest="include_paths", default=[], help="include paths for other GIR files") + parser.add_option("", "--write-sections-file", + action="store_true", dest="write_sections", + help="Generate and write out a sections file") options, args = parser.parse_args(args) if not options.output: @@ -55,7 +59,14 @@ def doc_main(args): extra_include_dirs.extend(options.include_paths) transformer = Transformer.parse_from_gir(args[1], extra_include_dirs) - writer = DocWriter(transformer, options.language) - writer.write(options.output) + if options.write_sections: + sections_file = generate_sections_file(transformer) + + fp = open(options.output, 'w') + write_sections_file(fp, sections_file) + fp.close() + else: + writer = DocWriter(transformer, options.language) + writer.write(options.output) return 0 diff --git a/giscanner/sectionparser.py b/giscanner/sectionparser.py index 61763e45..6a6a231c 100644 --- a/giscanner/sectionparser.py +++ b/giscanner/sectionparser.py @@ -18,6 +18,8 @@ # import re +from . import ast +from .utils import to_underscores class SectionsFile(object): @@ -89,3 +91,60 @@ def parse_sections_file(lines): current_subsection.symbols.append(line) return SectionsFile(sections) + +def write_sections_file(f, sections_file): + for section in sections_file.sections: + f.write("\n
\n") + if section.file is not None: + f.write("%s\n" % (section.file, )) + if section.title is not None: + f.write("%s\n" % (section.title, )) + if section.includes is not None: + f.write("%s\n" % (section.includes, )) + + is_first_subsection = True + for subsection in section.subsections: + if subsection.name is not None: + f.write("\n" % (subsection.name, )) + elif not is_first_subsection: + f.write("\n\n") + + is_first_subsection = False + + for symbol in subsection.symbols: + f.write(symbol + "\n") + +def generate_sections_file(transformer): + ns = transformer.namespace + + sections = [] + + def new_section(file_, title): + section = Section() + section.file = file_ + section.title = title + section.subsections.append(Subsection(None)) + sections.append(section) + return section + + def append_symbol(section, sym): + section.subsections[0].symbols.append(sym) + + general_section = new_section("main", "Main") + + for node in ns.itervalues(): + if isinstance(node, ast.Function): + append_symbol(general_section, node.symbol) + elif isinstance(node, (ast.Class, ast.Interface)): + gtype_name = node.gtype_name + file_name = to_underscores(gtype_name).replace('_', '-').lower() + section = new_section(file_name, gtype_name) + append_symbol(section, gtype_name) + append_symbol(section, node.glib_type_struct.target_giname.replace('.', '')) + + for meth in node.methods: + append_symbol(section, meth.symbol) + for meth in node.static_methods: + append_symbol(section, meth.symbol) + + return SectionsFile(sections) diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index 133dfaad..a2276929 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -152,7 +152,7 @@ Headeronly-1.0.gir: headeronly.h if BUILD_DOCTOOL DOCGIRS = Regress-1.0.gir -CHECKDOCS = $(DOCGIRS:.gir=-C.page.check) $(DOCGIRS:.gir=-Python.page.check) $(DOCGIRS:.gir=-Gjs.page.check) +CHECKDOCS = $(DOCGIRS:.gir=-C.page.check) $(DOCGIRS:.gir=-Python.page.check) $(DOCGIRS:.gir=-Gjs.page.check) $(DOCGIRS:.gir=-sections.txt.page.check) MALLARD_DIRS = $(DOCGIRS:.gir=-C) $(DOCGIRS:.gir=-Python) $(DOCGIRS:.gir=-Gjs) MALLARD_CLEAN = $(DOCGIRS:.gir=-C)/* $(DOCGIRS:.gir=-Python)/* $(DOCGIRS:.gir=-Gjs)/* EXPECTED_MALLARD_DIRS = $(MALLARD_DIRS:=-expected) @@ -173,6 +173,10 @@ CLEANFILES += $(MALLARD_CLEAN) $(AM_V_at)-rm -rf $(builddir)/$*-Gjs $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --language Gjs $*.gir -o $(builddir)/$*-Gjs/ +%-sections.txt: %.gir + $(AM_V_GEN) + $(AM_V_at)$(INTROSPECTION_DOCTOOL) $(INTROSPECTION_DOCTOOL_ARGS) --write-sections-file $*.gir -o $@ + %-C.page.check: %-C @diff -r -u -w -B -U 10 $(srcdir)/$*-C-expected $(builddir)/$*-C && echo " TEST $*-C" @@ -181,6 +185,10 @@ CLEANFILES += $(MALLARD_CLEAN) %-Gjs.page.check: %-Gjs @diff -r -u -w -B -U 10 $(srcdir)/$*-Gjs-expected $(builddir)/$*-Gjs && echo " TEST $*-Gjs" + +%-sections.txt.page.check: %-sections.txt + @diff -u -w -B -U 10 $(srcdir)/$*-sections-expected.txt $*-sections.txt && echo " TEST $*-C" + else CHECKDOCS = endif diff --git a/tests/scanner/Regress-1.0-sections-expected.txt b/tests/scanner/Regress-1.0-sections-expected.txt new file mode 100644 index 00000000..96df7c59 --- /dev/null +++ b/tests/scanner/Regress-1.0-sections-expected.txt @@ -0,0 +1,362 @@ + +
+main +Main +regress_aliased_caller_alloc +regress_annotation_attribute_func +regress_annotation_custom_destroy +regress_annotation_get_source_file +regress_annotation_init +regress_annotation_invalid_regress_annotation +regress_annotation_ptr_array +regress_annotation_return_array +regress_annotation_return_filename +regress_annotation_set_source_file +regress_annotation_space_after_comment_bug631690 +regress_annotation_string_array_length +regress_annotation_string_zero_terminated +regress_annotation_string_zero_terminated_out +regress_annotation_test_parsing_bug630862 +regress_annotation_transfer_floating +regress_annotation_versioned +regress_atest_error_quark +regress_foo_async_ready_callback +regress_foo_destroy_notify_callback +regress_foo_enum_type_method +regress_foo_enum_type_returnv +regress_foo_error_quark +regress_foo_init +regress_foo_interface_static_method +regress_foo_method_external_references +regress_foo_not_a_constructor_new +regress_foo_rectangle_new +regress_foo_skip_me +regress_foo_some_variant +regress_foo_some_variant_ptr +regress_foo_test_array +regress_foo_test_const_char_param +regress_foo_test_const_char_retval +regress_foo_test_const_struct_param +regress_foo_test_const_struct_retval +regress_foo_test_string_array +regress_foo_test_string_array_with_g +regress_foo_test_unsigned_qualifier +regress_foo_test_unsigned_type +regress_foo_test_varargs_callback +regress_foo_test_varargs_callback2 +regress_foo_test_varargs_callback3 +regress_func_obj_null_in +regress_global_get_flags_out +regress_has_parameter_named_attrs +regress_introspectable_via_alias +regress_not_introspectable_via_alias +regress_random_function_with_skipped_structure +regress_set_abort_on_error +regress_test_abc_error_quark +regress_test_array_callback +regress_test_array_fixed_out_objects +regress_test_array_fixed_size_int_in +regress_test_array_fixed_size_int_out +regress_test_array_fixed_size_int_return +regress_test_array_gint16_in +regress_test_array_gint32_in +regress_test_array_gint64_in +regress_test_array_gint8_in +regress_test_array_gtype_in +regress_test_array_int_full_out +regress_test_array_int_in +regress_test_array_int_inout +regress_test_array_int_none_out +regress_test_array_int_null_in +regress_test_array_int_null_out +regress_test_array_int_out +regress_test_async_ready_callback +regress_test_boolean +regress_test_boolean_false +regress_test_boolean_true +regress_test_cairo_context_full_return +regress_test_cairo_context_none_in +regress_test_cairo_surface_full_out +regress_test_cairo_surface_full_return +regress_test_cairo_surface_none_in +regress_test_cairo_surface_none_return +regress_test_callback +regress_test_callback_async +regress_test_callback_destroy_notify +regress_test_callback_destroy_notify_no_user_data +regress_test_callback_thaw_async +regress_test_callback_thaw_notifications +regress_test_callback_user_data +regress_test_closure +regress_test_closure_one_arg +regress_test_closure_variant +regress_test_date_in_gvalue +regress_test_def_error_quark +regress_test_double +regress_test_enum_param +regress_test_error_quark +regress_test_filename_return +regress_test_float +regress_test_garray_container_return +regress_test_garray_full_return +regress_test_gerror_callback +regress_test_ghash_container_return +regress_test_ghash_everything_return +regress_test_ghash_gvalue_in +regress_test_ghash_gvalue_return +regress_test_ghash_nested_everything_return +regress_test_ghash_nested_everything_return2 +regress_test_ghash_nothing_in +regress_test_ghash_nothing_in2 +regress_test_ghash_nothing_return +regress_test_ghash_nothing_return2 +regress_test_ghash_null_in +regress_test_ghash_null_out +regress_test_ghash_null_return +regress_test_glist_container_return +regress_test_glist_everything_return +regress_test_glist_nothing_in +regress_test_glist_nothing_in2 +regress_test_glist_nothing_return +regress_test_glist_nothing_return2 +regress_test_glist_null_in +regress_test_glist_null_out +regress_test_gslist_container_return +regress_test_gslist_everything_return +regress_test_gslist_nothing_in +regress_test_gslist_nothing_in2 +regress_test_gslist_nothing_return +regress_test_gslist_nothing_return2 +regress_test_gslist_null_in +regress_test_gslist_null_out +regress_test_gtype +regress_test_gvariant_as +regress_test_gvariant_asv +regress_test_gvariant_i +regress_test_gvariant_s +regress_test_gvariant_v +regress_test_hash_table_callback +regress_test_int +regress_test_int16 +regress_test_int32 +regress_test_int64 +regress_test_int8 +regress_test_int_out_utf8 +regress_test_int_value_arg +regress_test_long +regress_test_multi_callback +regress_test_multi_double_args +regress_test_multiline_doc_comments +regress_test_nested_parameter +regress_test_null_gerror_callback +regress_test_owned_gerror_callback +regress_test_short +regress_test_simple_boxed_a_const_return +regress_test_simple_callback +regress_test_size +regress_test_skip_unannotated_callback +regress_test_ssize +regress_test_struct_a_parse +regress_test_strv_in +regress_test_strv_in_gvalue +regress_test_strv_out +regress_test_strv_out_c +regress_test_strv_out_container +regress_test_strv_outarg +regress_test_timet +regress_test_torture_signature_0 +regress_test_torture_signature_1 +regress_test_torture_signature_2 +regress_test_uint +regress_test_uint16 +regress_test_uint32 +regress_test_uint64 +regress_test_uint8 +regress_test_ulong +regress_test_unconventional_error_quark +regress_test_unichar +regress_test_unsigned_enum_param +regress_test_ushort +regress_test_utf8_const_in +regress_test_utf8_const_return +regress_test_utf8_inout +regress_test_utf8_nonconst_return +regress_test_utf8_null_in +regress_test_utf8_null_out +regress_test_utf8_out +regress_test_utf8_out_nonconst_return +regress_test_utf8_out_out +regress_test_value_get_fundamental_object +regress_test_value_return +regress_test_value_set_fundamental_object +regress_test_versioning + +
+regress-annotation-object +RegressAnnotationObject +RegressAnnotationObject +RegressAnnotationObjectClass +regress_annotation_object_allow_none +regress_annotation_object_calleeowns +regress_annotation_object_calleesowns +regress_annotation_object_compute_sum +regress_annotation_object_compute_sum_n +regress_annotation_object_compute_sum_nz +regress_annotation_object_create_object +regress_annotation_object_do_not_use +regress_annotation_object_extra_annos +regress_annotation_object_foreach +regress_annotation_object_get_hash +regress_annotation_object_get_objects +regress_annotation_object_get_strings +regress_annotation_object_hidden_self +regress_annotation_object_in +regress_annotation_object_inout +regress_annotation_object_inout2 +regress_annotation_object_inout3 +regress_annotation_object_method +regress_annotation_object_notrans +regress_annotation_object_out +regress_annotation_object_parse_args +regress_annotation_object_set_data +regress_annotation_object_set_data2 +regress_annotation_object_set_data3 +regress_annotation_object_string_out +regress_annotation_object_use_buffer +regress_annotation_object_watch +regress_annotation_object_watch_full +regress_annotation_object_with_voidp + +
+regress-foo-buffer +RegressFooBuffer +RegressFooBuffer +RegressFooBufferClass +regress_foo_buffer_some_method + +
+regress-foo-interface +RegressFooInterface +RegressFooInterface +RegressFooInterfaceIface +regress_foo_interface_do_regress_foo +regress_foo_interface_static_method + +
+regress-foo-object +RegressFooObject +RegressFooObject +RegressFooObjectClass +regress_foo_object_append_new_stack_layer +regress_foo_object_dup_name +regress_foo_object_external_type +regress_foo_object_get_name +regress_foo_object_handle_glyph +regress_foo_object_is_it_time_yet +regress_foo_object_new_cookie +regress_foo_object_read +regress_foo_object_skipped_method +regress_foo_object_take_all +regress_foo_object_various +regress_foo_object_virtual_method +regress_foo_object_a_global_method +regress_foo_object_get_default +regress_foo_object_static_meth + +
+regress-foo-other-object +RegressFooOtherObject +RegressFooOtherObject +RegressFooOtherObjectClass + +
+regress-foo-sub-interface +RegressFooSubInterface +RegressFooSubInterface +RegressFooSubInterfaceIface +regress_foo_sub_interface_do_bar +regress_foo_sub_interface_do_baz + +
+regress-foo-subobject +RegressFooSubobject +RegressFooSubobject +RegressFooSubobjectClass + +
+regress-test-floating +RegressTestFloating +RegressTestFloating +RegressTestFloatingClass + +
+regress-test-fundamental-object +RegressTestFundamentalObject +RegressTestFundamentalObject +RegressTestFundamentalObjectClass +regress_test_fundamental_object_ref +regress_test_fundamental_object_unref + +
+regress-test-fundamental-sub-object +RegressTestFundamentalSubObject +RegressTestFundamentalSubObject +RegressTestFundamentalSubObjectClass + +
+regress-test-inherit-drawable +RegressTestInheritDrawable +RegressTestInheritDrawable +RegressTestInheritDrawableClass +regress_test_inherit_drawable_do_foo +regress_test_inherit_drawable_do_foo_maybe_throw +regress_test_inherit_drawable_get_origin +regress_test_inherit_drawable_get_size + +
+regress-test-interface +RegressTestInterface +RegressTestInterface +RegressTestInterfaceIface + +
+regress-test-obj +RegressTestObj +RegressTestObj +RegressTestObjClass +regress_test_obj_do_matrix +regress_test_obj_emit_sig_with_foreign_struct +regress_test_obj_emit_sig_with_int64 +regress_test_obj_emit_sig_with_obj +regress_test_obj_emit_sig_with_uint64 +regress_forced_method +regress_test_obj_instance_method +regress_test_obj_instance_method_callback +regress_test_obj_set_bare +regress_test_obj_skip_inout_param +regress_test_obj_skip_out_param +regress_test_obj_skip_param +regress_test_obj_skip_return_val +regress_test_obj_skip_return_val_no_out +regress_test_obj_torture_signature_0 +regress_test_obj_torture_signature_1 +regress_test_obj_null_out +regress_test_obj_static_method +regress_test_obj_static_method_callback + +
+regress-test-sub-obj +RegressTestSubObj +RegressTestSubObj +RegressTestSubObjClass +regress_test_sub_obj_instance_method +regress_test_sub_obj_unset_bare + +
+regress-test-wi8021x +RegressTestWi8021x +RegressTestWi8021x +RegressTestWi8021xClass +regress_test_wi_802_1x_get_testbool +regress_test_wi_802_1x_set_testbool +regress_test_wi_802_1x_static_method -- cgit v1.2.1 From c2a5adad7f807e7be2fe41bc16ee90ff429d6f34 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Wed, 19 Jun 2013 17:57:17 +0200 Subject: giscanner: Fix PEP-8 issue --- giscanner/sectionparser.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/giscanner/sectionparser.py b/giscanner/sectionparser.py index 6a6a231c..ffe41afc 100644 --- a/giscanner/sectionparser.py +++ b/giscanner/sectionparser.py @@ -92,6 +92,7 @@ def parse_sections_file(lines): return SectionsFile(sections) + def write_sections_file(f, sections_file): for section in sections_file.sections: f.write("\n
\n") @@ -114,6 +115,7 @@ def write_sections_file(f, sections_file): for symbol in subsection.symbols: f.write(symbol + "\n") + def generate_sections_file(transformer): ns = transformer.namespace -- cgit v1.2.1 From d2613dd9a0959bc59fe20d4c245d896934ef9fae Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 21 Jun 2013 11:04:46 +0800 Subject: Visual Studio Builds: Fix "Installation" Process Install the Python scripts under collections/ and doctemplates/, especially the scripts under collections are required during the run of g-ir-scanner. --- Makefile-msvcproj.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile-msvcproj.am b/Makefile-msvcproj.am index ccc7faf5..7937a3aa 100644 --- a/Makefile-msvcproj.am +++ b/Makefile-msvcproj.am @@ -139,9 +139,10 @@ esac; \ done >>./build/win32/vs10/gir.vs10.install echo '' >>./build/win32/vs10/gir.vs10.install - echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner' >>./build/win32/vs10/gir.vs10.install + echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\collections' >>./build/win32/vs10/gir.vs10.install + echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates' >>./build/win32/vs10/gir.vs10.install echo '' >>./build/win32/vs10/gir.vs10.install - for F in `echo $(pkgpyexec_PYTHON) | tr '/' '\\'`; do \ + for F in `echo $(pkgpyexec_PYTHON) $(collections_PYTHON) $(nobase_dist_template_DATA) | tr '/' '\\'`; do \ case $$F in \ *.py|*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner' && \ echo '' \ -- cgit v1.2.1 From 1738df95f2e750dc05d08ced1ae162737d33a910 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Fri, 21 Jun 2013 08:05:54 +0200 Subject: tests: Fix make dist --- tests/scanner/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/scanner/Makefile.am b/tests/scanner/Makefile.am index a2276929..a3069a8b 100644 --- a/tests/scanner/Makefile.am +++ b/tests/scanner/Makefile.am @@ -245,4 +245,6 @@ EXTRA_DIST += \ annotationparser/gtkdoc/gobject/gobject.c.xml \ Regress-1.0-C-expected \ Regress-1.0-Gjs-expected \ - Regress-1.0-Python-expected + Regress-1.0-Python-expected \ + Regress-1.0-sections-expected.txt \ + $(NULL) -- cgit v1.2.1 From 487411db1162323522572f3aebfc423e1706cb69 Mon Sep 17 00:00:00 2001 From: Dieter Verfaillie Date: Sun, 23 Jun 2013 14:22:28 +0200 Subject: Update annotations from glib git --- gir/gio-2.0.c | 1786 ++++++----------------------------------------------- gir/glib-2.0.c | 131 +++- gir/gobject-2.0.c | 19 +- 3 files changed, 337 insertions(+), 1599 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 999b130b..5f9a5653 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -5089,6 +5089,17 @@ * version will return a list of #GFileInfos, whereas the * synchronous will only return the next file in the enumerator. * + * The ordering of returned files is unspecified for non-Unix + * platforms; for more information, see g_dir_read_name(). On Unix, + * when operating on local files, returned files will be sorted by + * inode number. Effectively you can assume that the ordering of + * returned files will be stable between successive calls (and + * applications) assuming the directory is unchanged. + * + * If your application needs a specific ordering, such as by name or + * modification time, you will have to implement that in your + * application code. + * * To close a #GFileEnumerator, use g_file_enumerator_close(), or * its asynchronous version, g_file_enumerator_close_async(). Once * a #GFileEnumerator is closed, no further actions may be performed @@ -7823,1651 +7834,208 @@ * between processes by the kernel. * * For an easier way to send and receive file descriptors over - * stream-oriented UNIX sockets, see g_unix_connection_send_fd() and - * g_unix_connection_receive_fd(). - * - * Note that <gio/gunixfdmessage.h> belongs to - * the UNIX-specific GIO interfaces, thus you have to use the - * gio-unix-2.0.pc pkg-config file when using it. - */ - - -/** - * SECTION:gunixinputstream - * @short_description: Streaming input operations for UNIX file descriptors - * @include: gio/gunixinputstream.h - * @see_also: #GInputStream - * - * #GUnixInputStream implements #GInputStream for reading from a UNIX - * file descriptor, including asynchronous operations. (If the file - * descriptor refers to a socket or pipe, this will use poll() to do - * asynchronous I/O. If it refers to a regular file, it will fall back - * to doing asynchronous I/O in another thread.) - * - * Note that <gio/gunixinputstream.h> belongs - * to the UNIX-specific GIO interfaces, thus you have to use the - * gio-unix-2.0.pc pkg-config file when using it. - */ - - -/** - * SECTION:gunixmounts - * @include: gio/gunixmounts.h - * @short_description: UNIX mounts - * - * Routines for managing mounted UNIX mount points and paths. - * - * Note that <gio/gunixmounts.h> belongs to the - * UNIX-specific GIO interfaces, thus you have to use the - * gio-unix-2.0.pc pkg-config file when using it. - */ - - -/** - * SECTION:gunixoutputstream - * @short_description: Streaming output operations for UNIX file descriptors - * @include: gio/gunixoutputstream.h - * @see_also: #GOutputStream - * - * #GUnixOutputStream implements #GOutputStream for writing to a UNIX - * file descriptor, including asynchronous operations. (If the file - * descriptor refers to a socket or pipe, this will use poll() to do - * asynchronous I/O. If it refers to a regular file, it will fall back - * to doing asynchronous I/O in another thread.) - * - * Note that <gio/gunixoutputstream.h> belongs - * to the UNIX-specific GIO interfaces, thus you have to use the - * gio-unix-2.0.pc pkg-config file when using it. - */ - - -/** - * SECTION:gunixsocketaddress - * @short_description: UNIX GSocketAddress - * @include: gio/gunixsocketaddress.h - * - * Support for UNIX-domain (also known as local) sockets. - * - * UNIX domain sockets are generally visible in the filesystem. - * However, some systems support abstract socket names which are not - * visible in the filesystem and not affected by the filesystem - * permissions, visibility, etc. Currently this is only supported - * under Linux. If you attempt to use abstract sockets on other - * systems, function calls may return %G_IO_ERROR_NOT_SUPPORTED - * errors. You can use g_unix_socket_address_abstract_names_supported() - * to see if abstract names are supported. - * - * Note that <gio/gunixsocketaddress.h> belongs to - * the UNIX-specific GIO interfaces, thus you have to use the - * gio-unix-2.0.pc pkg-config file when using it. - */ - - -/** - * SECTION:gvfs - * @short_description: Virtual File System - * @include: gio/gio.h - * - * Entry point for using GIO functionality. - */ - - -/** - * SECTION:gvolume - * @short_description: Volume management - * @include: gio/gio.h - * - * The #GVolume interface represents user-visible objects that can be - * mounted. Note, when porting from GnomeVFS, #GVolume is the moral - * equivalent of #GnomeVFSDrive. - * - * Mounting a #GVolume instance is an asynchronous operation. For more - * information about asynchronous operations, see #GAsyncResult and - * #GTask. To mount a #GVolume, first call g_volume_mount() with (at - * least) the #GVolume instance, optionally a #GMountOperation object - * and a #GAsyncReadyCallback. - * - * Typically, one will only want to pass %NULL for the - * #GMountOperation if automounting all volumes when a desktop session - * starts since it's not desirable to put up a lot of dialogs asking - * for credentials. - * - * The callback will be fired when the operation has resolved (either - * with success or failure), and a #GAsyncReady structure will be - * passed to the callback. That callback should then call - * g_volume_mount_finish() with the #GVolume instance and the - * #GAsyncReady data to see if the operation was completed - * successfully. If an @error is present when g_volume_mount_finish() - * is called, then it will be filled with any error information. - * - * - * It is sometimes necessary to directly access the underlying - * operating system object behind a volume (e.g. for passing a volume - * to an application via the commandline). For this purpose, GIO - * allows to obtain an 'identifier' for the volume. There can be - * different kinds of identifiers, such as Hal UDIs, filesystem labels, - * traditional Unix devices (e.g. /dev/sda2), - * uuids. GIO uses predefind strings as names for the different kinds - * of identifiers: #G_VOLUME_IDENTIFIER_KIND_HAL_UDI, - * #G_VOLUME_IDENTIFIER_KIND_LABEL, etc. Use g_volume_get_identifier() - * to obtain an identifier for a volume. - * - * - * Note that #G_VOLUME_IDENTIFIER_KIND_HAL_UDI will only be available - * when the gvfs hal volume monitor is in use. Other volume monitors - * will generally be able to provide the #G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE - * identifier, which can be used to obtain a hal device by means of - * libhal_manager_find_device_string_match(). - */ - - -/** - * SECTION:gvolumemonitor - * @short_description: Volume Monitor - * @include: gio/gio.h - * @see_also: #GFileMonitor - * - * #GVolumeMonitor is for listing the user interesting devices and volumes - * on the computer. In other words, what a file selector or file manager - * would show in a sidebar. - * - * #GVolumeMonitor is not thread-default-context - * aware, and so should not be used other than from the main - * thread, with no thread-default-context active. - */ - - -/** - * SECTION:gwin32inputstream - * @short_description: Streaming input operations for Windows file handles - * @include: gio/gwin32inputstream.h - * @see_also: #GInputStream - * - * #GWin32InputStream implements #GInputStream for reading from a - * Windows file handle. - * - * Note that <gio/gwin32inputstream.h> belongs - * to the Windows-specific GIO interfaces, thus you have to use the - * gio-windows-2.0.pc pkg-config file when using it. - */ - - -/** - * SECTION:gwin32outputstream - * @short_description: Streaming output operations for Windows file handles - * @include: gio/gwin32outputstream.h - * @see_also: #GOutputStream - * - * #GWin32OutputStream implements #GOutputStream for writing to a - * Windows file handle. - * - * Note that <gio/gwin32outputstream.h> belongs - * to the Windows-specific GIO interfaces, thus you have to use the - * gio-windows-2.0.pc pkg-config file when using it. - */ - - -/** - * SECTION:gzcompressor - * @short_description: Zlib compressor - * @include: gio/gio.h - * - * #GZlibCompressor is an implementation of #GConverter that - * compresses data using zlib. - */ - - -/** - * SECTION:gzdecompressor - * @short_description: Zlib decompressor - * @include: gio/gio.h - * - * #GZlibDecompressor is an implementation of #GConverter that - * decompresses data compressed with zlib. - */ - - -/** - * _GFreedesktopDBus: - * - * Abstract interface type for the D-Bus interface org.freedesktop.DBus. - */ - - -/** - * _GFreedesktopDBus::handle-add-match: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_rule: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the AddMatch() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_add_match() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-get-connection-selinux-security-context: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_name: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the GetConnectionSELinuxSecurityContext() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_get_connection_selinux_security_context() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-get-connection-unix-process-id: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_name: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the GetConnectionUnixProcessID() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_get_connection_unix_process_id() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-get-connection-unix-user: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_name: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the GetConnectionUnixUser() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_get_connection_unix_user() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-get-id: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the GetId() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_get_id() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-get-name-owner: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_name: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the GetNameOwner() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_get_name_owner() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-hello: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the Hello() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_hello() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-list-activatable-names: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the ListActivatableNames() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_list_activatable_names() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-list-names: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the ListNames() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_list_names() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-list-queued-owners: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_name: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the ListQueuedOwners() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_list_queued_owners() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-name-has-owner: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_name: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the NameHasOwner() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_name_has_owner() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-release-name: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_name: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the ReleaseName() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_release_name() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-reload-config: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * - * Signal emitted when a remote caller is invoking the ReloadConfig() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_reload_config() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-remove-match: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_rule: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the RemoveMatch() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_remove_match() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-request-name: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_name: Argument passed by remote caller. - * @arg_flags: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the RequestName() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_request_name() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-start-service-by-name: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_name: Argument passed by remote caller. - * @arg_flags: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the StartServiceByName() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_start_service_by_name() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::handle-update-activation-environment: - * @object: A #_GFreedesktopDBus. - * @invocation: A #GDBusMethodInvocation. - * @arg_environment: Argument passed by remote caller. - * - * Signal emitted when a remote caller is invoking the UpdateActivationEnvironment() D-Bus method. - * - * If a signal handler returns %TRUE, it means the signal handler will handle the invocation (e.g. take a reference to @invocation and eventually call _g_freedesktop_dbus_complete_update_activation_environment() or e.g. g_dbus_method_invocation_return_error() on it) and no order signal handlers will run. If no signal handler handles the invocation, the %G_DBUS_ERROR_UNKNOWN_METHOD error is returned. - * - * Returns: %TRUE if the invocation was handled, %FALSE to let other signal handlers run. - */ - - -/** - * _GFreedesktopDBus::name-acquired: - * @object: A #_GFreedesktopDBus. - * @arg_name: Argument. - * - * On the client-side, this signal is emitted whenever the D-Bus signal "NameAcquired" is received. - * - * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal. - */ - - -/** - * _GFreedesktopDBus::name-lost: - * @object: A #_GFreedesktopDBus. - * @arg_name: Argument. - * - * On the client-side, this signal is emitted whenever the D-Bus signal "NameLost" is received. - * - * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal. - */ - - -/** - * _GFreedesktopDBus::name-owner-changed: - * @object: A #_GFreedesktopDBus. - * @arg_name: Argument. - * @arg_old_owner: Argument. - * @arg_new_owner: Argument. - * - * On the client-side, this signal is emitted whenever the D-Bus signal "NameOwnerChanged" is received. - * - * On the service-side, this signal can be used with e.g. g_signal_emit_by_name() to make the object emit the D-Bus signal. - */ - - -/** - * _GFreedesktopDBusIface: - * @parent_iface: The parent interface. - * @handle_add_match: Handler for the #_GFreedesktopDBus::handle-add-match signal. - * @handle_get_connection_selinux_security_context: Handler for the #_GFreedesktopDBus::handle-get-connection-selinux-security-context signal. - * @handle_get_connection_unix_process_id: Handler for the #_GFreedesktopDBus::handle-get-connection-unix-process-id signal. - * @handle_get_connection_unix_user: Handler for the #_GFreedesktopDBus::handle-get-connection-unix-user signal. - * @handle_get_id: Handler for the #_GFreedesktopDBus::handle-get-id signal. - * @handle_get_name_owner: Handler for the #_GFreedesktopDBus::handle-get-name-owner signal. - * @handle_hello: Handler for the #_GFreedesktopDBus::handle-hello signal. - * @handle_list_activatable_names: Handler for the #_GFreedesktopDBus::handle-list-activatable-names signal. - * @handle_list_names: Handler for the #_GFreedesktopDBus::handle-list-names signal. - * @handle_list_queued_owners: Handler for the #_GFreedesktopDBus::handle-list-queued-owners signal. - * @handle_name_has_owner: Handler for the #_GFreedesktopDBus::handle-name-has-owner signal. - * @handle_release_name: Handler for the #_GFreedesktopDBus::handle-release-name signal. - * @handle_reload_config: Handler for the #_GFreedesktopDBus::handle-reload-config signal. - * @handle_remove_match: Handler for the #_GFreedesktopDBus::handle-remove-match signal. - * @handle_request_name: Handler for the #_GFreedesktopDBus::handle-request-name signal. - * @handle_start_service_by_name: Handler for the #_GFreedesktopDBus::handle-start-service-by-name signal. - * @handle_update_activation_environment: Handler for the #_GFreedesktopDBus::handle-update-activation-environment signal. - * @name_acquired: Handler for the #_GFreedesktopDBus::name-acquired signal. - * @name_lost: Handler for the #_GFreedesktopDBus::name-lost signal. - * @name_owner_changed: Handler for the #_GFreedesktopDBus::name-owner-changed signal. - * - * Virtual table for the D-Bus interface org.freedesktop.DBus. - */ - - -/** - * _GFreedesktopDBusProxy: - * - * The #_GFreedesktopDBusProxy structure contains only private data and should only be accessed using the provided API. - */ - - -/** - * _GFreedesktopDBusProxyClass: - * @parent_class: The parent class. - * - * Class structure for #_GFreedesktopDBusProxy. - */ - - -/** - * _GFreedesktopDBusSkeleton: - * - * The #_GFreedesktopDBusSkeleton structure contains only private data and should only be accessed using the provided API. - */ - - -/** - * _GFreedesktopDBusSkeletonClass: - * @parent_class: The parent class. - * - * Class structure for #_GFreedesktopDBusSkeleton. - */ - - -/** - * _g_freedesktop_dbus_call_add_match: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_rule: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the AddMatch() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_add_match_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_add_match_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_add_match_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_add_match(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_add_match(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_add_match_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_rule: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the AddMatch() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_add_match() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_get_connection_selinux_security_context: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the GetConnectionSELinuxSecurityContext() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_get_connection_selinux_security_context_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_get_connection_selinux_security_context_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_get_connection_selinux_security_context_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_security_context: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_get_connection_selinux_security_context(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_get_connection_selinux_security_context(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_get_connection_selinux_security_context_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @out_security_context: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the GetConnectionSELinuxSecurityContext() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_get_connection_selinux_security_context() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_get_connection_unix_process_id: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the GetConnectionUnixProcessID() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_get_connection_unix_process_id_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_get_connection_unix_process_id_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_get_connection_unix_process_id_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_pid: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_get_connection_unix_process_id(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_get_connection_unix_process_id(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_get_connection_unix_process_id_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @out_pid: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the GetConnectionUnixProcessID() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_get_connection_unix_process_id() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_get_connection_unix_user: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the GetConnectionUnixUser() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_get_connection_unix_user_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_get_connection_unix_user_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_get_connection_unix_user_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_uid: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_get_connection_unix_user(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_get_connection_unix_user(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_get_connection_unix_user_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @out_uid: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the GetConnectionUnixUser() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_get_connection_unix_user() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_get_id: - * @proxy: A #_GFreedesktopDBusProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the GetId() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_get_id_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_get_id_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_get_id_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_unique_id: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_get_id(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_get_id(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_get_id_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_unique_id: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the GetId() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_get_id() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_get_name_owner: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the GetNameOwner() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_get_name_owner_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_get_name_owner_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_get_name_owner_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_unique_name: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_get_name_owner(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_get_name_owner(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_get_name_owner_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @out_unique_name: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the GetNameOwner() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_get_name_owner() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_hello: - * @proxy: A #_GFreedesktopDBusProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the Hello() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_hello_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_hello_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_hello_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_assigned_name: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_hello(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_hello(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_hello_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_assigned_name: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the Hello() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_hello() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_list_activatable_names: - * @proxy: A #_GFreedesktopDBusProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the ListActivatableNames() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_list_activatable_names_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_list_activatable_names_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_list_activatable_names_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_activatable_names: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_list_activatable_names(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_list_activatable_names(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_list_activatable_names_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_activatable_names: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the ListActivatableNames() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_list_activatable_names() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_list_names: - * @proxy: A #_GFreedesktopDBusProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the ListNames() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_list_names_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_list_names_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_list_names_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_names: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_list_names(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_list_names(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_list_names_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_names: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the ListNames() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_list_names() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_list_queued_owners: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the ListQueuedOwners() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_list_queued_owners_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_list_queued_owners_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_list_queued_owners_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_queued_owners: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_list_queued_owners(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_list_queued_owners(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_list_queued_owners_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @out_queued_owners: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the ListQueuedOwners() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_list_queued_owners() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_name_has_owner: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the NameHasOwner() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_name_has_owner_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_name_has_owner_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_name_has_owner_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_has_owner: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_name_has_owner(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_name_has_owner(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_name_has_owner_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @out_has_owner: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the NameHasOwner() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_name_has_owner() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_release_name: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the ReleaseName() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_release_name_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_release_name_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_release_name_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_value: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_release_name(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_release_name(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_release_name_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @out_value: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the ReleaseName() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_release_name() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_reload_config: - * @proxy: A #_GFreedesktopDBusProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the ReloadConfig() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_reload_config_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_reload_config_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_reload_config_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_reload_config(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_reload_config(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_reload_config_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the ReloadConfig() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_reload_config() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_remove_match: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_rule: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the RemoveMatch() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_remove_match_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_remove_match_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_remove_match_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_remove_match(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_remove_match(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_remove_match_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_rule: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the RemoveMatch() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_remove_match() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_request_name: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @arg_flags: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the RequestName() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_request_name_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_request_name_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_request_name_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_value: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_request_name(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_request_name(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_request_name_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @arg_flags: Argument to pass with the method invocation. - * @out_value: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the RequestName() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_request_name() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_start_service_by_name: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @arg_flags: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the StartServiceByName() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_start_service_by_name_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_start_service_by_name_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_start_service_by_name_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @out_value: (out): Return location for return parameter or %NULL to ignore. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_start_service_by_name(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_start_service_by_name(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_start_service_by_name_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_name: Argument to pass with the method invocation. - * @arg_flags: Argument to pass with the method invocation. - * @out_value: (out): Return location for return parameter or %NULL to ignore. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the StartServiceByName() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_start_service_by_name() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_update_activation_environment: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_environment: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied or %NULL. - * @user_data: User data to pass to @callback. - * - * Asynchronously invokes the UpdateActivationEnvironment() D-Bus method on @proxy. - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_call_update_activation_environment_finish() to get the result of the operation. - * - * See _g_freedesktop_dbus_call_update_activation_environment_sync() for the synchronous, blocking version of this method. - */ - - -/** - * _g_freedesktop_dbus_call_update_activation_environment_finish: - * @proxy: A #_GFreedesktopDBusProxy. - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_call_update_activation_environment(). - * @error: Return location for error or %NULL. - * - * Finishes an operation started with _g_freedesktop_dbus_call_update_activation_environment(). - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_call_update_activation_environment_sync: - * @proxy: A #_GFreedesktopDBusProxy. - * @arg_environment: Argument to pass with the method invocation. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL. - * - * Synchronously invokes the UpdateActivationEnvironment() D-Bus method on @proxy. The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_call_update_activation_environment() for the asynchronous version of this method. - * - * Returns: (skip): %TRUE if the call succeded, %FALSE if @error is set. - */ - - -/** - * _g_freedesktop_dbus_complete_add_match: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * - * Helper function used in service implementations to finish handling invocations of the AddMatch() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_get_connection_selinux_security_context: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @security_context: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the GetConnectionSELinuxSecurityContext() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_get_connection_unix_process_id: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @pid: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the GetConnectionUnixProcessID() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_get_connection_unix_user: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @uid: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the GetConnectionUnixUser() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_get_id: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @unique_id: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the GetId() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_get_name_owner: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @unique_name: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the GetNameOwner() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_hello: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @assigned_name: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the Hello() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_list_activatable_names: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @activatable_names: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the ListActivatableNames() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_list_names: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @names: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the ListNames() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_list_queued_owners: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @queued_owners: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the ListQueuedOwners() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_name_has_owner: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @has_owner: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the NameHasOwner() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_release_name: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @value: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the ReleaseName() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_reload_config: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * - * Helper function used in service implementations to finish handling invocations of the ReloadConfig() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_remove_match: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * - * Helper function used in service implementations to finish handling invocations of the RemoveMatch() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_request_name: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @value: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the RequestName() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. - * - * This method will free @invocation, you cannot use it afterwards. - */ - - -/** - * _g_freedesktop_dbus_complete_start_service_by_name: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. - * @value: Parameter to return. - * - * Helper function used in service implementations to finish handling invocations of the StartServiceByName() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * stream-oriented UNIX sockets, see g_unix_connection_send_fd() and + * g_unix_connection_receive_fd(). * - * This method will free @invocation, you cannot use it afterwards. + * Note that <gio/gunixfdmessage.h> belongs to + * the UNIX-specific GIO interfaces, thus you have to use the + * gio-unix-2.0.pc pkg-config file when using it. */ /** - * _g_freedesktop_dbus_complete_update_activation_environment: - * @object: A #_GFreedesktopDBus. - * @invocation: (transfer full): A #GDBusMethodInvocation. + * SECTION:gunixinputstream + * @short_description: Streaming input operations for UNIX file descriptors + * @include: gio/gunixinputstream.h + * @see_also: #GInputStream * - * Helper function used in service implementations to finish handling invocations of the UpdateActivationEnvironment() D-Bus method. If you instead want to finish handling an invocation by returning an error, use g_dbus_method_invocation_return_error() or similar. + * #GUnixInputStream implements #GInputStream for reading from a UNIX + * file descriptor, including asynchronous operations. (If the file + * descriptor refers to a socket or pipe, this will use poll() to do + * asynchronous I/O. If it refers to a regular file, it will fall back + * to doing asynchronous I/O in another thread.) * - * This method will free @invocation, you cannot use it afterwards. + * Note that <gio/gunixinputstream.h> belongs + * to the UNIX-specific GIO interfaces, thus you have to use the + * gio-unix-2.0.pc pkg-config file when using it. */ /** - * _g_freedesktop_dbus_emit_name_acquired: - * @object: A #_GFreedesktopDBus. - * @arg_name: Argument to pass with the signal. + * SECTION:gunixmounts + * @include: gio/gunixmounts.h + * @short_description: UNIX mounts * - * Emits the "NameAcquired" D-Bus signal. - */ - - -/** - * _g_freedesktop_dbus_emit_name_lost: - * @object: A #_GFreedesktopDBus. - * @arg_name: Argument to pass with the signal. + * Routines for managing mounted UNIX mount points and paths. * - * Emits the "NameLost" D-Bus signal. + * Note that <gio/gunixmounts.h> belongs to the + * UNIX-specific GIO interfaces, thus you have to use the + * gio-unix-2.0.pc pkg-config file when using it. */ /** - * _g_freedesktop_dbus_emit_name_owner_changed: - * @object: A #_GFreedesktopDBus. - * @arg_name: Argument to pass with the signal. - * @arg_old_owner: Argument to pass with the signal. - * @arg_new_owner: Argument to pass with the signal. + * SECTION:gunixoutputstream + * @short_description: Streaming output operations for UNIX file descriptors + * @include: gio/gunixoutputstream.h + * @see_also: #GOutputStream * - * Emits the "NameOwnerChanged" D-Bus signal. + * #GUnixOutputStream implements #GOutputStream for writing to a UNIX + * file descriptor, including asynchronous operations. (If the file + * descriptor refers to a socket or pipe, this will use poll() to do + * asynchronous I/O. If it refers to a regular file, it will fall back + * to doing asynchronous I/O in another thread.) + * + * Note that <gio/gunixoutputstream.h> belongs + * to the UNIX-specific GIO interfaces, thus you have to use the + * gio-unix-2.0.pc pkg-config file when using it. */ /** - * _g_freedesktop_dbus_interface_info: + * SECTION:gunixsocketaddress + * @short_description: UNIX GSocketAddress + * @include: gio/gunixsocketaddress.h * - * Gets a machine-readable description of the org.freedesktop.DBus D-Bus interface. + * Support for UNIX-domain (also known as local) sockets. * - * Returns: (transfer none): A #GDBusInterfaceInfo. Do not free. + * UNIX domain sockets are generally visible in the filesystem. + * However, some systems support abstract socket names which are not + * visible in the filesystem and not affected by the filesystem + * permissions, visibility, etc. Currently this is only supported + * under Linux. If you attempt to use abstract sockets on other + * systems, function calls may return %G_IO_ERROR_NOT_SUPPORTED + * errors. You can use g_unix_socket_address_abstract_names_supported() + * to see if abstract names are supported. + * + * Note that <gio/gunixsocketaddress.h> belongs to + * the UNIX-specific GIO interfaces, thus you have to use the + * gio-unix-2.0.pc pkg-config file when using it. */ /** - * _g_freedesktop_dbus_override_properties: - * @klass: The class structure for a #GObject-derived class. - * @property_id_begin: The property id to assign to the first overridden property. - * - * Overrides all #GObject properties in the #_GFreedesktopDBus interface for a concrete class. - * The properties are overridden in the order they are defined. + * SECTION:gvfs + * @short_description: Virtual File System + * @include: gio/gio.h * - * Returns: The last property id. + * Entry point for using GIO functionality. */ /** - * _g_freedesktop_dbus_proxy_new: - * @connection: A #GDBusConnection. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. - * @object_path: An object path. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied. - * @user_data: User data to pass to @callback. + * SECTION:gvolume + * @short_description: Volume management + * @include: gio/gio.h * - * Asynchronously creates a proxy for the D-Bus interface org.freedesktop.DBus. See g_dbus_proxy_new() for more details. + * The #GVolume interface represents user-visible objects that can be + * mounted. Note, when porting from GnomeVFS, #GVolume is the moral + * equivalent of #GnomeVFSDrive. * - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_proxy_new_finish() to get the result of the operation. + * Mounting a #GVolume instance is an asynchronous operation. For more + * information about asynchronous operations, see #GAsyncResult and + * #GTask. To mount a #GVolume, first call g_volume_mount() with (at + * least) the #GVolume instance, optionally a #GMountOperation object + * and a #GAsyncReadyCallback. * - * See _g_freedesktop_dbus_proxy_new_sync() for the synchronous, blocking version of this constructor. - */ - - -/** - * _g_freedesktop_dbus_proxy_new_finish: - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_proxy_new(). - * @error: Return location for error or %NULL + * Typically, one will only want to pass %NULL for the + * #GMountOperation if automounting all volumes when a desktop session + * starts since it's not desirable to put up a lot of dialogs asking + * for credentials. * - * Finishes an operation started with _g_freedesktop_dbus_proxy_new(). + * The callback will be fired when the operation has resolved (either + * with success or failure), and a #GAsyncReady structure will be + * passed to the callback. That callback should then call + * g_volume_mount_finish() with the #GVolume instance and the + * #GAsyncReady data to see if the operation was completed + * successfully. If an @error is present when g_volume_mount_finish() + * is called, then it will be filled with any error information. * - * Returns: (transfer full) (type _GFreedesktopDBusProxy): The constructed proxy object or %NULL if @error is set. + * + * It is sometimes necessary to directly access the underlying + * operating system object behind a volume (e.g. for passing a volume + * to an application via the commandline). For this purpose, GIO + * allows to obtain an 'identifier' for the volume. There can be + * different kinds of identifiers, such as Hal UDIs, filesystem labels, + * traditional Unix devices (e.g. /dev/sda2), + * uuids. GIO uses predefind strings as names for the different kinds + * of identifiers: #G_VOLUME_IDENTIFIER_KIND_HAL_UDI, + * #G_VOLUME_IDENTIFIER_KIND_LABEL, etc. Use g_volume_get_identifier() + * to obtain an identifier for a volume. + * + * + * Note that #G_VOLUME_IDENTIFIER_KIND_HAL_UDI will only be available + * when the gvfs hal volume monitor is in use. Other volume monitors + * will generally be able to provide the #G_VOLUME_IDENTIFIER_KIND_UNIX_DEVICE + * identifier, which can be used to obtain a hal device by means of + * libhal_manager_find_device_string_match(). */ /** - * _g_freedesktop_dbus_proxy_new_for_bus: - * @bus_type: A #GBusType. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: A bus name (well-known or unique). - * @object_path: An object path. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @callback: A #GAsyncReadyCallback to call when the request is satisfied. - * @user_data: User data to pass to @callback. - * - * Like _g_freedesktop_dbus_proxy_new() but takes a #GBusType instead of a #GDBusConnection. + * SECTION:gvolumemonitor + * @short_description: Volume Monitor + * @include: gio/gio.h + * @see_also: #GFileMonitor * - * When the operation is finished, @callback will be invoked in the thread-default main loop of the thread you are calling this method from. - * You can then call _g_freedesktop_dbus_proxy_new_for_bus_finish() to get the result of the operation. + * #GVolumeMonitor is for listing the user interesting devices and volumes + * on the computer. In other words, what a file selector or file manager + * would show in a sidebar. * - * See _g_freedesktop_dbus_proxy_new_for_bus_sync() for the synchronous, blocking version of this constructor. + * #GVolumeMonitor is not thread-default-context + * aware, and so should not be used other than from the main + * thread, with no thread-default-context active. */ /** - * _g_freedesktop_dbus_proxy_new_for_bus_finish: - * @res: The #GAsyncResult obtained from the #GAsyncReadyCallback passed to _g_freedesktop_dbus_proxy_new_for_bus(). - * @error: Return location for error or %NULL + * SECTION:gwin32inputstream + * @short_description: Streaming input operations for Windows file handles + * @include: gio/gwin32inputstream.h + * @see_also: #GInputStream * - * Finishes an operation started with _g_freedesktop_dbus_proxy_new_for_bus(). + * #GWin32InputStream implements #GInputStream for reading from a + * Windows file handle. * - * Returns: (transfer full) (type _GFreedesktopDBusProxy): The constructed proxy object or %NULL if @error is set. + * Note that <gio/gwin32inputstream.h> belongs + * to the Windows-specific GIO interfaces, thus you have to use the + * gio-windows-2.0.pc pkg-config file when using it. */ /** - * _g_freedesktop_dbus_proxy_new_for_bus_sync: - * @bus_type: A #GBusType. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: A bus name (well-known or unique). - * @object_path: An object path. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL - * - * Like _g_freedesktop_dbus_proxy_new_sync() but takes a #GBusType instead of a #GDBusConnection. - * - * The calling thread is blocked until a reply is received. + * SECTION:gwin32outputstream + * @short_description: Streaming output operations for Windows file handles + * @include: gio/gwin32outputstream.h + * @see_also: #GOutputStream * - * See _g_freedesktop_dbus_proxy_new_for_bus() for the asynchronous version of this constructor. + * #GWin32OutputStream implements #GOutputStream for writing to a + * Windows file handle. * - * Returns: (transfer full) (type _GFreedesktopDBusProxy): The constructed proxy object or %NULL if @error is set. + * Note that <gio/gwin32outputstream.h> belongs + * to the Windows-specific GIO interfaces, thus you have to use the + * gio-windows-2.0.pc pkg-config file when using it. */ /** - * _g_freedesktop_dbus_proxy_new_sync: - * @connection: A #GDBusConnection. - * @flags: Flags from the #GDBusProxyFlags enumeration. - * @name: (allow-none): A bus name (well-known or unique) or %NULL if @connection is not a message bus connection. - * @object_path: An object path. - * @cancellable: (allow-none): A #GCancellable or %NULL. - * @error: Return location for error or %NULL - * - * Synchronously creates a proxy for the D-Bus interface org.freedesktop.DBus. See g_dbus_proxy_new_sync() for more details. - * - * The calling thread is blocked until a reply is received. - * - * See _g_freedesktop_dbus_proxy_new() for the asynchronous version of this constructor. + * SECTION:gzcompressor + * @short_description: Zlib compressor + * @include: gio/gio.h * - * Returns: (transfer full) (type _GFreedesktopDBusProxy): The constructed proxy object or %NULL if @error is set. + * #GZlibCompressor is an implementation of #GConverter that + * compresses data using zlib. */ /** - * _g_freedesktop_dbus_skeleton_new: - * - * Creates a skeleton object for the D-Bus interface org.freedesktop.DBus. + * SECTION:gzdecompressor + * @short_description: Zlib decompressor + * @include: gio/gio.h * - * Returns: (transfer full) (type _GFreedesktopDBusSkeleton): The skeleton object. + * #GZlibDecompressor is an implementation of #GConverter that + * decompresses data compressed with zlib. */ @@ -12673,6 +11241,13 @@ * except in the case that g_application_set_inactivity_timeout() is in * use. * + * This function sets the prgname (g_set_prgname()), if not already set, + * to the basename of argv[0]. Since 2.38, if %G_APPLICATION_IS_SERVICE + * is specified, the prgname is set to the application ID. The main + * impact of this is is that the wmclass of windows created by Gtk+ will + * be set accordingly, which helps the window manager determine which + * application is showing the window. + * * Returns: the exit status * Since: 2.28 */ @@ -17474,6 +16049,11 @@ * * Gets the name of the D-Bus interface the method was invoked on. * + * If this method call is a property Get, Set or GetAll call that has + * been redirected to the method call handler then + * "org.freedesktop.DBus.Properties" will be returned. See + * #GDBusInterfaceVTable for more information. + * * Returns: A string. Do not free, it is owned by @invocation. * Since: 2.26 */ @@ -17503,6 +16083,11 @@ * * Gets information about the method call, if any. * + * If this method invocation is a property Get, Set or GetAll call that + * has been redirected to the method call handler then %NULL will be + * returned. See g_dbus_method_invocation_get_property_info() and + * #GDBusInterfaceVTable for more information. + * * Returns: A #GDBusMethodInfo or %NULL. Do not free, it is owned by @invocation. * Since: 2.26 */ @@ -17542,6 +16127,27 @@ */ +/** + * g_dbus_method_invocation_get_property_info: + * @invocation: A #GDBusMethodInvocation + * + * Gets information about the property that this method call is for, if + * any. + * + * This will only be set in the case of an invocation in response to a + * property Get or Set call that has been directed to the method call + * handler for an object on account of its property_get() or + * property_set() vtable pointers being unset. + * + * See #GDBusInterfaceVTable for more information. + * + * If the call was GetAll, %NULL will be returned. + * + * Returns: (transfer none): a #GDBusPropertyInfo or %NULL + * Since: 2.38 + */ + + /** * g_dbus_method_invocation_get_sender: * @invocation: A #GDBusMethodInvocation. @@ -19043,15 +17649,15 @@ * launch applications. Ordinary applications should use * g_app_info_launch_uris(). * - * In contrast to g_app_info_launch_uris(), all processes created will - * always be run directly as children as if by the UNIX fork()/exec() - * calls. + * If the application is launched via traditional UNIX fork()/exec() + * then @spawn_flags, @user_setup and @user_setup_data are used for the + * call to g_spawn_async(). Additionally, @pid_callback (with + * @pid_callback_data) will be called to inform about the PID of the + * created process. * - * This guarantee allows additional control over the exact environment - * of the child processes, which is provided via a setup function - * @user_setup, as well as the process identifier of each child process - * via @pid_callback. See g_spawn_async() for more information about the - * semantics of the @user_setup function. + * If application launching occurs via some other mechanism (eg: D-Bus + * activation) then @spawn_flags, @user_setup, @user_setup_data, + * @pid_callback and @pid_callback_data are ignored. * * Returns: %TRUE on successful launch, %FALSE otherwise. */ @@ -20419,6 +19025,9 @@ * returned from this function will contain attributes that match the * attribute string that was passed when the #GFileEnumerator was created. * + * See the documentation of #GFileEnumerator for information about the + * order of returned files. + * * On error, returns %NULL and sets @error to the error. If the * enumerator is at the end, %NULL will be returned and @error will * be unset. @@ -20440,6 +19049,9 @@ * When all i/o for the operation is finished the @callback will be called with * the requested information. * + * See the documentation of #GFileEnumerator for information about the + * order of returned files. + * * The callback can be called with less than @num_files files in case of error * or at the end of the enumerator. In case of a partial error the callback will * be called with any succeeding items and no error, and on the next request the diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index ac8f7796..85d49c62 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -1760,6 +1760,32 @@ */ +/** + * GTestFileType: + * @G_TEST_DIST: a file that was included in the distribution tarball + * @G_TEST_BUILT: a file that was built on the compiling machine + * + * The type of file to return the filename for, when used with + * g_test_build_filename(). + * + * These two options correspond rather directly to the 'dist' and + * 'built' terminology that automake uses and are explicitly used to + * distinguish between the 'srcdir' and 'builddir' being separate. All + * files in your project should either be dist (in the + * DIST_EXTRA or dist_schema_DATA + * sense, in which case they will always be in the srcdir) or built (in + * the BUILT_SOURCES sense, in which case they will + * always be in the builddir). + * + * Note: as a general rule of automake, files that are generated only as + * part of the build-from-git process (but then are distributed with the + * tarball) always go in srcdir (even if doing a srcdir != builddir + * build from git) and are considered as distributed files. + * + * Since: 2.38 + */ + + /** * GTestFixtureFunc: * @fixture: the test fixture @@ -18570,8 +18596,34 @@ * g_main_context_wakeup: * @context: a #GMainContext * - * If @context is currently waiting in a poll(), interrupt - * the poll(), and continue the iteration process. + * If @context is currently blocking in g_main_context_iteration() + * waiting for a source to become ready, cause it to stop blocking + * and return. Otherwise, cause the next invocation of + * g_main_context_iteration() to return without blocking. + * + * This API is useful for low-level control over #GMainContext; for + * example, integrating it with main loop implementations such as + * #GMainLoop. + * + * Another related use for this function is when implementing a main + * loop with a termination condition, computed from multiple threads: + * + * |[ + * #define NUM_TASKS 10 + * static volatile gint tasks_remaining = NUM_TASKS; + * ... + * + * while (g_atomic_int_get (&tasks_remaining) != 0) + * g_main_context_iteration (NULL, TRUE); + * ]| + * + * Then in a thread: + * |[ + * perform_work(); + * + * if (g_atomic_int_dec_and_test (&tasks_remaining)) + * g_main_context_wakeup (NULL); + * ]| */ @@ -27301,6 +27353,39 @@ */ +/** + * g_test_build_filename: + * @file_type: the type of file (built vs. distributed) + * @first_path: the first segment of the pathname ...: NULL terminated additional path segments + * + * Creates the pathname to a data file that is required for a test. + * + * This function is conceptually similar to g_build_filename() except + * that the first argument has been replaced with a #GTestFileType + * argument. + * + * The data file should either have been distributed with the module + * containing the test (%G_TEST_DIST) or built as part of the build + * system of that module (%G_TEST_BUILT). + * + * In order for this function to work in srcdir != builddir situations, + * the G_TEST_SRCDIR and G_TEST_BUILDDIR environment variables need to + * have been defined. As of 2.38, this is done by the Makefile.decl + * included in GLib. Please ensure that your copy is up to date before + * using this function. + * + * In case neither variable is set, this function will fall back to + * using the dirname portion of argv[0], possibly removing ".libs". + * This allows for casual running of tests directly from the commandline + * in the srcdir == builddir case and should also support running of + * installed tests, assuming the data files have been installed in the + * same relative path as the test binary. + * + * Returns: the path of the file, to be freed using g_free() + * Since: 2.38 + */ + + /** * g_test_create_case: * @test_name: the name for the test case @@ -27401,6 +27486,44 @@ */ +/** + * g_test_get_dir: + * @file_type: the type of file (built vs. distributed) + * + * Gets the pathname of the directory containing test files of the type + * specified by @file_type. + * + * This is approximately the same as calling g_test_build_filename("."), + * but you don't need to free the return value. + * + * Returns: the path of the directory, owned by GLib + * Since: 2.38 + */ + + +/** + * g_test_get_filename: + * @file_type: the type of file (built vs. distributed) + * @first_path: the first segment of the pathname ...: NULL terminated additional path segments + * + * Gets the pathname to a data file that is required for a test. + * + * This is the same as g_test_build_filename() with two differences. + * The first difference is that must only use this function from within + * a testcase function. The second difference is that you need not free + * the return value -- it will be automatically freed when the testcase + * finishes running. + * + * It is safe to use this function from a thread inside of a testcase + * but you must ensure that all such uses occur before the main testcase + * function returns (ie: it is best to ensure that all threads have been + * joined). + * + * Returns: the path, automatically freed at the end of the testcase + * Since: 2.38 + */ + + /** * g_test_get_root: * @@ -30179,7 +30302,7 @@ /** * g_uri_escape_string: * @unescaped: the unescaped input string. - * @reserved_chars_allowed: a string of reserved characters that are allowed to be used, or %NULL. + * @reserved_chars_allowed: (allow-none): a string of reserved characters that are allowed to be used, or %NULL. * @allow_utf8: %TRUE if the result can include UTF-8 characters. * * Escapes a string for use in a URI. @@ -30246,7 +30369,7 @@ /** * g_uri_unescape_string: * @escaped_string: an escaped string to be unescaped. - * @illegal_characters: an optional string of illegal characters not to be allowed. + * @illegal_characters: (allow-none): a string of illegal characters not to be allowed, or %NULL. * * Unescapes a whole escaped string. * diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c index 59892f03..dab3e3e6 100644 --- a/gir/gobject-2.0.c +++ b/gir/gobject-2.0.c @@ -775,7 +775,10 @@ * Explicitly releases the binding between the source and the target * property expressed by @binding. * - * This function does not change the reference count of @binding. + * This function will release the reference that is being held on + * the @binding instance; if you want to hold on to the #GBinding instance + * after calling g_binding_unbind(), you will need to hold a reference + * to it. * * Since: 2.38 */ @@ -2444,7 +2447,7 @@ * * If the previous value was replaced then ownership of the * old value (@oldval) is passed to the caller, including - * the registred destroy notify for it (passed out in @old_destroy). + * the registered destroy notify for it (passed out in @old_destroy). * Its up to the caller to free this as he wishes, which may * or may not include using @old_destroy as sometimes replacement * should not destroy the object in the normal way. @@ -2474,7 +2477,7 @@ * * If the previous value was replaced then ownership of the * old value (@oldval) is passed to the caller, including - * the registred destroy notify for it (passed out in @old_destroy). + * the registered destroy notify for it (passed out in @old_destroy). * Its up to the caller to free this as he wishes, which may * or may not include using @old_destroy as sometimes replacement * should not destroy the object in the normal way. @@ -4626,11 +4629,11 @@ /** * g_type_get_type_registration_serial: * - * Returns an opaque serial number that represents the state of the set of registered - * types. Any time a type is registred this serial changes, which means you can - * cache information based on type lookups (such as g_type_from_name) and know if - * the cache is still valid at a later time by comparing the current serial with - * the one at the type lookup. + * Returns an opaque serial number that represents the state of the set of + * registered types. Any time a type is registered this serial changes, + * which means you can cache information based on type lookups (such as + * g_type_from_name()) and know if the cache is still valid at a later + * time by comparing the current serial with the one at the type lookup. * * Since: 2.36 * Returns: An unsigned int, representing the state of type registrations. -- cgit v1.2.1 From 049c7fd7cf1faaf1ddcd6ed5445dfaceefe70295 Mon Sep 17 00:00:00 2001 From: Simon Feltman Date: Tue, 2 Jul 2013 19:13:53 -0700 Subject: gimarshallingtests: Add test for GValue pass-by-reference https://bugzilla.gnome.org/show_bug.cgi?id=701058 --- tests/gimarshallingtests.c | 14 ++++++++++++++ tests/gimarshallingtests.h | 1 + 2 files changed, 15 insertions(+) diff --git a/tests/gimarshallingtests.c b/tests/gimarshallingtests.c index 1998161b..7d392544 100644 --- a/tests/gimarshallingtests.c +++ b/tests/gimarshallingtests.c @@ -3137,6 +3137,20 @@ gi_marshalling_tests_gvalue_in_with_type (GValue *value, GType type) g_assert (g_type_is_a (G_VALUE_TYPE (value), type)); } +/** + * gi_marshalling_tests_gvalue_in_with_modification: + * @value: (transfer none): + * + * Expects a GValue passed by reference which is then modified by + * this function. + */ +void +gi_marshalling_tests_gvalue_in_with_modification (GValue *value) +{ + g_assert_cmpint (g_value_get_int (value), ==, 42); + g_value_set_int (value, 24); +} + /** * gi_marshalling_tests_gvalue_in_enum: * @value: (transfer none): diff --git a/tests/gimarshallingtests.h b/tests/gimarshallingtests.h index 33f3b3e9..3b436f0c 100644 --- a/tests/gimarshallingtests.h +++ b/tests/gimarshallingtests.h @@ -545,6 +545,7 @@ GValue *gi_marshalling_tests_gvalue_return (void); void gi_marshalling_tests_gvalue_in (GValue *value); void gi_marshalling_tests_gvalue_int64_in (GValue *value); void gi_marshalling_tests_gvalue_in_with_type (GValue *value, GType type); +void gi_marshalling_tests_gvalue_in_with_modification (GValue *value); void gi_marshalling_tests_gvalue_in_enum (GValue *value); -- cgit v1.2.1 From 6b4ab34d2a3f77c09aa12a75240b083cee43bbeb Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 10 Jul 2013 12:40:45 -0400 Subject: Release 1.37.4 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 4a899c8f..d9e3131c 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl the gi version number m4_define(gi_major_version, 1) m4_define(gi_minor_version, 37) -m4_define(gi_micro_version, 1) +m4_define(gi_micro_version, 4) m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version) AC_PREREQ([2.63]) -- cgit v1.2.1 From 8ad86283bd950eedd50585e1b84c28428aa5229a Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Thu, 11 Jul 2013 17:34:15 +0200 Subject: Update annotations from glib 2.37.4 --- gir/gio-2.0.c | 30 ++++++++++++++++++++++-------- gir/glib-2.0.c | 14 ++++++++------ 2 files changed, 30 insertions(+), 14 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 5f9a5653..c530dd83 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -3943,7 +3943,7 @@ * |[ * void _theoretical_frobnitz_async (Theoretical *t, * GCancellable *c, - * GAsyncReadyCallback *cb, + * GAsyncReadyCallback cb, * gpointer u); * * gboolean _theoretical_frobnitz_finish (Theoretical *t, @@ -4045,7 +4045,7 @@ /** * SECTION:gbytesicon - * @short_description: An icon stored in memory as a #GBytes + * @short_description: An icon stored in memory as a GBytes * @include: gio/gio.h * @see_also: #GIcon, #GLoadableIcon, #GBytes * @@ -4702,7 +4702,7 @@ /** * SECTION:gdbusutils * @title: D-Bus Utilities - * @short_description: Various utilities related to D-Bus. + * @short_description: Various utilities related to D-Bus * @include: gio/gio.h * * Various utility routines related to D-Bus. @@ -5873,7 +5873,7 @@ /** * SECTION:gpollableutils - * @short_description: #GPollableInputStream / #GPollableOutputStream utilities + * @short_description: Utilities for pollable streams * @include: gio/gio.h * * Utility functions for #GPollableInputStream and @@ -5918,7 +5918,7 @@ /** * SECTION:gremoteactiongroup * @title: GRemoteActionGroup - * @short_description: a #GActionGroup that interacts with other processes + * @short_description: A GActionGroup that interacts with other processes * * The GRemoteActionGroup interface is implemented by #GActionGroup * instances that either transmit action invocations to other processes @@ -6296,7 +6296,7 @@ /** * SECTION:gsettingsschema - * @short_description: introspecting and controlling the loading of GSettings schemas + * @short_description: Introspecting and controlling the loading of GSettings schemas * * The #GSettingsSchemaSource and #GSettingsSchema APIs provide a * mechanism for advanced control over the loading of schemas and a @@ -6938,7 +6938,7 @@ * Eventually, you will call a method such as * g_task_return_pointer() or g_task_return_error(), which will * save the value you give it and then invoke the task's callback - * function (waiting until the next next iteration of the main + * function (waiting until the next iteration of the main * loop first, if necessary). The caller will pass the #GTask back * to the operation's finish function (as a #GAsyncResult), and * you can use g_task_propagate_pointer() or the like to extract @@ -7461,7 +7461,7 @@ /** * SECTION:gtcpwrapperconnection * @title: GTcpWrapperConnection - * @short_description: wrapper for non-GSocketConnection-based, GSocket-based GIOStreams + * @short_description: Wrapper for non-GSocketConnection-based, GSocket-based GIOStreams * @see_also: #GSocketConnection. * * A #GTcpWrapperConnection can be used to wrap a #GIOStream that is @@ -29234,6 +29234,20 @@ */ +/** + * g_simple_proxy_resolver_set_ignore_hosts: + * @resolver: a #GSimpleProxyResolver + * @ignore_hosts: %NULL-terminated list of hosts/IP addresses to not use a proxy for + * + * Sets the list of ignored hosts. + * + * See #GSimpleProxyResolver:ignore-hosts for more details on how the + * @ignore_hosts argument is interpreted. + * + * Since: 2.36 + */ + + /** * g_simple_proxy_resolver_set_uri_proxy: * @resolver: a #GSimpleProxyResolver diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 85d49c62..c0f244ba 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -25964,7 +25964,7 @@ * passing %NULL for @standard_output and @standard_error. * * If @exit_status is non-%NULL, the platform-specific exit status of - * the child is stored there; see the doucumentation of + * the child is stored there; see the documentation of * g_spawn_check_exit_status() for how to use and interpret this. * Note that it is invalid to pass %G_SPAWN_DO_NOT_REAP_CHILD in * @flags. @@ -27356,7 +27356,8 @@ /** * g_test_build_filename: * @file_type: the type of file (built vs. distributed) - * @first_path: the first segment of the pathname ...: NULL terminated additional path segments + * @first_path: the first segment of the pathname + * @...: %NULL-terminated additional path segments * * Creates the pathname to a data file that is required for a test. * @@ -27504,7 +27505,8 @@ /** * g_test_get_filename: * @file_type: the type of file (built vs. distributed) - * @first_path: the first segment of the pathname ...: NULL terminated additional path segments + * @first_path: the first segment of the pathname + * @...: %NULL-terminated additional path segments * * Gets the pathname to a data file that is required for a test. * @@ -28127,13 +28129,13 @@ /** * g_test_trap_subprocess: - * @test_name: Test to run in a subprocess + * @test_path: Test to run in a subprocess * @usec_timeout: Timeout for the subprocess test in micro seconds. * @test_flags: Flags to modify subprocess behaviour. * - * Respawns the test program to run only @test_name in a subprocess. + * Respawns the test program to run only @test_path in a subprocess. * This can be used for a test case that might not return, or that - * might abort. @test_name will normally be the name of the parent + * might abort. @test_path will normally be the name of the parent * test, followed by "/subprocess/" and then a name * for the specific subtest (or just ending with * "/subprocess" if the test only has one child -- cgit v1.2.1 From 9073085e03453bc0f7a0778a80b58d881856f11b Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Tue, 16 Jul 2013 19:10:39 +0200 Subject: Update annotations from glib git --- gir/gio-2.0.c | 278 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- gir/glib-2.0.c | 16 ++++ 2 files changed, 288 insertions(+), 6 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index c530dd83..0c670b21 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -1874,6 +1874,89 @@ */ +/** + * GPropertyAction: + * + * This type is opaque. + * + * Since: 2.38 + */ + + +/** + * GPropertyAction:enabled: + * + * If @action is currently enabled. + * + * If the action is disabled then calls to g_action_activate() and + * g_action_change_state() have no effect. + * + * Since: 2.38 + */ + + +/** + * GPropertyAction:name: + * + * The name of the action. This is mostly meaningful for identifying + * the action once it has been added to a #GActionMap. + * + * Since: 2.38 + */ + + +/** + * GPropertyAction:object: + * + * The object to wrap a property on. + * + * The object must be a non-%NULL #GObject with properties. + * + * Since: 2.38 + */ + + +/** + * GPropertyAction:parameter-type: + * + * The type of the parameter that must be given when activating the + * action. + * + * Since: 2.38 + */ + + +/** + * GPropertyAction:property-name: + * + * The name of the property to wrap on the object. + * + * The property must exist on the passed-in object and it must be + * readable and writable (and not construct-only). + * + * Since: 2.38 + */ + + +/** + * GPropertyAction:state: + * + * The state of the action, or %NULL if the action is stateless. + * + * Since: 2.38 + */ + + +/** + * GPropertyAction:state-type: + * + * The #GVariantType of the state that the action has, or %NULL if the + * action is stateless. + * + * Since: 2.38 + */ + + /** * GProxyAddress: * @@ -5881,6 +5964,68 @@ */ +/** + * SECTION:gpropertyaction + * @title: GPropertyAction + * @short_description: A GAction reflecting a GObject property + * + * A #GPropertyAction is a way to get a #GAction with a state value + * reflecting and controlling the value of a #GObject property. + * + * The state of the action will correspond to the value of the property. + * Changing it will change the property (assuming the requested value + * matches the requirements as specified in the #GParamSpec). + * + * Only the most common types are presently supported. Booleans are + * mapped to booleans, strings to strings, signed/unsigned integers to + * int32/uint32 and floats and doubles to doubles. + * + * If the property is an enum then the state will be string-typed and + * conversion will automatically be performed between the enum value and + * "nick" string as per the #GEnumValue table. + * + * Flags types are not currently supported. + * + * Properties of object types, boxed types and pointer types are not + * supported and probably never will be. + * + * Properties of #GVariant types are not currently supported. + * + * If the property is boolean-valued then the action will have a NULL + * parameter type, and activating the action (with no parameter) will + * toggle the value of the property. + * + * In all other cases, the parameter type will correspond to the type of + * the property. + * + * The general idea here is to reduce the number of locations where a + * particular piece of state is kept (and therefore has to be + * synchronised between). #GPropertyAction does not have a separate + * state that is kept in sync with the property value -- its state + * is the property value. + * + * For example, it might be useful to create a #GAction corresponding to + * the "visible-child-name" property of a #GtkStack so that the current + * page can be switched from a menu. The active radio indication in the + * menu is then directly determined from the active page of the + * #GtkStack. + * + * An anti-example would be binding the "active-id" property on a + * #GtkComboBox. This is because the state of the combobox itself is + * probably uninteresting and is actually being used to control + * something else. + * + * Another anti-example would be to bind to the "visible-child-name" + * property of a #GtkStack if this value is actually stored in + * #GSettings. In that case, the real source of the value is + * #GSettings. If you want a #GAction to control a setting stored in + * #GSettings, see g_settings_create_action() instead, and possibly + * combine its use with g_settings_bind(). + * + * Since: 2.38 + */ + + /** * SECTION:gproxy * @short_description: Interface for proxy handling @@ -10052,6 +10197,23 @@ */ +/** + * g_action_name_is_valid: + * @action_name: an potential action name + * + * Checks if @action_name is valid. + * + * @action_name is valid if it consists only of alphanumeric characters, + * plus '-' and '.'. The empty string is not a valid action name. + * + * It is an error to call this function with a non-utf8 @action_name. + * @action_name must not be %NULL. + * + * Returns: %TRUE if @action_name is valid + * Since: 2.38 + */ + + /** * g_action_parse_detailed_name: * @detailed_name: a detailed action name @@ -10068,22 +10230,49 @@ * value and consists of just an action name containing no whitespace * nor the characters ':', '(' or ')'. For example: "app.action". * - * The second format is used to represent an action with a string-typed - * target value. The action name and target value are separated by a - * double colon ("::"). For example: "app.action::target". + * The second format is used to represent an action with a target value + * that is a non-empty string consisting only of alphanumerics, plus '-' + * and '.'. In that case, the action name and target value are + * separated by a double colon ("::"). For example: + * "app.action::target". * - * The third format is used to represent an action with an - * arbitrarily-typed target value. The target value follows the action + * The third format is used to represent an action with any type of + * target value, including strings. The target value follows the action * name, surrounded in parens. For example: "app.action(42)". The * target value is parsed using g_variant_parse(). If a tuple-typed * value is desired, it must be specified in the same way, resulting in - * two sets of parens, for example: "app.action((1,2,3))". + * two sets of parens, for example: "app.action((1,2,3))". A string + * target can be specified this way as well: "app.action('target')". + * For strings, this third format must be used if * target value is + * empty or contains characters other than alphanumerics, '-' and '.'. * * Returns: %TRUE if successful, else %FALSE with @error set * Since: 2.38 */ +/** + * g_action_print_detailed_name: + * @action_name: a valid action name + * @target_value: (allow-none): a #GVariant target value, or %NULL + * + * Formats a detailed action name from @action_name and @target_value. + * + * It is an error to call this function with an invalid action name. + * + * This function is the opposite of + * g_action_parse_detailed_action_name(). It will produce a string that + * can be parsed back to the @action_name and @target_value by that + * function. + * + * See that function for the types of strings that will be printed by + * this function. + * + * Returns: a detailed format string + * Since: 2.38 + */ + + /** * g_app_info_add_supports_type: * @appinfo: a #GAppInfo. @@ -17490,6 +17679,22 @@ */ +/** + * g_desktop_app_info_get_action_name: + * @info: a #GDesktopAppInfo + * @action_name: the name of the action as from g_desktop_app_info_list_actions() + * + * Gets the user-visible display name of the "additional application + * action" specified by @action_name. + * + * This corresponds to the "Name" key within the keyfile group for the + * action. + * + * Returns: (transfer full): the locale-specific action name + * Since: 2.38 + */ + + /** * g_desktop_app_info_get_boolean: * @info: a #GDesktopAppInfo @@ -17632,6 +17837,32 @@ */ +/** + * g_desktop_app_info_launch_action: + * @info: a #GDesktopAppInfo + * @action_name: the name of the action as from g_desktop_app_info_list_actions() + * @launch_context: (allow-none): a #GAppLaunchContext + * + * Activates the named application action. + * + * You may only call this function on action names that were + * returned from g_desktop_app_info_list_actions(). + * + * Note that if the main entry of the desktop file indicates that the + * application supports startup notification, and @launch_context is + * non-%NULL, then startup notification will be used when activating the + * action (and as such, invocation of the action on the receiving side + * must signal the end of startup notification when it is completed). + * This is the expected behaviour of applications declaring additional + * actions, as per the desktop file specification. + * + * As with g_app_info_launch() there is no way to detect failures that + * occur while using this function. + * + * Since: 2.38 + */ + + /** * g_desktop_app_info_launch_uris_as_manager: * @appinfo: a #GDesktopAppInfo @@ -17663,6 +17894,21 @@ */ +/** + * g_desktop_app_info_list_actions: + * @info: a #GDesktopAppInfo + * + * Returns the list of "additional application actions" supported on the + * desktop file, as per the desktop file specification. + * + * As per the specification, this is the list of actions that are + * explicitly listed in the "Actions" key of the [Desktop Entry] group. + * + * Returns: (array zero-terminated=1) (element-type utf8) (transfer none): a list of strings, always non-%NULL + * Since: 2.38 + */ + + /** * g_desktop_app_info_lookup_get_default_for_uri_scheme: * @lookup: a #GDesktopAppInfoLookup @@ -26512,6 +26758,26 @@ */ +/** + * g_property_action_new: + * @name: the name of the action to create + * @object: the object that has the property to wrap + * @property_name: the name of the property + * + * Creates a #GAction corresponding to the value of property + * @property_name on @object. + * + * The property must be existent and readable and writable (and not + * construct-only). + * + * This function takes a reference on @object and doesn't release it + * until the action is destroyed. + * + * Returns: a new #GPropertyAction + * Since: 2.38 + */ + + /** * g_proxy_address_get_destination_hostname: * @proxy: a #GProxyAddress diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index c0f244ba..838f83c0 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -32726,6 +32726,22 @@ */ +/** + * g_variant_new_printf: (skip) + * @format_string: a printf-style format string + * @...: arguments for @format_string + * + * Creates a string-type GVariant using printf formatting. + * + * This is similar to calling g_strdup_printf() and then + * g_variant_new_string() but it saves a temporary variable and an + * unnecessary copy. + * + * Returns: (transfer none): a floating reference to a new string #GVariant instance + * Since: 2.38 + */ + + /** * g_variant_new_signature: * @signature: a normal C nul-terminated string -- cgit v1.2.1 From a998dc74c8311106d298134c5cd42f61db945203 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Fri, 19 Jul 2013 12:38:49 +0800 Subject: Visual Studio builds: Update _giscanner Project Add the "PC" folder in the Python installation root as one of the include folders, as that is where pyconfig.h would reside (at least for the people that compiled Python themselves from source using Visual Studio) --- build/win32/vs10/_giscanner.vcxproj | 8 ++++---- build/win32/vs9/_giscanner.vcproj | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build/win32/vs10/_giscanner.vcxproj b/build/win32/vs10/_giscanner.vcxproj index 01c46f23..07f2611a 100644 --- a/build/win32/vs10/_giscanner.vcxproj +++ b/build/win32/vs10/_giscanner.vcxproj @@ -75,7 +75,7 @@ Disabled - ..\..\..\giscanner;$(PYTHONDIR)\include;%(AdditionalIncludeDirectories) + ..\..\..\giscanner;$(PYTHONDIR)\include;$(PYTHONDIR)\PC;%(AdditionalIncludeDirectories) %(ForcedIncludeFiles);io.h _DEBUG;YY_NO_UNISTD_H;%(PreprocessorDefinitions) true @@ -98,7 +98,7 @@ MaxSpeed true - ..\..\..\giscanner;$(PYTHONDIR)\include;%(AdditionalIncludeDirectories) + ..\..\..\giscanner;$(PYTHONDIR)\include;$(PYTHONDIR)\PC;%(AdditionalIncludeDirectories) %(ForcedIncludeFiles);io.h YY_NO_UNISTD_H;%(PreprocessorDefinitions) MultiThreadedDLL @@ -124,7 +124,7 @@ Disabled - ..\..\..\giscanner;$(PYTHONDIR)\include;%(AdditionalIncludeDirectories) + ..\..\..\giscanner;$(PYTHONDIR)\include;$(PYTHONDIR)\PC;%(AdditionalIncludeDirectories) %(ForcedIncludeFiles);io.h _DEBUG;YY_NO_UNISTD_H;%(PreprocessorDefinitions) true @@ -150,7 +150,7 @@ MaxSpeed true - ..\..\..\giscanner;$(PYTHONDIR)\include;%(AdditionalIncludeDirectories) + ..\..\..\giscanner;$(PYTHONDIR)\include;$(PYTHONDIR)\PC;%(AdditionalIncludeDirectories) %(ForcedIncludeFiles);io.h YY_NO_UNISTD_H;%(PreprocessorDefinitions) MultiThreadedDLL diff --git a/build/win32/vs9/_giscanner.vcproj b/build/win32/vs9/_giscanner.vcproj index 290158ab..3619a2fb 100644 --- a/build/win32/vs9/_giscanner.vcproj +++ b/build/win32/vs9/_giscanner.vcproj @@ -31,7 +31,7 @@ Date: Fri, 19 Jul 2013 12:42:30 +0800 Subject: MSVC Builds: Fix "Installation" Process again My previous commit on this (d2613dd9) didn't quite get it right then and some items were missed from that commit. Get that corrected, and ensure also the scripts/templates in collections/ and doctemplates are "installed" accordingly. --- Makefile-msvcproj.am | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/Makefile-msvcproj.am b/Makefile-msvcproj.am index 7937a3aa..a9eb88c5 100644 --- a/Makefile-msvcproj.am +++ b/Makefile-msvcproj.am @@ -120,10 +120,25 @@ done >>./build/win32/vs9/gir.vs9.install echo '' >>./build/win32/vs9/gir.vs9.install echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner ' >>./build/win32/vs9/gir.vs9.install + echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\collections ' >>./build/win32/vs9/gir.vs9.install + echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates ' >>./build/win32/vs9/gir.vs9.install + echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C ' >>./build/win32/vs9/gir.vs9.install + echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs ' >>./build/win32/vs9/gir.vs9.install + echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python ' >>./build/win32/vs9/gir.vs9.install echo '' >>./build/win32/vs9/gir.vs9.install - for F in `echo $(pkgpyexec_PYTHON) | tr '/' '\\'`; do \ + for F in `echo $(pkgpyexec_PYTHON) $(collections_PYTHON) $(nobase_dist_template_DATA) | tr '/' '\\'`; do \ case $$F in \ - *.py|*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner ' \ + giscanner\\doctemplates\\C\\*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C ' \ + ;; \ + giscanner\\doctemplates\\Gjs\\*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs ' \ + ;; \ + giscanner\\doctemplates\\Python\\*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python ' \ + ;; \ + giscanner\\doctemplates\\*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates ' \ + ;; \ + giscanner\\collections\\*.py) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\collections ' \ + ;; \ + giscanner\\*.py) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner ' \ ;; \ esac; \ done >>./build/win32/vs9/gir.vs9.install @@ -141,10 +156,23 @@ echo '' >>./build/win32/vs10/gir.vs10.install echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\collections' >>./build/win32/vs10/gir.vs10.install echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates' >>./build/win32/vs10/gir.vs10.install + echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C' >>./build/win32/vs10/gir.vs10.install + echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs' >>./build/win32/vs10/gir.vs10.install + echo 'mkdir $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python' >>./build/win32/vs10/gir.vs10.install echo '' >>./build/win32/vs10/gir.vs10.install for F in `echo $(pkgpyexec_PYTHON) $(collections_PYTHON) $(nobase_dist_template_DATA) | tr '/' '\\'`; do \ case $$F in \ - *.py|*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner' && \ + giscanner\\doctemplates\\C\\*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\C' \ + ;; \ + giscanner\\doctemplates\\Gjs\\*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Gjs' \ + ;; \ + giscanner\\doctemplates\\Python\\*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates\Python' \ + ;; \ + giscanner\\doctemplates\\*.tmpl) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\doctemplates' \ + ;; \ + giscanner\\collections\\*.py) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner\collections' \ + ;; \ + giscanner\\*.py) echo 'copy ..\..\..\'$$F' $$(CopyDir)\lib\gobject-introspection\giscanner' && \ echo '' \ ;; \ esac; \ -- cgit v1.2.1 From cf55433f17957c13fc4a345d52d708400215e192 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 25 Jul 2013 13:02:59 +0100 Subject: scanner: Consistently use realpath() on input filenames The scanner has some logic to compare the filenames specified on the command line against files it will parse. For the latter, it uses g_realpath(). With this patch, we also use g_realpath() on the command line arguments. This fixes g-i when used inside jhbuild in a gnome-ostree VM, which has a symbolic link /home -> /sysroot/home. This caused a realpath mismatch, and then we'd ignore the input source files. It'd be best to get out of the realpath business entirely...but a patch to do that seems more likely to break. https://bugzilla.gnome.org/show_bug.cgi?id=704864 --- giscanner/giscannermodule.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/giscanner/giscannermodule.c b/giscanner/giscannermodule.c index a5686ea3..182d8438 100644 --- a/giscanner/giscannermodule.c +++ b/giscanner/giscannermodule.c @@ -515,7 +515,7 @@ pygi_source_scanner_lex_filename (PyGISourceScanner *self, if (!PyArg_ParseTuple (args, "s:SourceScanner.lex_filename", &filename)) return NULL; - self->scanner->current_filename = g_strdup (filename); + self->scanner->current_filename = g_realpath (filename); if (!gi_source_scanner_lex_filename (self->scanner, filename)) { g_print ("Something went wrong during lexing.\n"); -- cgit v1.2.1 From f299e2512769030b76e6ef7662f95194b972450e Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Tue, 30 Jul 2013 20:55:17 +0200 Subject: Update annotations from glib 2.37.5 --- gir/glib-2.0.c | 29 +++++++++++++++++------------ gir/gobject-2.0.c | 2 +- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 838f83c0..3e7f8b6e 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -19650,19 +19650,11 @@ * stops at the partial match. * When both #G_REGEX_MATCH_PARTIAL_SOFT and #G_REGEX_MATCH_PARTIAL_HARD * are set, the latter takes precedence. - * See man:pcrepartial for more information on partial matching. * - * Because of the way certain internal optimizations are implemented - * the partial matching algorithm cannot be used with all patterns. - * So repeated single characters such as "a{2,4}" and repeated single - * meta-sequences such as "\d+" are not permitted if the maximum number - * of occurrences is greater than one. Optional items such as "\d?" - * (where the maximum is one) are permitted. Quantifiers with any values - * are permitted after parentheses, so the invalid examples above can be - * coded thus "(a){2,4}" and "(\d)+". If #G_REGEX_MATCH_PARTIAL or - * #G_REGEX_MATCH_PARTIAL_HARD is set - * for a pattern that does not conform to the restrictions, matching - * functions return an error. + * There were formerly some restrictions on the pattern for partial matching. + * The restrictions no longer apply. + * + * See man:pcrepartial for more information on partial matching. * * Returns: %TRUE if the match was partial, %FALSE otherwise * Since: 2.14 @@ -22563,6 +22555,19 @@ */ +/** + * g_regex_get_max_lookbehind: + * @regex: a #GRegex structure + * + * Gets the number of characters in the longest lookbehind assertion in the + * pattern. This information is useful when doing multi-segment matching using + * the partial matching facilities. + * + * Returns: the number of characters in the longest lookbehind assertion. + * Since: 2.38 + */ + + /** * g_regex_get_pattern: * @regex: a #GRegex structure diff --git a/gir/gobject-2.0.c b/gir/gobject-2.0.c index dab3e3e6..941b838d 100644 --- a/gir/gobject-2.0.c +++ b/gir/gobject-2.0.c @@ -4049,7 +4049,7 @@ * * Overrides the class closure (i.e. the default handler) for the * given signal for emissions on instances of @instance_type with - * callabck @class_handler. @instance_type must be derived from the + * callback @class_handler. @instance_type must be derived from the * type to which the signal belongs. * * See g_signal_chain_from_overridden() and -- cgit v1.2.1 From fbf303a972195f009b8bb37d77212f089a74d20e Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 2 Aug 2013 18:56:46 -0400 Subject: Add win32-1.0.gir So for doing the GTK+ stack with gobject-introspection on Windows, we basically need to stub out the win32 types just like we do for xlib. Contributed by serenomickael@gmail.com --- Makefile-gir.am | 3 ++- gir/win32-1.0.gir | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 gir/win32-1.0.gir diff --git a/Makefile-gir.am b/Makefile-gir.am index 2b39e546..848655c9 100644 --- a/Makefile-gir.am +++ b/Makefile-gir.am @@ -11,7 +11,8 @@ STATIC_GIRSOURCES = \ gir/xft-2.0.gir \ gir/xlib-2.0.gir \ gir/xfixes-4.0.gir \ - gir/xrandr-1.3.gir + gir/xrandr-1.3.gir \ + gir/win32-1.0.gir EXTRA_DIST += $(STATIC_GIRSOURCES) gir/cairo-1.0.gir: gir/cairo-1.0.gir.in Makefile diff --git a/gir/win32-1.0.gir b/gir/win32-1.0.gir new file mode 100644 index 00000000..ac9db850 --- /dev/null +++ b/gir/win32-1.0.gir @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + -- cgit v1.2.1 From 6162e7ab38e86544485cdd9ce8cf197e28d864dd Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Sat, 3 Aug 2013 02:15:31 -0400 Subject: Makefile: Fix the build --- Makefile-gir.am | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile-gir.am b/Makefile-gir.am index 848655c9..dfff294a 100644 --- a/Makefile-gir.am +++ b/Makefile-gir.am @@ -38,6 +38,7 @@ gir/xft-2.0.typelib: g-ir-compiler gir/xlib-2.0.typelib: g-ir-compiler gir/xfixes-4.0.typelib: g-ir-compiler gir/xrandr-1.3.typelib: g-ir-compiler +gir/win32-1.0.typelib: g-ir-compiler # glib with source (to enable documentation) if WITH_GLIBSRC -- cgit v1.2.1 From a17a94545ab3f7d9a3d8b205ffe071f9c8ab0e65 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Tue, 6 Aug 2013 16:51:04 +0800 Subject: build/win32/gengir.bat: Process win32-1.0.gir ...and include it when we generate GLib-2.0.gir as the Windows types are used from there on, and update the .typelib compilation command lines accordingly, as it will be referenced. --- build/win32/gengir.bat | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/build/win32/gengir.bat b/build/win32/gengir.bat index f7eedbf1..453b45e7 100644 --- a/build/win32/gengir.bat +++ b/build/win32/gengir.bat @@ -90,7 +90,7 @@ rem Setup the command line flags to g-ir-scanner for GLib-2.0.gir... rem ================================================================ echo python ..\..\tools\g-ir-scanner --verbose -I..\.. --add-include-path=..\.. ^^>> glib_gir.bat echo --add-include-path=..\..\gir --add-include-path=. --namespace=GLib --nsversion=2.0 ^^>> glib_gir.bat -echo --no-libtool --pkg=glib-2.0 --library=glib-2-vs%VSVER% --library=gobject-2-vs%VSVER% ^^>> glib_gir.bat +echo --no-libtool --pkg=glib-2.0 --include=win32-1.0 --library=glib-2-vs%VSVER% --library=gobject-2-vs%VSVER% ^^>> glib_gir.bat echo --external-library --reparse-validate --identifier-prefix=G --symbol-prefix=g ^^>> glib_gir.bat echo --symbol-prefix=glib --c-include="glib.h" -I%BASEDIR%\include\glib-2.0 ^^>> glib_gir.bat echo -I%BASEDIR%\lib\glib-2.0\include -I%BASEDIR%\include -DGETTEXT_PACKAGE=Dummy ^^>> glib_gir.bat @@ -250,11 +250,11 @@ echo You need to specify a valid BASEDIR. goto DONE :DO_COMPILE_GIR rem Now compile the generated .gir files -g-ir-compiler --includedir=. --debug --verbose GLib-2.0.gir -o GLib-2.0.typelib -g-ir-compiler --includedir=. --debug --verbose GModule-2.0.gir -o GModule-2.0.typelib -g-ir-compiler --includedir=. --debug --verbose GObject-2.0.gir -o GObject-2.0.typelib -g-ir-compiler --includedir=. --debug --verbose Gio-2.0.gir -o Gio-2.0.typelib -g-ir-compiler --includedir=. --debug --verbose GIRepository-2.0.gir -o GIRepository-2.0.typelib +g-ir-compiler --includedir=. --includedir=..\..\gir --debug --verbose GLib-2.0.gir -o GLib-2.0.typelib +g-ir-compiler --includedir=. --includedir=..\..\gir --debug --verbose GModule-2.0.gir -o GModule-2.0.typelib +g-ir-compiler --includedir=. --includedir=..\..\gir --debug --verbose GObject-2.0.gir -o GObject-2.0.typelib +g-ir-compiler --includedir=. --includedir=..\..\gir --debug --verbose Gio-2.0.gir -o Gio-2.0.typelib +g-ir-compiler --includedir=. --includedir=..\..\gir --debug --verbose GIRepository-2.0.gir -o GIRepository-2.0.typelib rem Now process the bundled .gir files python create_nonglib_gir.py --vsver=%VSVER% @@ -264,6 +264,7 @@ g-ir-compiler --includedir=. --debug --verbose cairo-1.0.gir -o cairo-1.0.typeli g-ir-compiler --includedir=. --debug --verbose freetype2-2.0.gir -o freetype2-2.0.typelib g-ir-compiler --includedir=. --debug --verbose GL-1.0.gir -o GL-1.0.typelib g-ir-compiler --includedir=. --debug --verbose libxml2-2.0.gir -o libxml2-2.0.typelib +g-ir-compiler --includedir=. --debug --verbose win32-1.0.gir -o win32-1.0.typelib cd %CURRDIR% rem Copy the generated .girs and .typelibs to their appropriate places @@ -274,6 +275,7 @@ copy /y ..\..\gir\freetype2-2.0.gir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\sh copy /y ..\..\gir\GL-1.0.gir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\share\gir-1.0\ copy /y ..\..\gir\libxml2-2.0.gir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\share\gir-1.0\ copy /y ..\..\gir\cairo-1.0.gir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\share\gir-1.0\ +copy /y ..\..\gir\win32-1.0.gir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\share\gir-1.0\ mkdir ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\lib\girepository-1.0 move /y *.typelib ..\..\build\win32\vs%VSVER%\%CONF%\%PLAT%\lib\girepository-1.0\ -- cgit v1.2.1 From 8f20bc5046ed83c73cfa97480c99ba7881799752 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Mon, 19 Aug 2013 22:34:16 +0200 Subject: Update annotations from glib git --- gir/gio-2.0.c | 4 ++++ gir/glib-2.0.c | 19 +++++++++++++------ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 0c670b21..064e968c 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -28983,6 +28983,7 @@ * and adding them to the action group. * * Since: 2.30 + * Deprecated: 2.38: Use g_action_map_add_action_entries() */ @@ -28999,6 +29000,7 @@ * The action group takes its own reference on @action. * * Since: 2.28 + * Deprecated: 2.38: Use g_action_map_add_action() */ @@ -29013,6 +29015,7 @@ * * Returns: (transfer none): a #GAction, or %NULL * Since: 2.28 + * Deprecated: 2.38: Use g_action_map_lookup_action() */ @@ -29036,6 +29039,7 @@ * If no action of this name is in the group then nothing happens. * * Since: 2.28 + * Deprecated: 2.38: Use g_action_map_remove_action() */ diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index 3e7f8b6e..e5b73062 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -14813,12 +14813,19 @@ /** * g_get_tmp_dir: * - * Gets the directory to use for temporary files. This is found from - * inspecting the environment variables TMPDIR, - * TMP, and TEMP in that order. If none - * of those are defined "/tmp" is returned on UNIX and "C:\" on Windows. - * The encoding of the returned string is system-defined. On Windows, - * it is always UTF-8. The return value is never %NULL or the empty string. + * Gets the directory to use for temporary files. + * + * On UNIX, this is taken from the TMPDIR environment + * variable. If the variable is not set, P_tmpdir is + * used, as defined by the system C library. Failing that, a hard-coded + * default of "/tmp" is returned. + * + * On Windows, the TEMP environment variable is used, + * with the root directory of the Windows installation (eg: "C:\") used + * as a default. + * + * The encoding of the returned string is system-defined. On Windows, it + * is always UTF-8. The return value is never %NULL or the empty string. * * Returns: the directory to use for temporary files. */ -- cgit v1.2.1 From b8b3c7e25702bbd04cd4b5a27648784e445f5014 Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Mon, 19 Aug 2013 22:38:19 +0200 Subject: Update annotations from glib git --- gir/gio-2.0.c | 32 ++++++----- gir/glib-2.0.c | 167 ++++++++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 162 insertions(+), 37 deletions(-) diff --git a/gir/gio-2.0.c b/gir/gio-2.0.c index 064e968c..80fe1cb7 100644 --- a/gir/gio-2.0.c +++ b/gir/gio-2.0.c @@ -2393,7 +2393,7 @@ /** * GSocket:broadcast: * - * Whether the socket should allow sending to and receiving from broadcast addresses. + * Whether the socket should allow sending to broadcast addresses. * * Since: 2.32 */ @@ -29685,14 +29685,20 @@ * In certain situations, you may also want to bind a socket that will be * used to initiate connections, though this is not normally required. * - * @allow_reuse should be %TRUE for server sockets (sockets that you will - * eventually call g_socket_accept() on), and %FALSE for client sockets. - * (Specifically, if it is %TRUE, then g_socket_bind() will set the - * %SO_REUSEADDR flag on the socket, allowing it to bind @address even if - * that address was previously used by another socket that has not yet been - * fully cleaned-up by the kernel. Failing to set this flag on a server - * socket may cause the bind call to return %G_IO_ERROR_ADDRESS_IN_USE if - * the server program is stopped and then immediately restarted.) + * If @socket is a TCP socket, then @allow_reuse controls the setting + * of the SO_REUSEADDR socket option; normally it + * should be %TRUE for server sockets (sockets that you will + * eventually call g_socket_accept() on), and %FALSE for client + * sockets. (Failing to set this flag on a server socket may cause + * g_socket_bind() to return %G_IO_ERROR_ADDRESS_IN_USE if the server + * program is stopped and then immediately restarted.) + * + * If @socket is a UDP socket, then @allow_reuse determines whether or + * not other UDP sockets can be bound to the same address at the same + * time. In particular, you can have several UDP sockets bound to the + * same address, and they will all receive all of the multicast and + * broadcast packets sent to that address. (The behavior of unicast + * UDP packets to an address with multiple listeners is not defined.) * * Returns: %TRUE on success, %FALSE on error. * Since: 2.22 @@ -30729,7 +30735,7 @@ * * Gets the broadcast setting on @socket; if %TRUE, * it is possible to send packets to broadcast - * addresses or receive from broadcast addresses. + * addresses. * * Returns: the broadcast setting on @socket * Since: 2.32 @@ -31662,10 +31668,10 @@ /** * g_socket_set_broadcast: * @socket: a #GSocket. - * @broadcast: whether @socket should allow sending to and receiving from broadcast addresses + * @broadcast: whether @socket should allow sending to broadcast addresses * - * Sets whether @socket should allow sending to and receiving from - * broadcast addresses. This is %FALSE by default. + * Sets whether @socket should allow sending to broadcast addresses. + * This is %FALSE by default. * * Since: 2.32 */ diff --git a/gir/glib-2.0.c b/gir/glib-2.0.c index e5b73062..a01b5d27 100644 --- a/gir/glib-2.0.c +++ b/gir/glib-2.0.c @@ -8721,11 +8721,10 @@ * @cmp: The comparison operator to use. One of ==, !=, <, >, <=, >=. * @n2: another floating point number * - * Debugging macro to terminate the application with a warning - * message if a floating point number comparison fails. + * Debugging macro to compare two floating point numbers. * * The effect of g_assert_cmpfloat (n1, op, n2) is - * the same as g_assert (n1 op n2). The advantage + * the same as g_assert_true (n1 op n2). The advantage * of this macro is that it can produce a message that includes the * actual values of @n1 and @n2. * @@ -8739,8 +8738,7 @@ * @cmp: The comparison operator to use. One of ==, !=, <, >, <=, >=. * @n2: another unsigned integer * - * Debugging macro to terminate the application with a warning - * message if an unsigned integer comparison fails. + * Debugging macro to compare to unsigned integers. * * This is a variant of g_assert_cmpuint() that displays the numbers * in hexadecimal notation in the message. @@ -8755,11 +8753,10 @@ * @cmp: The comparison operator to use. One of ==, !=, <, >, <=, >=. * @n2: another integer * - * Debugging macro to terminate the application with a warning - * message if an integer comparison fails. + * Debugging macro to compare two integers. * * The effect of g_assert_cmpint (n1, op, n2) is - * the same as g_assert (n1 op n2). The advantage + * the same as g_assert_true (n1 op n2). The advantage * of this macro is that it can produce a message that includes the * actual values of @n1 and @n2. * @@ -8773,12 +8770,13 @@ * @cmp: The comparison operator to use. One of ==, !=, <, >, <=, >=. * @s2: another string (may be %NULL) * - * Debugging macro to terminate the application with a warning - * message if a string comparison fails. The strings are compared - * using g_strcmp0(). + * Debugging macro to compare two strings. If the comparison fails, + * an error message is logged and the application is either terminated + * or the testcase marked as failed. + * The strings are compared using g_strcmp0(). * * The effect of g_assert_cmpstr (s1, op, s2) is - * the same as g_assert (g_strcmp0 (s1, s2) op 0). + * the same as g_assert_true (g_strcmp0 (s1, s2) op 0). * The advantage of this macro is that it can produce a message that * includes the actual values of @s1 and @s2. * @@ -8796,11 +8794,10 @@ * @cmp: The comparison operator to use. One of ==, !=, <, >, <=, >=. * @n2: another unsigned integer * - * Debugging macro to terminate the application with a warning - * message if an unsigned integer comparison fails. + * Debugging macro to compare two unsigned integers. * * The effect of g_assert_cmpuint (n1, op, n2) is - * the same as g_assert (n1 op n2). The advantage + * the same as g_assert_true (n1 op n2). The advantage * of this macro is that it can produce a message that includes the * actual values of @n1 and @n2. * @@ -8814,11 +8811,11 @@ * @dom: the expected error domain (a #GQuark) * @c: the expected error code * - * Debugging macro to terminate the application with a warning - * message if a method has not returned the correct #GError. + * Debugging macro to check that a method has returned + * the correct #GError. * * The effect of g_assert_error (err, dom, c) is - * the same as g_assert (err != NULL && err->domain + * the same as g_assert_true (err != NULL && err->domain * == dom && err->code == c). The advantage of this * macro is that it can produce a message that includes the incorrect * error message and code. @@ -8831,15 +8828,30 @@ */ +/** + * g_assert_false: + * @expr: the expression to check + * + * Debugging macro to check an expression is false. + * + * If the assertion fails (i.e. the expression is not false), + * an error message is logged and the application is either + * terminated or the testcase marked as failed. + * + * See g_test_set_nonfatal_assertions(). + * + * Since: 2.38 + */ + + /** * g_assert_no_error: * @err: a #GError, possibly %NULL * - * Debugging macro to terminate the application with a warning - * message if a method has returned a #GError. + * Debugging macro to check that a #GError is not set. * * The effect of g_assert_no_error (err) is - * the same as g_assert (err == NULL). The advantage + * the same as g_assert_true (err == NULL). The advantage * of this macro is that it can produce a message that includes * the error message and code. * @@ -8859,6 +8871,38 @@ */ +/** + * g_assert_null: + * @expr: the expression to check + * + * Debugging macro to check an expression is %NULL. + * + * If the assertion fails (i.e. the expression is not %NULL), + * an error message is logged and the application is either + * terminated or the testcase marked as failed. + * + * See g_test_set_nonfatal_assertions(). + * + * Since: 2.38 + */ + + +/** + * g_assert_true: + * @expr: the expression to check + * + * Debugging macro to check that an expression is true. + * + * If the assertion fails (i.e. the expression is not true), + * an error message is logged and the application is either + * terminated or the testcase marked as failed. + * + * See g_test_set_nonfatal_assertions(). + * + * Since: 2.38 + */ + + /** * g_async_queue_length: * @queue: a #GAsyncQueue. @@ -16369,7 +16413,7 @@ /** * g_io_channel_read_unichar: * @channel: a #GIOChannel - * @thechar: a location to return a character + * @thechar: (out): a location to return a character * @error: a location to return an error of type #GConvertError or #GIOChannelError * * Reads a Unicode character from @channel. @@ -27499,6 +27543,25 @@ */ +/** + * g_test_failed: + * + * Returns whether a test has already failed. This will + * be the case when g_test_fail(), g_test_incomplete() + * or g_test_skip() have been called, but also if an + * assertion has failed. + * + * This can be useful to return early from a test if + * continuing after a failed assertion might be harmful. + * + * The return value of this function is only meaningful + * if it is called from inside a test function. + * + * Returns: %TRUE if the test has failed + * Since: 2.38 + */ + + /** * g_test_get_dir: * @file_type: the type of file (built vs. distributed) @@ -27548,6 +27611,25 @@ */ +/** + * g_test_incomplete: + * @msg: (allow-none): explanation + * + * Indicates that a test failed because of some incomplete + * functionality. This function can be called multiple times + * from the same test. + * + * Calling this function will not stop the test from running, you + * need to return from the test function yourself. So you can + * produce additional diagnostic messages or even continue running + * the test. + * + * If not called from inside a test, this function does nothing. + * + * Since: 2.38 + */ + + /** * g_test_init: * @argc: Address of the @argc parameter of the main() function. Changed if any arguments were handled. @@ -27918,6 +28000,42 @@ */ +/** + * g_test_set_nonfatal_assertions: + * + * Changes the behaviour of g_assert_cmpstr(), g_assert_cmpint(), + * g_assert_cmpuint(), g_assert_cmphex(), g_assert_cmpfloat(), + * g_assert_true(), g_assert_false(), g_assert_null(), g_assert_no_error(), + * g_assert_error(), g_test_assert_expected_messages() and the various + * g_test_trap_assert_*() macros to not abort to program, but instead + * call g_test_fail() and continue. + * + * Note that the g_assert_not_reached() and g_assert() are not + * affected by this. + * + * This function can only be called after g_test_init(). + * + * Since: 2.38 + */ + + +/** + * g_test_skip: + * @msg: (allow-none): explanation + * + * Indicates that a test was skipped. + * + * Calling this function will not stop the test from running, you + * need to return from the test function yourself. So you can + * produce additional diagnostic messages or even continue running + * the test. + * + * If not called from inside a test, this function does nothing. + * + * Since: 2.38 + */ + + /** * g_test_slow: * @@ -28281,7 +28399,7 @@ /** * g_thread_new: - * @name: a name for the new thread + * @name: (allow-none): an (optional) name for the new thread * @func: a function to execute in the new thread * @data: an argument to supply to the new thread * @@ -28292,6 +28410,7 @@ * with g_thread_join(). * * The @name can be useful for discriminating threads in a debugger. + * It is not used for other purposes and does not have to be unique. * Some systems restrict the length of @name to 16 bytes. * * If the thread can not be created the program aborts. See @@ -28584,7 +28703,7 @@ /** * g_thread_try_new: - * @name: a name for the new thread + * @name: (allow-none): an (optional) name for the new thread * @func: a function to execute in the new thread * @data: an argument to supply to the new thread * @error: return location for error, or %NULL -- cgit v1.2.1 From 85d02d59f101f9eb37829b16a81890ef9801824a Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 20 Aug 2013 14:53:28 -0400 Subject: Release 1.37.6 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d9e3131c..5b1e746f 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ dnl the gi version number m4_define(gi_major_version, 1) m4_define(gi_minor_version, 37) -m4_define(gi_micro_version, 4) +m4_define(gi_micro_version, 6) m4_define(gi_version, gi_major_version.gi_minor_version.gi_micro_version) AC_PREREQ([2.63]) -- cgit v1.2.1