Skip to content

Commit 9953bc9

Browse files
9il9il
committed
rename tuple 2 refTuple
1 parent fdf6b93 commit 9953bc9

File tree

3 files changed

+52
-50
lines changed

3 files changed

+52
-50
lines changed

‎source/mir/functional.d‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,13 @@ alias Unref(V : RefTuple!T, T...) = RefTuple!(staticMap!(.Unref, T));
105105
/// ditto
106106
alias Unref(V) = V;
107107

108+
deprecated("Use 'refTuple' name instead.")
109+
alias tuple = refTuple;
108110

109111
/++
110112
Returns: a $(LREF RefTuple) structure.
111113
+/
112-
RefTuple!Args tuple(Args...)(auto ref Args args)
114+
RefTuple!Args refTuple(Args...)(auto ref Args args)
113115
{
114116
return RefTuple!Args(args);
115117
}
@@ -175,7 +177,7 @@ template adjoin(fun...) if (fun.length && fun.length <= 26)
175177
}
176178

177179
import mir.internal.utility;
178-
mixin("return tuple(" ~ [staticMap!(_adjoin, Iota!(fun.length))].joinStrings ~ ");");
180+
mixin("return refTuple(" ~ [staticMap!(_adjoin, Iota!(fun.length))].joinStrings ~ ");");
179181
}
180182
}
181183
else alias adjoin = .adjoin!(staticMap!(naryFun, fun));
@@ -224,8 +226,8 @@ unittest
224226
alias funs = staticMap!(naryFun, "a", "a * 2", "a * 3", "a * a", "-a");
225227
alias afun = adjoin!funs;
226228
int a = 5, b = 5;
227-
assert(afun(a) == tuple(Ref!int(a), 10, 15, 25, -5));
228-
assert(afun(a) == tuple(Ref!int(b), 10, 15, 25, -5));
229+
assert(afun(a) == refTuple(Ref!int(a), 10, 15, 25, -5));
230+
assert(afun(a) == refTuple(Ref!int(b), 10, 15, 25, -5));
229231

230232
static class C{}
231233
alias IC = immutable(C);

‎source/mir/math/sum.d‎

Lines changed: 44 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1590,7 +1590,7 @@ public:
15901590

