Changeset 317

Timestamp:

12/29/09 05:09:42 (15 years ago)

Author:

walter

Message:

bugzilla 3611 Enum forward referencing regression

Files:

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

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

@@ -38 +38 @@
-    t = memtype->syntaxCopy();
-
-    EnumDeclaration *ed;
-    if (s)
-    {   ed = (EnumDeclaration *)s;
-    ed->memtype = t;
-    }
-    else
-    ed = new EnumDeclaration(loc, ident, t);
-    ScopeDsymbol::syntaxCopy(ed);
-    return ed;
-}
-
-void EnumDeclaration::semantic(Scope *sc)
-{   int i;
-    uinteger_t number;
-    Type *t;
-    Scope *sce;
-
-    //printf("EnumDeclaration::semantic(sd = %p, '%s')\n", sc->scopesym, sc->scopesym->toChars());
-    if (symtab)         // if already done
-    return;
-    if (!memtype)
-    memtype = Type::tint32;
+
+    if (symtab)         // if already done
+    {   if (!scope)
+        return;     // semantic() already completed
+    }
+    else
+    symtab = new DsymbolTable();
+
+    Scope *scx = NULL;
+    if (scope)
+    {   sc = scope;
+        scx = scope;            // save so we don't make redundant copies
+        scope = NULL;
+    }
+
-    if (sc->stc & STCdeprecated)
-    isdeprecated = 1;
-
-    parent = sc->scopesym;
-    memtype = memtype->semantic(loc, sc);
-
-    /* Check to see if memtype is forward referenced
-     */
-    if (memtype->ty == Tenum)
-    {   EnumDeclaration *sym = (EnumDeclaration *)memtype->toDsymbol(sc);
-    if (!sym->memtype)
-    {
-        error("base enum %s is forward referenced", sym->toChars());
-        memtype = Type::tint32;
-    }
-    }
-
-    if (!memtype->isintegral())
-    {   error("base type must be of integral type, not %s", memtype->toChars());
-    memtype = Type::tint32;

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

@@ -3848 +3848 @@
-unsigned TypeEnum::alignsize()
-{
-    if (!sym->memtype)
-    {
-#ifdef DEBUG
-    printf("1: ");
-#endif
-    error(0, "enum %s is forward referenced", sym->toChars());
-    return 4;
-    }
-    return sym->memtype->alignsize();
-}
-
-Dsymbol *TypeEnum::toDsymbol(Scope *sc)
-{
-    return sym;
-}
-
-Type *TypeEnum::toBasetype()
-{
+    if (sym->scope)
+    {
+    sym->semantic(NULL);    // attempt to resolve forward reference
+    }
-    if (!sym->memtype)
-    {
-#ifdef DEBUG
-    printf("2: ");
-#endif
-    error(sym->loc, "enum %s is forward referenced", sym->toChars());
-    return terror;
-    }
-    return sym->memtype->toBasetype();
-}
-
-void TypeEnum::toDecoBuffer(OutBuffer *buf)
-{   char *name;
-
-    name = sym->mangle();
-//    if (name[0] == '_' && name[1] == 'D')
-//  name += 2;
-    buf->printf("%c%s", mangleChar[ty], name);
-}
-

trunk/src/mtype.c

@@ -5966 +5966 @@
-unsigned TypeEnum::alignsize()
-{
-    if (!sym->memtype)
-    {
-#ifdef DEBUG
-    printf("1: ");
-#endif
-    error(0, "enum %s is forward referenced", sym->toChars());
-    return 4;
-    }
-    return sym->memtype->alignsize();
-}
-
-Dsymbol *TypeEnum::toDsymbol(Scope *sc)
-{
-    return sym;
-}
-
-Type *TypeEnum::toBasetype()
-{
+    if (sym->scope)
+    {
+    sym->semantic(NULL);    // attempt to resolve forward reference
+    }
-    if (!sym->memtype)
-    {
-#ifdef DEBUG
-    printf("2: ");
-#endif
-    error(sym->loc, "enum %s is forward referenced", sym->toChars());
-    return tint32;
-    }
-    return sym->memtype->toBasetype();
-}
-
-void TypeEnum::toDecoBuffer(OutBuffer *buf, int flag)
-{
-    const char *name = sym->mangle();
-    Type::toDecoBuffer(buf, flag);
-    buf->printf("%s", name);
-}
-
-void TypeEnum::toCBuffer2(OutBuffer *buf, HdrGenState *hgs, int mod)
-{

trunk/src/optimize.c

@@ -813 +813 @@
-}
-
-Expression *EqualExp::optimize(int result)
-{   Expression *e;
-
-    //printf("EqualExp::optimize(result = %x) %s\n", result, toChars());
-    e1 = e1->optimize(WANTvalue | (result & WANTinterpret));
-    e2 = e2->optimize(WANTvalue | (result & WANTinterpret));
-    e = this;
-
-    Expression *e1 = fromConstInitializer(result, this->e1);
-    Expression *e2 = fromConstInitializer(result, this->e2);
-
-    e = Equal(op, type, e1, e2);
-    if (e == EXP_CANT_INTERPRET)
-    e = this;
-    return e;
-}
-
-Expression *IdentityExp::optimize(int result)
-
-
+
-    //printf("IdentityExp::optimize(result = %d) %s\n", result, toChars());
-    e1 = e1->optimize(WANTvalue | (result & WANTinterpret));
-    e2 = e2->optimize(WANTvalue | (result & WANTinterpret));
-
+Expression *
-
-    if ((this->e1->isConst()     && this->e2->isConst()) ||
-    (this->e1->op == TOKnull && this->e2->op == TOKnull))
-    {
-    e = Identity(op, type, this->e1, this->e2);
-    if (e == EXP_CANT_INTERPRET)
-        e = this;
-    }
-    return e;
-}
-
-Expression *IndexExp::optimize(int result)
-{   Expression *e;
-
-    //printf("IndexExp::optimize(result = %d) %s\n", result, toChars());
-    Expression *e1 = this->e1->optimize(WANTvalue | (result & WANTinterpret));
-    e1 = fromConstInitializer(result, e1);
-    if (this->e1->op == TOKvar)
-    {   VarExp *ve = (VarExp *)this->e1;
-    if (ve->var->storage_class & STCmanifest)