Changeset 590

Timestamp:

07/30/10 05:16:35 (14 years ago)

Author:

walter

Message:

bugzilla 4514 Regression: Cannot cast from X* to X

Files:

• branches/dmd-1.x/src/expression.c (modified) (1 diff)
• branches/dmd-1.x/src/libelf.c (modified) (1 diff)
• trunk/src/expression.c (modified) (1 diff)
• trunk/src/libelf.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);
-
+isClassDeclaration() && ad->
-        {   // 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());
-}
-
-/************************************************************/

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

@@ -144 +144 @@
-        h->object_name[len] = '/';
-        assert(len < OBJECT_NAME_SIZE);
-        memset(h->object_name + len + 1, ' ', OBJECT_NAME_SIZE - (len + 1));
-    }
-    else
-    {
-        len = sprintf(h->object_name, "/%d", om->name_offset);
-        h->object_name[len] = ' ';
-    }
-
-    /* In the following sprintf's, don't worry if the trailing 0
-     * that sprintf writes goes off the end of the field. It will
-     * write into the next field, which we will promptly overwrite
-     * anyway. (So make sure to write the fields in ascending order.)
-     */
-
-    len = sprintf(h->file_time, "%lu", om->file_time);
-    assert(len <= 12);
-    memset(h->file_time + len, ' ', 12 - len);
-
+    if (om->user_id > 999999)
+        om->user_id = 0;
-    len = sprintf(h->user_id, "%u", om->user_id);
-    assert(len <= 6);
-    memset(h->user_id + len, ' ', 6 - len);
-
-    len = sprintf(h->group_id, "%u", om->group_id);
-    assert(len <= 6);
-    memset(h->group_id + len, ' ', 6 - len);
-
-    len = sprintf(h->file_mode, "%o", om->file_mode);
-    assert(len <= 8);
-    memset(h->file_mode + len, ' ', 8 - len);
-
-    len = sprintf(h->file_size, "%u", om->length);
-    assert(len <= 10);
-    memset(h->file_size + len, ' ', 10 - len);
-
-    h->trailer[0] = '`';
-    h->trailer[1] = '\n';
-}
-

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);
-
+isClassDeclaration() && ad->
-        {   // 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());
-}
-
-/************************************************************/

trunk/src/libelf.c

@@ -144 +144 @@
-        h->object_name[len] = '/';
-        assert(len < OBJECT_NAME_SIZE);
-        memset(h->object_name + len + 1, ' ', OBJECT_NAME_SIZE - (len + 1));
-    }
-    else
-    {
-        len = sprintf(h->object_name, "/%d", om->name_offset);
-        h->object_name[len] = ' ';
-    }
-
-    /* In the following sprintf's, don't worry if the trailing 0
-     * that sprintf writes goes off the end of the field. It will
-     * write into the next field, which we will promptly overwrite
-     * anyway. (So make sure to write the fields in ascending order.)
-     */
-
-    len = sprintf(h->file_time, "%lu", om->file_time);
-    assert(len <= 12);
-    memset(h->file_time + len, ' ', 12 - len);
-
+    if (om->user_id > 999999)
+        om->user_id = 0;
-    len = sprintf(h->user_id, "%u", om->user_id);
-    assert(len <= 6);
-    memset(h->user_id + len, ' ', 6 - len);
-
-    len = sprintf(h->group_id, "%u", om->group_id);
-    assert(len <= 6);
-    memset(h->group_id + len, ' ', 6 - len);
-
-    len = sprintf(h->file_mode, "%o", om->file_mode);
-    assert(len <= 8);
-    memset(h->file_mode + len, ' ', 8 - len);
-
-    len = sprintf(h->file_size, "%u", om->length);
-    assert(len <= 10);
-    memset(h->file_size + len, ' ', 10 - len);
-
-    h->trailer[0] = '`';
-    h->trailer[1] = '\n';
-}
-