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 PR #6115 compatible with BlackEdder/ggplotd

Browse source
This commit is contained in:
Nathan Sashihara 2018-07-09 09:38:45 -04:00
parent e34f420ff1
commit 5e90a60ebd
1 changed files with 23 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

23
std/algorithm/iteration.d
View file

@ -2494,6 +2494,8 @@ if (isInputRange!RoR && isInputRange!(ElementType!RoR))
{ {
_items = items; _items = items;
_current = current; _current = current;
static if (isBidirectional && hasNested!Result)
_currentBack = typeof(_currentBack).init;
} }
public: public:
@ -2501,6 +2503,8 @@ if (isInputRange!RoR && isInputRange!(ElementType!RoR))
{ {
_items = r; _items = r;
static if (isBidirectional && hasNested!Result)
_currentBack = typeof(_currentBack).init;
// field _current must be initialized in constructor, because it is nested struct // field _current must be initialized in constructor, because it is nested struct
mixin(popFrontEmptyElements); mixin(popFrontEmptyElements);
static if (isBidirectional) static if (isBidirectional)
@ -2734,6 +2738,25 @@ if (isInputRange!RoR && isInputRange!(ElementType!RoR))
static assert(isForwardRange!(typeof(joiner([""])))); static assert(isForwardRange!(typeof(joiner([""]))));
} }
@safe unittest
{
// Initial version of PR #6115 caused a compilation failure for
// https://github.com/BlackEdder/ggplotd/blob/d4428c08db5ffdc05dfd29690bf7da9073ea1dc5/source/ggplotd/stat.d#L562-L583
import std.range : zip;
int[] xCoords = [1, 2, 3];
int[] yCoords = [4, 5, 6];
auto coords = zip(xCoords, xCoords[1..$]).map!( (xr) {
return zip(yCoords, yCoords[1..$]).map!( (yr) {
return [
[[xr[0], xr[0], xr[1]],
[yr[0], yr[1], yr[1]]],
[[xr[0], xr[1], xr[1]],
[yr[0], yr[0], yr[1]]]
];
}).joiner;
}).joiner;
}
@system unittest @system unittest
{ {
import std.algorithm.comparison : equal; import std.algorithm.comparison : equal;