Skip to content

Added Asserts and Messages to Asserts in std.algorithm.iteration #4602

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
merged 1 commit into from
Jul 15, 2016
Merged

Added Asserts and Messages to Asserts in std.algorithm.iteration #4602

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
51 changes: 33 additions & 18 deletions std/algorithm/iteration.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ private struct _Cache(R, bool bidir)
auto opSlice(size_t low, size_t high)
in
{
assert(low <= high);
assert(low <= high, "Bounds error when slicing cache.");
}
body
{
Expand Down Expand Up @@ -552,11 +552,13 @@ private struct MapResult(alias fun, Range)
{
@property auto ref back()()
{
assert(!empty, "Attempting to fetch the back of an empty map.");
return fun(_input.back);
}

void popBack()()
{
assert(!empty, "Attempting to popBack an empty map.");
_input.popBack();
}
}
Expand All @@ -581,11 +583,13 @@ private struct MapResult(alias fun, Range)

void popFront()
{
assert(!empty, "Attempting to popFront an empty map.");
_input.popFront();
}

@property auto ref front()
{
assert(!empty, "Attempting to fetch the front of an empty map.");
return fun(_input.front);
}

Expand Down Expand Up @@ -1120,7 +1124,7 @@ private struct FilterResult(alias pred, Range)

@property auto ref front()
{
assert(!empty);
assert(!empty, "Attempting to fetch the front of an empty filter.");
return _input.front;
}

Expand Down Expand Up @@ -1303,7 +1307,7 @@ private struct FilterBidiResult(alias pred, Range)

@property auto ref front()
{
assert(!empty);
assert(!empty, "Attempting to fetch the front of an empty filterBidirectional.");
return _input.front;
}

Expand All @@ -1317,7 +1321,7 @@ private struct FilterBidiResult(alias pred, Range)

@property auto ref back()
{
assert(!empty);
assert(!empty, "Attempting to fetch the back of an empty filterBidirectional.");
return _input.back;
}

Expand Down Expand Up @@ -1422,7 +1426,7 @@ struct Group(alias pred, R) if (isInputRange!R)
///
@property auto ref front()
{
assert(!empty);
assert(!empty, "Attempting to fetch the front of an empty Group.");
return _current;
}

Expand Down Expand Up @@ -2157,13 +2161,13 @@ if (isInputRange!RoR && isInputRange!(ElementType!RoR)
@property ElementType!(ElementType!RoR) front()
{
if (!_currentSep.empty) return _currentSep.front;
assert(!_current.empty);
assert(!_current.empty, "Attempting to fetch the front of an empty joiner.");
return _current.front;
}

void popFront()
{
assert(!_items.empty);
assert(!_items.empty, "Attempting to popFront an empty joiner.");
// Using separator?
if (!_currentSep.empty)
{
Expand Down Expand Up @@ -2385,12 +2389,12 @@ if (isInputRange!RoR && isInputRange!(ElementType!RoR))
}
@property auto ref front()
{
assert(!empty);
assert(!empty, "Attempting to fetch the front of an empty joiner.");
return _current.front;
}
void popFront()
{
assert(!_current.empty);
assert(!_current.empty, "Attempting to popFront an empty joiner.");
_current.popFront();
if (_current.empty)
{
Expand Down Expand Up @@ -3204,7 +3208,7 @@ if (fun.length >= 1)

@property auto front()
{
assert(!empty);
assert(!empty, "Attempting to fetch the front of an empty cumulativeFold.");
static if (fun.length > 1)
{
import std.typecons : tuple;
Expand All @@ -3218,6 +3222,7 @@ if (fun.length >= 1)

void popFront()
{
assert(!empty, "Attempting to popFront an empty cumulativeFold.");
source.popFront;

if (source.empty)
Expand Down Expand Up @@ -3570,7 +3575,7 @@ if (is(typeof(binaryFun!pred(r.front, s)) : bool)

@property Range front()
{
assert(!empty);
assert(!empty, "Attempting to fetch the front of an empty splitter.");
if (_frontLength == _unComputed)
{
auto r = _input.find!pred(_separator);
Expand All @@ -3581,7 +3586,7 @@ if (is(typeof(binaryFun!pred(r.front, s)) : bool)

void popFront()
{
assert(!empty);
assert(!empty, "Attempting to popFront an empty splitter.");
if (_frontLength == _unComputed)
{
front;
Expand Down Expand Up @@ -3616,7 +3621,7 @@ if (is(typeof(binaryFun!pred(r.front, s)) : bool)
{
@property Range back()
{
assert(!empty);
assert(!empty, "Attempting to fetch the back of an empty splitter.");
if (_backLength == _unComputed)
{
immutable lastIndex = lastIndexOf(_input, _separator);
Expand All @@ -3634,7 +3639,7 @@ if (is(typeof(binaryFun!pred(r.front, s)) : bool)

void popBack()
{
assert(!empty);
assert(!empty, "Attempting to popBack an empty splitter.");
if (_backLength == _unComputed)
{
// evaluate back to make sure it's computed
Expand Down Expand Up @@ -3842,7 +3847,7 @@ if (is(typeof(binaryFun!pred(r.front, s.front)) : bool)

@property Range front()
{
assert(!empty);
assert(!empty, "Attempting to fetch the front of an empty splitter.");
ensureFrontLength();
return _input[0 .. _frontLength];
}
Expand All @@ -3861,7 +3866,7 @@ if (is(typeof(binaryFun!pred(r.front, s.front)) : bool)

void popFront()
{
assert(!empty);
assert(!empty, "Attempting to popFront an empty splitter.");
ensureFrontLength();
if (_frontLength == _input.length)
{
Expand Down Expand Up @@ -4829,6 +4834,7 @@ private struct UniqResult(alias pred, Range)

void popFront()
{
assert(!empty, "Attempting to popFront an empty uniq.");
auto last = _input.front;
do
{
Expand All @@ -4837,12 +4843,17 @@ private struct UniqResult(alias pred, Range)
while (!_input.empty && pred(last, _input.front));
}

@property ElementType!Range front() { return _input.front; }
@property ElementType!Range front()
{
assert(!empty, "Attempting to fetch the front of an empty uniq.");
return _input.front;
}

static if (isBidirectionalRange!Range)
{
void popBack()
{
assert(!empty, "Attempting to popBack an empty uniq.");
auto last = _input.back;
do
{
Expand All @@ -4851,7 +4862,11 @@ private struct UniqResult(alias pred, Range)
while (!_input.empty && pred(last, _input.back));
}

@property ElementType!Range back() { return _input.back; }
@property ElementType!Range back()
{
assert(!empty, "Attempting to fetch the back of an empty uniq.");
return _input.back;
}
}

static if (isInfinite!Range)
Expand Down