Changeset 786

Timestamp:

12/06/10 08:19:47 (14 years ago)

Author:

walter

Message:

bugzilla 5094 No implicit conversion with 'alias property this'

Files:

• trunk/src/mtype.c (modified) (3 diffs)

trunk/src/mtype.c

@@ -7090 +7090 @@
-    }
-    return TRUE;
-}
-
-int TypeStruct::hasPointers()
-{
-    // Probably should cache this information in sym rather than recompute
-    StructDeclaration *s = sym;
-
-    sym->size(0);               // give error for forward references
-    for (size_t i = 0; i < s->fields.dim; i++)
-    {
-        Dsymbol *sm = (Dsymbol *)s->fields.data[i];
-        Declaration *d = sm->isDeclaration();
-        if (d->storage_class & STCref || d->hasPointers())
-            return TRUE;
-    }
-    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 t->implicitConvTo(to);
+    }
+    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;
-            return MATCHnomatch;
-        }
-    }
-
-    if (ty == to->ty && sym == ((TypeStruct *)to)->sym)
@@ -7139 +7163 @@
-                for (int i = 0; i < sym->fields.dim; i++)
-                {   Dsymbol *s = (Dsymbol *)sym->fields.data[i];
-                    VarDeclaration *v = s->isVarDeclaration();
-                    assert(v && v->storage_class & STCfield);
-
-                    // 'from' type
-                    Type *tvf = v->type->addMod(mod);
-
-                    // 'to' type
-                    Type *tv = v->type->castMod(to->mod);
-
-                    //printf("\t%s => %s, match = %d\n", v->type->toChars(), tv->toChars(), tvf->implicitConvTo(tv));
-                    if (tvf->implicitConvTo(tv) < MATCHconst)
-                        return MATCHnomatch;
-                }
-                m = MATCHconst;
-            }
-        }
-    }
-    else if (sym->aliasthis)
-
-
-
-
-
-
-
-
-
+
-    else
-        m = MATCHnomatch;       // no match
-    return m;
-}
-
-Type *TypeStruct::toHeadMutable()
-{
-    return this;
-}
-
-MATCH TypeStruct::constConv(Type *to)
-{
-    if (equals(to))
-        return MATCHexact;
-    if (ty == to->ty && sym == ((TypeStruct *)to)->sym &&
-        MODimplicitConv(mod, to->mod))
-        return MATCHconst;
-    return MATCHnomatch;
-}
-
@@ -7563 +7579 @@
-    //printf("TypeClass::implicitConvTo(to = '%s') %s\n", to->toChars(), toChars());
-    MATCH m = constConv(to);
-    if (m != MATCHnomatch)
-        return m;
-
-    ClassDeclaration *cdto = to->isClassHandle();
-    if (cdto && cdto->isBaseOf(sym, NULL))
-    {   //printf("'to' is base\n");
-        return MATCHconvert;
-    }
-
-    if (global.params.Dversion == 1)
-    {
-        // Allow conversion to (void *)
-        if (to->ty == Tpointer && ((TypePointer *)to)->next->ty == Tvoid)
-            return MATCHconvert;
-    }
-
-    m = MATCHnomatch;
-    if (sym->aliasthis)
-
-
-
-
-
-
-
-
+
-
-    return m;
-}
-
-MATCH TypeClass::constConv(Type *to)
-{
-    if (equals(to))
-        return MATCHexact;
-    if (ty == to->ty && sym == ((TypeClass *)to)->sym &&
-        MODimplicitConv(mod, to->mod))
-        return MATCHconst;
-    return MATCHnomatch;
-}
-
-Type *TypeClass::toHeadMutable()
-{
-    return this;
-}
-
-Expression *TypeClass::defaultInit(Loc loc)