Changeset 2098

Timestamp:

10/13/10 00:18:02 (14 years ago)

Author:

dsimcha

Message:

Bug 5035: Schrödinger's Stride

Files:

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

trunk/phobos/std/range.d

@@ -1073 +1073 @@
-/**
-Initializes the stride.
- */
-    this(R input, size_t n)
-    {
-        _input = input;
-        _n = n;
-        static if (hasLength!(R))
-        {
-            auto slack = _input.length % _n;
-
+
+
+
+
+
+
+
+
+
+
+
+
-            if (!slack) return;
-            static if (isRandomAccessRange!(R) && hasSlicing!(R))
-            {
-                _input = _input[0 .. _input.length - slack];
-            }
-            else static if(isBidirectionalRange!(R))
-            {
-                foreach (i; 0 .. slack)
-                {
-                    if (_input.empty) break;
@@ -1165 +1176 @@
-        }
-        else
-            foreach (i; 0 .. _n)
-            {
-                _input.popFront;
-                if (_input.empty) break;
-            }
-    }
-
-/**
-Front
+Back
- */
-    static if (isBidirectionalRange!(R) && hasLength!(R))
-        void popBack()
-        {
-_n
+1
-            static if (isRandomAccessRange!(R) && hasSlicing!(R))
-            {
-
+
+
+
+
+
-            }
-            else
-            {
-                foreach (i; 0 .. _n)
-                {
-                    if (_input.empty) break;
-                    _input.popBack;
-                }
-            }
-        }
@@ -1307 +1322 @@
-    assert(equal(s1[1..5], [2, 3, 4, 5]));
-    assert(s1[1..5].length == 4);
-    assert(s1[0..0].empty);
-
-    auto s2 = stride(arr, 2);
-    assert(equal(s2[0..2], [1,3]));
-    assert(s2[0..2].length == 2);
-    assert(equal(s2[1..5], [3, 5, 7, 9]));
-    assert(s2[1..5].length == 4);
-    assert(s2[0..0].empty);
+
+    // Test fix for Bug 5035
+    auto m = [1, 2, 3, 4, 1, 2, 3, 4, 1, 2, 3, 4]; // 3 rows, 4 columns
+    auto col = stride(m, 4);
+    assert(equal(col, [1, 1, 1]));
+    assert(equal(retro(col), [1, 1, 1]));
+
-
-    static assert(is(Stride!(immutable int[])));
-
-    // Check for infiniteness propagation.
-    static assert(isInfinite!(typeof(stride(repeat(1), 3))));
-
-    foreach(DummyType; AllDummyRanges) {
-        DummyType dummyRange;
-        dummyRange.reinit();
-