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 2015-10-13 20:30:32 +02:00
parent 8d9d606ef8
commit d698887729
48 changed files with 643 additions and 645 deletions

View file

@ -9,7 +9,7 @@ module std.regex.internal.ir;
package(std.regex):
import std.exception, std.uni, std.typetuple, std.traits, std.range;
import std.exception, std.uni, std.meta, std.traits, std.range;
// just a common trait, may be moved elsewhere
alias BasicElementOf(Range) = Unqual!(ElementEncodingType!Range);
@ -88,7 +88,7 @@ enum RegexOption: uint {
singleline = 0x20
}
//do not reorder this list
alias RegexOptionNames = TypeTuple!('g', 'i', 'x', 'U', 'm', 's');
alias RegexOptionNames = AliasSeq!('g', 'i', 'x', 'U', 'm', 's');
static assert( RegexOption.max < 0x80);
// flags that allow guide execution of engine
enum RegexInfo : uint { oneShot = 0x80 }

View file

@ -484,7 +484,7 @@ unittest
import std.conv, std.regex;
@trusted void test_fixed(alias Kick)()
{
foreach(i, v; TypeTuple!(char, wchar, dchar))
foreach(i, v; AliasSeq!(char, wchar, dchar))
{
alias Char = v;
alias String = immutable(v)[];
@ -510,7 +510,7 @@ unittest
}
@trusted void test_flex(alias Kick)()
{
foreach(i, v;TypeTuple!(char, wchar, dchar))
foreach(i, v; AliasSeq!(char, wchar, dchar))
{
alias Char = v;
alias String = immutable(v)[];

View file

@ -5,7 +5,7 @@
module std.regex.internal.parser;
import std.regex.internal.ir;
import std.algorithm, std.range, std.uni, std.typetuple,
import std.algorithm, std.range, std.uni, std.meta,
std.traits, std.typecons, std.exception;
// package relevant info from parser into a regex object
@ -155,7 +155,7 @@ unittest
}
alias Escapables = TypeTuple!('[', ']', '\\', '^', '$', '.', '|', '?', ',', '-',
alias Escapables = AliasSeq!('[', ']', '\\', '^', '$', '.', '|', '?', ',', '-',
';', ':', '#', '&', '%', '/', '<', '>', '`', '*', '+', '(', ')', '{', '}', '~');
//test if a given string starts with hex number of maxDigit that's a valid codepoint

View file

@ -5,8 +5,8 @@ module std.regex.internal.tests;
package(std.regex):
import std.algorithm, std.conv, std.exception, std.range, std.typecons,
std.typetuple, std.regex;
import std.algorithm, std.conv, std.exception, std.meta, std.range,
std.typecons, std.regex;
import std.regex.internal.parser : Escapables; // characters that need escaping
@ -347,7 +347,7 @@ unittest
void run_tests(alias matchFn)()
{
int i;
foreach(Char; TypeTuple!( char, wchar, dchar))
foreach(Char; AliasSeq!( char, wchar, dchar))
(){ // avoid slow optimizations for large functions @@@BUG@@@ 2396
alias String = immutable(Char)[];
String produceExpected(M,Range)(auto ref M m, Range fmt)
@ -417,7 +417,7 @@ unittest
alias Tests = Sequence!(220, tv.length);
}
else
alias Tests = TypeTuple!(Sequence!(0, 30), Sequence!(235, tv.length-5));
alias Tests = AliasSeq!(Sequence!(0, 30), Sequence!(235, tv.length-5));
foreach(a, v; Tests)
(){ // avoid slow optimizations for large functions @@@BUG@@@ 2396
enum tvd = tv[v];
@ -670,7 +670,7 @@ unittest
{
import std.uni : toUpper;
foreach(i, v; TypeTuple!(string, wstring, dstring))
foreach(i, v; AliasSeq!(string, wstring, dstring))
{
auto baz(Cap)(Cap m)
if (is(Cap == Captures!(Cap.String)))
@ -753,7 +753,7 @@ unittest
}
unittest
{// bugzilla 7679
foreach(S; TypeTuple!(string, wstring, dstring))
foreach(S; AliasSeq!(string, wstring, dstring))
(){ // avoid slow optimizations for large functions @@@BUG@@@ 2396
enum re = ctRegex!(to!S(r"\."));
auto str = to!S("a.b");

View file

@ -884,7 +884,7 @@ public auto matchAll(R, RegEx)(R input, RegEx re)
import std.conv : to;
import std.algorithm : map, equal;
foreach(String; TypeTuple!(string, wstring, const(dchar)[]))
foreach(String; AliasSeq!(string, wstring, const(dchar)[]))
{
auto str1 = "blah-bleh".to!String();
auto pat1 = "bl[ae]h".to!String();
@ -1267,7 +1267,7 @@ public @trusted void replaceAllInto(alias fun, Sink, R, RegEx)
{
import std.conv;
// try and check first/all simple substitution
foreach(S; TypeTuple!(string, wstring, dstring, char[], wchar[], dchar[]))
foreach(S; AliasSeq!(string, wstring, dstring, char[], wchar[], dchar[]))
{
S s1 = "curt trial".to!S();
S s2 = "round dome".to!S();