gobject-introspection r351 - in trunk: . girepository tests/scanner

[walters svn gnome org]

Author: walters
Date: Tue Aug 12 18:49:16 2008
New Revision: 351
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=351&view=rev

Log:
2008-08-12  Colin Walters  <walters verbum org>

	* girepository/girparser.c: Handle 'any'.
	* tests/scanner/Foo-expected.gir, tests/scanner/foo-object.h:
	Add test for void *.



Modified:
   trunk/ChangeLog
   trunk/girepository/girparser.c
   trunk/tests/scanner/Foo-expected.gir
   trunk/tests/scanner/foo-object.h
   trunk/tests/scanner/foo.c

Modified: trunk/girepository/girparser.c
==============================================================================
--- trunk/girepository/girparser.c	(original)
+++ trunk/girepository/girparser.c	Tue Aug 12 18:49:16 2008
@@ -135,6 +135,7 @@
   } basic[] = {
     { "void",     GI_TYPE_TAG_VOID,    0 },
     { "none",     GI_TYPE_TAG_VOID,    0 },
+    { "any",      GI_TYPE_TAG_VOID,    1 },
     { "gpointer", GI_TYPE_TAG_VOID,    1 },
     { "bool",     GI_TYPE_TAG_BOOLEAN, 0 },
     { "gboolean", GI_TYPE_TAG_BOOLEAN, 0 },

Modified: trunk/tests/scanner/Foo-expected.gir
==============================================================================
--- trunk/tests/scanner/Foo-expected.gir	(original)
+++ trunk/tests/scanner/Foo-expected.gir	Tue Aug 12 18:49:16 2008
@@ -184,6 +184,19 @@
           </parameter>
         </parameters>
       </method>
+      <method name="with_voidp" c:identifier="foo_object_with_voidp">
+        <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>
+        </parameters>
+      </method>
       <property name="string">
         <type name="string" c:type="gchararray"/>
       </property>

Modified: trunk/tests/scanner/foo-object.h
==============================================================================
--- trunk/tests/scanner/foo-object.h	(original)
+++ trunk/tests/scanner/foo-object.h	Tue Aug 12 18:49:16 2008
@@ -61,6 +61,7 @@
 GList*                foo_object_get_strings       (FooObject *object);
 GSList*               foo_object_get_objects       (FooObject *object);
 
+void                  foo_object_with_voidp        (FooObject *object, void *data);
 
 struct _FooSubobject
 {

Modified: trunk/tests/scanner/foo.c
==============================================================================
--- trunk/tests/scanner/foo.c	(original)
+++ trunk/tests/scanner/foo.c	Tue Aug 12 18:49:16 2008
@@ -260,6 +260,17 @@
   return list;
 }
 
+
+/**
+ * foo_object_with_voidp
+ * @data: Opaque pointer handle
+ */
+void
+foo_object_with_voidp (FooObject *object, void *data)
+{
+  
+}
+
 /**
  * foo_object_get_objects:
  * @object: a #GObject