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 1

bugzilla 5257, including suggestion to default predicate to true

Browse source
This commit is contained in:
Andrei Alexandrescu 2010-11-25 22:50:55 +00:00
parent 84477a5d3e
commit 4a189f8915
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
std/algorithm.d
View file

@ -3344,6 +3344,15 @@ unittest
int[] a = [ 1, 2, 4, 3, 2, 5, 3, 2, 4 ]; int[] a = [ 1, 2, 4, 3, 2, 5, 3, 2, 4 ];
assert(count(a, 2) == 3, text(count(a, 2))); assert(count(a, 2) == 3, text(count(a, 2)));
assert(count!("a > b")(a, 2) == 5, text(count!("a > b")(a, 2))); assert(count!("a > b")(a, 2) == 5, text(count!("a > b")(a, 2)));
// check strings
assert(count("日本語") == 3);
assert(count("日本語"w) == 3);
assert(count("日本語"d) == 3);
assert(count!("a == '日'")("日本語") == 1);
assert(count!("a == '本'")("日本語"w) == 1);
assert(count!("a == '語'")("日本語"d) == 1);
} }
/** /**
@ -3356,12 +3365,12 @@ int[] a = [ 1, 2, 4, 3, 2, 5, 3, 2, 4 ];
assert(count!("a > 1")(a) == 8); assert(count!("a > 1")(a) == 8);
---- ----
*/ */
size_t count(alias pred, Range)(Range r) if (isInputRange!(Range)) size_t count(alias pred = "true", Range)(Range r) if (isInputRange!(Range))
{ {
size_t result; size_t result;
foreach (e; r) for (; !r.empty; r.popFront())
{ {
if (unaryFun!(pred)(e)) ++result; if (unaryFun!pred(r.front)) ++result;
} }
return result; return result;
} }
@ -5467,7 +5476,7 @@ void schwartzSort(alias transform, alias less = "a < b",
alias typeof(z.front()) ProxyType; alias typeof(z.front()) ProxyType;
bool myLess(ProxyType a, ProxyType b) bool myLess(ProxyType a, ProxyType b)
{ {
return binaryFun!(less)(a[0], b[0]); return binaryFun!less(a[0], b[0]);
} }
sort!(myLess, ss)(z); sort!(myLess, ss)(z);
} }