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

Merge pull request #49 from kyllingstad/joiner-input-range

Browse source 
std.algorithm.joiner() should only require an input range
This commit is contained in:
Andrei Alexandrescu 2011-05-16 07:12:10 -07:00
commit d1d81245ea
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
std/algorithm.d
View file

@ -2159,7 +2159,7 @@ assert(equal(joiner(["Mary", "has", "a", "little", "lamb"], "..."),
----
*/
auto joiner(RoR, Separator)(RoR r, Separator sep)
if (isForwardRange!RoR && isInputRange!(ElementType!RoR)
if (isInputRange!RoR && isInputRange!(ElementType!RoR)
&& isForwardRange!Separator
&& is(ElementType!Separator : ElementType!(ElementType!RoR)))
{
@ -2289,6 +2289,13 @@ unittest
"Mary...has...a...little...lamb"));
}
unittest
{
// joiner() should work for non-forward ranges too.
InputRange!string r = inputRangeObject(["abc", "def"]);
assert (equal(joiner(r, "xyz"), "abcxyzdef"));
}
auto joiner(RoR)(RoR r)
if (isInputRange!RoR && isInputRange!(ElementType!RoR))
{