gobject-introspection r495 - in trunk: giscanner tests/scanner

[johan svn gnome org]

Author: johan
Date: Tue Aug 26 11:21:02 2008
New Revision: 495
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=495&view=rev

Log:
make the tests pass again

Modified:
   trunk/giscanner/glibtransformer.py
   trunk/tests/scanner/drawable-expected.gir
   trunk/tests/scanner/foo-expected.gir

Modified: trunk/giscanner/glibtransformer.py
==============================================================================
--- trunk/giscanner/glibtransformer.py	(original)
+++ trunk/giscanner/glibtransformer.py	Tue Aug 26 11:21:02 2008
@@ -68,10 +68,10 @@
 
     def _print_statistics(self):
         nodes = list(self._names.names.itervalues())
+
         def count_type(otype):
             return len([x for x in nodes
                         if isinstance(x[1], otype)])
-        
         objectcount = count_type(GLibObject)
         ifacecount = count_type(GLibInterface)
         enumcount = count_type(GLibEnum)
@@ -655,8 +655,9 @@
 
     def _resolve_glib_object(self, node):
         node.parent = self._force_resolve(node.parent)
-        node.interfaces = filter(None, [self._force_resolve(x, allow_unknown=True)
-                                        for x in node.interfaces])
+        node.interfaces = filter(None,
+            [self._force_resolve(x, allow_unknown=True)
+                                    for x in node.interfaces])
         self._resolve_constructors(node.constructors)
         self._resolve_methods(node.methods)
         self._resolve_properties(node.properties)

Modified: trunk/tests/scanner/drawable-expected.gir
==============================================================================
--- trunk/tests/scanner/drawable-expected.gir	(original)
+++ trunk/tests/scanner/drawable-expected.gir	Tue Aug 26 11:21:02 2008
@@ -31,6 +31,19 @@
         <type name="GObject.Class" c:type="GObjectClass"/>
       </field>
     </record>
+    <function name="do_foo" c:identifier="test_drawable_do_foo">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="drawable">
+          <type name="TestDrawable" c:type="TestDrawable*"/>
+        </parameter>
+        <parameter name="x">
+          <type name="int" c:type="int"/>
+        </parameter>
+      </parameters>
+    </function>
     <record name="TestPixmapObjectClass" c:type="_TestPixmapObjectClass">
       <field name="parent_class">
         <type name="TestDrawableClass" c:type="TestDrawableClass"/>

Modified: trunk/tests/scanner/foo-expected.gir
==============================================================================
--- trunk/tests/scanner/foo-expected.gir	(original)
+++ trunk/tests/scanner/foo-expected.gir	Tue Aug 26 11:21:02 2008
@@ -159,6 +159,55 @@
         <type name="int" c:type="gint"/>
       </return-value>
     </function>
+    <function name="new" c:identifier="foo_object_new">
+      <return-value>
+        <type name="Object" c:type="FooObject*"/>
+      </return-value>
+    </function>
+    <function name="external_type" c:identifier="foo_object_external_type">
+      <return-value>
+        <type name="utility.Object" c:type="UtilityObject*"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="Object" c:type="FooObject*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="various" c:identifier="foo_object_various">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="Object" c:type="FooObject*"/>
+        </parameter>
+        <parameter name="data">
+          <type name="any" c:type="void*"/>
+        </parameter>
+        <parameter name="some_type">
+          <type name="GObject.Type" c:type="GType"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="with_tdef" c:identifier="foo_object_with_tdef">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="object">
+          <type name="Object" c:type="FooObject*"/>
+        </parameter>
+        <parameter name="blah">
+          <type name="List" c:type="FooList*"/>
+        </parameter>
+      </parameters>
+    </function>
+    <function name="new" c:identifier="foo_subobject_new">
+      <return-value>
+        <type name="Subobject" c:type="FooSubobject*"/>
+      </return-value>
+    </function>
     <enumeration name="EnumType"
                  c:type="FooEnumType"
                  glib:type-name="FooEnumType"
@@ -238,6 +287,21 @@
         </parameters>
       </method>
     </glib:boxed>
+    <function name="new" c:identifier="foo_boxed_new">
+      <return-value>
+        <type name="Boxed" c:type="FooBoxed*"/>
+      </return-value>
+    </function>
+    <function name="method" c:identifier="foo_boxed_method">
+      <return-value>
+        <type name="none" c:type="void"/>
+      </return-value>
+      <parameters>
+        <parameter name="boxed">
+          <type name="Boxed" c:type="FooBoxed*"/>
+        </parameter>
+      </parameters>
+    </function>
     <callback name="Callback" c:type="FooCallback">
       <return-value>
         <type name="boolean" c:type="gboolean"/>