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

Fix for issue# 8158.

Browse source
This commit is contained in:
jmdavis 2012-05-29 03:28:17 -07:00
parent 73b56a12bb
commit adb31e7048
1 changed files with 51 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

69
std/algorithm.d
View file

@ -5032,14 +5032,19 @@ template MinType(T...)
{ {
static if (!is(typeof(T[0].min))) static if (!is(typeof(T[0].min)))
alias CommonType!(T[0 .. 2]) MinType; alias CommonType!(T[0 .. 2]) MinType;
else static if (mostNegative!(T[1]) < mostNegative!(T[0]))
alias T[1] MinType;
else static if (mostNegative!(T[1]) > mostNegative!(T[0]))
alias T[0] MinType;
else static if (T[1].max < T[0].max)
alias T[1] MinType;
else else
alias T[0] MinType; {
enum hasMostNegative = is(typeof(mostNegative!(T[0]))) &&
is(typeof(mostNegative!(T[1])));
static if (hasMostNegative && mostNegative!(T[1]) < mostNegative!(T[0]))
alias T[1] MinType;
else static if (hasMostNegative && mostNegative!(T[1]) > mostNegative!(T[0]))
alias T[0] MinType;
else static if (T[1].max < T[0].max)
alias T[1] MinType;
else
alias T[0] MinType;
}
} }
else else
{ {
@ -5053,17 +5058,20 @@ Returns the minimum of the passed-in values. The type of the result is
computed by using $(XREF traits, CommonType). computed by using $(XREF traits, CommonType).
*/ */
MinType!(T1, T2, T) min(T1, T2, T...)(T1 a, T2 b, T xs) MinType!(T1, T2, T) min(T1, T2, T...)(T1 a, T2 b, T xs)
if(is(typeof(a < b)))
{ {
static if (T.length == 0) static if (T.length == 0)
{ {
static if (isIntegral!(T1) && isIntegral!(T2) static if (isIntegral!T1 && isIntegral!T2 &&
&& (mostNegative!(T1) < 0) != (mostNegative!(T2) < 0)) (mostNegative!T1 < 0) != (mostNegative!T2 < 0))
static if (mostNegative!(T1) < 0) {
static if (mostNegative!T1 < 0)
immutable chooseB = b < a && a > 0; immutable chooseB = b < a && a > 0;
else else
immutable chooseB = b < a || b < 0; immutable chooseB = b < a || b < 0;
}
else else
immutable chooseB = b < a; immutable chooseB = b < a;
return cast(typeof(return)) (chooseB ? b : a); return cast(typeof(return)) (chooseB ? b : a);
} }
else else
@ -5080,16 +5088,27 @@ unittest
short b = 6; short b = 6;
double c = 2; double c = 2;
auto d = min(a, b); auto d = min(a, b);
assert(is(typeof(d) == int)); static assert(is(typeof(d) == int));
assert(d == 5); assert(d == 5);
auto e = min(a, b, c); auto e = min(a, b, c);
assert(is(typeof(e) == double)); static assert(is(typeof(e) == double));
assert(e == 2); assert(e == 2);
// mixed signedness test // mixed signedness test
a = -10; a = -10;
uint f = 10; uint f = 10;
static assert(is(typeof(min(a, f)) == int)); static assert(is(typeof(min(a, f)) == int));
assert(min(a, f) == -10); assert(min(a, f) == -10);
//Test user-defined types
import std.datetime;
assert(min(Date(2012, 12, 21), Date(1982, 1, 4)) == Date(1982, 1, 4));
assert(min(Date(1982, 1, 4), Date(2012, 12, 21)) == Date(1982, 1, 4));
assert(min(Date(1982, 1, 4), Date.min) == Date.min);
assert(min(Date.min, Date(1982, 1, 4)) == Date.min);
assert(min(Date(1982, 1, 4), Date.max) == Date(1982, 1, 4));
assert(min(Date.max, Date(1982, 1, 4)) == Date(1982, 1, 4));
assert(min(Date.min, Date.max) == Date.min);
assert(min(Date.max, Date.min) == Date.min);
} }
// MaxType // MaxType
@ -5130,15 +5149,18 @@ assert(e == 2);
---- ----
*/ */
MaxType!(T1, T2, T) max(T1, T2, T...)(T1 a, T2 b, T xs) MaxType!(T1, T2, T) max(T1, T2, T...)(T1 a, T2 b, T xs)
if(is(typeof(a < b)))
{ {
static if (T.length == 0) static if (T.length == 0)
{ {
static if (isIntegral!(T1) && isIntegral!(T2) static if (isIntegral!T1 && isIntegral!T2 &&
&& (mostNegative!(T1) < 0) != (mostNegative!(T2) < 0)) (mostNegative!T1 < 0) != (mostNegative!T2 < 0))
static if (mostNegative!(T1) < 0) {
static if (mostNegative!T1 < 0)
immutable chooseB = b > a || a < 0; immutable chooseB = b > a || a < 0;
else else
immutable chooseB = b > a && b > 0; immutable chooseB = b > a && b > 0;
}
else else
immutable chooseB = b > a; immutable chooseB = b > a;
return cast(typeof(return)) (chooseB ? b : a); return cast(typeof(return)) (chooseB ? b : a);
@ -5157,16 +5179,27 @@ unittest
short b = 6; short b = 6;
double c = 2; double c = 2;
auto d = max(a, b); auto d = max(a, b);
assert(is(typeof(d) == int)); static assert(is(typeof(d) == int));
assert(d == 6); assert(d == 6);
auto e = max(a, b, c); auto e = max(a, b, c);
assert(is(typeof(e) == double)); static assert(is(typeof(e) == double));
assert(e == 6); assert(e == 6);
// mixed sign // mixed sign
a = -5; a = -5;
uint f = 5; uint f = 5;
static assert(is(typeof(max(a, f)) == uint)); static assert(is(typeof(max(a, f)) == uint));
assert(max(a, f) == 5); assert(max(a, f) == 5);
//Test user-defined types
import std.datetime;
assert(max(Date(2012, 12, 21), Date(1982, 1, 4)) == Date(2012, 12, 21));
assert(max(Date(1982, 1, 4), Date(2012, 12, 21)) == Date(2012, 12, 21));
assert(max(Date(1982, 1, 4), Date.min) == Date(1982, 1, 4));
assert(max(Date.min, Date(1982, 1, 4)) == Date(1982, 1, 4));
assert(max(Date(1982, 1, 4), Date.max) == Date.max);
assert(max(Date.max, Date(1982, 1, 4)) == Date.max);
assert(max(Date.min, Date.max) == Date.max);
assert(max(Date.max, Date.min) == Date.max);
} }
/** /**