Changeset 777

Timestamp:

12/05/10 05:23:42 (14 years ago)

Author:

walter

Message:

bugzilla 2206 unnamed template mixin of class inside function or class has incorrect classinfo and mangleof

Files:

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

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

@@ -205 +205 @@
-        parent = NULL;
-
-    char *id = Dsymbol::mangle();
-    parent = parentsave;
-    return id;
-}
-
-
-char *TemplateInstance::mangle()
-{
-    OutBuffer buf;
-    char *id;
-
-#if 0
-    printf("TemplateInstance::mangle() %s", toChars());
-    if (parent)
-        printf("  parent = %s %s", parent->kind(), parent->toChars());
-    printf("\n");
-#endif
-    id = ident ? ident->toChars() : toChars();
+    Dsymbol *par = isnested || isTemplateMixin() ? parent : tempdecl->parent;
-    if (!tempdecl)
-        error("is not defined");
-tempdecl->parent
-
-tempdecl->parent
+par
+
+par
-        if (p[0] == '_' && p[1] == 'D')
-            p += 2;
-        buf.writestring(p);
-    }
-    buf.printf("%zu%s", strlen(id), id);
-    id = buf.toChars();
-    buf.data = NULL;
-    //printf("TemplateInstance::mangle() %s = %s\n", toChars(), id);
-    return id;
-}
-
-
-
-char *Dsymbol::mangle()
-{
-    OutBuffer buf;
-    char *id;
-
-#if 0
-    printf("Dsymbol::mangle() '%s'", toChars());

trunk/src/mangle.c

@@ -199 +199 @@
-        ident == Id::TypeInfo_Tuple ||
-        this == object     ||
-        this == classinfo  ||
-        this == Module::moduleinfo ||
-        memcmp(ident->toChars(), "TypeInfo_", 9) == 0
-       )
-        parent = NULL;
-
-    char *id = Dsymbol::mangle();
-    parent = parentsave;
-    return id;
-}
-
-
-char *TemplateInstance::mangle()
-{
-    OutBuffer buf;
-    char *id;
-
-#if 0
-s"
+p %s", this
-    if (parent)
-        printf("  parent = %s %s", parent->kind(), parent->toChars());
-    printf("\n");
-#endif
-    id = ident ? ident->toChars() : toChars();
+    Dsymbol *par = isnested || isTemplateMixin() ? parent : tempdecl->parent;
-    if (!tempdecl)
-        error("is not defined");
-tempdecl->parent
-
-tempdecl->parent
+par
+
+par
-        if (p[0] == '_' && p[1] == 'D')
-            p += 2;
-        buf.writestring(p);
-    }
-    buf.printf("%zu%s", strlen(id), id);
-    id = buf.toChars();
-    buf.data = NULL;
-    //printf("TemplateInstance::mangle() %s = %s\n", toChars(), id);
-    return id;
-}
-
-
-
-char *Dsymbol::mangle()
-{
-    OutBuffer buf;
-    char *id;
-
-#if 0
-    printf("Dsymbol::mangle() '%s'", toChars());