diff options
author | Andreas Rottmann <a.rottmann@gmx.at> | 2009-01-03 13:44:42 +0000 |
---|---|---|
committer | Jürg Billeter <juergbi@src.gnome.org> | 2009-01-03 13:44:42 +0000 |
commit | bc88ef7bcda59b15988d27517a4f4f7e0672e33b (patch) | |
tree | 7e3af8b1d130ca9e4b5e78fb7314340d02b11eca /tests/scanner/annotation-1.0-expected.tgir | |
parent | 00b0ae6bca603adc2c424c9a9384c60c4e4b1ccb (diff) | |
download | gobject-introspection-bc88ef7bcda59b15988d27517a4f4f7e0672e33b.tar.gz |
Bug 556489 – callback annotations
2008-01-03 Andreas Rottmann <a.rottmann@gmx.at>
Bug 556489 – callback annotations
* giscanner/transformer.py
* tools/generate.c (write_callable_info): Write out the new scope,
closure and destroy attributes.
* giscanner/transformer.py (Transformer._type_is_callback): New
method, checking if a given type is a callback.
(Transformer._augment_callback_params): New method; adds
information (closure, destroy) to callback parameters.
(Transformer._handle_closure, Transformer._handle_destroy): New methods,
auxiliary to _augment_callback_params.
(Transformer._create_function): Call _augment_callback_params().
(Transformer._create_parameter): Handle scope option.
(Transformer._create_typedef_callback): New method, creates a
callback, and registers it in the typedef namespace
(Transformer._create_typedef): Use _create_typedef_callback()
instead of the plain _create_callback().
* giscanner/ast.py (Parameter): Added callback-related fields.
* giscanner/girwriter.py: Write out new Parameter fields.
* girepository/girnode.h (GIrNodeParam): Added fields scope,
closure and destroy.
* girepository/gtypelib.h (ArgBlob): Ditto.
* girepository/girparser.c (start_parameter): Handle new fields.
* girepository/girmodule.c (g_ir_module_build_typelib): Adjust
arg_blob_size, bump major version due to this change.
* girepository/girnode.c (g_ir_node_get_full_size_internal)
(g_ir_node_build_typelib)
* girepository/gtypelib.c (g_typelib_check_sanity): ArgBlob size
adjustments.
(g_ir_node_build_typelib): Fill in new ArgBlob flags from param.
* girepository/girepository.h (GIScope): New enumeration, listing
the different possible scopes for callbacks.
* girepository/ginfo.c (g_arg_info_get_scope)
(g_arg_info_get_closure, g_arg_info_get_destroy): Accessors for
callback-related argument indices (callback scope, closure for a
callback, destroy notification for a callback).
* tests/scanner/: Added testcases for new features.
svn path=/trunk/; revision=998
Diffstat (limited to 'tests/scanner/annotation-1.0-expected.tgir')
-rw-r--r-- | tests/scanner/annotation-1.0-expected.tgir | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/tests/scanner/annotation-1.0-expected.tgir b/tests/scanner/annotation-1.0-expected.tgir index 4fe10bd6..576d6d74 100644 --- a/tests/scanner/annotation-1.0-expected.tgir +++ b/tests/scanner/annotation-1.0-expected.tgir @@ -234,6 +234,19 @@ </parameter> </parameters> </method> + <method name="foreach" c:identifier="annotation_object_foreach"> + <return-value transfer-ownership="none"> + <type name="none"/> + </return-value> + <parameters> + <parameter name="func" transfer-ownership="none" scope="call" closure="2"> + <type name="ForeachFunc"/> + </parameter> + <parameter name="user_data" transfer-ownership="none"> + <type name="any"/> + </parameter> + </parameters> + </method> <method name="do_not_use" c:identifier="annotation_object_do_not_use" deprecated="1"> <return-value transfer-ownership="full"> <type name="GObject.Object"/> @@ -245,6 +258,22 @@ <type name="GObject.ObjectClass"/> </field> </record> + <callback name="ForeachFunc"> + <return-value transfer-ownership="none"> + <type name="none"/> + </return-value> + <parameters> + <parameter name="object" transfer-ownership="none"> + <type name="Object"/> + </parameter> + <parameter name="item" transfer-ownership="none"> + <type name="utf8"/> + </parameter> + <parameter name="user_data" transfer-ownership="none"> + <type name="any"/> + </parameter> + </parameters> + </callback> <function name="init" c:identifier="annotation_init"> <return-value transfer-ownership="none"> <type name="none"/> |