mirrors/phobos
1
0
Fork 0
mirror of https://github.com/dlang/phobos.git synced 2025-05-07 19:49:36 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1544 from 9rnsr/fix9565

Browse source 
Additional fix for issue 9565
This commit is contained in:
monarch dodra 2013-09-04 07:58:45 -07:00
commit b79d1111e7
1 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

25
std/typecons.d
View file

@ -1102,7 +1102,8 @@ string alignForSize(E...)(string[] names...)
string[7] declaration = ["", "", "", "", "", "", ""]; string[7] declaration = ["", "", "", "", "", "", ""];
foreach (i, T; E) { foreach (i, T; E)
{
auto a = T.alignof; auto a = T.alignof;
auto k = a>=64? 0 : a>=32? 1 : a>=16? 2 : a>=8? 3 : a>=4? 4 : a>=2? 5 : 6; auto k = a>=64? 0 : a>=32? 1 : a>=16? 2 : a>=8? 3 : a>=4? 4 : a>=2? 5 : 6;
declaration[k] ~= T.stringof ~ " " ~ names[i] ~ ";\n"; declaration[k] ~= T.stringof ~ " " ~ names[i] ~ ";\n";
@ -1114,11 +1115,26 @@ string alignForSize(E...)(string[] names...)
return s; return s;
} }
unittest { unittest
{
enum x = alignForSize!(int[], char[3], short, double[5])("x", "y","z", "w"); enum x = alignForSize!(int[], char[3], short, double[5])("x", "y","z", "w");
struct Foo{ int x; } struct Foo { int x; }
enum y = alignForSize!(ubyte, Foo, cdouble)("x", "y","z"); enum y = alignForSize!(ubyte, Foo, cdouble)("x", "y", "z");
static if ((int[1]).stringof == "int[1]") // if issue 9565 is implemented
{
enum passNormalX = x == "double[5] w;\nint[] x;\nshort z;\nchar[3] y;\n";
enum passNormalY = y == "cdouble z;\nFoo y;\nubyte x;\n";
enum passAbnormalX = x == "int[] x;\ndouble[5] w;\nshort z;\nchar[3] y;\n";
enum passAbnormalY = y == "Foo y;\ncdouble z;\nubyte x;\n";
// ^ blame http://d.puremagic.com/issues/show_bug.cgi?id=231
static assert(passNormalX || passAbnormalX && double.alignof <= (int[]).alignof);
static assert(passNormalY || passAbnormalY && double.alignof <= int.alignof);
}
else
{
static if(size_t.sizeof == uint.sizeof) static if(size_t.sizeof == uint.sizeof)
{ {
enum passNormalX = x == "double[5u] w;\nint[] x;\nshort z;\nchar[3u] y;\n"; enum passNormalX = x == "double[5u] w;\nint[] x;\nshort z;\nchar[3u] y;\n";
@ -1136,6 +1152,7 @@ unittest {
static assert(x == "int[] x;\ndouble[5LU] w;\nshort z;\nchar[3LU] y;\n"); static assert(x == "int[] x;\ndouble[5LU] w;\nshort z;\nchar[3LU] y;\n");
static assert(y == "cdouble z;\nFoo y;\nubyte x;\n"); static assert(y == "cdouble z;\nFoo y;\nubyte x;\n");
} }
}
} }
/*--* /*--*