Changeset 638

Timestamp:

08/28/10 05:49:32 (14 years ago)

Author:

walter

Message:

partial apply of bugzilla 2511 - Covariant return type doesn't work with circular import

Files:

• branches/dmd-1.x/src/aggregate.h (modified) (2 diffs)
• branches/dmd-1.x/src/class.c (modified) (2 diffs)
• trunk/src/aggregate.h (modified) (2 diffs)
• trunk/src/class.c (modified) (2 diffs)
• trunk/src/mtype.c (modified) (1 diff)

branches/dmd-1.x/src/aggregate.h

@@ -220 +220 @@
-    ClassInfoDeclaration *vclassinfo;   // the ClassInfo object for this ClassDeclaration
-    int com;                            // !=0 if this is a COM class (meaning
-                                        // it derives from IUnknown)
-    int isauto;                         // !=0 if this is an auto class
-    int isabstract;                     // !=0 if abstract class
-#if DMDV1
-    int isnested;                       // !=0 if is nested
-    VarDeclaration *vthis;              // 'this' parameter if this class is nested
-#endif
-    int inuse;                          // to prevent recursive attempts
-
-    ClassDeclaration(Loc loc, Identifier *id, BaseClasses *baseclasses);
-    Dsymbol *syntaxCopy(Dsymbol *s);
-    void semantic(Scope *sc);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    int isBaseOf2(ClassDeclaration *cd);
-
-    #define OFFSET_RUNTIME 0x76543210
-    virtual int isBaseOf(ClassDeclaration *cd, int *poffset);
-
+    virtual int isBaseInfoComplete();
-    Dsymbol *search(Loc, Identifier *ident, int flags);
-#if DMDV2
-    int isFuncHidden(FuncDeclaration *fd);
-#endif
-    FuncDeclaration *findFunc(Identifier *ident, TypeFunction *tf);
-    void interfaceSemantic(Scope *sc);
-#if DMDV1
-    int isNested();
-#endif
-    int isCOMclass();
-    virtual int isCOMinterface();
-#if DMDV2
-    virtual int isCPPinterface();
-#endif
-    int isAbstract();
-    virtual int vtblOffset();
-    const char *kind();
-    char *mangle();
-    void toDocBuffer(OutBuffer *buf);
-
@@ -269 +270 @@
-    Symbol *toVtblSymbol();
-    void toDt(dt_t **pdt);
-    void toDt2(dt_t **pdt, ClassDeclaration *cd);
-
-    Symbol *vtblsym;
-
-    ClassDeclaration *isClassDeclaration() { return (ClassDeclaration *)this; }
-};
-
-struct InterfaceDeclaration : ClassDeclaration
-{
-#if DMDV2
-    int cpp;                            // !=0 if this is a C++ interface
-#endif
-    InterfaceDeclaration(Loc loc, Identifier *id, BaseClasses *baseclasses);
-    Dsymbol *syntaxCopy(Dsymbol *s);
-    void semantic(Scope *sc);
-    int isBaseOf(ClassDeclaration *cd, int *poffset);
-    int isBaseOf(BaseClass *bc, int *poffset);
-    const char *kind();
+    int isBaseInfoComplete();
-    int vtblOffset();
-#if DMDV2
-    int isCPPinterface();
-#endif
-    virtual int isCOMinterface();
-
-    void toObjFile(int multiobj);                       // compile to .obj file
-    Symbol *toSymbol();
-
-    InterfaceDeclaration *isInterfaceDeclaration() { return this; }
-};
-
-#endif /* DMD_AGGREGATE_H */

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

