Changeset 1690

Timestamp:

06/23/10 15:50:01 (14 years ago)

Author:

andrei

Message:

Fixed bugzilla 3839

Files:

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

trunk/phobos/std/range.d

@@ -2169 +2169 @@
-            this.pastLast = pastLast - 1;
-            this.pastLast -= (this.pastLast - current) % step;
-        }
-        else
-        {
-            this.pastLast = pastLast + 1;
-            this.pastLast += (this.pastLast - current) % step;
-        }
-        this.pastLast += step;
-    }
-
-
+
+
+
+
+
-    alias front moveFront;
+    /// Ditto
-    void popFront()
-    {
-        current += step;
-    }
-
+
+
+
-    alias back moveBack;
+    /// Ditto
-    void popBack()
-    {
-        pastLast -= step;
-    }
-
+
+
+
-    N opIndex(size_t n)
-    {
-        return current + step * n;
-    }
-
+
+
+
-    {
-        return (pastLast - current) / step;
-    }
-}
-
-// Iota for floating-point numbers
-/// Ditto
-struct Iota(N, S) if (isFloatingPoint!N && isNumeric!S) {
-    private N start;
-    private S step;
-    private size_t index, count;
-    this(N start, N end, S step)
-    {
-        this.start = start;
-        this.step = step;
-
-
+
-        immutable fcount = (end - start) / step;
-        enforce(fcount >= 0, "iota: incorrect startup parameters");
-        count = to!size_t(fcount);
-        auto pastEnd = start + count * step;
-        if (step > 0)
-        {
-            if (pastEnd < end) ++count;
-, text(count)
+
-        }
-        else
-        {
-            if (pastEnd > end) ++count;
-            assert(start + count * step <= end);
-        }
-    }
-
-
+
+
+
+
+
-    alias front moveFront;
+    /// Ditto
-    void popFront()
-    {
-        enforce(!empty);
-        ++index;
-    }
-
+
+
-    {
-        enforce(!empty);
-        return start + step * (count - 1);
-    }
+    /// Ditto
-    alias back moveBack;
+    /// Ditto
-    void popBack()
-    {
-        enforce(!empty);
-        --count;
-    }
-
+
+
+
-    N opIndex(size_t n)
-    {
-        enforce(n < count);
-        return start + step * n;
-    }
-
+
+
-    {
-        return count;
-    }
-}
-
-unittest
-{
-    auto r = iota(0, 10, 1);
-    assert(equal(r, [0, 1, 2, 3, 4, 5, 6, 7, 8, 9][]));
-    auto rr = iota(10);
@@ -2282 +2302 @@
-    //foreach (e; rf) writeln(e);
-    assert(approxEqual(rf, [0.0, 0.1, 0.2, 0.3, 0.4, 0.5][]));
-
-    // going down
-    rf = iota(0.0, -0.5, -0.1);
-    //foreach (e; rf) writeln(e);
-    assert(approxEqual(rf, [0.0, -0.1, -0.2, -0.3, -0.4][]));
-    rf = iota(0.0, nextDown(-0.5), -0.1);
-    //foreach (e; rf) writeln(e);
-    assert(approxEqual(rf, [0.0, -0.1, -0.2, -0.3, -0.4, -0.5][]));
+
+    // iota of longs
+    auto rl = iota(5_000_000L);
+    assert(rl.length == 5_000_000L);
-}
-
-unittest
-{
-    auto idx = new size_t[100];
-    copy(iota(0, idx.length), idx);
-}
-
-/**
-Options for the $(D FrontTransversal) and $(D Transversal) ranges