From 1b3ce6945e359e6cfbf1805be19db9599f134e09 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 26 Feb 2009 19:44:24 +0000 Subject: Merge branch 'bug557383-vfuncs' --- diff --git a/giscanner/ast.py b/giscanner/ast.py index e708258..4bd674d 100644 --- a/giscanner/ast.py +++ b/giscanner/ast.py @@ -205,6 +205,7 @@ class Function(Node): self.symbol = symbol self.throws = not not throws self.is_method = False + self.is_virtual = False self.doc = None def get_parameter_index(self, name): @@ -222,11 +223,6 @@ class Function(Node): self.name, self.retval, self.parameters) - -class VFunction(Function): - pass - - class Type(Node): def __init__(self, name, ctype=None): diff --git a/giscanner/girwriter.py b/giscanner/girwriter.py index df52709..9a08aaa 100644 --- a/giscanner/girwriter.py +++ b/giscanner/girwriter.py @@ -167,7 +167,11 @@ and/or use gtk-doc annotations. ''') self._write_parameters(func.parameters) def _write_method(self, method): - self._write_function(method, tag_name='method') + if method.is_virtual: + tag_name = 'vfunc' + else: + tag_name = 'method' + self._write_function(method, tag_name) def _write_static_method(self, method): self._write_function(method, tag_name='function') diff --git a/giscanner/glibtransformer.py b/giscanner/glibtransformer.py index 5a7a96d..fc7f17c 100644 --- a/giscanner/glibtransformer.py +++ b/giscanner/glibtransformer.py @@ -159,6 +159,10 @@ class GLibTransformer(object): except KeyError, e: print "WARNING: DELETING node %s: %s" % (node.name, e) self._remove_attribute(node.name) + # Another pass, since we need to have the methods parsed + # in order to correctly modify them after class/record + # pairing + for (ns, node) in nodes: # associate GtkButtonClass with GtkButton if isinstance(node, Record): self._pair_class_record(node) @@ -573,10 +577,19 @@ class GLibTransformer(object): for field in maybe_class.fields: if isinstance(field, Field): field.writable = False - # TODO: remove this, we should be computing vfuncs instead - if isinstance(pair_class, GLibInterface): - for field in maybe_class.fields[1:]: - pair_class.fields.append(field) + + # Pair up virtual methods by finding a slot in + # the class with the same name + for field in maybe_class.fields: + if not isinstance(field, Callback): + continue + matched = False + for method in pair_class.methods: + if (method.name == field.name and + len(method.parameters)+1 == len(field.parameters)): + method.is_virtual = True + break + gclass_struct = GLibRecord.from_record(class_struct) self._remove_attribute(class_struct.name) self._add_attribute(gclass_struct, True) diff --git a/tests/scanner/foo-1.0-expected.gir b/tests/scanner/foo-1.0-expected.gir index 0f6b1f1..38bde58 100644 --- a/tests/scanner/foo-1.0-expected.gir +++ b/tests/scanner/foo-1.0-expected.gir @@ -232,16 +232,16 @@ and/or use gtk-doc annotations. --> glib:type-name="FooInterface" glib:get-type="foo_interface_get_type" glib:type-struct="InterfaceIface"> - + - - + + - + + + + @@ -359,6 +362,16 @@ and/or use gtk-doc annotations. --> + + + + + + + + + + @@ -467,21 +480,11 @@ and/or use gtk-doc annotations. --> glib:get-type="foo_sub_interface_get_type" glib:type-struct="SubInterfaceIface"> - - - - - - + - - - - - - + - + + + + + + + + + + + + @@ -271,6 +282,16 @@ + + + + + + + + + + @@ -337,11 +358,11 @@ - + - + diff --git a/tests/scanner/foo.c b/tests/scanner/foo.c index 0488260..98d2f4b 100644 --- a/tests/scanner/foo.c +++ b/tests/scanner/foo.c @@ -8,8 +8,8 @@ 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); -void foo_do_foo (FooInterface *self); +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); @@ -47,9 +47,9 @@ foo_interface_get_type (void) return object_type; } -void foo_interface_do_foo (FooInterface *self) +void foo_interface_do_foo (FooInterface *self, int x) { - FOO_INTERFACE_GET_INTERFACE(self)->do_foo (self); + FOO_INTERFACE_GET_INTERFACE(self)->do_foo (self, x); } enum { @@ -191,7 +191,7 @@ foo_object_take_all (FooObject *object, int x, ...) } void -foo_do_foo (FooInterface *self) +foo_do_foo (FooInterface *self, int x) { diff --git a/tests/scanner/foo.h b/tests/scanner/foo.h index da30df3..2eeed6d 100644 --- a/tests/scanner/foo.h +++ b/tests/scanner/foo.h @@ -48,11 +48,13 @@ struct _FooInterfaceIface { GTypeInterface parent_iface; - void (*do_foo) (FooInterface *self); + void (*do_foo) (FooInterface *self, int x); }; GType foo_interface_get_type (void) G_GNUC_CONST; +void foo_interface_do_foo (FooInterface *iface, int x); + struct _FooSubInterfaceIface { GTypeInterface parent_iface; @@ -105,6 +107,8 @@ char * foo_object_dup_name (FooObject *object); void foo_object_handle_glyph (FooObject *object, UtilityGlyph glyph); +void foo_object_virtual_method (FooObject *object, int first_param); + int foo_object_static_meth (); struct _FooSubobject -- cgit v0.9.1