Changeset 607

Timestamp:

08/09/10 04:30:47 (14 years ago)

Author:

walter

Message:

bugzilla 4503 forward reference to aliased template instance

Files:

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

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

@@ -599 +599 @@
-{
-    //printf("AliasDeclaration::getType() %s\n", type->toChars());
-#if 0
-    if (!type->deco && scope)
-        semantic(scope);
-    if (type && !type->deco)
-        error("forward reference to alias %s\n", toChars());
-#endif
-    return type;
-}
-
-Dsymbol *AliasDeclaration::toAlias()
-{
-    //printf("AliasDeclaration::toAlias('%s', this = %p, aliassym = %p, kind = '%s')\n", toChars(), this, aliassym, aliassym ? aliassym->kind() : "");
-    assert(this != aliassym);
-    //static int count; if (++count == 75) exit(0); //*(char*)0=0;
-    if (inSemantic)
-    {   error("recursive alias declaration");
-        aliassym = new TypedefDeclaration(loc, ident, Type::terror, NULL);
-    }
+    else if (!aliassym && scope)
+        semantic(scope);
-    Dsymbol *s = aliassym ? aliassym->toAlias() : this;
-    return s;
-}
-
-void AliasDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    buf->writestring("alias ");
-#if 0 && _DH
-    if (hgs->hdrgen)
-    {
-        if (haliassym)
-        {
-            haliassym->toCBuffer(buf, hgs);
-            buf->writeByte(' ');
-            buf->writestring(ident->toChars());
-        }
-        else
-            htype->toCBuffer(buf, ident, hgs);
-    }
-    else

trunk/src/declaration.c

@@ -577 +577 @@
-
-const char *AliasDeclaration::kind()
-{
-    return "alias";
-}
-
-Type *AliasDeclaration::getType()
-{
-    return type;
-}
-
-Dsymbol *AliasDeclaration::toAlias()
-{
-    //printf("AliasDeclaration::toAlias('%s', this = %p, aliassym = %p, kind = '%s')\n", toChars(), this, aliassym, aliassym ? aliassym->kind() : "");
-    assert(this != aliassym);
-    //static int count; if (++count == 10) *(char*)0=0;
-    if (inSemantic)
-    {   error("recursive alias declaration");
-        aliassym = new TypedefDeclaration(loc, ident, Type::terror, NULL);
-    }
+    else if (!aliassym && scope)
+        semantic(scope);
-    Dsymbol *s = aliassym ? aliassym->toAlias() : this;
-    return s;
-}
-
-void AliasDeclaration::toCBuffer(OutBuffer *buf, HdrGenState *hgs)
-{
-    buf->writestring("alias ");
-#if 0 && _DH
-    if (hgs->hdrgen)
-    {
-        if (haliassym)
-        {
-            haliassym->toCBuffer(buf, hgs);
-            buf->writeByte(' ');
-            buf->writestring(ident->toChars());
-        }
-        else
-            htype->toCBuffer(buf, ident, hgs);
-    }
-    else