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

Fixed some issues

Browse source
This commit is contained in:
RazvanN7 2016-11-21 13:59:40 +02:00
parent 71ffa25d8a
commit 60396a1d67
1 changed files with 21 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

50
std/algorithm/searching.d
View file

@ -1365,13 +1365,13 @@ if (isInputRange!InputRange &&
// Works only for the default find predicate and any SortedRange predicate. // Works only for the default find predicate and any SortedRange predicate.
// 8829 enhancement // 8829 enhancement
import std.range: SortedRange; import std.range: SortedRange;
static if(is(typeof(haystack) : SortedRange!TT, TT) && isDefaultPred) static if (is(InputRange : SortedRange!TT, TT) && isDefaultPred)
{ {
auto partitions = haystack.trisect(needle); auto lb = haystack.lowerBound(needle);
if(partitions[1].length == 0) if (lb.length == 0 || lb.length == haystack.length || haystack[lb.length] != needle)
return partitions[1]; return haystack[$ .. $];
return haystack[partitions[0].length .. $]; return haystack[lb.length .. $];
} }
else static if (isNarrowString!R) else static if (isNarrowString!R)
{ {
@ -1821,43 +1821,35 @@ if (isRandomAccessRange!R1 && hasLength!R1 && hasSlicing!R1 && isBidirectionalRa
// When it is found O(walklength(needle)) steps are performed. // When it is found O(walklength(needle)) steps are performed.
// 8829 enhancement // 8829 enhancement
import std.range; import std.range;
static if(is(typeof(haystack) == typeof(needle)) import std.algorithm.comparison: mismatch;
&& is(typeof(haystack) : SortedRange!TT, TT) static if (is(R1 == R2)
&& is(R1 : SortedRange!TT, TT)
&& pred == "a == b") && pred == "a == b")
{ {
auto needleFirstElem = needle[0]; auto needleFirstElem = needle[0];
auto partitions = haystack.trisect(needleFirstElem); auto partitions = haystack.trisect(needleFirstElem);
auto firstElemLen = partitions[1].length; auto firstElemLen = partitions[1].length;
int count = 0; size_t count = 0;
if(firstElemLen == 0) if (firstElemLen == 0)
return haystack[$ .. $]; return haystack[$ .. $];
while(!needle.empty()) while (needle.front() == needleFirstElem)
{ {
auto elem = needle.front(); auto elem = needle.front();
needle.popFront(); needle.popFront();
if(elem == needleFirstElem) ++count;
{
++count; if (count > firstElemLen)
if(count > firstElemLen) return haystack[$ .. $];
return haystack[$ .. $];
}
else
{
if(needle.length >= partitions[2].length)
return haystack[$ .. $];
else if( elem == partitions[2].front())
{
partitions[2].popFront();
continue;
}
else
return haystack[$ .. $];
}
} }
if(needle.empty())
auto m = mismatch(partitions[2], needle);
if (m[1] == haystack[$ .. $])
return haystack[partitions[0].length + partitions[1].length - count .. $]; return haystack[partitions[0].length + partitions[1].length - count .. $];
if (m[1] != haystack[$ .. $])
return haystack[$ .. $];
} }
static if (isRandomAccessRange!R2) static if (isRandomAccessRange!R2)
{ {