codegen: Prioritize "array_length=true" over "array_null_terminated=true"

If arrays claim to have an array-length and also are null-terminated then
use and rely on the given length.

Adapt the girparser for this and add "array_length = true" accordingly.

https://bugzilla.gnome.org/show_bug.cgi?id=788775

diff --git a/codegen/valaccodeattribute.vala b/codegen/valaccodeattribute.vala
index a1270a113b427e84157213c0cdb101ec276261f2..c21f54677e405d0ea997bd788a78637e244f7688 100644 (file)
--- a/codegen/valaccodeattribute.vala
+++ b/codegen/valaccodeattribute.vala
@@ -507,7 +507,10 @@ public class Vala.CCodeAttribute : AttributeCache {
        public bool array_null_terminated {
                get {
                        if (_array_null_terminated == null) {
-                               if (ccode != null && ccode.has_argument ("array_null_terminated")) {
+                               // If arrays claim to have an array-length and also are null-terminated then rely on the given length
+                               if (ccode != null && ccode.has_argument ("array_length") && ccode.get_bool ("array_length")) {
+                                       _array_null_terminated = false;
+                               } else if (ccode != null && ccode.has_argument ("array_null_terminated")) {
                                        _array_null_terminated = ccode.get_bool ("array_null_terminated");
                                } else {
                                        _array_null_terminated = get_default_array_null_terminated ();

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 79659261b15f1b6e8fdb451aaa092dabb7903f59..912bc338047853059bd6627212c068fd780dc2f2 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -45,6 +45,7 @@ TESTS = \
        basic-types/bug771626.test \
        basic-types/bug772426.vala \
        basic-types/bug777697.test \
+       basic-types/bug788775.vala \
        namespaces.vala \
        methods/lambda.vala \
        methods/closures.vala \
@@ -244,6 +245,7 @@ TESTS = \
        gir/bug651773.test \
        gir/bug667751.test \
        gir/bug742012.test \
+       gir/bug788775.test \
        gir/delegate-alias-without-target.test \
        $(NULL)
 

diff --git a/tests/basic-types/bug788775.vala b/tests/basic-types/bug788775.vala
new file mode 100644 (file)
index 0000000..bd92a94
--- /dev/null
+++ b/tests/basic-types/bug788775.vala
@@ -0,0 +1,10 @@
+void test_compile_only () {
+       try {
+               var file = new KeyFile ();
+               var list = file.get_string_list ("foo", "bar");
+       } catch (KeyFileError e) {
+       }
+}
+
+void main () {
+}

diff --git a/tests/gir/bug788775.test b/tests/gir/bug788775.test
new file mode 100644 (file)
index 0000000..80ae7cd
--- /dev/null
+++ b/tests/gir/bug788775.test
@@ -0,0 +1,29 @@
+GIR
+
+Input:
+
+      <function name="get_string_list" c:identifier="test_get_string_list">
+        <return-value transfer-ownership="full">
+          <array length="1" zero-terminated="1" c:type="gchar**">
+            <type name="utf8"/>
+          </array>
+        </return-value>
+        <parameters>
+          <parameter name="key" transfer-ownership="none">
+            <type name="utf8" c:type="const gchar*"/>
+          </parameter>
+          <parameter name="length"
+                     direction="out"
+                     caller-allocates="0"
+                     transfer-ownership="full"
+                     optional="1"
+                     allow-none="1">
+            <type name="gsize" c:type="gsize*"/>
+          </parameter>
+        </parameters>
+      </function>
+
+Output:
+
+[CCode (array_length = true, array_length_pos = 1.1, array_length_type = "gsize", array_null_terminated = true, cheader_filename = "test.h")]
+public static string[] get_string_list (string key);

diff --git a/vala/valagirparser.vala b/vala/valagirparser.vala
index 98894e6c3e1c124fb7a2836b5b145a42c7133231..d9323a3aa28810640c6b68cab547b8aed8eb0bf2 100644 (file)
--- a/vala/valagirparser.vala
+++ b/vala/valagirparser.vala
@@ -2504,8 +2504,8 @@ public class Vala.GirParser : CodeVisitor {
                                if (metadata.has_argument (ArgumentType.ARRAY_LENGTH_IDX)) {
                                        array_length_idx = metadata.get_integer (ArgumentType.ARRAY_LENGTH_IDX);
                                } else {
-                                       if (no_array_length) {
-                                               param.set_attribute_bool ("CCode", "array_length", false);
+                                       if (no_array_length || array_null_terminated) {
+                                               param.set_attribute_bool ("CCode", "array_length", !no_array_length);
                                        }
                                        if (array_null_terminated) {
                                                param.set_attribute_bool ("CCode", "array_null_terminated", array_null_terminated);
@@ -2938,11 +2938,11 @@ public class Vala.GirParser : CodeVisitor {
                        field.set_attribute_string ("CCode", "cname", cname);
                }
                if (type is ArrayType) {
-                       if (!no_array_length && !array_null_terminated && array_length_idx > -1) {
+                       if (!no_array_length && array_length_idx > -1) {
                                current.array_length_idx = array_length_idx;
                        }
-                       if (no_array_length) {
-                               field.set_attribute_bool ("CCode", "array_length", false);
+                       if (no_array_length || array_null_terminated) {
+                               field.set_attribute_bool ("CCode", "array_length", !no_array_length);
                        }
                        if (array_null_terminated) {
                                field.set_attribute_bool ("CCode", "array_null_terminated", true);
@@ -2976,8 +2976,8 @@ public class Vala.GirParser : CodeVisitor {
                prop.access = SymbolAccessibility.PUBLIC;
                prop.external = true;
                prop.is_abstract = is_abstract;
-               if (no_array_length) {
-                       prop.set_attribute_bool ("CCode", "array_length", false);
+               if (no_array_length || array_null_terminated) {
+                       prop.set_attribute_bool ("CCode", "array_length", !no_array_length);
                }
                if (array_null_terminated) {
                        prop.set_attribute_bool ("CCode", "array_null_terminated", true);
@@ -3153,8 +3153,8 @@ public class Vala.GirParser : CodeVisitor {
                if (return_type is ArrayType && metadata.has_argument (ArgumentType.ARRAY_LENGTH_IDX)) {
                        return_array_length_idx = metadata.get_integer (ArgumentType.ARRAY_LENGTH_IDX);
                } else {
-                       if (return_no_array_length) {
-                               s.set_attribute_bool ("CCode", "array_length", false);
+                       if (return_no_array_length || return_array_null_terminated) {
+                               s.set_attribute_bool ("CCode", "array_length", !return_no_array_length);
                        }
                        if (return_array_null_terminated) {
                                s.set_attribute_bool ("CCode", "array_null_terminated", true);

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index 91ad59c77c81de9461edb7590ae630df2e880c60..76395cddbc3c1db01d7bc0e092266e4b0ec3d20b 100644 (file)
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -4025,7 +4025,7 @@ namespace GLib {
                public uint64 get_uint64 (string group_name, string key) throws KeyFileError;
                [Version (since = "2.12")]
                public double get_double (string group_name, string key) throws KeyFileError;
-               [CCode (array_length_type = "gsize")]
+               [CCode (array_length = true, array_length_type = "gsize", array_null_terminated = true)]
                public string[] get_string_list (string group_name, string key) throws KeyFileError;
                [CCode (array_length_type = "gsize")]
                public string[] get_locale_string_list (string group_name, string key, string? locale = null) throws KeyFileError;