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

No need for isEmptyRange

Browse source
This commit is contained in:
Andrei Alexandrescu 2020-09-15 13:34:59 -04:00
parent 890cd7e8b7
commit 369ed6edb6
1 changed files with 2 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
std/algorithm/comparison.d
View file

@ -891,9 +891,6 @@ Compares two ranges for equality, as defined by predicate `pred`
*/ */
template equal(alias pred = "a == b") template equal(alias pred = "a == b")
{ {
enum isEmptyRange(R) =
isInputRange!R && __traits(compiles, {static assert(R.empty, "");});
enum hasFixedLength(T) = hasLength!T || isNarrowString!T; enum hasFixedLength(T) = hasLength!T || isNarrowString!T;
// use code points when comparing two ranges of UTF code units that aren't // use code points when comparing two ranges of UTF code units that aren't
@ -931,11 +928,7 @@ template equal(alias pred = "a == b")
static if (!useCodePoint!(Range1, Range2)) static if (!useCodePoint!(Range1, Range2))
{ {
// No pred calls necessary. // No pred calls necessary.
static if (isEmptyRange!Range1 || isEmptyRange!Range2) static if (isInfinite!Range1 || isInfinite!Range2)
{
return r1.empty && r2.empty;
}
else static if (isInfinite!Range1 || isInfinite!Range2)
{ {
// No finite range can be ever equal to an infinite range. // No finite range can be ever equal to an infinite range.
return false; return false;
@ -983,8 +976,7 @@ template equal(alias pred = "a == b")
//Generic case, we have to walk both ranges making sure neither is empty //Generic case, we have to walk both ranges making sure neither is empty
for (; !r1.empty; r1.popFront(), r2.popFront()) for (; !r1.empty; r1.popFront(), r2.popFront())
{ {
if (r2.empty) return false; if (r2.empty || !binaryFun!(pred)(r1.front, r2.front)) return false;
if (!binaryFun!(pred)(r1.front, r2.front)) return false;
} }
return r2.empty; return r2.empty;
} }