girparser: Discover our very own array length fields

diff --git a/tests/girwriter/GirTest-1.0.metadata b/tests/girwriter/GirTest-1.0.metadata
index 37a3608d6cbecae6f1db6aa1f68d73c580e80f85..49ebef7d3b2ff167d98512ffe465d525c7741dce 100644 (file)
--- a/tests/girwriter/GirTest-1.0.metadata
+++ b/tests/girwriter/GirTest-1.0.metadata
@@ -10,8 +10,7 @@ ObjectTest
        .fixed_array_field unowned=false
        .nullable_field unowned=false
 SubTypeTest
-       .array_field unowned=false array_length_field="array_field_length1"
-       .array_field_length1 skip
+       .array_field unowned=false
        .delegate_field unowned=false
        .delegate_field_target* skip
 nested_function name="nested" parent="GirTest.Nested"

diff --git a/tests/girwriter/girtest.vapigen-expected b/tests/girwriter/girtest.vapigen-expected
index a0d0cebe2490112886598221d04861e9db29a35e..68bb68f90e235cf7b73beab829b301e7a270bd16 100644 (file)
--- a/tests/girwriter/girtest.vapigen-expected
+++ b/tests/girwriter/girtest.vapigen-expected
@@ -127,8 +127,9 @@ namespace GirTest {
        }
        [CCode (cheader_filename = "girtest.h", type_id = "gir_test_sub_type_test_get_type ()")]
        public class SubTypeTest : GirTest.TypeTest {
-               [CCode (array_length = false, array_null_terminated = true)]
+               [CCode (array_length_cname = "array_field_length1")]
                public string[] array_field;
+               public int array_field_length1;
                public GirTest.DelegateTest delegate_field;
                [CCode (has_construct_function = false)]
                public SubTypeTest ();

diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index ee520350d506352772838087c544388a5c91d430..c17658981414e916acedf396d4777d1680ba4c41 100644 (file)
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -1163,6 +1163,9 @@ public class Vala.GirParser : CodeVisitor {
                                                                array_length = parent.lookup ("num_%s".printf (field.name));
                                                                if (array_length == null) {
                                                                        array_length = parent.lookup ("%s_length".printf (field.name));
+                                                                       if (array_length == null) {
+                                                                               array_length = parent.lookup ("%s_length1".printf (field.name));
+                                                                       }
                                                                }
                                                        }
                                                }