Changeset 2728

Timestamp:

10/27/07 22:30:47 (1 year ago)

Author:

kris

Message:

added functions stripl, stripr, and head

Files:

• trunk/tango/text/Util.d (modified) (6 diffs)

trunk/tango/text/Util.d

@@ -57 +57 @@
-        trim (source)                               // trim whitespace
-        strip (source, match)                       // trim elements
+        stripl (source, match)                      // trim left elements
+        stripr (source, match)                      // trim right elements
-        delimit (src, set)                          // split on delims
-        split (source, pattern)                     // split on pattern
-        splitLines (source);                        // split on lines
+        head (source, pattern, tail)                // split to head & tail
-        join (source, postfix, output)              // join text segments
-        repeat (source, count, output)              // repeat source 
@@ -85 +88 @@
-module tango.text.Util;
-
-///  use split() instead
-deprecated T[][] demarcate (T) (T[] src, T[] pattern)
-{return split!(T) (src, pattern);}
-
-deprecated T[][] delineate (T) (T[] src)
-{return splitLines!(T) (src);}
-
-
-/******************************************************************************
-
@@ -128 +123 @@
-        while (head < tail && *head is match)
-               ++head;
+
+        while (tail > head && *(tail-1) is match)
+               --tail;
+
+        return head [0 .. tail - head];
+}
+
+/******************************************************************************
+
+        Trim the given array by stripping the provided match from
+        the left hand side. Returns a slice of the original content
+
+******************************************************************************/
+
+T[] stripl(T) (T[] source, T match)
+{
+        T*   head = source.ptr,
+             tail = head + source.length;
+
+        while (head < tail && *head is match)
+               ++head;
+
+        return head [0 .. tail - head];
+}
+
+/******************************************************************************
+
+        Trim the given array by stripping the provided match from
+        the right hand side. Returns a slice of the original content
+
+******************************************************************************/
+
+T[] stripr(T) (T[] source, T match)
+{
+        T*   head = source.ptr,
+             tail = head + source.length;
-
-        while (tail > head && *(tail-1) is match)
@@ -335 +366 @@
-                 result ~= segment;
-        return result;
+}
+
+/******************************************************************************
+
+        Split the provided array on the first pattern instance, and 
+        return the resultant head and tail. The pattern is excluded 
+        from each of the segments. 
+
+        Where a segment is not found, tail will be null and the return
+        value will be the original array.
+        
+******************************************************************************/
+
+T[] head(T) (T[] src, T[] pattern, out T[] tail)
+{
+        T[][] result;
+
+        foreach (segment; patterns (src, pattern))
+                {
+                if (segment.length < src.length)
+                    tail = src [segment.length+pattern.length .. $];
+                return segment;
+                }
+        return src;
-}
-
@@ -1154 +1209 @@
-        assert (strip ("%abc%%%", '%') == "abc");
-        assert (strip ("#####", '#') == "");
+        assert (stripl ("#####", '#') == "");
+        assert (stripl (" ###", ' ') == "###");
+        assert (stripl ("#####", 's') == "#####");
+        assert (stripr ("#####", '#') == "");
+        assert (stripr ("### ", ' ') == "###");
+        assert (stripr ("#####", 's') == "#####");
-
-        assert (replace ("abc".dup, 'b', ':') == "a:c");
@@ -1222 +1283 @@
-        assert (x.length is 1 && x[0] == "one, two, three");
-
+        char[] h, t;
+        h =  head ("one:two:three", ":", t);
+        assert (h == "one" && t == "two:three");
+        h = head ("one:::two:three", ":::", t);
+        assert (h == "one" && t == "two:three");
+        h = head ("one:two:three", "*", t);
+        assert (h == "one:two:three" && t is null);
+
-        char[][] foo = ["one", "two", "three"];
-        auto j = join (foo);