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

Fix early stopping PR

Browse source
This commit is contained in:
Sebastian Wilzbach 2018-08-14 15:49:02 +02:00
parent 8ef426d772
commit e1d37201f7
1 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

16
std/algorithm/iteration.d
View file

@ -948,8 +948,7 @@ public:
Flag!"each")) Flag!"each"))
cast(void) binaryFun!BinaryArgs(i, r.front); cast(void) binaryFun!BinaryArgs(i, r.front);
else else
if (binaryFun!BinaryArgs(i, r.front) == No.each) if (binaryFun!BinaryArgs(i, r.front) == No.each) return No.each;
return No.each;
r.popFront(); r.popFront();
i++; i++;
} }
@ -959,8 +958,12 @@ public:
{ {
// range interface with >2 parameters. // range interface with >2 parameters.
for (auto range = r; !range.empty; range.popFront()) for (auto range = r; !range.empty; range.popFront())
if (pred(range.front.expand) {
return No.each; static if (!is(typeof(fun(r.front.expand)) == Flag!"each"))
cast(void) fun(range.front.expand);
else
if (fun(range.front.expand)) return No.each;
}
} }
return Yes.each; return Yes.each;
} }
@ -1006,8 +1009,7 @@ public:
// opApply with >2 parameters. count the delegate args. // opApply with >2 parameters. count the delegate args.
// only works if it is not templated (otherwise we cannot count the args) // only works if it is not templated (otherwise we cannot count the args)
auto result = Yes.each; auto result = Yes.each;
auto dg(Parameters!(Parameters!(r.opApply)) params) { auto dg(Parameters!(Parameters!(r.opApply)) params)
pred(params);
{ {
static if (!is(typeof(binaryFun!BinaryArgs(i, e)) == Flag!"each")) static if (!is(typeof(binaryFun!BinaryArgs(i, e)) == Flag!"each"))
{ {
@ -1023,7 +1025,7 @@ public:
r.opApply(&dg); r.opApply(&dg);
return result; return result;
} }
return Yes.each;
} }
} }