15911591
unittest
15921592
{
1593-
import mir.functional: RefTuple, tuple;
1593+
import mir.functional: RefTuple, refTuple;
15941594
import mir.ndslice.topology: map, iota, retro;
15951595
import std.array: array;
15961596
import std.math: isInfinity, isFinite, isNaN;
@@ -1599,49 +1599,49 @@ unittest
15991599

16001600
enum double M = (cast(double)2) ^^ (double.max_exp - 1);
16011601
RefTuple!(double[], double)[] tests = [
1602-
tuple(new double[0], 0.0),
1603-
tuple([0.0], 0.0),
1604-
tuple([1e100, 1.0, -1e100, 1e-100, 1e50, -1, -1e50], 1e-100),
1605-
tuple([1e308, 1e308, -1e308], 1e308),
1606-
tuple([-1e308, 1e308, 1e308], 1e308),
1607-
tuple([1e308, -1e308, 1e308], 1e308),
1608-
tuple([M, M, -2.0^^1000], 1.7976930277114552e+308),
1609-
tuple([M, M, M, M, -M, -M, -M], 8.9884656743115795e+307),
1610-
tuple([2.0^^53, -0.5, -2.0^^-54], 2.0^^53-1.0),
1611-
tuple([2.0^^53, 1.0, 2.0^^-100], 2.0^^53+2.0),
1612-
tuple([2.0^^53+10.0, 1.0, 2.0^^-100], 2.0^^53+12.0),
1613-
tuple([2.0^^53-4.0, 0.5, 2.0^^-54], 2.0^^53-3.0),
1614-
tuple([M-2.0^^970, -1, M], 1.7976931348623157e+308),
1615-
tuple([double.max, double.max*2.^^-54], double.max),
1616-
tuple([double.max, double.max*2.^^-53], double.infinity),
1617-
tuple(iota([1000], 1).map!(a => 1.0/a).array , 7.4854708605503451),
1618-
tuple(iota([1000], 1).map!(a => (-1.0)^^a/a).array, -0.69264743055982025), //0.693147180559945309417232121458176568075500134360255254120680...
1619-
tuple(iota([1000], 1).map!(a => 1.0/a).retro.array , 7.4854708605503451),
1620-
tuple(iota([1000], 1).map!(a => (-1.0)^^a/a).retro.array, -0.69264743055982025),
1621-
tuple([double.infinity, -double.infinity, double.nan], double.nan),
1622-
tuple([double.nan, double.infinity, -double.infinity], double.nan),
1623-
tuple([double.infinity, double.nan, double.infinity], double.nan),
1624-
tuple([double.infinity, double.infinity], double.infinity),
1625-
tuple([double.infinity, -double.infinity], double.nan),
1626-
tuple([-double.infinity, 1e308, 1e308, -double.infinity], -double.infinity),
1627-
tuple([M-2.0^^970, 0.0, M], double.infinity),
1628-
tuple([M-2.0^^970, 1.0, M], double.infinity),
1629-
tuple([M, M], double.infinity),
1630-
tuple([M, M, -1], double.infinity),
1631-
tuple([M, M, M, M, -M, -M], double.infinity),
1632-
tuple([M, M, M, M, -M, M], double.infinity),
1633-
tuple([-M, -M, -M, -M], -double.infinity),
1634-
tuple([M, M, -2.^^971], double.max),
1635-
tuple([M, M, -2.^^970], double.infinity),
1636-
tuple([-2.^^970, M, M, -0X0.0000000000001P-0 * 2.^^-1022], double.max),
1637-
tuple([M, M, -2.^^970, 0X0.0000000000001P-0 * 2.^^-1022], double.infinity),
1638-
tuple([-M, 2.^^971, -M], -double.max),
1639-
tuple([-M, -M, 2.^^970], -double.infinity),
1640-
tuple([-M, -M, 2.^^970, 0X0.0000000000001P-0 * 2.^^-1022], -double.max),
1641-
tuple([-0X0.0000000000001P-0 * 2.^^-1022, -M, -M, 2.^^970], -double.infinity),
1642-
tuple([2.^^930, -2.^^980, M, M, M, -M], 1.7976931348622137e+308),
1643-
tuple([M, M, -1e307], 1.6976931348623159e+308),
1644-
tuple([1e16, 1., 1e-16], 10_000_000_000_000_002.0),
1602+
refTuple(new double[0], 0.0),
1603+
refTuple([0.0], 0.0),
1604+
refTuple([1e100, 1.0, -1e100, 1e-100, 1e50, -1, -1e50], 1e-100),
1605+
refTuple([1e308, 1e308, -1e308], 1e308),
1606+
refTuple([-1e308, 1e308, 1e308], 1e308),
1607+
refTuple([1e308, -1e308, 1e308], 1e308),
1608+
refTuple([M, M, -2.0^^1000], 1.7976930277114552e+308),
1609+
refTuple([M, M, M, M, -M, -M, -M], 8.9884656743115795e+307),
1610+
refTuple([2.0^^53, -0.5, -2.0^^-54], 2.0^^53-1.0),
1611+
refTuple([2.0^^53, 1.0, 2.0^^-100], 2.0^^53+2.0),
1612+
refTuple([2.0^^53+10.0, 1.0, 2.0^^-100], 2.0^^53+12.0),
1613+
refTuple([2.0^^53-4.0, 0.5, 2.0^^-54], 2.0^^53-3.0),
1614+
refTuple([M-2.0^^970, -1, M], 1.7976931348623157e+308),
1615+
refTuple([double.max, double.max*2.^^-54], double.max),
1616+
refTuple([double.max, double.max*2.^^-53], double.infinity),
1617+
refTuple(iota([1000], 1).map!(a => 1.0/a).array , 7.4854708605503451),
1618+
refTuple(iota([1000], 1).map!(a => (-1.0)^^a/a).array, -0.69264743055982025), //0.693147180559945309417232121458176568075500134360255254120680...
1619+
refTuple(iota([1000], 1).map!(a => 1.0/a).retro.array , 7.4854708605503451),
1620+
refTuple(iota([1000], 1).map!(a => (-1.0)^^a/a).retro.array, -0.69264743055982025),
1621+
refTuple([double.infinity, -double.infinity, double.nan], double.nan),
1622+
refTuple([double.nan, double.infinity, -double.infinity], double.nan),
1623+
refTuple([double.infinity, double.nan, double.infinity], double.nan),
1624+
refTuple([double.infinity, double.infinity], double.infinity),
1625+
refTuple([double.infinity, -double.infinity], double.nan),
1626+
refTuple([-double.infinity, 1e308, 1e308, -double.infinity], -double.infinity),
1627+
refTuple([M-2.0^^970, 0.0, M], double.infinity),
1628+
refTuple([M-2.0^^970, 1.0, M], double.infinity),
1629+
refTuple([M, M], double.infinity),
1630+
refTuple([M, M, -1], double.infinity),
1631+
refTuple([M, M, M, M, -M, -M], double.infinity),
1632+
refTuple([M, M, M, M, -M, M], double.infinity),
1633+
refTuple([-M, -M, -M, -M], -double.infinity),
1634+
refTuple([M, M, -2.^^971], double.max),
1635+
refTuple([M, M, -2.^^970], double.infinity),
1636+
refTuple([-2.^^970, M, M, -0X0.0000000000001P-0 * 2.^^-1022], double.max),
1637+
refTuple([M, M, -2.^^970, 0X0.0000000000001P-0 * 2.^^-1022], double.infinity),
1638+
refTuple([-M, 2.^^971, -M], -double.max),
1639+
refTuple([-M, -M, 2.^^970], -double.infinity),
1640+
refTuple([-M, -M, 2.^^970, 0X0.0000000000001P-0 * 2.^^-1022], -double.max),
1641+
refTuple([-0X0.0000000000001P-0 * 2.^^-1022, -M, -M, 2.^^970], -double.infinity),
1642+
refTuple([2.^^930, -2.^^980, M, M, M, -M], 1.7976931348622137e+308),
1643+
refTuple([M, M, -1e307], 1.6976931348623159e+308),
1644+
refTuple([1e16, 1., 1e-16], 10_000_000_000_000_002.0),
16451645
];
16461646
foreach (i, test; tests)
16471647
{

‎source/mir/ndslice/ndfield.d‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ struct Cartesian(NdFields...)
103103
///
104104
auto opIndex()(size_t[N] indexes...)
105105
{
106-
import mir.functional : tuple;
107-
return mixin("tuple(" ~ _indexes!(NdFields) ~ ")");
106+
import mir.functional : refTuple;
107+
return mixin("refTuple(" ~ _indexes!(NdFields) ~ ")");
108108
}
109109
}
110110

0 commit comments

Comments
 (0)