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

Issue 8166 - retro() of splitter() too

Browse source
This commit is contained in:
Sebastian Wilzbach 2018-02-09 21:12:23 +01:00
parent 3292ed32eb
commit c7b6aabfea
1 changed files with 0 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

31
std/algorithm/iteration.d
View file

@ -4016,8 +4016,6 @@ if (is(typeof(binaryFun!pred(r.front, s.front)) : bool)
Separator _separator; Separator _separator;
// _frontLength == size_t.max means empty // _frontLength == size_t.max means empty
size_t _frontLength = size_t.max; size_t _frontLength = size_t.max;
static if (isBidirectionalRange!Range)
size_t _backLength = size_t.max;
@property auto separatorLength() { return _separator.length; } @property auto separatorLength() { return _separator.length; }
@ -4028,22 +4026,6 @@ if (is(typeof(binaryFun!pred(r.front, s.front)) : bool)
// compute front length // compute front length
_frontLength = (_separator.empty) ? 1 : _frontLength = (_separator.empty) ? 1 :
_input.length - find!pred(_input, _separator).length; _input.length - find!pred(_input, _separator).length;
static if (isBidirectionalRange!Range)
if (_frontLength == _input.length) _backLength = _frontLength;
}
void ensureBackLength()
{
static if (isBidirectionalRange!Range)
if (_backLength != _backLength.max) return;
assert(!_input.empty);
// compute back length
static if (isBidirectionalRange!Range && isBidirectionalRange!Separator)
{
import std.range : retro;
_backLength = _input.length -
find!pred(retro(_input), retro(_separator)).source.length;
}
} }
public: public:
@ -4081,8 +4063,6 @@ if (is(typeof(binaryFun!pred(r.front, s.front)) : bool)
// done, there's no separator in sight // done, there's no separator in sight
_input = _input[_frontLength .. _frontLength]; _input = _input[_frontLength .. _frontLength];
_frontLength = _frontLength.max; _frontLength = _frontLength.max;
static if (isBidirectionalRange!Range)
_backLength = _backLength.max;
return; return;
} }
if (_frontLength + separatorLength == _input.length) if (_frontLength + separatorLength == _input.length)
@ -4091,8 +4071,6 @@ if (is(typeof(binaryFun!pred(r.front, s.front)) : bool)
// an empty item right after this. // an empty item right after this.
_input = _input[_input.length .. _input.length]; _input = _input[_input.length .. _input.length];
_frontLength = 0; _frontLength = 0;
static if (isBidirectionalRange!Range)
_backLength = 0;
return; return;
} }
// Normal case, pop one item and the separator, get ready for // Normal case, pop one item and the separator, get ready for
@ -4170,15 +4148,6 @@ if (is(typeof(binaryFun!pred(r.front, s.front)) : bool)
assert(e == w[i++]); assert(e == w[i++]);
} }
assert(i == w.length); assert(i == w.length);
// // Now go back
// auto s2 = splitter(a, 0);
// foreach (e; retro(s2))
// {
// assert(i > 0);
// assert(equal(e, w[--i]), text(e));
// }
// assert(i == 0);
wstring names = ",peter,paul,jerry,"; wstring names = ",peter,paul,jerry,";
auto words = split(names, ","); auto words = split(names, ",");