Changeset 1713

Timestamp:

07/04/10 19:57:04 (14 years ago)

Author:

andrei

Message:

Made Appender a reference type by encoding capacity at the end of the store

Files:

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

trunk/phobos/std/array.d

@@ -642 +642 @@
-int[] a = [ 1, 2 ];
-auto app2 = appender(&a);
-app2.put(3);
-app2.put([ 4, 5, 6 ]);
-assert(app2.data == [ 1, 2, 3, 4, 5, 6 ]);
-----
- */
-
-struct Appender(A : T[], T)
-{
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    this(T[] * p)
-    {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-/**
-Returns the managed array.
- */
-    T[] data()
-    {
-        return cast(typeof(return)) (pArray ? *pArray : null);
-    }
-
-/**
-Returns the capacity of the array (the maximum number of elements the
-managed array can accommodate before triggering a reallocation).
- */
-    size_t capacity() const { return _capacity; }
-
-/**
-Appends one item to the managed array.
- */
-    void put(U)(U item) if (isImplicitlyConvertible!(U, T) ||
-            isSomeChar!T && isSomeChar!U)
-    {
-        static if (isSomeChar!T && isSomeChar!U && T.sizeof < U.sizeof)
-        {
-            // must do some transcoding around here
-            Unqual!T[T.sizeof == 1 ? 4 : 2] encoded;
-            auto len = std.utf.encode(encoded, item);
-            put(encoded[0 .. len]);
-        }
-        else
-        {
-
+
+
+
+
+
-            immutable len = pArray.length;
-_
+
-            {
-// Should do in-place construction here
-pArray.ptr[len] = item
+emplace!(Unqual!T)
+    (cast(void[]) pArray.ptr[len .. len + 1], item)
-                *pArray = pArray.ptr[0 .. len + 1];
-            }
-            else
-            {
+              APPEND:
-                // Time to reallocate, do it and cache capacity
-                *pArray ~= item;
-_capacity = GC.sizeOf(pArray.ptr) / T.sizeof
+allocateCapacity()
-            }
-        }
-    }
-
-/**
-Appends an entire range to the managed array.
- */
-    void put(Range)(Range items) if (isForwardRange!Range
-            && is(typeof(Appender.init.put(items.front))))
-    {
-        static if (is(typeof(*pArray ~= items)))
-        {
-            if (!pArray) pArray = (new typeof(*pArray)[1]).ptr;
-            *pArray ~= items;
+            allocateCapacity();
-        }
-        else
-        {
-            //pragma(msg, Range.stringof);
-            // Generic input range
-            for (; !items.empty; items.popFront)
-            {
-                put(items.front());
-            }
-        }
-    }
-
-/**
-Clears the managed array.
-*/
-    void clear()
-    {
-        if (!pArray) return;
-        pArray.length = 0;
-
-
+
-    }
-}
-
-/**
-Convenience function that returns an $(D Appender!(T)) object
-initialized with $(D t).
- */
-Appender!(E[]) appender(A : E[], E)(A * array = null)
-{
-
+ ? array : (new A[1]).ptr
-}
-
-unittest
-{
-    auto arr = new char[0];
-    auto app = appender(&arr);
-    string b = "abcdefg";
-    foreach (char c; b) app.put(c);
-    assert(app.data == "abcdefg");
-
-    int[] a = [ 1, 2 ];
-    auto app2 = appender(&a);
+    assert(app2.data == [ 1, 2 ]);
-    app2.put(3);
-    app2.put([ 4, 5, 6 ][]);
-    assert(app2.data == [ 1, 2, 3, 4, 5, 6 ]);
-}
-
-/*
-A simple slice type only holding pointers to the beginning and the end
-of an array. Experimental duplication of the built-in slice - do not
-use yet.
- */