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

Improved error messages

Browse source
This commit is contained in:
Andrei Alexandrescu 2013-12-26 16:47:58 -08:00
parent 8366c67d9e
commit 6df2098064
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
std/range.d
View file

@ -8604,9 +8604,9 @@ with elements strictly greater than $(D value)). The search schedule
and its complexity are documented in $(LREF SearchPolicy). and its complexity are documented in $(LREF SearchPolicy).
For ranges that do not offer random access, $(D SearchPolicy.linear) For ranges that do not offer random access, $(D SearchPolicy.linear)
is the only policy allowed (and the default). For random-access is the only policy allowed (and it must be specified explicitly lest it exposes
searches, all policies are allowed, and $(D SearchPolicy.binarySearch) user code to unexpected inefficiencies). For random-access searches, all
is the default. policies are allowed, and $(D SearchPolicy.binarySearch) is the default.
See_Also: STL's $(WEB sgi.com/tech/stl/lower_bound.html,upper_bound). See_Also: STL's $(WEB sgi.com/tech/stl/lower_bound.html,upper_bound).
@ -8617,15 +8617,12 @@ auto p = a.upperBound(3);
assert(equal(p, [4, 4, 5, 6])); assert(equal(p, [4, 4, 5, 6]));
---- ----
*/ */
auto upperBound(SearchPolicy sp = isRandomAccessRange!Range auto upperBound(SearchPolicy sp = SearchPolicy.binarySearch, V)(V value)
? SearchPolicy.binarySearch if (isTwoWayCompatible!(predFun, ElementType!Range, V))
: SearchPolicy.linear,
V)(V value)
if (sp == SearchPolicy.linear
||
isTwoWayCompatible!(predFun, ElementType!Range, V)
&& isRandomAccessRange!Range && sp != SearchPolicy.linear)
{ {
static assert(isRandomAccessRange!Range || sp == SearchPolicy.linear,
"Specify SearchPolicy.linear explicitly for "
~ typeof(this).stringof);
static if (sp == SearchPolicy.linear) static if (sp == SearchPolicy.linear)
{ {
for (; !_input.empty && !predFun(value, _input.front); for (; !_input.empty && !predFun(value, _input.front);
@ -8901,14 +8898,14 @@ unittest
unittest unittest
{ {
import std.file, std.path; import std.file, std.path;
auto name = join(tempDir(), "test.std.range." ~ text(__LINE__)); auto name = buildPath(tempDir(), "test.std.range." ~ text(__LINE__));
auto f = File(name, "w"); auto f = File(name, "w");
// write a sorted range of lines to the file // write a sorted range of lines to the file
f.write("abc\ndef\nghi\njkl"); f.write("abc\ndef\nghi\njkl");
f.close(); f.close();
f.open(name); f.open(name);
auto r = assumeSorted(f.byLine()); auto r = assumeSorted(f.byLine());
auto r1 = r.upperBound("def"); auto r1 = r.upperBound!(SearchPolicy.linear)("def");
assert(r1.front == "ghi"); assert(r1.front == "ghi");
} }