Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions changelog/std-algorithm-searching-find.dd
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
`std.algorithm.searching.find` returns a named tuple

For variadic overloads $(REF find, std,algorithm,searching) will
return a named tuple tuple instead of an anonymous tuple:

---
import std.algorithm.searching : find;
auto t = find(a, 2, 4);
assert(t.haystack == [4, 2, 3]);
assert(t.needle == 2);
---
33 changes: 22 additions & 11 deletions std/algorithm/searching.d
Original file line number Diff line number Diff line change
Expand Up @@ -2295,9 +2295,9 @@ forward range with elements comparable with elements in

Returns:

A tuple containing `haystack` positioned to match one of the
needles and also the 1-based index of the matching element in $(D
needles) (0 if none of `needles` matched, 1 if `needles[0]`
A `Tuple!("haystack", "needle")` containing `haystack` positioned to match one of the
needles and also `needle`, the 1-based index of the matching element in
`needles` (0 if none of `needles` matched, 1 if `needles[0]`
matched, 2 if `needles[1]` matched...). The first needle to be found
will be the one that matches. If multiple needles are found at the
same spot in the range, then the shortest one is the one which matches
Expand All @@ -2306,11 +2306,11 @@ same spot in the range, then the shortest one is the one which matches
matches).

The relationship between `haystack` and `needles` simply means
that one can e.g. search for individual `int`s or arrays of $(D
int)s in an array of `int`s. In addition, if elements are
that one can e.g. search for individual `int`s or arrays of
`int`s in an array of `int`s. In addition, if elements are
individually comparable, searches of heterogeneous types are allowed
as well: a `double[]` can be searched for an `int` or a $(D
short[]), and conversely a `long` can be searched for a `float`
as well: a `double[]` can be searched for an `int` or a
`short[]`, and conversely a `long` can be searched for a `float`
or a `double[]`. This makes for efficient searches without the need
to coerce one side of the comparison into the other's side type.

Expand All @@ -2320,7 +2320,7 @@ is considered to be 1.) The strategy used in searching several
subranges at once maximizes cache usage by moving in `haystack` as
few times as possible.
*/
Tuple!(Range, size_t) find(alias pred = "a == b", Range, Ranges...)
auto find(alias pred = "a == b", Range, Ranges...)
(Range haystack, Ranges needles)
if (Ranges.length > 1 && is(typeof(startsWith!pred(haystack, needles))))
{
Expand All @@ -2329,7 +2329,7 @@ if (Ranges.length > 1 && is(typeof(startsWith!pred(haystack, needles))))
size_t r = startsWith!pred(haystack, needles);
if (r || haystack.empty)
{
return tuple(haystack, r);
return tuple!("haystack", "needle")(haystack, r);
}
}
}
Expand All @@ -2338,16 +2338,27 @@ if (Ranges.length > 1 && is(typeof(startsWith!pred(haystack, needles))))
@safe unittest
{
import std.typecons : tuple;

int[] a = [ 1, 4, 2, 3 ];
// Non-variadic find (returns just the haystack)
assert(find(a, 4) == [ 4, 2, 3 ]);
assert(find(a, [ 1, 4 ]) == [ 1, 4, 2, 3 ]);
assert(find(a, [ 1, 3 ], 4) == tuple([ 4, 2, 3 ], 2));

// Variadic find (returns haystack + range)
auto t = find(a, 2, 4);
assert(t.haystack == [4, 2, 3]);
assert(t.needle == 2);

// Mixed types allowed if comparable
assert(find(a, [ 1, 3 ], 4) == tuple([ 4, 2, 3 ], 2));
assert(find(a, 5, [ 1.2, 3.5 ], 2.0) == tuple([ 2, 3 ], 3));
}

///
@safe unittest
{
import std.typecons : tuple;

auto s1 = "Mary has a little lamb";
assert(find(s1, "has a", "has an") == tuple("has a little lamb", 1));
assert(find(s1, 't', "has a", "has an") == tuple("has a little lamb", 2));
Expand Down Expand Up @@ -2521,7 +2532,7 @@ template canFind(alias pred="a == b")
allSatisfy!(isForwardRange, Ranges) &&
is(typeof(find!pred(haystack, needles))))
{
return find!pred(haystack, needles)[1];
return find!pred(haystack, needles).needle;
}
}

Expand Down