OSS
/
tanya
1
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Rename meta.metafunction.Tuple into Pack 

typecons.Tuples and meta.metafunction.Tuples are often used together,
from the same module. So it is reasonable give them different names.
This commit is contained in:
Eugen Wissner 2018-07-24 20:16:21 +02:00
parent f2eb99bab0
commit d62f29abd1
2 changed files with 40 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
source/tanya/meta/metafunction.d
View File

@ -116,7 +116,7 @@ if (Args.length > 0 && __traits(isTemplate, pred))
} }
/** /**
* Zips one or more $(D_PSYMBOL Tuple)s with $(D_PARAM f). * Zips one or more $(D_PSYMBOL Pack)s with $(D_PARAM f).
* *
* Given $(D_PARAM f) and tuples t1, t2, ..., tk, where tk[i] denotes the * Given $(D_PARAM f) and tuples t1, t2, ..., tk, where tk[i] denotes the
* $(I i)-th element of the tuple $(I k)-th tuple, $(D_PSYMBOL ZipWith) * $(I i)-th element of the tuple $(I k)-th tuple, $(D_PSYMBOL ZipWith)
@ -129,7 +129,7 @@ if (Args.length > 0 && __traits(isTemplate, pred))
* f(tk[0], tk[1], ... tk[i]), * f(tk[0], tk[1], ... tk[i]),
* --- * ---
* *
* $(D_PSYMBOL ZipWith) begins with the first elements from $(D_PARAM Tuples) * $(D_PSYMBOL ZipWith) begins with the first elements from $(D_PARAM Packs)
* and applies $(D_PARAM f) to them, then it takes the second * and applies $(D_PARAM f) to them, then it takes the second
* ones and does the same, and so on. * ones and does the same, and so on.
* *
@ -140,16 +140,17 @@ if (Args.length > 0 && __traits(isTemplate, pred))
* *
* Params: * Params:
* f = Some template that can be applied to the elements of * f = Some template that can be applied to the elements of
* $(D_PARAM Tuples). * $(D_PARAM Packs).
* Tuples = $(D_PSYMBOL Tuple) instances. * Packs = $(D_PSYMBOL Pack) instances.
* *
* Returns: A sequence, whose $(I i)-th element contains the $(I i)-th element * Returns: A sequence, whose $(I i)-th element contains the $(I i)-th element
* from each of the $(D_PARAM Tuples). * from each of the $(D_PARAM Packs).
*/ */
template ZipWith(alias f, Tuples...) template ZipWith(alias f, Packs...)
if (Tuples.length > 0 if (Packs.length > 0
&& __traits(isTemplate, f) && __traits(isTemplate, f)
&& allSatisfy!(ApplyLeft!(isInstanceOf, Tuple), Tuples)) && (allSatisfy!(ApplyLeft!(isInstanceOf, Pack), Packs)
|| allSatisfy!(ApplyLeft!(isInstanceOf, Tuple), Packs)))
{ {
private template GetIth(size_t i, Args...) private template GetIth(size_t i, Args...)
{ {
@ -164,43 +165,37 @@ if (Tuples.length > 0
} }
private template Iterate(size_t i, Args...) private template Iterate(size_t i, Args...)
{ {
alias Tuple = GetIth!(i, Args); alias Pack = GetIth!(i, Args);
static if (Tuple.length < Tuples.length) static if (Pack.length < Packs.length)
{ {
alias Iterate = AliasSeq!(); alias Iterate = AliasSeq!();
} }
else else
{ {
alias Iterate = AliasSeq!(f!Tuple, alias Iterate = AliasSeq!(f!Pack, Iterate!(i + 1, Args));
Iterate!(i + 1, Args));
} }
} }
alias ZipWith = Iterate!(0, Tuples); alias ZipWith = Iterate!(0, Packs);
} }
/// ///
@nogc nothrow pure @safe unittest @nogc nothrow pure @safe unittest
{ {
alias Result1 = ZipWith!(AliasSeq, alias Result1 = ZipWith!(AliasSeq, Pack!(1, 2), Pack!(5, 6), Pack!(9, 10));
Tuple!(1, 2),
Tuple!(5, 6),
Tuple!(9, 10));
static assert(Result1 == AliasSeq!(1, 5, 9, 2, 6, 10)); static assert(Result1 == AliasSeq!(1, 5, 9, 2, 6, 10));
alias Result2 = ZipWith!(AliasSeq, alias Result2 = ZipWith!(AliasSeq, Pack!(1, 2, 3), Pack!(4, 5));
Tuple!(1, 2, 3),
Tuple!(4, 5));
static assert(Result2 == AliasSeq!(1, 4, 2, 5)); static assert(Result2 == AliasSeq!(1, 4, 2, 5));
alias Result3 = ZipWith!(AliasSeq, Tuple!(), Tuple!(4, 5)); alias Result3 = ZipWith!(AliasSeq, Pack!(), Pack!(4, 5));
static assert(Result3.length == 0); static assert(Result3.length == 0);
} }
/** /**
* Holds a typed sequence of template parameters. * Holds a typed sequence of template parameters.
* *
* Different than $(D_PSYMBOL AliasSeq), $(D_PSYMBOL Tuple) doesn't unpack * Different than $(D_PSYMBOL AliasSeq), $(D_PSYMBOL Pack) doesn't unpack
* its template parameters automatically. Consider: * its template parameters automatically. Consider:
* *
* --- * ---
@ -215,7 +210,7 @@ if (Tuples.length > 0
* Using $(D_PSYMBOL AliasSeq) template `A` gets 4 parameters instead of 2, * Using $(D_PSYMBOL AliasSeq) template `A` gets 4 parameters instead of 2,
* because $(D_PSYMBOL AliasSeq) is just an alias for its template parameters. * because $(D_PSYMBOL AliasSeq) is just an alias for its template parameters.
* *
* With $(D_PSYMBOL Tuple) it is possible to pass distinguishable * With $(D_PSYMBOL Pack) it is possible to pass distinguishable
* sequences of parameters to a template. So: * sequences of parameters to a template. So:
* *
* --- * ---
@ -224,14 +219,26 @@ if (Tuples.length > 0
* static assert(Args.length == 2); * static assert(Args.length == 2);
* } * }
* *
* alias BInstance = B!(Tuple!(int, uint), Tuple!(float, double)); * alias BInstance = B!(Pack!(int, uint), Pack!(float, double));
* --- * ---
* *
* Params: * Params:
* Args = Elements of this $(D_PSYMBOL Tuple). * Args = Elements of this $(D_PSYMBOL Pack).
* *
* See_Also: $(D_PSYMBOL AliasSeq). * See_Also: $(D_PSYMBOL AliasSeq).
*/ */
struct Pack(Args...)
{
/// Elements in this tuple as $(D_PSYMBOL AliasSeq).
alias Seq = Args;
/// The length of the tuple.
enum size_t length = Args.length;
alias Seq this;
}
deprecated("Use Pack instead")
struct Tuple(Args...) struct Tuple(Args...)
{ {
/// Elements in this tuple as $(D_PSYMBOL AliasSeq). /// Elements in this tuple as $(D_PSYMBOL AliasSeq).
@ -246,9 +253,9 @@ struct Tuple(Args...)
/// ///
@nogc nothrow pure @safe unittest @nogc nothrow pure @safe unittest
{ {
alias A = Tuple!short; alias A = Pack!short;
alias B = Tuple!(3, 8, 9); alias B = Pack!(3, 8, 9);
alias C = Tuple!(A, B); alias C = Pack!(A, B);
static assert(C.length == 2); static assert(C.length == 2);
@ -257,7 +264,7 @@ struct Tuple(Args...)
static assert(B.length == 3); static assert(B.length == 3);
static assert(B.Seq == AliasSeq!(3, 8, 9)); static assert(B.Seq == AliasSeq!(3, 8, 9));
alias D = Tuple!(); alias D = Pack!();
static assert(D.length == 0); static assert(D.length == 0);
static assert(is(D.Seq == AliasSeq!())); static assert(is(D.Seq == AliasSeq!()));
} }
@ -270,7 +277,7 @@ struct Tuple(Args...)
* for determining if two items are equal. * for determining if two items are equal.
* *
* Params: * Params:
* Args = Elements of this $(D_PSYMBOL Tuple). * Args = Elements of this $(D_PSYMBOL Set).
*/ */
struct Set(Args...) struct Set(Args...)
{ {

6
source/tanya/typecons.d
View File

@ -19,7 +19,7 @@ module tanya.typecons;
import tanya.algorithm.mutation; import tanya.algorithm.mutation;
import tanya.format; import tanya.format;
import tanya.meta.metafunction : AliasSeq, AliasTuple = Tuple, Map; import tanya.meta.metafunction;
import tanya.meta.trait; import tanya.meta.trait;
/** /**
@ -49,13 +49,13 @@ template Tuple(Specs...)
static if (is(typeof(Specs[1]) == string)) static if (is(typeof(Specs[1]) == string))
{ {
alias parseSpecs alias parseSpecs
= AliasSeq!(AliasTuple!(Specs[0], Specs[1]), = AliasSeq!(Pack!(Specs[0], Specs[1]),
parseSpecs!(fieldCount + 1, Specs[2 .. $])); parseSpecs!(fieldCount + 1, Specs[2 .. $]));
} }
else else
{ {
alias parseSpecs alias parseSpecs
= AliasSeq!(AliasTuple!(Specs[0]), = AliasSeq!(Pack!(Specs[0]),
parseSpecs!(fieldCount + 1, Specs[1 .. $])); parseSpecs!(fieldCount + 1, Specs[1 .. $]));
} }
} }