mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-05-14 00:46:22 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4167 from 9il/api

Browse source 
clean API for moveAt, fix indexes/lengths to be type of size_t, fix length declarations
This commit is contained in:
Dmitry Olshansky 2016-04-10 17:07:51 +04:00
commit 401158d54a
3 changed files with 37 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

16
std/algorithm/iteration.d
View file

@ -3029,10 +3029,9 @@ if (is(typeof(binaryFun!pred(r.front, s)) : bool)
Range _input;
Separator _separator;
// Do we need hasLength!Range? popFront uses _input.length...
alias IndexType = typeof(unsigned(_input.length));
enum IndexType _unComputed = IndexType.max - 1, _atEnd = IndexType.max;
IndexType _frontLength = _unComputed;
IndexType _backLength = _unComputed;
enum size_t _unComputed = size_t.max - 1, _atEnd = size_t.max;
size_t _frontLength = _unComputed;
size_t _backLength = _unComputed;
static if (isNarrowString!Range)
{
@ -3045,7 +3044,7 @@ if (is(typeof(binaryFun!pred(r.front, s)) : bool)
static if (isBidirectionalRange!Range)
{
static IndexType lastIndexOf(Range haystack, Separator needle)
static size_t lastIndexOf(Range haystack, Separator needle)
{
import std.range : retro;
auto r = haystack.retro().find!pred(needle);
@ -3312,11 +3311,10 @@ if (is(typeof(binaryFun!pred(r.front, s.front)) : bool)
private:
Range _input;
Separator _separator;
alias RIndexType = typeof(unsigned(_input.length));
// _frontLength == size_t.max means empty
RIndexType _frontLength = RIndexType.max;
size_t _frontLength = size_t.max;
static if (isBidirectionalRange!Range)
RIndexType _backLength = RIndexType.max;
size_t _backLength = size_t.max;
@property auto separatorLength() { return _separator.length; }
@ -3367,7 +3365,7 @@ if (is(typeof(binaryFun!pred(r.front, s.front)) : bool)
{
@property bool empty()
{
return _frontLength == RIndexType.max && _input.empty;
return _frontLength == size_t.max && _input.empty;
}
}