diff options
author | Andreas Rottmann <a.rottmann@gmx.at> | 2009-07-03 23:14:04 +0200 |
---|---|---|
committer | Andreas Rottmann <a.rottmann@gmx.at> | 2009-07-03 23:14:04 +0200 |
commit | 5f811f2d0d192c3d546b91e12fcf74b341434ca9 (patch) | |
tree | 8a1d43404a7e51d5cc5700233a249a8904c8ccca /tests | |
parent | e8d99aad1d29f343583792fac41a5182ab7d2ef7 (diff) | |
download | gobject-introspection-5f811f2d0d192c3d546b91e12fcf74b341434ca9.tar.gz |
Allow annotations on fields
Plain fields (i.e. non-callbacks) may have a 'type' annotation now.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/scanner/utility-1.0-expected.gir | 8 | ||||
-rw-r--r-- | tests/scanner/utility-1.0-expected.tgir | 8 | ||||
-rw-r--r-- | tests/scanner/utility.c | 6 | ||||
-rw-r--r-- | tests/scanner/utility.h | 7 |
4 files changed, 29 insertions, 0 deletions
diff --git a/tests/scanner/utility-1.0-expected.gir b/tests/scanner/utility-1.0-expected.gir index 02e29136..8c6a602b 100644 --- a/tests/scanner/utility-1.0-expected.gir +++ b/tests/scanner/utility-1.0-expected.gir @@ -14,6 +14,14 @@ and/or use gtk-doc annotations. --> shared-library="utility" c:prefix="utility"> <alias name="Glyph" target="uint32" c:type="UtilityGlyph"/> + <record name="Buffer" c:type="UtilityBuffer"> + <field name="data" writable="1"> + <type name="any" c:type="char*"/> + </field> + <field name="length" writable="1"> + <type name="size_t" c:type="gsize"/> + </field> + </record> <union name="Byte" c:type="UtilityByte"> <field name="value" writable="1"> <type name="uint8" c:type="guint8"/> diff --git a/tests/scanner/utility-1.0-expected.tgir b/tests/scanner/utility-1.0-expected.tgir index 2a30f850..d25bd59f 100644 --- a/tests/scanner/utility-1.0-expected.tgir +++ b/tests/scanner/utility-1.0-expected.tgir @@ -6,6 +6,14 @@ <include name="GObject" version="2.0"/> <include name="GLib" version="2.0"/> <namespace name="utility" version="1.0" shared-library="utility" c:prefix="utility"> + <record name="Buffer"> + <field name="data" writable="1"> + <type name="any"/> + </field> + <field name="length" writable="1"> + <type name="size"/> + </field> + </record> <union name="Byte"> <field name="value" writable="1"> <type name="uint8"/> diff --git a/tests/scanner/utility.c b/tests/scanner/utility.c index a54afad9..5ae5ed3e 100644 --- a/tests/scanner/utility.c +++ b/tests/scanner/utility.c @@ -6,6 +6,12 @@ G_DEFINE_TYPE (UtilityObject, utility_object, G_TYPE_OBJECT); * UtilityFlagType: (type bitfield) **/ +/** + * UtilityBuffer: + * + * @data: (type pointer): the data + **/ + static void utility_object_class_init (UtilityObjectClass *klass) { diff --git a/tests/scanner/utility.h b/tests/scanner/utility.h index cad93ff5..a3eb3ef8 100644 --- a/tests/scanner/utility.h +++ b/tests/scanner/utility.h @@ -44,6 +44,13 @@ typedef union }; } UtilityByte; +/* This one is similiar to Soup.Buffer */ +typedef struct +{ + const char *data; + gsize length; +} UtilityBuffer; + typedef void (*UtilityFileFunc)(const char *path, gpointer user_data); GType utility_object_get_type (void) G_GNUC_CONST; |