Skip to content

Fix Issue 17525 - std.algorithm.searching.skipOver should have a single argument with pred version #5543

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 1 commit into from
Jul 7, 2017
Merged

Fix Issue 17525 - std.algorithm.searching.skipOver should have a single argument with pred version #5543

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 29 additions & 4 deletions std/algorithm/searching.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3894,7 +3894,8 @@ if (isInputRange!Range && !isInfinite!Range &&

/**
Skip over the initial portion of the first given range that matches the second
range, or do nothing if there is no match.
range, or if no second range is given skip over the elements that fullfil pred.
Do nothing if there is no match.

Params:
pred = The predicate that determines whether elements from each respective
Expand All @@ -3905,9 +3906,9 @@ Params:
representing the initial segment of $(D r1) to skip over.

Returns:
true if the initial segment of $(D r1) matches $(D r2), and $(D r1) has been
advanced to the point past this segment; otherwise false, and $(D r1) is left
in its original position.
true if the initial segment of $(D r1) matches $(D r2) or $(D pred) evaluates to true,
and $(D r1) has been advanced to the point past this segment; otherwise false, and
$(D r1) is left in its original position.
*/
bool skipOver(R1, R2)(ref R1 r1, R2 r2)
if (isForwardRange!R1 && isInputRange!R2
Expand Down Expand Up @@ -3953,6 +3954,20 @@ if (is(typeof(binaryFun!pred(r1.front, r2.front))) &&
return r2.empty;
}

/// Ditto
bool skipOver(alias pred, R)(ref R r1)
if (isForwardRange!R &&
ifTestable!(typeof(r1.front), unaryFun!pred))
{
if (r1.empty || !unaryFun!pred(r1.front))
return false;

do
r1.popFront();
while (!r1.empty && unaryFun!pred(r1.front));
return true;
}

///
@safe unittest
{
Expand All @@ -3969,6 +3984,16 @@ if (is(typeof(binaryFun!pred(r1.front, r2.front))) &&
assert(r1 == ["abc", "def", "hij"]);
assert(skipOver!((a, b) => a.equal(b))(r1, r2));
assert(r1 == ["def", "hij"]);

import std.ascii : isWhite;
import std.range.primitives : empty;

auto s2 = "\t\tvalue";
auto s3 = "";
auto s4 = "\t\t\t";
assert(s2.skipOver!isWhite && s2 == "value");
assert(!s3.skipOver!isWhite);
assert(s4.skipOver!isWhite && s3.empty);
Copy link
Contributor

@wilzbach wilzbach Jul 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to import empty from std.range.primitives here (public tests need to be runnable standalone)

}

/**
Expand Down