mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-05-05 09:30:49 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix unittests in std.range.

Browse source
This commit is contained in:
David Simcha 2010-06-23 13:07:31 +00:00
parent 6f1dc2378d
commit d6cefbcf7e
1 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
std/range.d
View file

@ -1487,6 +1487,7 @@ Repeat!(T) repeat(T)(T value) { return Repeat!(T)(value); }
unittest unittest
{ {
enforce(equal(take(repeat(5), 4), [ 5, 5, 5, 5 ][])); enforce(equal(take(repeat(5), 4), [ 5, 5, 5, 5 ][]));
static assert(isForwardRange!(Repeat!(uint)));
} }
/** /**
@ -1549,7 +1550,7 @@ struct Cycle(R) if (isForwardRange!(R) && !isInfinite!(R))
R _original, _current; R _original, _current;
this(R input) { _original = input; _current = input.save; } this(R input) { _original = input; _current = input.save; }
/// Range primitive implementations. /// Range primitive implementations.
ref ElementType!(R) front() { return _current.front; } auto ref front() { return _current.front; }
/// Ditto /// Ditto
static if (isBidirectionalRange!(R)) static if (isBidirectionalRange!(R))
ref ElementType!(R) back() { return _current.back; } ref ElementType!(R) back() { return _current.back; }
@ -1563,7 +1564,10 @@ struct Cycle(R) if (isForwardRange!(R) && !isInfinite!(R))
} }
@property Cycle!(R) save() { @property Cycle!(R) save() {
return Cycle!(R)(this._original.save, this._current.save); Cycle!(R) ret;
ret._original = this._original.save;
ret._current = this._current.save;
return ret;
} }
} }
@ -1633,11 +1637,23 @@ Cycle!(R) cycle(R)(ref R input, size_t index = 0) if (isStaticArray!R)
unittest unittest
{ {
assert(equal(take(cycle([1, 2][]), 5), [ 1, 2, 1, 2, 1 ][])); assert(equal(take(cycle([1, 2][]), 5), [ 1, 2, 1, 2, 1 ][]));
static assert(isForwardRange!(Cycle!(uint[])));
struct DummyRange {
uint num;
ref uint front() { return num; }
void popFront() { num++; }
@property bool empty() { return num >= 10; }
typeof(this) save() { return this; }
}
static assert(isForwardRange!(Cycle!(DummyRange)));
int[3] a = [ 1, 2, 3 ]; int[3] a = [ 1, 2, 3 ];
static assert(isStaticArray!(typeof(a))); static assert(isStaticArray!(typeof(a)));
auto c = cycle(a); auto c = cycle(a);
assert(a.ptr == c._ptr); assert(a.ptr == c._ptr);
assert(equal(take(cycle(a), 5), [ 1, 2, 3, 1, 2 ][])); assert(equal(take(cycle(a), 5), [ 1, 2, 3, 1, 2 ][]));
static assert(isForwardRange!(typeof(c)));
} }
unittest // For infinite ranges unittest // For infinite ranges