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(-)

module mini.nested13;

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

void main()
{
    int var = 2;

    void exec(void delegate() dg)
    {
        printf("var = %d\n", var);
        dg();
    }

    void foo()
    {
        printf("var = %d\n", var);
        assert(var == 5);
    }

    void bar()
    {
        printf("var = %d\n", var);
        var += 3;
        exec(&foo);
    }

    printf("var = %d\n", var);
    exec(&bar);

    return;
}