Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix issue 8737 Unqual for AA #822

Merged
merged 1 commit into from Oct 4, 2012
Merged

fix issue 8737 Unqual for AA #822

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 35 additions & 13 deletions std/traits.d
View file
Open in desktop
Expand Up @@ -4359,22 +4359,32 @@ static assert(is(Unqual!(shared(const int)) == int));
*/
template Unqual(T)
{
version (none) // Error: recursive alias declaration @@@BUG1308@@@
static if (!isAssociativeArray!T)
{
static if (is(T U == const U)) alias Unqual!U Unqual;
else static if (is(T U == immutable U)) alias Unqual!U Unqual;
else static if (is(T U == inout U)) alias Unqual!U Unqual;
else static if (is(T U == shared U)) alias Unqual!U Unqual;
else alias T Unqual;
version (none) // Error: recursive alias declaration @@@BUG1308@@@
{
static if (is(T U == const U)) alias Unqual!U Unqual;
else static if (is(T U == immutable U)) alias Unqual!U Unqual;
else static if (is(T U == inout U)) alias Unqual!U Unqual;
else static if (is(T U == shared U)) alias Unqual!U Unqual;
else alias T Unqual;
}
else // workaround
{
static if (is(T U == shared(const U))) alias U Unqual;
else static if (is(T U == const U )) alias U Unqual;
else static if (is(T U == immutable U )) alias U Unqual;
else static if (is(T U == inout U )) alias U Unqual;
else static if (is(T U == shared U )) alias U Unqual;
else alias T Unqual;
}
}
else // workaround
else
{
static if (is(T U == shared(const U))) alias U Unqual;
else static if (is(T U == const U )) alias U Unqual;
else static if (is(T U == immutable U )) alias U Unqual;
else static if (is(T U == inout U )) alias U Unqual;
else static if (is(T U == shared U )) alias U Unqual;
else alias T Unqual;
//An AA's mutability is defined by its key's mutability.
alias KeyType!T K;
alias Unqual!(ValueType!T) V;
alias V[K] Unqual;
}
}

Expand All @@ -4389,6 +4399,18 @@ unittest
alias immutable(int[]) ImmIntArr;
static assert(is(Unqual!(ImmIntArr) == immutable(int)[]));
}
unittest //8737 AA
{
alias const(int[int]) AA;
alias const(int)[int] BB;
alias const(int)[const(int)] CC;
static assert(is(Unqual!AA == int[int]));
static assert(is(Unqual!BB == int[int]));
static assert(is(Unqual!CC == int[const(int)]));
alias int[int[int]] DD;
static assert(is(KeyType!DD == const(int)[int]));
static assert(is(Unqual!(KeyType!DD) == int[int]));
}

// [For internal use]
private template ModifyTypePreservingSTC(alias Modifier, T)
Expand Down