Fix issue 13619 - array capacity not updated when changing length

dlang · Mar 11, 2017 · 8ba7ce5 · 8ba7ce5
1 parent f156be1
commit 8ba7ce5
Showing 1 changed file with 24 additions and 0 deletions.
diff --git a/std/container/array.d b/std/container/array.d
@@ -333,6 +333,7 @@ if (!is(Unqual!T == bool))
             _payload = (cast(T*) realloc(_payload.ptr,
                             nbytes))[0 .. newLength];
             initializeAll(_payload.ptr[startEmplace .. length]);
+            _capacity = newLength;
         }
 
         // capacity
@@ -1003,6 +1004,25 @@ $(D r)
     assert(a.empty);
 }
 
+@system unittest
+{
+    Array!int a;
+    a.length = 10;
+    assert(a.length == 10);
+    assert(a.capacity >= a.length);
+}
+
+@system unittest
+{
+    Array!int a;
+    a.length = 10;
+    assert(a.length == 10);
+    assert(a.capacity >= a.length);
+    a.length = 5;
+    assert(a.length == 5);
+    assert(a.capacity >= a.length);
+}
+
 @system unittest
 {
     Array!int a = Array!int(1, 2, 3);
@@ -1935,10 +1955,14 @@ if (is(Unqual!T == bool))
         Array!bool a;
         a.length = 1057;
         assert(a.length == 1057);
+        assert(a.capacity >= a.length);
         foreach (e; a)
         {
             assert(!e);
         }
+        a.length = 100;
+        assert(a.length == 100);
+        assert(a.capacity >= a.length);
     }
 
     /**