Changeset 604

Timestamp:

08/06/10 06:39:19 (14 years ago)

Author:

walter

Message:

bugzilla 1418 tupleof bug on nested classes

Files:

• branches/dmd-1.x/src/mtype.c (modified) (1 diff)
• trunk/src/mtype.c (modified) (1 diff)

branches/dmd-1.x/src/mtype.c

@@ -4726 +4726 @@
-
-        if (de->e1->op == TOKimport)
-        {
-            ScopeExp *se = (ScopeExp *)de->e1;
-
-            s = se->sds->search(e->loc, ident, 0);
-            e = de->e1;
-            goto L1;
-        }
-    }
-
-    if (ident == Id::tupleof)
-    {
-        /* Create a TupleExp
-         */
-        e = e->semantic(sc);    // do this before turning on noaccesscheck
-        Expressions *exps = new Expressions;
-        exps->reserve(sym->fields.dim);
-        for (size_t i = 0; i < sym->fields.dim; i++)
-        {   VarDeclaration *v = (VarDeclaration *)sym->fields.data[i];
+            // Don't include hidden 'this' pointer
+            if (v->isThisDeclaration())
+                continue;
-            Expression *fe = new DotVarExp(e->loc, e, v);
-            exps->push(fe);
-        }
-        e = new TupleExp(e->loc, exps);
-        sc = sc->push();
-        sc->noaccesscheck = 1;
-        e = e->semantic(sc);
-        sc->pop();
-        return e;
-    }
-
-    s = sym->search(e->loc, ident, 0);
-L1:
-    if (!s)
-    {
-        // See if it's a base class
-        ClassDeclaration *cbase;
-        for (cbase = sym->baseClass; cbase; cbase = cbase->baseClass)
-        {
-            if (cbase->ident->equals(ident))

trunk/src/mtype.c

@@ -7118 +7118 @@
-
-        if (de->e1->op == TOKimport)
-        {
-            ScopeExp *se = (ScopeExp *)de->e1;
-
-            s = se->sds->search(e->loc, ident, 0);
-            e = de->e1;
-            goto L1;
-        }
-    }
-
-    if (ident == Id::tupleof)
-    {
-        /* Create a TupleExp
-         */
-        e = e->semantic(sc);    // do this before turning on noaccesscheck
-        Expressions *exps = new Expressions;
-        exps->reserve(sym->fields.dim);
-        for (size_t i = 0; i < sym->fields.dim; i++)
-        {   VarDeclaration *v = (VarDeclaration *)sym->fields.data[i];
+            // Don't include hidden 'this' pointer
+            if (v->isThisDeclaration())
+                continue;
-            Expression *fe = new DotVarExp(e->loc, e, v);
-            exps->push(fe);
-        }
-        e = new TupleExp(e->loc, exps);
-        sc = sc->push();
-        sc->noaccesscheck = 1;
-        e = e->semantic(sc);
-        sc->pop();
-        return e;
-    }
-
-    s = sym->search(e->loc, ident, 0);
-L1:
-    if (!s)
-    {
-        // See if it's a base class
-        ClassDeclaration *cbase;
-        for (cbase = sym->baseClass; cbase; cbase = cbase->baseClass)
-        {
-            if (cbase->ident->equals(ident))