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

Improve type computation - a type that defines max could mess things up

Browse source
This commit is contained in:
Andrei Alexandrescu 2020-09-13 12:08:24 -04:00
parent 423f633fd7
commit 43c95c46d8
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
std/algorithm/comparison.d
View file

@ -1569,10 +1569,13 @@ if (T.length >= 2 && !is(CommonType!T == void))
" and " ~ T1.stringof ~ " for ordering."); " and " ~ T1.stringof ~ " for ordering.");
// Compute the returned type. // Compute the returned type.
static if (!is(typeof(T0.min))) static if (is(typeof(mostNegative!T0 < mostNegative!T1)))
alias Result = CommonType!(T0, T1); // Both are numeric (or character or Boolean), so we choose the one with the highest maximum.
else // (We use mostNegative for num/bool/char testing purposes even if it's not used otherwise.)
alias Result = Select!(T1.max > T0.max, T1, T0); alias Result = Select!(T1.max > T0.max, T1, T0);
else
// At least one is non-numeric, so just go with the common type.
alias Result = CommonType!(T0, T1);
// Perform the computation. // Perform the computation.
import std.functional : lessThan; import std.functional : lessThan;
@ -1663,13 +1666,12 @@ if (T.length >= 2 && !is(CommonType!T == void))
" and " ~ T1.stringof ~ " for ordering."); " and " ~ T1.stringof ~ " for ordering.");
// Compute the returned type. // Compute the returned type.
static if (!is(typeof(T0.min))) static if (is(typeof(mostNegative!T0 < mostNegative!T1)))
alias Result = CommonType!(T0, T1); // Both are numeric (or character or Boolean), so we choose the one with the lowest minimum.
else
static if (is(typeof(mostNegative!T0)) && is(typeof(mostNegative!T1)))
alias Result = Select!(mostNegative!T1 < mostNegative!T0, T1, T0); alias Result = Select!(mostNegative!T1 < mostNegative!T0, T1, T0);
else else
alias Result = Select!(T1.max < T0.max, T1, T0); // At least one is non-numeric, so just go with the common type.
alias Result = CommonType!(T0, T1);
// Engage! // Engage!
import std.functional : lessThan; import std.functional : lessThan;