Changeset 1695

Timestamp:

06/29/10 02:58:31 (14 years ago)

Author:

dsimcha

Message:

More unittest improvements for std.range. Most of them are commented out b/c they don't work yet, but fixing them sanely is blocked by DMD bug 3294.

Files:

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

trunk/phobos/std/range.d

@@ -2142 +2142 @@
-    int[] a = [ 1, 2, 3 ];
-    float[] b = [ 1., 2, 3 ];
-    foreach (e; zip(a, b))
-    {
-        assert(e.at!(0) == e.at!(1));
-    }
-    auto z = zip(a, b);
-    swap(z.front(), z.back());
-    //@@@BUG@@@
-    //sort!("a.at!(0) < b.at!(0)")(zip(a, b));
+
+// Horribly broken.  See bugs 4402, 3123
+//    foreach(DummyType1; AllDummyRanges) {
+//        DummyType1 d1;
+//        foreach(DummyType2; AllDummyRanges) {
+//            DummyType2 d2;
+//            auto r = zip(d1, d2);
+//
+//            assert(equal(map!"a.at!0"(r), [1,2,3,4,5,6,7,8,9,10]));
+//            assert(equal(map!"a.at!1"(r), [1,2,3,4,5,6,7,8,9,10]));
+//        }
+//    }
-}
-
-/**
-Creates a mathematical sequence given the initial values and a
-recurrence function that computes the popFront value from the existing
-values. The sequence comes in the form of an infinite forward
-range. The type $(D Recurrence) itself is seldom used directly; most
-often, recurrences are obtained by calling the function $(D
-recurrence).
-
@@ -2676 +2688 @@
-
-/// Ditto
-FrontTransversal!(RangeOfRanges, opt) frontTransversal(
-    TransverseOptions opt = TransverseOptions.assumeJagged,
-    RangeOfRanges)
-(RangeOfRanges rr)
-{
-    return typeof(return)(rr);
-}
-
+unittest {
+    foreach(DummyType; AllDummyRanges) {
+        static if(DummyType.r == ReturnBy.Reference) { // Bug 4403
+            auto dummies = [DummyType.init, DummyType.init];
+            auto ft = frontTransversal(dummies);
+            assert(equal(ft, [1, 1]));
+        }
+    }
+}
+
-/**
-Given a range of ranges, iterate transversally through the the $(D
-n)th element of each of the enclosed ranges. All elements of the
-enclosing range must offer random access.
-
-Example:
-----
-int[][] x = new int[][2];
-x[0] = [1, 2];
-x[1] = [3, 4];
@@ -2814 +2836 @@
-unittest
-{
-    int[][] x = new int[][2];
-    x[0] = [ 1, 2 ];
-    x[1] = [3, 4];
-    auto ror = transversal(x, 1);
-    auto witness = [ 2, 4 ];
-    uint i;
-    foreach (e; ror) assert(e == witness[i++]);
-    assert(i == 2);
+
+    // Test w/o ref return.  Doesn't work due to bug 4404.
+//    alias DummyRange!(ReturnBy.Value, Length.Yes, RangeType.Random) D;
+//    auto drs = [D.init, D.init];
+//    foreach(num; 0..10) {
+//        auto t = transversal(drs, num);
+//        assert(equal(t, [num + 1, num + 1]));
+//  }
-}
-
-struct Transposed(RangeOfRanges)
-{
-    alias typeof(map!"a.front"(RangeOfRanges.init)) ElementType;
-
-    this(RangeOfRanges input)
-    {
-        this._input = input;
-    }