Changeset 1547

Timestamp:

05/23/10 18:09:19 (15 years ago)

Author:

SHOO

Message:

Fixed bugzilla 4228: std.array.replace contains 2 bugs

4th parameter allows null.
Approach of remove method was wrong.

Files:

• trunk/docsrc/changelog.dd (modified) (1 diff)
• trunk/phobos/std/array.d (modified) (1 diff)

trunk/docsrc/changelog.dd

@@ -10 +10 @@
-    $(LI std.traits: Added templates to get compile-time information about functions.)
-    $(LI std.typecons: Added tie and AutoImplement.)
-    )
-    $(BUGSFIXED
-    $(LI $(BUGZILLA 2835): std.socket.TcpSocket doesn't actually connect)
-    $(LI $(BUGZILLA 3200): std.xml doesn't follow spec for Tag.text)
-    $(LI $(BUGZILLA 3873): std.range.repeat should have popBack defined)
-    $(LI $(BUGZILLA 3880): std.regex functions with const/immutable Regex object)
-    $(LI $(BUGZILLA 4109): writeln doesn't work with empty static array)
-    $(LI $(BUGZILLA 4202): Changset 1517 doesn't compile)
+    $(LI $(BUGZILLA 4228): std.array.replace contains 2 bugs)
-    )
-)
-
-<div id=version>
-$(UL
-    $(NEW 047)
-    $(NEW 046)
-    $(NEW 045)
-    $(NEW 044)
-    $(NEW 043)

trunk/phobos/std/array.d

@@ -549 +549 @@
-//     int[] a = [1, 2, 3, 4, 5];
-//     erase(a, 2u);
-//     assert(a == [1, 2, 4, 5]);
-// }
-
-/**
-Replaces elements from $(D array) with indices ranging from $(D from)
-(inclusive) to $(D to) (exclusive) with the range $(D stuff). Expands
-or shrinks the array as needed.
- */
-
-    Range stuff
+ Range stuff)
+if (is(ElementType!Range == T)
-{
-    // container = container[0 .. from] ~ stuff ~ container[to .. $];
-    if (overlap(array, stuff))
-    {
-        // use slower/conservative method
-        array = array[0 .. from] ~ stuff ~ array[to .. $];
-    }
-    else if (stuff.length <= to - from)
-    {
-        // replacement reduces length
-        // BUG 2128
-        //immutable stuffEnd = from + stuff.length;
-        auto stuffEnd = from + stuff.length;
-        array[from .. stuffEnd] = stuff;
-
+array = 
-    }
-    else
-    {
-        // replacement increases length
-        // @@@TODO@@@: optimize this
-        immutable replaceLen = to - from;
-        array[from .. to] = stuff[0 .. replaceLen];
-        insert(array, to, stuff[replaceLen .. $]);
-    }
-}
-
+
+void replace(T, Range)(ref T[] array, size_t from, size_t to, Range stuff)
+    if (!is(ElementType!Range == T) && is(Unqual!Range == void*))
+{
+    replace(array, from, to, cast(T[])[]);
+}
+
+
+
-unittest
-{
-    int[] a = [1, 4, 5];
-    replace(a, 1u, 2u, [2, 3, 4]);
-    assert(a == [1, 2, 3, 4, 5]);
+    replace(a, 1u, 2u, cast(int[])[]);
+    assert(a == [1, 3, 4, 5]);
+    replace(a, 1u, 2u, null);
+    assert(a == [1, 4, 5]);
-}
-
-/**
-Implements an output range that appends data to an array. This is
-recommended over $(D a ~= data) because it is more efficient.
-
-Example:
-----
-string arr;
-auto app = appender(&arr);