Changeset 587

Timestamp:

07/25/10 02:09:37 (14 years ago)

Author:

walter

Message:

bugzilla 3706 delegates of interfaces with multiple inheritance fail

Files:

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

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

@@ -6035 +6035 @@
-
-DelegateExp::DelegateExp(Loc loc, Expression *e, FuncDeclaration *f)
-        : UnaExp(loc, TOKdelegate, sizeof(DelegateExp), e)
-{
-    this->func = f;
-}
-
-Expression *DelegateExp::semantic(Scope *sc)
-{
-#if LOGSEMANTIC
-    printf("DelegateExp::semantic('%s')\n", toChars());
-#endif
-    if (!type)
-    {
-        e1 = e1->semantic(sc);
-        type = new TypeDelegate(func->type);
-        type = type->semantic(loc, sc);
-        AggregateDeclaration *ad = func->toParent()->isAggregateDeclaration();
-        if (func->needThis())
-            e1 = getRightThis(loc, sc, ad, e1, func);
+        if (ad && ad->type != e1->type)
+        {   // A downcast is required for interfaces, see Bugzilla 3706
+            e1 = new CastExp(loc, e1, ad->type);
+            e1 = e1->semantic(sc);
+        }
-    }
-    return this;
-}
-
-void DelegateExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    buf->writeByte('&');
-    if (!func->isNested())
-    {
-        expToCBuffer(buf, hgs, e1, PREC_primary);
-        buf->writeByte('.');
-    }
-    buf->writestring(func->toChars());
-}
-
-/************************************************************/
-
-DotTypeExp::DotTypeExp(Loc loc, Expression *e, Dsymbol *s)
-        : UnaExp(loc, TOKdottype, sizeof(DotTypeExp), e)
-{

trunk/src/expression.c

@@ -6370 +6370 @@
-DelegateExp::DelegateExp(Loc loc, Expression *e, FuncDeclaration *f, int hasOverloads)
-        : UnaExp(loc, TOKdelegate, sizeof(DelegateExp), e)
-{
-    this->func = f;
-    this->hasOverloads = hasOverloads;
-}
-
-Expression *DelegateExp::semantic(Scope *sc)
-{
-#if LOGSEMANTIC
-    printf("DelegateExp::semantic('%s')\n", toChars());
-#endif
-    if (!type)
-    {
-        e1 = e1->semantic(sc);
-        type = new TypeDelegate(func->type);
-        type = type->semantic(loc, sc);
-        AggregateDeclaration *ad = func->toParent()->isAggregateDeclaration();
-        if (func->needThis())
-            e1 = getRightThis(loc, sc, ad, e1, func);
+        if (ad && ad->type != e1->type)
+        {   // A downcast is required for interfaces, see Bugzilla 3706
+            e1 = new CastExp(loc, e1, ad->type);
+            e1 = e1->semantic(sc);
+        }
-    }
-    return this;
-}
-
-void DelegateExp::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    buf->writeByte('&');
-    if (!func->isNested())
-    {
-        expToCBuffer(buf, hgs, e1, PREC_primary);
-        buf->writeByte('.');
-    }
-    buf->writestring(func->toChars());
-}
-
-/************************************************************/
-
-DotTypeExp::DotTypeExp(Loc loc, Expression *e, Dsymbol *s)
-        : UnaExp(loc, TOKdottype, sizeof(DotTypeExp), e)
-{