Changeset 1741

Timestamp:

07/09/10 04:18:41 (14 years ago)

Author:

andrei

Message:

Changed definition of isOutputRange and also added the free function put that effects outputting stuff to such a range.

Files:

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

trunk/phobos/std/range.d

@@ -218 +218 @@
-        void popFront();
-        bool empty();
-        int front();
-    }
-    static assert(isInputRange!(B));
-    static assert(isInputRange!(int[]));
-    static assert(isInputRange!(char[]));
-}
-
-/**
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-E e;
-r.put(e);        // can write an element to the range
-----
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- */
-template isOutputRange(R, E)
-{
-    enum bool isOutputRange = is(typeof(
-    {
-        R r;            // can define a range object
-        E e;
-        r.put(e);       // can write element to range
+    }())) || isInputRange!R && is(typeof(
+    {
+        R r;               // can define a range object
+        E e;
+        r.front = e;       // can assign to the front of range
-    }()));
+}
+
+/**
+Outputs $(D e) to $(D r), which must be an output range. Depending on
+the range's kind, it either evaluates $(D r.put(e)) or $(D (r.front =
+e, r.popFront())).
+ */
+void put(R, E)(ref R r, E e) if (isOutputRange!(R, E))
+{
+    static if (is(typeof(&r.put)))
+    {
+        r.put(e);
+    }
+    else
+    {
+        r.front = e;
+        r.popFront();
+    }
-}
-
-unittest
-{
-    struct A {}
-    static assert(!isInputRange!(A));
-    struct B
-    {
-        void put(int);
-    }