@@ -802 +802 @@
-    //printf("ClassDeclaration::isBaseOf(this = '%s', cd = '%s')\n", toChars(), cd->toChars());
-    if (poffset)
-        *poffset = 0;
-    while (cd)
-    {
-        if (this == cd->baseClass)
-            return 1;
-
-        /* cd->baseClass might not be set if cd is forward referenced.
-         */
-        if (!cd->baseClass && cd->baseclasses->dim && !cd->isInterfaceDeclaration())
-        {
-            cd->error("base class is forward referenced by %s", toChars());
-        }
-
-        cd = cd->baseClass;
-    }
-    return 0;
-}
-
+/*********************************************
+ * Determine if 'this' has complete base class information.
+ * This is used to detect forward references in covariant overloads.
+ */
+
+int ClassDeclaration::isBaseInfoComplete()
+{
+    if (!baseClass)
+        return 0;
+    for (int i = 0; i < baseclasses->dim; i++)
+    {   BaseClass *b = (BaseClass *)baseclasses->data[i];
+        if (!b->base || !b->base->isBaseInfoComplete())
+            return 0;
+    }
+    return 1;
+}
+
-Dsymbol *ClassDeclaration::search(Loc loc, Identifier *ident, int flags)
-{
-    Dsymbol *s;
-    //printf("%s.ClassDeclaration::search('%s')\n", toChars(), ident->toChars());
-
-    if (scope)
-    {   Scope *sc = scope;
-        sc->mustsemantic++;
-        semantic(sc);
-        sc->mustsemantic--;
-    }
-
-    if (!members || !symtab || scope)
-    {
-        error("is forward referenced when looking for '%s'", ident->toChars());
-        //*(char*)0=0;
-        return NULL;
-    }
-
-    s = ScopeDsymbol::search(loc, ident, flags);
@@ -1293 +1310 @@
-        if (this == b->base)
-        {
-            if (poffset)
-            {   *poffset = b->offset;
-                if (j && bc->base->isInterfaceDeclaration())
-                    *poffset = OFFSET_RUNTIME;
-            }
-            return 1;
-        }
-        if (isBaseOf(b, poffset))
-        {   if (j && poffset && bc->base->isInterfaceDeclaration())
-                *poffset = OFFSET_RUNTIME;
-            return 1;
-        }
-    }
-    if (poffset)
-        *poffset = 0;
-    return 0;
-}
-
+/*********************************************
+ * Determine if 'this' has clomplete base class information.
+ * This is used to detect forward references in covariant overloads.
+ */
+
+int InterfaceDeclaration::isBaseInfoComplete()
+{
+    assert(!baseClass);
+    for (int i = 0; i < baseclasses->dim; i++)
+    {   BaseClass *b = (BaseClass *)baseclasses->data[i];
+        if (!b->base || !b->base->isBaseInfoComplete ())
+            return 0;
+    }
+    return 1;
+}
+
-/****************************************
- * Determine if slot 0 of the vtbl[] is reserved for something else.
- * For class objects, yes, this is where the ClassInfo ptr goes.
- * For COM interfaces, no.
- * For non-COM interfaces, yes, this is where the Interface ptr goes.
- */
-
-int InterfaceDeclaration::vtblOffset()
-{
-    if (isCOMinterface())
-        return 0;
-    return 1;
-}
-
-int InterfaceDeclaration::isCOMinterface()
-{
-    return com;
-}
-
-#if DMDV2

trunk/src/aggregate.h

@@ -223 +223 @@
-    TypeInfoClassDeclaration *vclassinfo;       // the ClassInfo object for this ClassDeclaration
-    int com;                            // !=0 if this is a COM class (meaning
-                                        // it derives from IUnknown)
-    int isauto;                         // !=0 if this is an auto class
-    int isabstract;                     // !=0 if abstract class
-#if DMDV1
-    int isnested;                       // !=0 if is nested
-    VarDeclaration *vthis;              // 'this' parameter if this class is nested
-#endif
-    int inuse;                          // to prevent recursive attempts
-
-    ClassDeclaration(Loc loc, Identifier *id, BaseClasses *baseclasses);
-    Dsymbol *syntaxCopy(Dsymbol *s);
-    void semantic(Scope *sc);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    int isBaseOf2(ClassDeclaration *cd);
-
-    #define OFFSET_RUNTIME 0x76543210
-    virtual int isBaseOf(ClassDeclaration *cd, int *poffset);
-
+    virtual int isBaseInfoComplete();
-    Dsymbol *search(Loc, Identifier *ident, int flags);
-#if DMDV2
-    int isFuncHidden(FuncDeclaration *fd);
-#endif
-    FuncDeclaration *findFunc(Identifier *ident, TypeFunction *tf);
-    void interfaceSemantic(Scope *sc);
-#if DMDV1
-    int isNested();
-#endif
-    int isCOMclass();
-    virtual int isCOMinterface();
-#if DMDV2
-    virtual int isCPPinterface();
-#endif
-    int isAbstract();
-    virtual int vtblOffset();
-    const char *kind();
-    char *mangle();
-    void toDocBuffer(OutBuffer *buf);
-
@@ -272 +273 @@
-    Symbol *toVtblSymbol();
-    void toDt(dt_t **pdt);
-    void toDt2(dt_t **pdt, ClassDeclaration *cd);
-
-    Symbol *vtblsym;
-
-    ClassDeclaration *isClassDeclaration() { return (ClassDeclaration *)this; }
-};
-
-struct InterfaceDeclaration : ClassDeclaration
-{
-#if DMDV2
-    int cpp;                            // !=0 if this is a C++ interface
-#endif
-    InterfaceDeclaration(Loc loc, Identifier *id, BaseClasses *baseclasses);
-    Dsymbol *syntaxCopy(Dsymbol *s);
-    void semantic(Scope *sc);
-    int isBaseOf(ClassDeclaration *cd, int *poffset);
-    int isBaseOf(BaseClass *bc, int *poffset);
-    const char *kind();
+    int isBaseInfoComplete();
-    int vtblOffset();
-#if DMDV2
-    int isCPPinterface();
-#endif
-    virtual int isCOMinterface();
-
-    void toObjFile(int multiobj);                       // compile to .obj file
-    Symbol *toSymbol();
-
-    InterfaceDeclaration *isInterfaceDeclaration() { return this; }
-};
-
-#endif /* DMD_AGGREGATE_H */

trunk/src/class.c

