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

void main()
{
    int[int] aa;
    aa = addkey(aa,42,12);
    int* p = haskey(aa,42);
    assert(p && *p == 12);
}

int[int] addkey(int[int] aa, int key, int val)
{
    aa[key] = val;
    return aa;
}

int* haskey(int[int] aa, int key)
{
    return key in aa;
}