Changeset 638

Timestamp:

08/28/10 01:49:32 (1 year 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

@@ -238 +238 @@
-    virtual int isBaseOf(ClassDeclaration *cd, int *poffset);
-
+    virtual int isBaseInfoComplete();
-    Dsymbol *search(Loc, Identifier *ident, int flags);
-#if DMDV2
@@ -287 +288 @@
-    int isBaseOf(BaseClass *bc, int *poffset);
-    const char *kind();
+    int isBaseInfoComplete();
-    int vtblOffset();
-#if DMDV2

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

@@ -820 +820 @@
-}
-
+/*********************************************
+ * 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)
-{
@@ -1311 +1328 @@
-}
-
+/*********************************************
+ * 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.

trunk/src/aggregate.h

@@ -241 +241 @@
-    virtual int isBaseOf(ClassDeclaration *cd, int *poffset);
-
+    virtual int isBaseInfoComplete();
-    Dsymbol *search(Loc, Identifier *ident, int flags);
-#if DMDV2
@@ -290 +291 @@
-    int isBaseOf(BaseClass *bc, int *poffset);
-    const char *kind();
+    int isBaseInfoComplete();
-    int vtblOffset();
-#if DMDV2

trunk/src/class.c

@@ -837 +837 @@
-}
-
+/*********************************************
+ * 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)
-{
@@ -1356 +1373 @@
-}
-
+/*********************************************
+ * 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.

trunk/src/mtype.c

@@ -4541 +4541 @@
-        // If t1n is forward referenced:
-        ClassDeclaration *cd = ((TypeClass *)t1n)->sym;
+#if 1
-        if (!cd->baseClass && cd->baseclasses->dim && !cd->isInterfaceDeclaration())
-
-
+
+
+
+
+
-        }
-    }