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

Corrected constraints for std.algorithm.endsWith

Browse source 
Previously endsWith constraints only required input ranges, but the algorithm uses `back` and `popBack` within, so clearly a bidirectional range is needed.
This commit is contained in:
Peter Alexander 2012-12-15 23:20:20 +00:00
parent b6b223ecdb
commit b7472c4e39
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
std/algorithm.d
View file

@ -4789,7 +4789,7 @@ assert(endsWith("abc", "x", "aaa", 'c', "sab") == 3);
*/ */
uint endsWith(alias pred = "a == b", Range, Ranges...) uint endsWith(alias pred = "a == b", Range, Ranges...)
(Range doesThisEnd, Ranges withOneOfThese) (Range doesThisEnd, Ranges withOneOfThese)
if (isInputRange!Range && Ranges.length > 1 && if (isBidirectionalRange!Range && Ranges.length > 1 &&
is(typeof(.endsWith!pred(doesThisEnd, withOneOfThese[0])) : bool) && is(typeof(.endsWith!pred(doesThisEnd, withOneOfThese[0])) : bool) &&
is(typeof(.endsWith!pred(doesThisEnd, withOneOfThese[1 .. $])) : uint)) is(typeof(.endsWith!pred(doesThisEnd, withOneOfThese[1 .. $])) : uint))
{ {
@ -4857,8 +4857,8 @@ if (isInputRange!Range && Ranges.length > 1 &&
/// Ditto /// Ditto
bool endsWith(alias pred = "a == b", R1, R2) bool endsWith(alias pred = "a == b", R1, R2)
(R1 doesThisEnd, R2 withThis) (R1 doesThisEnd, R2 withThis)
if (isInputRange!R1 && if (isBidirectionalRange!R1 &&
isInputRange!R2 && isBidirectionalRange!R2 &&
is(typeof(binaryFun!pred(doesThisEnd.back, withThis.back)) : bool)) is(typeof(binaryFun!pred(doesThisEnd.back, withThis.back)) : bool))
{ {
alias doesThisEnd haystack; alias doesThisEnd haystack;
@ -4911,7 +4911,7 @@ if (isInputRange!R1 &&
/// Ditto /// Ditto
bool endsWith(alias pred = "a == b", R, E) bool endsWith(alias pred = "a == b", R, E)
(R doesThisEnd, E withThis) (R doesThisEnd, E withThis)
if (isInputRange!R && if (isBidirectionalRange!R &&
is(typeof(binaryFun!pred(doesThisEnd.back, withThis)) : bool)) is(typeof(binaryFun!pred(doesThisEnd.back, withThis)) : bool))
{ {
return doesThisEnd.empty return doesThisEnd.empty
@ -4938,6 +4938,7 @@ unittest
@property bool empty() {return _range.empty;} @property bool empty() {return _range.empty;}
void popFront() {_range.popFront();} void popFront() {_range.popFront();}
void popBack() {_range.popBack();} void popBack() {_range.popBack();}
@property auto save() {return this;}
R _range; R _range;
} }