girwriter: Write implicit fields for arrays and delegates

diff --git a/codegen/valagirwriter.vala b/codegen/valagirwriter.vala
index 590a887c3f788a18930d8bd117339e1752c486f0..0c7c5b9872559cdc783a74e0d4f812f068f43a05 100644 (file)
--- a/codegen/valagirwriter.vala
+++ b/codegen/valagirwriter.vala
@@ -942,6 +942,49 @@ public class Vala.GIRWriter : CodeVisitor {
                indent--;
                write_indent ();
                buffer.append_printf ("</field>\n");
+
+               if (f.variable_type is ArrayType && get_ccode_array_length (f)) {
+                       var array_type = (ArrayType) f.variable_type;
+                       if (!array_type.fixed_length) {
+                               for (var i = 0; i < array_type.rank; i++) {
+                                       write_indent ();
+                                       buffer.append_printf ("<field name=\"%s_length%i\"", get_ccode_name (f), i + 1);
+                                       write_symbol_attributes (f);
+                                       buffer.append_printf (">\n");
+                                       indent++;
+                                       write_type (array_type.length_type);
+                                       indent--;
+                                       write_indent ();
+                                       buffer.append_printf ("</field>\n");
+                               }
+                       }
+               } else if (f.variable_type is DelegateType) {
+                       var deleg_type = (DelegateType) f.variable_type;
+                       if (deleg_type.delegate_symbol.has_target) {
+                               write_indent ();
+                               buffer.append_printf ("<field name=\"%s\"", get_ccode_delegate_target_name (f));
+                               write_symbol_attributes (f);
+                               buffer.append_printf (">\n");
+                               indent++;
+                               write_indent ();
+                               buffer.append_printf ("<type name=\"gpointer\" c:type=\"gpointer\"/>\n");
+                               indent--;
+                               write_indent ();
+                               buffer.append_printf ("</field>\n");
+                               if (deleg_type.is_disposable ()) {
+                                       write_indent ();
+                                       buffer.append_printf ("<field name=\"%s\"", get_ccode_delegate_target_destroy_notify_name (f));
+                                       write_symbol_attributes (f);
+                                       buffer.append_printf (">\n");
+                                       indent++;
+                                       write_indent ();
+                                       buffer.append_printf ("<type name=\"GLib.DestroyNotify\" c:type=\"GDestroyNotify\"/>\n");
+                                       indent--;
+                                       write_indent ();
+                                       buffer.append_printf ("</field>\n");
+                               }
+                       }
+               }
        }
 
        private void write_implicit_params (DataType? type, ref int index, bool has_array_length, string? name, ParameterDirection direction) {

diff --git a/tests/girwriter/GirTest-1.0.gir-expected b/tests/girwriter/GirTest-1.0.gir-expected
index 9aba2a5f886e7be93cf93bedbc32276ce45d028d..034f484181fccd02963d64c85356db97baa2d2e1 100644 (file)
--- a/tests/girwriter/GirTest-1.0.gir-expected
+++ b/tests/girwriter/GirTest-1.0.gir-expected
@@ -75,6 +75,23 @@
                <field name="priv">
                        <type name="SubTypeTestPrivate" c:type="GirTestSubTypeTestPrivate*"/>
                </field>
+               <field name="array_field">
+                       <array c:type="gchar**">
+                               <type name="utf8" c:type="gchar*"/>
+                       </array>
+               </field>
+               <field name="array_field_length1">
+                       <type name="gint" c:type="gint"/>
+               </field>
+               <field name="delegate_field">
+                       <type name="GirTest.DelegateTest" c:type="GirTestDelegateTest"/>
+               </field>
+               <field name="delegate_field_target">
+                       <type name="gpointer" c:type="gpointer"/>
+               </field>
+               <field name="delegate_field_target_destroy_notify">
+                       <type name="GLib.DestroyNotify" c:type="GDestroyNotify"/>
+               </field>
                <constructor name="new" c:identifier="gir_test_sub_type_test_new">
                        <return-value transfer-ownership="full">
                                <type name="GirTest.SubTypeTest" c:type="GirTestSubTypeTest*"/>

diff --git a/tests/girwriter/girtest.vala b/tests/girwriter/girtest.vala
index 1164ab1dab3eece066bb1d62d0839aa7a973bd0e..3ace08a5bc05adc334cdbf8353e14d88c756540b 100644 (file)
--- a/tests/girwriter/girtest.vala
+++ b/tests/girwriter/girtest.vala
@@ -87,6 +87,8 @@ namespace GirTest {
        }
 
        public class SubTypeTest : TypeTest {
+               public string[] array_field;
+               public DelegateTest delegate_field;
        }
 
        public class ObjectTest : Object {

diff --git a/tests/girwriter/girtest.vapi-expected b/tests/girwriter/girtest.vapi-expected
index 8e3b3b6979c48cdfb4472e4b9c91f03277b84348..52d23d16a68371c0547716a9027736e796644a55 100644 (file)
--- a/tests/girwriter/girtest.vapi-expected
+++ b/tests/girwriter/girtest.vapi-expected
@@ -87,6 +87,8 @@ namespace GirTest {
        }
        [CCode (cheader_filename = "girtest.h")]
        public class SubTypeTest : GirTest.TypeTest {
+               public string[] array_field;
+               public GirTest.DelegateTest delegate_field;
                public SubTypeTest ();
        }
        [CCode (cheader_filename = "girtest.h")]