diff options
author | Dieter Verfaillie <dieterv@optionexplicit.be> | 2013-08-12 16:54:11 +0200 |
---|---|---|
committer | Dieter Verfaillie <dieterv@optionexplicit.be> | 2013-10-08 20:55:46 +0200 |
commit | a2b22ce75937d2d996ef90e0ab683d36031365d0 (patch) | |
tree | 42a1e8e7ba992a89efd98fa41b2d5e013f7165b2 /tests/scanner/annotation.c | |
parent | 839e4f10a6b291a261c200484ff05ec44a31d93e (diff) | |
download | gobject-introspection-a2b22ce75937d2d996ef90e0ab683d36031365d0.tar.gz |
giscanner: flesh out annotation parsing and storage
- remove annotations regex, restore proper parens parsing
- drop weird DocOption() storage class and use lists/dicts
as appropriate
- make GtkDocAnnotations a simple OrderedDict subclass instead
of a weird hybrid dict/list storage class
- Deprecate Attribute: tag, replace with (attributes) annotation
on the identifier
Diffstat (limited to 'tests/scanner/annotation.c')
-rw-r--r-- | tests/scanner/annotation.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/tests/scanner/annotation.c b/tests/scanner/annotation.c index 0a92d3a1..32187d38 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.annotation.foo1 val1): a value - * @arg2: (attribute some.annotation.foo2 val2): another value + * @arg1: (attributes some.annotation.foo1=val1): a value + * @arg2: (attributes some.annotation.foo2=val2): another value * * This signal tests a signal with attributes. * - * Returns: (attribute some.annotation.foo3 val3): the return value + * Returns: (attributes some.annotation.foo3=val3): the return value */ regress_annotation_object_signals[ATTRIBUTE_SIGNAL] = g_signal_new ("attribute-signal", @@ -707,9 +707,7 @@ regress_annotation_string_array_length (guint n_properties, const gchar * const } /** - * regress_annotation_object_extra_annos: - * - * Attributes: (org.foobar testvalue) + * regress_annotation_object_extra_annos: (attributes org.foobar=testvalue) */ void regress_annotation_object_extra_annos (RegressAnnotationObject *object) @@ -763,9 +761,9 @@ regress_annotation_ptr_array (GPtrArray *array) /** * regress_annotation_attribute_func: * @object: A #RegressAnnotationObject. - * @data: (attribute some.annotation value) (attribute another.annotation blahvalue): Some data. + * @data: (attributes some.annotation=value another.annotation=blahvalue): Some data. * - * Returns: (attribute some.other.annotation value2) (attribute yet.another.annotation another_value): The return value. + * Returns: (attributes some.other.annotation=value2 yet.another.annotation=another_value): The return value. */ gint regress_annotation_attribute_func (RegressAnnotationObject *object, |