gobject-introspection r744 - in trunk: . tests tools

[tko svn gnome org]

Author: tko
Date: Fri Oct 17 14:59:07 2008
New Revision: 744
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=744&view=rev

Log:
2008-10-17  Tommi Komulainen  <tommi komulainen iki fi>

	Bug 556732 â generate gir files consistently

	* tools/generate.c (write_callable_info): write 'direction'
	attribute only if other than 'in' to be consistent with
	girwriter.py
	* tests/boxed.gir:
	* tests/object.gir: remove direction="in" which is the default

Modified:
   trunk/ChangeLog
   trunk/tests/boxed.gir
   trunk/tests/object.gir
   trunk/tools/generate.c

Modified: trunk/tests/boxed.gir
==============================================================================
--- trunk/tests/boxed.gir	(original)
+++ trunk/tests/boxed.gir	Fri Oct 17 14:59:07 2008
@@ -19,15 +19,15 @@
           <type name="none"/>
         </return-value>
         <parameters>
-          <parameter name="box" direction="in">
+          <parameter name="box">
             <type name="BoxedType1"/>
           </parameter>
-          <parameter name="w" direction="in">
+          <parameter name="w">
             <type name="GLib.List">
               <type name="boxed2"/>
             </type>
           </parameter>
-          <parameter name="t" transfer="full" direction="in">
+          <parameter name="t" transfer="full">
             <type name="GLib.HashTable">
               <type name="utf8"/>
               <type name="int64"/>
@@ -43,7 +43,7 @@
           <type name="boolean"/>
         </return-value>
         <parameters>
-          <parameter name="box" direction="in">
+          <parameter name="box">
             <type name="boxed2"/>
           </parameter>
           <parameter name="val" transfer="full" direction="inout">
@@ -57,10 +57,10 @@
         <type name="boolean"/>
       </return-value>
       <parameters>
-        <parameter name="v1" direction="in">
+        <parameter name="v1">
           <type name="int"/>
         </parameter>
-        <parameter name="val2" direction="in">
+        <parameter name="val2">
           <type name="int"/>
         </parameter>
       </parameters>

Modified: trunk/tests/object.gir
==============================================================================
--- trunk/tests/object.gir	(original)
+++ trunk/tests/object.gir	Fri Oct 17 14:59:07 2008
@@ -16,7 +16,7 @@
           <type name="boolean"/>
         </return-value>
         <parameters>
-          <parameter name="obj" direction="in">
+          <parameter name="obj">
             <type name="Object1"/>
           </parameter>
         </parameters>
@@ -26,7 +26,7 @@
           <type name="none"/>
         </return-value>
         <parameters>
-          <parameter name="obj" direction="in">
+          <parameter name="obj">
             <type name="Object1"/>
           </parameter>
         </parameters>
@@ -36,7 +36,7 @@
           <type name="Object2"/>
         </return-value>
         <parameters>
-          <parameter name="param1" direction="in">
+          <parameter name="param1">
             <type name="Object1"/>
           </parameter>
         </parameters>
@@ -46,7 +46,7 @@
           <type name="Object2"/>
         </return-value>
         <parameters>
-          <parameter name="param1" direction="in">
+          <parameter name="param1">
             <type name="Object1"/>
           </parameter>
         </parameters>

Modified: trunk/tools/generate.c
==============================================================================
--- trunk/tools/generate.c	(original)
+++ trunk/tools/generate.c	Fri Oct 17 14:59:07 2008
@@ -432,20 +432,17 @@
 	  g_assert_not_reached ();
 	}
       
-      xml_printf (file, " direction=\"");
       switch (g_arg_info_get_direction (arg))
 	{
 	case GI_DIRECTION_IN:
-	  xml_printf (file, "in");
 	  break;
 	case GI_DIRECTION_OUT:
-	  xml_printf (file, "out");
+	  xml_printf (file, " direction=\"out\"");
 	  break;
 	case GI_DIRECTION_INOUT:
-	  xml_printf (file, "inout");
+	  xml_printf (file, " direction=\"inout\"");
 	  break;
 	}
-      xml_printf (file, "\"");
       
       if (g_arg_info_may_be_null (arg))
 	xml_printf (file, " null-ok=\"1\"");