Changeset 614

Timestamp:

08/10/10 23:08:57 (14 years ago)

Author:

walter

Message:

fix for inner struct as field bug

Files:

• trunk/src/struct.c (modified) (1 diff)

trunk/src/struct.c

@@ -386 +386 @@
-        /* There are problems doing this in the general case because
-         * Scope keeps track of things like 'offset'
-         */
-        if (s->isEnumDeclaration() || (s->isAggregateDeclaration() && s->ident))
-        {
-            //printf("setScope %s %s\n", s->kind(), s->toChars());
-            s->setScope(sc2);
-        }
-    }
-
-    for (int i = 0; i < members_dim; i++)
-    {
-        Dsymbol *s = (Dsymbol *)members->data[i];
-        s->semantic(sc2);
-#if 0
-        if (sizeok == 2)
-        {   //printf("forward reference\n");
-            break;
-        }
-#endif
+
+#if 0   /* Decided to allow this because if the field is initialized by copying it from
+         * a correctly initialized struct, it will work.
+         */
-        Type *t;
-        if (s->isDeclaration() &&
-            (t = s->isDeclaration()->type) != NULL &&
-            t->toBasetype()->ty == Tstruct)
-        {   StructDeclaration *sd = (StructDeclaration *)t->toDsymbol(sc);
-            if (sd->isnested)
-
-
+
+
+
+
-    }
-
-#if DMDV1
-    /* This doesn't work for DMDV2 because (ref S) and (S) parameter
-     * lists will overload the same.
-     */
-    /* The TypeInfo_Struct is expecting an opEquals and opCmp with
-     * a parameter that is a pointer to the struct. But if there
-     * isn't one, but is an opEquals or opCmp with a value, write
-     * another that is a shell around the value:
-     *  int opCmp(struct *p) { return opCmp(*p); }
-     */
-
-    TypeFunction *tfeqptr;
-    {
-        Parameters *arguments = new Parameters;
-        Parameter *arg = new Parameter(STCin, handle, Id::p, NULL);
-
-        arguments->push(arg);
-        tfeqptr = new TypeFunction(arguments, Type::tint32, 0, LINKd);