functional.forward: Fix template visibility bug
Because of the private template forwardOne, forward couldn't be used in other modules. forwardOne cannot be a local template either since it accepts an alias as its template parameter.
This commit is contained in:
parent
180c4d3956
commit
31d4f30a49
@ -17,21 +17,6 @@ module tanya.functional;
|
||||
import tanya.algorithm.mutation;
|
||||
import tanya.meta.metafunction;
|
||||
|
||||
private template forwardOne(alias arg)
|
||||
{
|
||||
static if (__traits(isRef, arg) || __traits(isOut, arg))
|
||||
{
|
||||
alias forwardOne = arg;
|
||||
}
|
||||
else
|
||||
{
|
||||
@property auto forwardOne()
|
||||
{
|
||||
return move(arg);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Forwards its argument list preserving $(D_KEYWORD ref) and $(D_KEYWORD out)
|
||||
* storage classes.
|
||||
@ -46,14 +31,36 @@ private template forwardOne(alias arg)
|
||||
* Returns: $(D_PARAM args) with their original storage classes.
|
||||
*/
|
||||
template forward(args...)
|
||||
{
|
||||
static if (args.length == 0)
|
||||
{
|
||||
alias forward = AliasSeq!();
|
||||
}
|
||||
else static if (__traits(isRef, args[0]) || __traits(isOut, args[0]))
|
||||
{
|
||||
static if (args.length == 1)
|
||||
{
|
||||
alias forward = forwardOne!(args[0]);
|
||||
alias forward = args[0];
|
||||
}
|
||||
else
|
||||
{
|
||||
alias forward = Map!(forwardOne, args);
|
||||
alias forward = AliasSeq!(args[0], forward!(args[1 .. $]));
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
@property auto forwardOne()
|
||||
{
|
||||
return move(args[0]);
|
||||
}
|
||||
static if (args.length == 1)
|
||||
{
|
||||
alias forward = forwardOne;
|
||||
}
|
||||
else
|
||||
{
|
||||
alias forward = AliasSeq!(forwardOne, forward!(args[1 .. $]));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user