Skip to content

Unify function overloads in std.range #5608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dlang-bot merged 3 commits into from
Jul 17, 2017
Merged

Unify function overloads in std.range #5608

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a1a73c
Unify function overloads in std.range: chooseAmong
wilzbach Jul 12, 2017
5373f12
Unify function overloads in std.range: take
wilzbach Jul 12, 2017
f52fd35
Unify function overloads in std.range: refRange
wilzbach Jul 12, 2017
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
67 changes: 28 additions & 39 deletions std/range/package.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1574,18 +1574,14 @@ Returns:
alias of that range's type.
*/
auto chooseAmong(Ranges...)(size_t index, Ranges rs)
if (Ranges.length > 2
&& is(typeof(choose(true, rs[0], rs[1])))
&& is(typeof(chooseAmong(0, rs[1 .. $]))))
if (Ranges.length >= 2
&& allSatisfy!(isInputRange, staticMap!(Unqual, Ranges))
&& !is(CommonType!(staticMap!(ElementType, Ranges)) == void))
{
return choose(index == 0, rs[0], chooseAmong(index - 1, rs[1 .. $]));
}

/// ditto
auto chooseAmong(Ranges...)(size_t index, Ranges rs)
if (Ranges.length == 2 && is(typeof(choose(true, rs[0], rs[1]))))
{
return choose(index == 0, rs[0], rs[1]);
static if (Ranges.length == 2)
return choose(index == 0, rs[0], rs[1]);
else
return choose(index == 0, rs[0], chooseAmong(index - 1, rs[1 .. $]));
}

///
Expand Down Expand Up @@ -1923,11 +1919,23 @@ Returns:
and `length`, `take` offers them as well.
*/
Take!R take(R)(R input, size_t n)
if (isInputRange!(Unqual!R) && !isInfinite!(Unqual!R) && hasSlicing!(Unqual!R) &&
!is(R T == Take!T))
if (isInputRange!(Unqual!R))
{
import std.algorithm.comparison : min;
return input[0 .. min(n, input.length)];
alias U = Unqual!R;
static if (is(R T == Take!T))
{
import std.algorithm.comparison : min;
return R(input.source, min(n, input._maxAvailable));
}
else static if (!isInfinite!U && hasSlicing!U)
{
import std.algorithm.comparison : min;
return input[0 .. min(n, input.length)];
}
else
{
return Take!R(input, n);
}
}

/// ditto
Expand Down Expand Up @@ -2158,21 +2166,6 @@ pure @safe nothrow unittest
assert(equal(t, [ 1, 2, 3 ]));
}

/// ditto
Take!R take(R)(R input, size_t n)
if (is(R T == Take!T))
{
import std.algorithm.comparison : min;
return R(input.source, min(n, input._maxAvailable));
}

/// ditto
Take!(R) take(R)(R input, size_t n)
if (isInputRange!(Unqual!R) && (isInfinite!(Unqual!R) || !hasSlicing!(Unqual!R) && !is(R T == Take!T)))
{
return Take!R(input, n);
}

pure @safe nothrow unittest
{
import std.algorithm.comparison : equal;
Expand Down Expand Up @@ -10714,16 +10707,12 @@ private:

/// ditto
auto refRange(R)(R* range)
if (isInputRange!R && !is(R == class))
{
return RefRange!R(range);
}

/// ditto
auto refRange(R)(R* range)
if (isInputRange!R && is(R == class))
if (isInputRange!R)
{
return *range;
static if (!is(R == class))
return RefRange!R(range);
else
return *range;
}

/*****************************************************************************/
Expand Down