glib-2.0: Map given end == 0 for string.slice/splice() to string.length

Fixes https://gitlab.gnome.org/GNOME/vala/issues/179

diff --git a/tests/basic-types/strings.vala b/tests/basic-types/strings.vala
index a4fcda4f7afca151dbcb3b4a0cfd2aab9c2027bc..7ae03ef974414699507eb2709dad15d652a56584 100644 (file)
--- a/tests/basic-types/strings.vala
+++ b/tests/basic-types/strings.vala
@@ -70,6 +70,12 @@ void test_string_slice () {
 
        r = s.slice (-7, -5);
        assert (r == "my");
+
+       r = s.slice (-7, 0);
+       assert (r == "myworld");
+
+       r = s.slice (5, 0);
+       assert (r == "myworld");
 }
 
 void test_string_splice () {
@@ -89,6 +95,12 @@ void test_string_splice () {
 
        s = s.splice (-14, -5);
        assert (s == "helloworld");
+
+       s = s.splice (-5, 0, "wide");
+       assert (s == "hellowide");
+
+       s = s.splice (5, 0, "world");
+       assert (s == "helloworld");
 }
 
 void test_string_substring () {

diff --git a/vapi/glib-2.0.vapi b/vapi/glib-2.0.vapi
index c3df0f7ec5fc4e681cb266f3511b869b2f1e5c00..4da3873b6c3162e65075b2fea0f34108386a8b12 100644 (file)
--- a/vapi/glib-2.0.vapi
+++ b/vapi/glib-2.0.vapi
@@ -1484,6 +1484,8 @@ public class string {
                }
                if (end < 0) {
                        end = string_length + end;
+               } else if (end == 0) {
+                       end = string_length;
                }
                GLib.return_val_if_fail (start >= 0 && start <= string_length, null);
                GLib.return_val_if_fail (end >= 0 && end <= string_length, null);
@@ -1498,6 +1500,8 @@ public class string {
                }
                if (end < 0) {
                        end = string_length + end;
+               } else if (end == 0) {
+                       end = string_length;
                }
                GLib.return_val_if_fail (start >= 0 && start <= string_length, null);
                GLib.return_val_if_fail (end >= 0 && end <= string_length, null);