Changeset 1349

Timestamp:

11/29/09 20:10:18 (9 months ago)

Author:

andrei

Message:

Optimization in replace: if the searched string is not found, return the original string

Files:

• trunk/phobos/std/string.d (modified) (2 diffs)

trunk/phobos/std/string.d

@@ -1841 +1841 @@
-    r[width - s.length .. width] = s;
-    return assumeUnique(r);
-}
-
-/********************************************
- * Replace occurrences of from[] with to[] in s[].
- */
-
-string replace(string s, string from, string to)
-{
+    if (from.length == 0) return s;
+
-    char[] p;
-
-
-
-
-
-
-
-
-
-
+
+
+
-        if (i == -1)
-        {
+            if (istart == 0)
+            {
+                // Never found, so just return s
+                return s;
+            }
-            p ~= s[istart .. s.length];
-            break;
-        }
-        p ~= s[istart .. istart + i];
-        p ~= to;
-        istart += i + from.length;
-    }
-    return assumeUnique(p);
-}
-
@@ -1881 +1881 @@
-    string r;
-    int i;
-
-    r = replace(s, from, to);
-    i = cmp(r, "This is a silly silly list");
-    assert(i == 0);
-
-    r = replace(s, "", to);
-    i = cmp(r, "This is a foo foo list");
-    assert(i == 0);
+
+    assert(replace(r, "won't find this", "whatever") is r);
-}
-
-/*****************************
- * Return a _string that is s[] with slice[] replaced by replacement[].
- */
-
-string replaceSlice(string s, in string slice, in string replacement)
-in
-{
-    // Verify that slice[] really is a slice of s[]