Merge DMD r243: some harmonization with D2 dmd --- dmd/aggregate.h | 24 ++++- dmd/attrib.c | 63 ++++++---- dmd/attrib.h | 10 +- dmd/declaration.h | 5 +- dmd/func.c | 337 ++++++++++++++++++++++------------------------------- dmd/mars.c | 2 +- dmd/mars.h | 7 + dmd/mtype.h | 13 ++- dmd/parse.c | 32 ++++- dmd/parse.h | 14 ++- dmd/scope.h | 2 +- 11 files changed, 263 insertions(+), 246 deletions(-)

int foo()
{
    enum { fourty2 = 42 }
    version(X86)
    asm
    {
        naked;
        mov EAX, fourty2;
        ret;
    }
    else version(X86_64)
    asm
    {
        naked;
        mov EAX, fourty2;
        ret;
    }
    else static assert(0, "todo");
}

void main()
{
    int i = foo();
    printf("i == %d\n", i);
    assert(i == 42);
}

extern(C) int printf(char*, ...);