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

Bug 4888: Heavy reliance on Bug 3534 in Phobos range usage. I used a different approach here than the first one I tried. I only did what was necessary to make Phobos work instead of trying to fix the deeper issue of making std.algorithm to work w/ const/immutable arrays.

Browse source
This commit is contained in:
David Simcha 2010-09-18 21:00:52 +00:00
parent fe6cbe460b
commit b597d23f83
8 changed files with 105 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

56
std/algorithm.d
View file

@ -111,14 +111,15 @@ template map(fun...)
}
}
struct Map(alias fun, Range) if (isInputRange!(Range))
struct Map(alias fun, Range) if (isInputRange!(Unqual!Range))
{
alias Unqual!Range R;
alias fun _fun;
alias typeof({ return _fun(.ElementType!(Range).init); }()) ElementType;
Unqual!Range _input;
alias typeof({ return _fun(.ElementType!(R).init); }()) ElementType;
R _input;
Unqual!ElementType _cache;
static if (isBidirectionalRange!(Range))
static if (isBidirectionalRange!(R))
{
// Using a second cache would lead to at least 1 extra function evaluation
// and wasted space when 99% of the time this range will only be iterated
@ -152,29 +153,29 @@ struct Map(alias fun, Range) if (isInputRange!(Range))
{
if (!_input.empty) _cache = _fun(_input.front);
static if(isBidirectionalRange!(Range))
static if(isBidirectionalRange!(R))
{
cacheIsBack_ = false;
}
}
this(Range input)
this(R input)
{
_input = input;
fillCache;
}
static if (isInfinite!Range)
static if (isInfinite!R)
{
// Propagate infinite-ness.
enum bool empty = false;
}
// Propagate infinite-ness.
enum bool empty = false;
}
else
{
@property bool empty()
@property bool empty()
{
return _input.empty;
}
return _input.empty;
}
}
void popFront()
@ -185,7 +186,7 @@ struct Map(alias fun, Range) if (isInputRange!(Range))
@property ElementType front()
{
static if (isBidirectionalRange!(Range))
static if (isBidirectionalRange!(R))
{
if (cacheIsBack_)
{
@ -195,7 +196,7 @@ struct Map(alias fun, Range) if (isInputRange!(Range))
return _cache;
}
static if (isRandomAccessRange!Range)
static if (isRandomAccessRange!R)
{
ElementType opIndex(size_t index)
{
@ -213,7 +214,7 @@ struct Map(alias fun, Range) if (isInputRange!(Range))
}
}
static if (hasSlicing!(Range))
static if (hasSlicing!(R))
{
typeof(this) opSlice(size_t lowerBound, size_t upperBound)
{
@ -221,13 +222,13 @@ struct Map(alias fun, Range) if (isInputRange!(Range))
}
}
static if (isForwardRange!Range)
@property Map save()
{
auto result = this;
result._input = result._input.save;
return result;
}
static if (isForwardRange!R)
@property Map save()
{
auto result = this;
result._input = result._input.save;
return result;
}
}
unittest
@ -850,11 +851,12 @@ filter(alias pred, Range)(Range rs)
return typeof(return)(rs);
}
struct Filter(alias pred, Range) if (isInputRange!(Range))
struct Filter(alias pred, Range) if (isInputRange!(Unqual!Range))
{
Unqual!Range _input;
alias Unqual!Range R;
R _input;
this(Range r)
this(R r)
{
_input = r;
while (!_input.empty && !pred(_input.front)) _input.popFront;
@ -879,7 +881,7 @@ struct Filter(alias pred, Range) if (isInputRange!(Range))
return _input.front;
}
static if(isForwardRange!Range)
static if(isForwardRange!R)
{
@property typeof(this) save()
{