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

Make takeExactly(…).length for non-random-access ranges a property.

Browse source
This commit is contained in:
David Nadlinger 2011-08-02 20:40:45 +02:00
parent cd5d266e04
commit 4df94e60b1
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
std/range.d
View file

@ -2352,7 +2352,7 @@ if (isInputRange!R && !isRandomAccessRange!R)
return _input.front(); return _input.front();
} }
void popFront() { _input.popFront(); --_n; } void popFront() { _input.popFront(); --_n; }
size_t length() const { return _n; } @property size_t length() const { return _n; }
static if (isForwardRange!R) static if (isForwardRange!R)
auto save() { return this; } auto save() { return this; }
@ -2371,17 +2371,24 @@ if (isRandomAccessRange!R)
unittest unittest
{ {
auto a = [ 1, 2, 3, 4, 5 ]; auto a = [ 1, 2, 3, 4, 5 ];
auto b = takeExactly(a, 3); auto b = takeExactly(a, 3);
assert(equal(b, [1, 2, 3])); assert(equal(b, [1, 2, 3]));
static assert(is(typeof(b.length) == size_t));
assert(b.length == 3);
assert(b.front == 1);
assert(b.back == 3);
auto c = takeExactly(b, 2); auto c = takeExactly(b, 2);
auto d = filter!"a > 0"(a); auto d = filter!"a > 0"(a);
auto e = takeExactly(d, 3); auto e = takeExactly(d, 3);
assert(equal(e, [1, 2, 3])); assert(equal(e, [1, 2, 3]));
static assert(is(typeof(e.length) == size_t));
assert(e.length == 3);
assert(e.front == 1);
assert(equal(takeExactly(e, 4), [1, 2, 3, 4])); assert(equal(takeExactly(e, 4), [1, 2, 3, 4]));
// assert(b.length == 3);
// assert(b.front == 1);
// assert(b.back == 3);
// b[1]++; // b[1]++;
} }