Bug 556732 – generate gir files consistently

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

svn path=/trunk/; revision=744

diff --git a/ChangeLog b/ChangeLog
index 49ac08c..4198369 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,16 @@
 
        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
+
+2008-10-17  Tommi Komulainen  <tommi.komulainen@iki.fi>
+
+       Bug 556732 – generate gir files consistently
+
        * giscanner/ast.py (Field): add readable and writable properties
        * giscanner/girparser.py (_parse_field): copy 'readable' and
        'writable' attributes

diff --git a/tests/boxed.gir b/tests/boxed.gir
index 5a66d17..d30a152 100644 (file)
--- a/tests/boxed.gir
+++ b/tests/boxed.gir
@@ -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>

diff --git a/tests/object.gir b/tests/object.gir
index 937849a..21645f5 100644 (file)
--- a/tests/object.gir
+++ b/tests/object.gir
@@ -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>

diff --git a/tools/generate.c b/tools/generate.c
index fa7dd46..52c7064 100644 (file)
--- a/tools/generate.c
+++ b/tools/generate.c
@@ -432,20 +432,17 @@ write_callable_info (const gchar    *namespace,
          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\"");