Changeset 1703

Timestamp:

07/01/10 02:39:50 (14 years ago)

Author:

dsimcha

Message:

@property and infiniteness propagation in std.algorithm.

Files:

• trunk/phobos/std/algorithm.d (modified) (13 diffs)

trunk/phobos/std/algorithm.d

@@ -570 +570 @@
-        }
-
-    }
-
-    ref Filter opSlice()
-    {
-        return this;
-    }
-
-    static if(isInfinite!Range) {
-
+  // Propagate infiniteness.
-    } else {
-        bool empty() { return _input.empty; }
-    }
-
-    void popFront()
-    {
-        do
-        {
-            _input.popFront;
-        } while (!_input.empty && !pred(_input.front));
@@ -867 +867 @@
-
-public:
-    this(Range input, Separator separator)
-    {
-        _input = input;
-        _separator = separator;
-        // computeFront();
-        // computeBack();
-    }
-
-
-
-
+
+
+
+
+
+
+
+
+
-    }
-
-    @property Range front()
-    {
-        assert(!empty);
-        if (_frontLength == _unComputed)
-        {
-            _frontLength = _input.indexOf(_separator);
-            if (_frontLength == -1) _frontLength = _input.length;
-        }
@@ -989 +995 @@
-        }
-    }
-
-public:
-    this(Range input, Separator separator)
-    {
-        _input = input;
-        _separator = separator;
-    }
-
-
+@property 
-    {
-        assert(!empty);
-        ensureFrontLength;
-        return _input[0 .. _frontLength];
-    }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-
-    void popFront()
-    {
-        assert(!empty);
-        ensureFrontLength;
-        if (_frontLength == _input.length)
-        {
-            // done, there's no separator in sight
-            _input = _input[_frontLength .. _frontLength];
@@ -1034 +1047 @@
-        // Normal case, pop one item and the separator, get ready for
-        // reading the next item
-        _input = _input[_frontLength + separatorLength .. _input.length];
-        // mark _frontLength as uninitialized
-        _frontLength = _frontLength.max;
-    }
-
-// Bidirectional functionality as suggested by Brad Roberts.
-    static if (isBidirectionalRange!Range)
-    {
-
+@property 
-        {
-            ensureBackLength;
-            return _input[_input.length - _backLength .. _input.length];
-        }
-
-        void popBack()
-        {
-            ensureBackLength;
-            if (_backLength == _input.length)
-            {
@@ -1136 +1149 @@
-        else
-        {
-            // Chase first terminator
-            while (_end < _input.length && !_isTerminator(_input[_end]))
-            {
-                ++_end;
-            }
-        }
-    }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-
-    @property Range front()
-    {
-        assert(!empty);
-        return _input[0 .. _end];
-    }
-
-    void popFront()
-    {
@@ -1250 +1270 @@
-    void popFront()
-    {
-        auto last = _input.front;
-        do
-        {
-            _input.popFront;
-        }
-        while (!_input.empty && binaryFun!(pred)(last, _input.front));
-    }
-
-
+
+
+
+
-        void popBack()
-        {
-            auto last = _input.back;
-            do
-            {
-                _input.popBack;
-            }
-            while (!_input.empty && binaryFun!(pred)(last, _input.back));
-        }
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-    static if(isForwardRange!R) {
-        @property typeof(this) save() {
-            return typeof(this)(_input.save);
-        }
-    }
-}
-
-/// Ditto
-Uniq!(pred, Range) uniq(alias pred = "a == b", Range)(Range r)
@@ -1348 +1378 @@
-            _current = tuple(_input.front, 1u);
-            _input.popFront;
-            while (!_input.empty && comp(_current.field[0], _input.front))
-            {
-                ++_current.field[1];
-                _input.popFront;
-            }
-        }
-    }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-
-    @property ref Tuple!(ElementType!R, uint) front()
-    {
-        assert(!empty);
-        return _current;
-    }
-
-    static if(isForwardRange!R) {
-        @property typeof(this) save() {
@@ -2031 +2068 @@
-            _done = _input.empty || openRight && predSatisfied();
-        }
-    else
-        this(Range input, OpenRight openRight = OpenRight.yes)
-        {
-            _input = input;
-            _openRight = openRight;
-            _done = _input.empty || openRight && predSatisfied();
-        }
-
-
+@property 
-    {
-        return _done;
-    }
-
-
+@property 
-    {
-        assert(!empty);
-        return _input.front;
-    }
-
-    bool predSatisfied()
-    {
-        static if (is(Sentinel == void))
-            return unaryFun!pred(_input.front);
-        else
@@ -5467 +5504 @@
-
-public:
-    alias CommonType!(staticMap!(.ElementType, Rs)) ElementType;
-
-    this(Rs rs)
-    {
-        this._r = rs;
-        adjustPosition();
-    }
-
-
+@property 
-    {
-        return _crt == _crt.max;
-    }
-
-    void popFront()
-    {
-        // Assumes _crt is correct
-        assert(!empty);
-        foreach (i, U; Rs)
-        {
-            if (i < _crt) continue;
-            // found _crt
-            assert(!_r[i].empty);
-            _r[i].popFront;
-            adjustPosition();
-            return;
-        }
-        assert(false);
-    }
-
-
+@property 
-    {
-        assert(!empty);
-        // Assume _crt is correct
-        foreach (i, U; Rs)
-        {
-            if (i < _crt) continue;
-            assert(!_r[i].empty);
-            return _r[i].front;
-        }
-        assert(false);
@@ -5586 +5623 @@
-    }
-
-public:
-    this(Rs input)
-    {
-        this._input = input;
-        // position to the first element
-        adjustPosition;
-    }
-
-
+@property 
-    {
-        foreach (i, U; Rs)
-        {
-            if (_input[i].empty) return true;
-        }
-        return false;
-    }
-
-    void popFront()
-    {
-        assert(!empty);
-        assert(!comp(_input[0].front, _input[1].front)
-                && !comp(_input[1].front, _input[0].front));
-        _input[0].popFront;
-        _input[1].popFront;
-        adjustPosition;
-    }
-
-
+@property 
-    {
-        assert(!empty);
-        return _input[0].front;
-    }
-}
-
-/// Ditto
-SetIntersection!(less, Rs) setIntersection(alias less = "a < b", Rs...)
-(Rs ranges)
-if (allSatisfy!(isInputRange, Rs))
@@ -5690 +5727 @@
-        // position to the first element
-        adjustPosition;
-    }
-
-    void popFront()
-    {
-        r1.popFront;
-        adjustPosition;
-    }
-
-
+@property 
-    {
-        assert(!empty);
-        return r1.front;
-    }
-
-    bool empty() { return r1.empty; }
-}
-
-/// Ditto
-SetDifference!(less, R1, R2) setDifference(alias less = "a < b", R1, R2)
@@ -5781 +5818 @@
-            }
-            else
-            {
-                assert(comp(r2.front, r1.front));
-                r2.popFront;
-            }
-        }
-        adjustPosition;
-    }
-
-
+@property 
-    {
-        assert(!empty);
-        if (r2.empty || !r1.empty && comp(r1.front, r2.front))
-        {
-            return r1.front;
-        }
-        assert(r1.empty || comp(r2.front, r1.front));
-        return r2.front;
-    }
-
-    ref auto opSlice() { return this; }
-
-
+@property 
-}
-
-/// Ditto
-SetSymmetricDifference!(less, R1, R2)
-setSymmetricDifference(alias less = "a < b", R1, R2)
-(R1 r1, R2 r2)
-{
-    return typeof(return)(r1, r2);
-}
-
@@ -5931 +5968 @@
-
-    this(RangeOfRanges ror)
-    {
-        // Preemptively get rid of all empty ranges in the input
-        // No need for stability either
-        _ror = remove!("a.empty", SwapStrategy.unstable)(ror);
-        //Build the heap across the range
-        _heap.acquire(_ror);
-    }
-
-
-
-
+@property 
+
+@property 
-    {
-        return _heap.front.front;
-    }
-
-    void popFront()
-    {
-        _heap.removeFront();
-        // let's look at the guy just popped
-        _ror.back.popFront;
-        if (_ror.back.empty)