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 nested10;

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

void main()
{
    int j = 3;
    void F()
    {
        int i = j;
        printf("F: i = %d, j = %d\n", i, j);
        void G()
        {
            printf("G: i = %d, j = %d\n", i, j);
            j += i;
        }
        G();
    }
    F();
    printf("6 = %d\n", j);
    assert(j == 6);
}