Changeset 818

Timestamp:

12/27/10 02:31:18 (14 years ago)

Author:

walter

Message:

bugzilla 5365 Regression (2.051) implicit conversions via alias this are broken

Files:

• trunk/src/cast.c (modified) (1 diff)
• trunk/src/mtype.c (modified) (1 diff)

trunk/src/cast.c

@@ -805 +805 @@
-            return toDelegate(sc, tf->nextOf());
-        }
-#endif
-        else
-        {
-            if (typeb->ty == Tstruct)
-            {   TypeStruct *ts = (TypeStruct *)typeb;
-                if (!(tb->ty == Tstruct && ts->sym == ((TypeStruct *)tb)->sym) &&
-                    ts->sym->aliasthis)
-                {   /* Forward the cast to our alias this member, rewrite to:
-                     *   cast(to)e1.aliasthis
-                     */
-                    Expression *e1 = new DotIdExp(loc, this, ts->sym->aliasthis->ident);
-                    Expression *e = new CastExp(loc, e1, tb);
-                    e = e->semantic(sc);
-                    return e;
-                }
-            }
-            else if (typeb->ty == Tclass)
-            {   TypeClass *ts = (TypeClass *)typeb;
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-                     *   cast(to)e1.aliasthis
-                     */
-                    Expression *e1 = new DotIdExp(loc, this, ts->sym->aliasthis->ident);
-                    Expression *e = new CastExp(loc, e1, tb);
-                    e = e->semantic(sc);
-                    return e;
-                }
+             L1: ;
-            }
-            e = new CastExp(loc, e, tb);
-        }
-    }
-    else
-    {
-        e = e->copy();  // because of COW for assignment to e->type
-    }
-    assert(e != this);
-    e->type = t;
-    //printf("Returning: %s\n", e->toChars());
-    return e;
-}
-
-
-Expression *RealExp::castTo(Scope *sc, Type *t)
-{   Expression *e = this;
-    if (type != t)
-    {
-        if ((type->isreal() && t->isreal()) ||

trunk/src/mtype.c

@@ -7111 +7111 @@
-    return FALSE;
-}
-
-static MATCH aliasthisConvTo(AggregateDeclaration *ad, Type *from, Type *to)
-{
-    assert(ad->aliasthis);
-    Declaration *d = ad->aliasthis->isDeclaration();
-    if (d)
-    {   assert(d->type);
-        Type *t = d->type;
-        if (d->isVarDeclaration() && d->needThis())
-        {
-            t = t->addMod(from->mod);
-        }
-        else if (d->isFuncDeclaration())
-        {
-            FuncDeclaration *fd = (FuncDeclaration *)d;
-            Expression *ethis = from->defaultInit(0);
-            fd = fd->overloadResolve(0, ethis, NULL);
-            if (fd)
+            {
-                t = ((TypeFunction *)fd->type)->next;
-
-
+
+
+
+
-    }
-    return MATCHnomatch;
-}
-
-MATCH TypeStruct::implicitConvTo(Type *to)
-{   MATCH m;
-
-    //printf("TypeStruct::implicitConvTo(%s => %s)\n", toChars(), to->toChars());
-    if (to->ty == Taarray)
-    {
-        /* If there is an error instantiating AssociativeArray!(), it shouldn't
-         * be reported -- it just means implicit conversion is impossible.
-         */
-        ++global.gag;
-        int errs = global.errors;
-        to = ((TypeAArray*)to)->getImpl()->type;
-        --global.gag;
-        if (errs != global.errors)
-        {
-            global.errors = errs;