summaryrefslogtreecommitdiff
path: root/tests/scanner
diff options
context:
space:
mode:
authorJohan Dahlin <johan@src.gnome.org>2009-01-11 22:41:31 +0000
committerJohan Dahlin <johan@src.gnome.org>2009-01-11 22:41:31 +0000
commit8ec1e3a52040a226110c04c3bf17ec190812e95b (patch)
treebe1a1dfa0c35c5f9f506e9cc11fa81564b280c01 /tests/scanner
parentba4ee2e606545ac703941698aa25e6d865e6976f (diff)
downloadgobject-introspection-8ec1e3a52040a226110c04c3bf17ec190812e95b.tar.gz
commit annotation parse patch
svn path=/branches/annotation/; revision=1008
Diffstat (limited to 'tests/scanner')
-rw-r--r--tests/scanner/annotation-1.0-expected.gir7
-rw-r--r--tests/scanner/annotation-1.0-expected.tgir7
-rw-r--r--tests/scanner/annotation.c4
-rw-r--r--tests/scanner/annotation.h5
4 files changed, 21 insertions, 2 deletions
diff --git a/tests/scanner/annotation-1.0-expected.gir b/tests/scanner/annotation-1.0-expected.gir
index 155b9c4a..a0c2a68b 100644
--- a/tests/scanner/annotation-1.0-expected.gir
+++ b/tests/scanner/annotation-1.0-expected.gir
@@ -328,5 +328,12 @@
<type name="none" c:type="void"/>
</return-value>
</function>
+ <record name="Struct" c:type="_AnnotationStruct">
+ <field name="objects" writable="1">
+ <array zero-terminated="0" c:type="AnnotationObject*" fixed-size="10">
+ <type name="Object"/>
+ </array>
+ </field>
+ </record>
</namespace>
</repository>
diff --git a/tests/scanner/annotation-1.0-expected.tgir b/tests/scanner/annotation-1.0-expected.tgir
index 576d6d74..0a654d56 100644
--- a/tests/scanner/annotation-1.0-expected.tgir
+++ b/tests/scanner/annotation-1.0-expected.tgir
@@ -306,5 +306,12 @@
<type name="none"/>
</return-value>
</function>
+ <record name="Struct">
+ <field name="objects" writable="1">
+ <array fixed-size="10">
+ <type name="Object"/>
+ </array>
+ </field>
+ </record>
</namespace>
</repository>
diff --git a/tests/scanner/annotation.c b/tests/scanner/annotation.c
index 6278b6ce..8fa6d8ec 100644
--- a/tests/scanner/annotation.c
+++ b/tests/scanner/annotation.c
@@ -50,7 +50,7 @@ annotation_object_out (AnnotationObject *object, int *outarg)
*
* This is a test for in arguments
*
- * @inarg: (in): This is an argument test
+ * @inarg: (in): (transfer none): This is an argument test
* Return value: an int
*/
gint
@@ -246,7 +246,7 @@ annotation_object_compute_sum (AnnotationObject *object,
/**
* annotation_object_compute_sum_n:
* @object: a #GObject
- * @nums: (array length=n_nums): Sequence of numbers
+ * @nums: (array length=n_nums zero-terminated=0): Sequence of numbers
* @n_nums: Length of number array
*
* Test taking an array with length parameter
diff --git a/tests/scanner/annotation.h b/tests/scanner/annotation.h
index 87946609..ddafeb6b 100644
--- a/tests/scanner/annotation.h
+++ b/tests/scanner/annotation.h
@@ -90,4 +90,9 @@ void annotation_init (int *argc,
char ** annotation_return_array (int *length);
void annotation_versioned (void);
+struct _AnnotationStruct
+{
+ AnnotationObject *objects[10];
+};
+
#endif /* __ANNOTATION_OBJECT_H__ */