mirror of
https://github.com/dlang/phobos.git
synced 2025-05-05 17:42:58 +03:00
Remove obsolete TypeTuple references
Replace following names: std.typetuple -> std.meta TypeTuple -> AliasSeq ParameterTypeTuple -> Parameters FieldTypeTuple -> Fields std.traits requires more work than search/replace and is left unchanged.
This commit is contained in:
Dragos Carp
parent
8d9d606ef8
commit
d698887729
48 changed files with 643 additions and 645 deletions
|
|
@ -68,8 +68,8 @@ Source: $(PHOBOSSRC std/_variant.d)
|
|||
*/
|
||||
module std.variant;
|
||||
|
||||
import core.stdc.string, std.conv, std.exception, std.traits, std.typecons,
|
||||
std.typetuple;
|
||||
import core.stdc.string, std.conv, std.exception, std.meta, std.traits,
|
||||
std.typecons;
|
||||
|
||||
/++
|
||||
Gives the $(D sizeof) the largest type given.
|
||||
|
|
@ -93,10 +93,10 @@ private template This2Variant(V, T...)
|
|||
{
|
||||
// Test if it compiles because right now type replacement does not work for
|
||||
// functions involving local types.
|
||||
static if (__traits(compiles, TypeTuple!(ReplaceType!(This, V, T))))
|
||||
alias This2Variant = TypeTuple!(ReplaceType!(This, V, T));
|
||||
static if (__traits(compiles, AliasSeq!(ReplaceType!(This, V, T))))
|
||||
alias This2Variant = AliasSeq!(ReplaceType!(This, V, T));
|
||||
else
|
||||
alias This2Variant = TypeTuple!T;
|
||||
alias This2Variant = AliasSeq!T;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -268,27 +268,27 @@ private:
|
|||
static bool tryPutting(A* src, TypeInfo targetType, void* target)
|
||||
{
|
||||
alias UA = Unqual!A;
|
||||
alias MutaTypes = TypeTuple!(UA, ImplicitConversionTargets!UA);
|
||||
alias MutaTypes = AliasSeq!(UA, ImplicitConversionTargets!UA);
|
||||
alias ConstTypes = staticMap!(ConstOf, MutaTypes);
|
||||
alias SharedTypes = staticMap!(SharedOf, MutaTypes);
|
||||
alias SharedConstTypes = staticMap!(SharedConstOf, MutaTypes);
|
||||
alias ImmuTypes = staticMap!(ImmutableOf, MutaTypes);
|
||||
|
||||
static if (is(A == immutable))
|
||||
alias AllTypes = TypeTuple!(ImmuTypes, ConstTypes, SharedConstTypes);
|
||||
alias AllTypes = AliasSeq!(ImmuTypes, ConstTypes, SharedConstTypes);
|
||||
else static if (is(A == shared))
|
||||
{
|
||||
static if (is(A == const))
|
||||
alias AllTypes = SharedConstTypes;
|
||||
else
|
||||
alias AllTypes = TypeTuple!(SharedTypes, SharedConstTypes);
|
||||
alias AllTypes = AliasSeq!(SharedTypes, SharedConstTypes);
|
||||
}
|
||||
else
|
||||
{
|
||||
static if (is(A == const))
|
||||
alias AllTypes = ConstTypes;
|
||||
else
|
||||
alias AllTypes = TypeTuple!(MutaTypes, ConstTypes);
|
||||
alias AllTypes = AliasSeq!(MutaTypes, ConstTypes);
|
||||
}
|
||||
|
||||
foreach (T ; AllTypes)
|
||||
|
|
@ -492,7 +492,7 @@ private:
|
|||
}
|
||||
else
|
||||
{
|
||||
alias ParamTypes = ParameterTypeTuple!A;
|
||||
alias ParamTypes = Parameters!A;
|
||||
auto p = cast(Variant*) parm;
|
||||
auto argCount = p.get!size_t;
|
||||
// To assign the tuple we need to use the unqualified version,
|
||||
|
|
@ -1147,7 +1147,7 @@ public:
|
|||
*/
|
||||
int opApply(Delegate)(scope Delegate dg) if (is(Delegate == delegate))
|
||||
{
|
||||
alias A = ParameterTypeTuple!(Delegate)[0];
|
||||
alias A = Parameters!(Delegate)[0];
|
||||
if (type == typeid(A[]))
|
||||
{
|
||||
auto arr = get!(A[]);
|
||||
|
|
@ -1216,7 +1216,7 @@ unittest
|
|||
}
|
||||
|
||||
static assert(S.sizeof >= Variant.sizeof);
|
||||
alias Types = TypeTuple!(string, int, S);
|
||||
alias Types = AliasSeq!(string, int, S);
|
||||
alias MyVariant = VariantN!(maxSize!Types, Types);
|
||||
|
||||
auto v = MyVariant(S.init);
|
||||
|
|
@ -1475,7 +1475,7 @@ static class VariantException : Exception
|
|||
unittest
|
||||
{
|
||||
alias W1 = This2Variant!(char, int, This[int]);
|
||||
alias W2 = TypeTuple!(int, char[int]);
|
||||
alias W2 = AliasSeq!(int, char[int]);
|
||||
static assert(is(W1 == W2));
|
||||
|
||||
alias var_t = Algebraic!(void, string);
|
||||
|
|
@ -2191,7 +2191,7 @@ private auto visitImpl(bool Strict, VariantType, Handler...)(VariantType variant
|
|||
// Handle normal function objects
|
||||
static if (isSomeFunction!dg)
|
||||
{
|
||||
alias Params = ParameterTypeTuple!dg;
|
||||
alias Params = Parameters!dg;
|
||||
static if (Params.length == 0)
|
||||
{
|
||||
// Just check exception functions in the first
|
||||
|
|
@ -2315,24 +2315,24 @@ unittest
|
|||
|
||||
int i = 10;
|
||||
v = i;
|
||||
foreach (qual; TypeTuple!(MutableOf, ConstOf))
|
||||
foreach (qual; AliasSeq!(MutableOf, ConstOf))
|
||||
{
|
||||
assert(v.get!(qual!int) == 10);
|
||||
assert(v.get!(qual!float) == 10.0f);
|
||||
}
|
||||
foreach (qual; TypeTuple!(ImmutableOf, SharedOf, SharedConstOf))
|
||||
foreach (qual; AliasSeq!(ImmutableOf, SharedOf, SharedConstOf))
|
||||
{
|
||||
assertThrown!VariantException(v.get!(qual!int));
|
||||
}
|
||||
|
||||
const(int) ci = 20;
|
||||
v = ci;
|
||||
foreach (qual; TypeTuple!(ConstOf))
|
||||
foreach (qual; AliasSeq!(ConstOf))
|
||||
{
|
||||
assert(v.get!(qual!int) == 20);
|
||||
assert(v.get!(qual!float) == 20.0f);
|
||||
}
|
||||
foreach (qual; TypeTuple!(MutableOf, ImmutableOf, SharedOf, SharedConstOf))
|
||||
foreach (qual; AliasSeq!(MutableOf, ImmutableOf, SharedOf, SharedConstOf))
|
||||
{
|
||||
assertThrown!VariantException(v.get!(qual!int));
|
||||
assertThrown!VariantException(v.get!(qual!float));
|
||||
|
|
@ -2340,12 +2340,12 @@ unittest
|
|||
|
||||
immutable(int) ii = ci;
|
||||
v = ii;
|
||||
foreach (qual; TypeTuple!(ImmutableOf, ConstOf, SharedConstOf))
|
||||
foreach (qual; AliasSeq!(ImmutableOf, ConstOf, SharedConstOf))
|
||||
{
|
||||
assert(v.get!(qual!int) == 20);
|
||||
assert(v.get!(qual!float) == 20.0f);
|
||||
}
|
||||
foreach (qual; TypeTuple!(MutableOf, SharedOf))
|
||||
foreach (qual; AliasSeq!(MutableOf, SharedOf))
|
||||
{
|
||||
assertThrown!VariantException(v.get!(qual!int));
|
||||
assertThrown!VariantException(v.get!(qual!float));
|
||||
|
|
@ -2353,12 +2353,12 @@ unittest
|
|||
|
||||
int[] ai = [1,2,3];
|
||||
v = ai;
|
||||
foreach (qual; TypeTuple!(MutableOf, ConstOf))
|
||||
foreach (qual; AliasSeq!(MutableOf, ConstOf))
|
||||
{
|
||||
assert(v.get!(qual!(int[])) == [1,2,3]);
|
||||
assert(v.get!(qual!(int)[]) == [1,2,3]);
|
||||
}
|
||||
foreach (qual; TypeTuple!(ImmutableOf, SharedOf, SharedConstOf))
|
||||
foreach (qual; AliasSeq!(ImmutableOf, SharedOf, SharedConstOf))
|
||||
{
|
||||
assertThrown!VariantException(v.get!(qual!(int[])));
|
||||
assertThrown!VariantException(v.get!(qual!(int)[]));
|
||||
|
|
@ -2366,12 +2366,12 @@ unittest
|
|||
|
||||
const(int[]) cai = [4,5,6];
|
||||
v = cai;
|
||||
foreach (qual; TypeTuple!(ConstOf))
|
||||
foreach (qual; AliasSeq!(ConstOf))
|
||||
{
|
||||
assert(v.get!(qual!(int[])) == [4,5,6]);
|
||||
assert(v.get!(qual!(int)[]) == [4,5,6]);
|
||||
}
|
||||
foreach (qual; TypeTuple!(MutableOf, ImmutableOf, SharedOf, SharedConstOf))
|
||||
foreach (qual; AliasSeq!(MutableOf, ImmutableOf, SharedOf, SharedConstOf))
|
||||
{
|
||||
assertThrown!VariantException(v.get!(qual!(int[])));
|
||||
assertThrown!VariantException(v.get!(qual!(int)[]));
|
||||
|
|
@ -2385,7 +2385,7 @@ unittest
|
|||
assert(v.get!(const(int)[]) == [7,8,9]);
|
||||
//assert(v.get!(shared(const(int[]))) == cast(shared const)[7,8,9]); // Bug ??? runtime error
|
||||
//assert(v.get!(shared(const(int))[]) == cast(shared const)[7,8,9]); // Bug ??? runtime error
|
||||
foreach (qual; TypeTuple!(MutableOf))
|
||||
foreach (qual; AliasSeq!(MutableOf))
|
||||
{
|
||||
assertThrown!VariantException(v.get!(qual!(int[])));
|
||||
assertThrown!VariantException(v.get!(qual!(int)[]));
|
||||
|
|
@ -2395,13 +2395,13 @@ unittest
|
|||
class B : A {}
|
||||
B b = new B();
|
||||
v = b;
|
||||
foreach (qual; TypeTuple!(MutableOf, ConstOf))
|
||||
foreach (qual; AliasSeq!(MutableOf, ConstOf))
|
||||
{
|
||||
assert(v.get!(qual!B) is b);
|
||||
assert(v.get!(qual!A) is b);
|
||||
assert(v.get!(qual!Object) is b);
|
||||
}
|
||||
foreach (qual; TypeTuple!(ImmutableOf, SharedOf, SharedConstOf))
|
||||
foreach (qual; AliasSeq!(ImmutableOf, SharedOf, SharedConstOf))
|
||||
{
|
||||
assertThrown!VariantException(v.get!(qual!B));
|
||||
assertThrown!VariantException(v.get!(qual!A));
|
||||
|
|
@ -2410,13 +2410,13 @@ unittest
|
|||
|
||||
const(B) cb = new B();
|
||||
v = cb;
|
||||
foreach (qual; TypeTuple!(ConstOf))
|
||||
foreach (qual; AliasSeq!(ConstOf))
|
||||
{
|
||||
assert(v.get!(qual!B) is cb);
|
||||
assert(v.get!(qual!A) is cb);
|
||||
assert(v.get!(qual!Object) is cb);
|
||||
}
|
||||
foreach (qual; TypeTuple!(MutableOf, ImmutableOf, SharedOf, SharedConstOf))
|
||||
foreach (qual; AliasSeq!(MutableOf, ImmutableOf, SharedOf, SharedConstOf))
|
||||
{
|
||||
assertThrown!VariantException(v.get!(qual!B));
|
||||
assertThrown!VariantException(v.get!(qual!A));
|
||||
|
|
@ -2425,13 +2425,13 @@ unittest
|
|||
|
||||
immutable(B) ib = new immutable(B)();
|
||||
v = ib;
|
||||
foreach (qual; TypeTuple!(ImmutableOf, ConstOf, SharedConstOf))
|
||||
foreach (qual; AliasSeq!(ImmutableOf, ConstOf, SharedConstOf))
|
||||
{
|
||||
assert(v.get!(qual!B) is ib);
|
||||
assert(v.get!(qual!A) is ib);
|
||||
assert(v.get!(qual!Object) is ib);
|
||||
}
|
||||
foreach (qual; TypeTuple!(MutableOf, SharedOf))
|
||||
foreach (qual; AliasSeq!(MutableOf, SharedOf))
|
||||
{
|
||||
assertThrown!VariantException(v.get!(qual!B));
|
||||
assertThrown!VariantException(v.get!(qual!A));
|
||||
|
|
@ -2440,13 +2440,13 @@ unittest
|
|||
|
||||
shared(B) sb = new shared B();
|
||||
v = sb;
|
||||
foreach (qual; TypeTuple!(SharedOf, SharedConstOf))
|
||||
foreach (qual; AliasSeq!(SharedOf, SharedConstOf))
|
||||
{
|
||||
assert(v.get!(qual!B) is sb);
|
||||
assert(v.get!(qual!A) is sb);
|
||||
assert(v.get!(qual!Object) is sb);
|
||||
}
|
||||
foreach (qual; TypeTuple!(MutableOf, ImmutableOf, ConstOf))
|
||||
foreach (qual; AliasSeq!(MutableOf, ImmutableOf, ConstOf))
|
||||
{
|
||||
assertThrown!VariantException(v.get!(qual!B));
|
||||
assertThrown!VariantException(v.get!(qual!A));
|
||||
|
|
@ -2455,13 +2455,13 @@ unittest
|
|||
|
||||
shared(const(B)) scb = new shared const B();
|
||||
v = scb;
|
||||
foreach (qual; TypeTuple!(SharedConstOf))
|
||||
foreach (qual; AliasSeq!(SharedConstOf))
|
||||
{
|
||||
assert(v.get!(qual!B) is scb);
|
||||
assert(v.get!(qual!A) is scb);
|
||||
assert(v.get!(qual!Object) is scb);
|
||||
}
|
||||
foreach (qual; TypeTuple!(MutableOf, ConstOf, ImmutableOf, SharedOf))
|
||||
foreach (qual; AliasSeq!(MutableOf, ConstOf, ImmutableOf, SharedOf))
|
||||
{
|
||||
assertThrown!VariantException(v.get!(qual!B));
|
||||
assertThrown!VariantException(v.get!(qual!A));
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue