diff options
author | Colin Walters <walters@verbum.org> | 2010-07-27 06:16:37 -0400 |
---|---|---|
committer | Colin Walters <walters@verbum.org> | 2010-08-31 16:05:56 -0400 |
commit | 36aa515f1036978ced8d4ffb808260844f7229e0 (patch) | |
tree | 93e06fb105a513a394365232bb632256f109dada /tests/scanner/Utility-1.0-expected.gir | |
parent | 552c1f1525e37a30376790151c1ba437776682c5 (diff) | |
download | gobject-introspection-36aa515f1036978ced8d4ffb808260844f7229e0.tar.gz |
Major rewrite
One of the first big changes in this rewrite is changing the Type
object to have separate target_fundamental and target_giname properties,
rather than just being strings. Previously in the scanner, it was
awful because we used heuristics around strings.
The ast.py is refactored so that not everything is a Node - that
was a rather useless abstraction. Now, only things which can have
a GIName are Node. E.g. Type and Field are no longer Node.
More things were merged from glibast.py into ast.py, since it isn't
a very useful split.
transformer.py gains more intelligence and will e.g. turn GLib.List
into a List() object earlier. The namespace processing is a lot
cleaner now; since we parse the included .girs, we know the C
prefix for each namespace, and have functions to parse both
C type names (GtkFooBar) and symbols gtk_foo_bar into their
symbols cleanly. Type resolution is much, much saner because
we know Type(target_giname=Gtk.Foo) maps to the namespace Gtk.
glibtransformer.py now just handles the XML processing from the dump,
and a few miscellaneous things.
The major heavy lifting now lives in primarytransformer.py, which
is a combination of most of annotationparser.py and half of
glibtransformer.py.
annotationparser.py now literally just parses annotations; it's
no longer in the business of e.g. guessing transfer too.
finaltransformer.py is a new file which does post-analysis for
"introspectability" mainly.
girparser.c is fixed for some introspectable=0 processing.
Diffstat (limited to 'tests/scanner/Utility-1.0-expected.gir')
-rw-r--r-- | tests/scanner/Utility-1.0-expected.gir | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/tests/scanner/Utility-1.0-expected.gir b/tests/scanner/Utility-1.0-expected.gir index f4c69092..c09c056b 100644 --- a/tests/scanner/Utility-1.0-expected.gir +++ b/tests/scanner/Utility-1.0-expected.gir @@ -2,7 +2,7 @@ <!-- This file was automatically generated from C sources - DO NOT EDIT! To affect the contents of this file, edit the original C definitions, and/or use gtk-doc annotations. --> -<repository version="1.1" +<repository version="1.2" xmlns="http://www.gtk.org/introspection/core/1.0" xmlns:c="http://www.gtk.org/introspection/c/1.0" xmlns:glib="http://www.gtk.org/introspection/glib/1.0"> @@ -12,13 +12,14 @@ and/or use gtk-doc annotations. --> <namespace name="Utility" version="1.0" shared-library="libutility.so" - c:prefix="Utility"> + c:identifier-prefixes="Utility" + c:symbol-prefixes="utility"> <alias name="Glyph" c:type="UtilityGlyph"> - <type name="guint32"/> + <type name="guint32" c:type="guint32"/> </alias> <record name="Buffer" c:type="UtilityBuffer"> <field name="data" writable="1"> - <type name="gpointer" c:type="char*"/> + <type name="gpointer"/> </field> <field name="length" writable="1"> <type name="gulong" c:type="gsize"/> @@ -61,6 +62,7 @@ and/or use gtk-doc annotations. --> <member name="c" value="4" c:identifier="UTILITY_FLAG_C"/> </bitfield> <class name="Object" + c:symbol-prefix="object" c:type="UtilityObject" parent="GObject.Object" glib:type-name="UtilityObject" @@ -77,14 +79,14 @@ and/or use gtk-doc annotations. --> <parameter name="func" transfer-ownership="none" scope="notified" - closure="3" - destroy="4"> + closure="2" + destroy="3"> <type name="FileFunc" c:type="UtilityFileFunc"/> </parameter> <parameter name="user_data" transfer-ownership="none"> <type name="gpointer" c:type="gpointer"/> </parameter> - <parameter name="destroy" transfer-ownership="none" scope="call"> + <parameter name="destroy" transfer-ownership="none" scope="async"> <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/> </parameter> </parameters> @@ -112,7 +114,7 @@ and/or use gtk-doc annotations. --> </field> <field name="data" writable="1"> <array zero-terminated="0" c:type="guint8" fixed-size="16"> - <type name="guint8"/> + <type name="guint8" c:type="guint8"/> </array> </field> </record> |