Changeset 319

Timestamp:

12/30/09 00:11:16 (15 years ago)

Author:

walter

Message:

bugzilla 400 forward reference error; no propety X for type Y (struct within struct)

Files:

• branches/dmd-1.x/src/class.c (modified) (1 diff)
• branches/dmd-1.x/src/struct.c (modified) (1 diff)
• trunk/src/class.c (modified) (1 diff)
• trunk/src/mars.c (modified) (1 diff)
• trunk/src/struct.c (modified) (1 diff)

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

@@ -572 +572 @@
-#endif
-    }
-    sc->protection = PROTpublic;
-    sc->explicitProtection = 0;
-    sc->structalign = 8;
-    structalign = sc->structalign;
-    if (baseClass)
-    {   sc->offset = baseClass->structsize;
-    alignsize = baseClass->alignsize;
-//  if (isnested)
-//      sc->offset += PTRSIZE;  // room for uplevel context pointer
-    }
-    else
-    {   sc->offset = PTRSIZE * 2;   // allow room for __vptr and __monitor
-    alignsize = PTRSIZE;
-    }
-    structsize = sc->offset;
-    Scope scsave = *sc;
-    int members_dim = members->dim;
-    sizeok = 0;
+
+    /* Set scope so if there are forward references, we still might be able to
+     * resolve individual members like enums.
+     */
-    for (i = 0; i < members_dim; i++)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    s->semantic(sc);
-    }
-
-    if (sizeok == 2)
-    {   // semantic() failed because of forward references.
-    // Unwind what we did, and defer it for later
-    fields.setDim(0);
-    structsize = 0;
-    alignsize = 0;
-    structalign = 0;
-
-    sc = sc->pop();
-
-    scope = scx ? scx : new Scope(*sc);
-    scope->setNoFree();
-    scope->module->addDeferredSemantic(this);
-
-    //printf("\tsemantic('%s') failed due to forward references\n", toChars());
-    return;
-    }

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

@@ -280 +280 @@
-    if (sizeok == 0)        // if not already done the addMember step
-    {
-    for (i = 0; i < members->dim; i++)
-    {
-        Dsymbol *s = (Dsymbol *)members->data[i];
-        //printf("adding member '%s' to '%s'\n", s->toChars(), this->toChars());
-        s->addMember(sc, this, 1);
-    }
-    }
-
-    sizeok = 0;
-    sc2 = sc->push(this);
-    sc2->stc = 0;
-    sc2->parent = this;
-    if (isUnionDeclaration())
-    sc2->inunion = 1;
-    sc2->protection = PROTpublic;
-    sc2->explicitProtection = 0;
-
-    int members_dim = members->dim;
+
+    /* Set scope so if there are forward references, we still might be able to
+     * resolve individual members like enums.
+     */
+    for (int i = 0; i < members_dim; i++)
+    {   Dsymbol *s = (Dsymbol *)members->data[i];
+    /* 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 (i = 0; i < members_dim; i++)
-    {
-    Dsymbol *s = (Dsymbol *)members->data[i];
-    s->semantic(sc2);
-    if (isUnionDeclaration())
-        sc2->offset = 0;
-#if 0
-    if (sizeok == 2)
-    {   //printf("forward reference\n");
-        break;
-    }
-#endif
-    }
-
-    /* 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); }
-     */

trunk/src/class.c

@@ -589 +589 @@
-#endif
-    }
-    sc->protection = PROTpublic;
-    sc->explicitProtection = 0;
-    sc->structalign = 8;
-    structalign = sc->structalign;
-    if (baseClass)
-    {   sc->offset = baseClass->structsize;
-    alignsize = baseClass->alignsize;
-//  if (isnested)
-//      sc->offset += PTRSIZE;  // room for uplevel context pointer
-    }
-    else
-    {   sc->offset = PTRSIZE * 2;   // allow room for __vptr and __monitor
-    alignsize = PTRSIZE;
-    }
-    structsize = sc->offset;
-    Scope scsave = *sc;
-    int members_dim = members->dim;
-    sizeok = 0;
+
+    /* Set scope so if there are forward references, we still might be able to
+     * resolve individual members like enums.
+     */
-    for (i = 0; i < members_dim; i++)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    s->semantic(sc);
-    }
-
-    if (sizeok == 2)
-    {   // semantic() failed because of forward references.
-    // Unwind what we did, and defer it for later
-    fields.setDim(0);
-    structsize = 0;
-    alignsize = 0;
-    structalign = 0;
-
-    sc = sc->pop();
-
-    scope = scx ? scx : new Scope(*sc);
-    scope->setNoFree();
-    scope->module->addDeferredSemantic(this);
-
-    //printf("\tsemantic('%s') failed due to forward references\n", toChars());
-    return;
-    }

trunk/src/mars.c

@@ -151 +151 @@
-{
-    if (!global.gag)
-    {
-    char *p = loc.toChars();
-
-    if (*p)
-        fprintf(stdmsg, "%s: ", p);
-    mem.free(p);
-
-    fprintf(stdmsg, "Error: ");
-#if _MSC_VER
-    // MS doesn't recognize %zu format
-    OutBuffer tmp;
-    tmp.vprintf(format, ap);
-    fprintf(stdmsg, "%s", tmp.toChars());
-#else
-    vfprintf(stdmsg, format, ap);
-#endif
-    fprintf(stdmsg, "\n");
-    fflush(stdmsg);
-//
+
-    }
-    global.errors++;
-}
-
-/***************************************
- * Call this after printing out fatal error messages to clean up and exit
- * the compiler.
- */
-
-void fatal()
-{
-#if 0
-    halt();
-#endif
-    exit(EXIT_FAILURE);
-}
-
-/**************************************
- * Try to stop forgetting to remove the breakpoints from
- * release builds.

trunk/src/struct.c

@@ -340 +340 @@
-            t = Type::tvoidptr; // t should not be a ref type
-                    assert(!vthis);
-                    vthis = new ThisDeclaration(loc, t);
-            //vthis->storage_class |= STCref;
-                    members->push(vthis);
-                }
-            }
-        }
-    }
-
-    sizeok = 0;
-    sc2 = sc->push(this);
-    sc2->stc &= storage_class & STC_TYPECTOR;
-    sc2->parent = this;
-    if (isUnionDeclaration())
-    sc2->inunion = 1;
-    sc2->protection = PROTpublic;
-    sc2->explicitProtection = 0;
-
-    int members_dim = members->dim;
+
+    /* Set scope so if there are forward references, we still might be able to
+     * resolve individual members like enums.
+     */
+    for (int i = 0; i < members_dim; i++)
+    {   Dsymbol *s = (Dsymbol *)members->data[i];
+    /* 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 (isUnionDeclaration())
-        sc2->offset = 0;
-#if 0
-    if (sizeok == 2)
-    {   //printf("forward reference\n");
-        break;
-    }
-#endif
-    Type *t;
-    if (s->isDeclaration() &&
-        (t = s->isDeclaration()->type) != NULL &&
-        t->toBasetype()->ty == Tstruct)
-    {   StructDeclaration *sd = (StructDeclaration *)t->toDsymbol(sc);
-        if (sd->isnested)
-        error("inner struct %s cannot be a field", sd->toChars());
-    }