@@ -819 +819 @@
-    //printf("ClassDeclaration::isBaseOf(this = '%s', cd = '%s')\n", toChars(), cd->toChars());
-    if (poffset)
-        *poffset = 0;
-    while (cd)
-    {
-        if (this == cd->baseClass)
-            return 1;
-
-        /* cd->baseClass might not be set if cd is forward referenced.
-         */
-        if (!cd->baseClass && cd->baseclasses->dim && !cd->isInterfaceDeclaration())
-        {
-            cd->error("base class is forward referenced by %s", toChars());
-        }
-
-        cd = cd->baseClass;
-    }
-    return 0;
-}
-
+/*********************************************
+ * Determine if 'this' has complete base class information.
+ * This is used to detect forward references in covariant overloads.
+ */
+
+int ClassDeclaration::isBaseInfoComplete()
+{
+    if (!baseClass)
+        return 0;
+    for (int i = 0; i < baseclasses->dim; i++)
+    {   BaseClass *b = (BaseClass *)baseclasses->data[i];
+        if (!b->base || !b->base->isBaseInfoComplete())
+            return 0;
+    }
+    return 1;
+}
+
-Dsymbol *ClassDeclaration::search(Loc loc, Identifier *ident, int flags)
-{
-    Dsymbol *s;
-    //printf("%s.ClassDeclaration::search('%s')\n", toChars(), ident->toChars());
-
-    if (scope)
-    {   Scope *sc = scope;
-        sc->mustsemantic++;
-        semantic(sc);
-        sc->mustsemantic--;
-    }
-
-    if (!members || !symtab || scope)
-    {
-        error("is forward referenced when looking for '%s'", ident->toChars());
-        //*(char*)0=0;
-        return NULL;
-    }
-
-    s = ScopeDsymbol::search(loc, ident, flags);
@@ -1338 +1355 @@
-        if (this == b->base)
-        {
-            if (poffset)
-            {   *poffset = b->offset;
-                if (j && bc->base->isInterfaceDeclaration())
-                    *poffset = OFFSET_RUNTIME;
-            }
-            return 1;
-        }
-        if (isBaseOf(b, poffset))
-        {   if (j && poffset && bc->base->isInterfaceDeclaration())
-                *poffset = OFFSET_RUNTIME;
-            return 1;
-        }
-    }
-    if (poffset)
-        *poffset = 0;
-    return 0;
-}
-
+/*********************************************
+ * Determine if 'this' has clomplete base class information.
+ * This is used to detect forward references in covariant overloads.
+ */
+
+int InterfaceDeclaration::isBaseInfoComplete()
+{
+    assert(!baseClass);
+    for (int i = 0; i < baseclasses->dim; i++)
+    {   BaseClass *b = (BaseClass *)baseclasses->data[i];
+        if (!b->base || !b->base->isBaseInfoComplete ())
+            return 0;
+    }
+    return 1;
+}
+
-/****************************************
- * Determine if slot 0 of the vtbl[] is reserved for something else.
- * For class objects, yes, this is where the ClassInfo ptr goes.
- * For COM interfaces, no.
- * For non-COM interfaces, yes, this is where the Interface ptr goes.
- */
-
-int InterfaceDeclaration::vtblOffset()
-{
-    if (isCOMinterface() || isCPPinterface())
-        return 0;
-    return 1;
-}
-
-int InterfaceDeclaration::isCOMinterface()
-{
-    return com;
-}
-
-#if DMDV2

trunk/src/mtype.c

@@ -4523 +4523 @@
-    Type *t1n = t1->next;
-    Type *t2n = t2->next;
-
-    if (!t1n || !t2n)           // happens with return type inference
-        goto Lnotcovariant;
-
-    if (t1n->equals(t2n))
-        goto Lcovariant;
-    if (t1n->ty == Tclass && t2n->ty == Tclass)
-    {
-        /* If same class type, but t2n is const, then it's
-         * covariant. Do this test first because it can work on
-         * forward references.
-         */
-        if (((TypeClass *)t1n)->sym == ((TypeClass *)t2n)->sym &&
-            MODimplicitConv(t1n->mod, t2n->mod))
-            goto Lcovariant;
-
-        // If t1n is forward referenced:
-        ClassDeclaration *cd = ((TypeClass *)t1n)->sym;
+#if 1
-        if (!cd->baseClass && cd->baseclasses->dim && !cd->isInterfaceDeclaration())
-
-
+
+
+
+
+
-        }
-    }
-    if (t1n->implicitConvTo(t2n))
-        goto Lcovariant;
-  }
-    goto Lnotcovariant;
-
-Lcovariant:
-    /* Can convert mutable to const
-     */
-    if (!MODimplicitConv(t2->mod, t1->mod))
-        goto Lnotcovariant;
-#if 0
-    if (t1->mod != t2->mod)
-    {
-        if (!(t1->mod & MODconst) && (t2->mod & MODconst))
-            goto Lnotcovariant;
-        if (!(t1->mod & MODshared) && (t2->mod & MODshared))
-            goto Lnotcovariant;
-    }