Changeset 478

Timestamp:

05/10/10 18:43:10 (15 years ago)

Author:

walter

Message:

bugzilla 945 template forward reference with named nested struct only

Files:

• branches/dmd-1.x/src/expression.c (modified) (1 diff)
• branches/dmd-1.x/src/func.c (modified) (1 diff)
• branches/dmd-1.x/src/struct.c (modified) (1 diff)
• trunk/src/expression.c (modified) (2 diffs)
• trunk/src/func.c (modified) (1 diff)
• trunk/src/struct.c (modified) (1 diff)

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

@@ -2263 +2263 @@
-            {
-                e = type->defaultInit();
-                e->loc = loc;
-                return e;
-            }
-        }
-        e = new VarExp(loc, v);
-        e->type = type;
-        e = e->semantic(sc);
-        return e->deref();
-    }
-    fld = s->isFuncLiteralDeclaration();
-    if (fld)
-    {   //printf("'%s' is a function literal\n", fld->toChars());
-        e = new FuncExp(loc, fld);
-        return e->semantic(sc);
-    }
-    f = s->isFuncDeclaration();
-    if (f)
-    {   //printf("'%s' is a function\n", f->toChars());
+
+        if (!f->originalType && f->scope)       // semantic not yet run
+            f->semantic(f->scope);
-        if (!f->type->deco)
-        {
-            error("forward reference to %s", toChars());
-            return new ErrorExp();
-        }
-        return new VarExp(loc, f);
-    }
-    cd = s->isClassDeclaration();
-    if (cd && thiscd && cd->isBaseOf(thiscd, NULL) && sc->func->needThis())
-    {
-        // We need to add an implicit 'this' if cd is this class or a base class.
-        DotTypeExp *dte;
-
-        dte = new DotTypeExp(loc, new ThisExp(loc), s);
-        return dte->semantic(sc);
-    }
-    imp = s->isImport();
-    if (imp)
-    {
-        if (!imp->pkg)

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

@@ -116 +116 @@
-#if 0
-    printf("FuncDeclaration::semantic(sc = %p, this = %p, '%s', linkage = %d)\n", sc, this, toPrettyChars(), sc->linkage);
-    if (isFuncLiteralDeclaration())
-        printf("\tFuncLiteralDeclaration()\n");
-    printf("sc->parent = %s, parent = %s\n", sc->parent->toChars(), parent ? parent->toChars() : "");
-    printf("type: %p, %s\n", type, type->toChars());
-#endif
-
-    if (semanticRun != PASSinit && isFuncLiteralDeclaration())
-    {
-        /* Member functions that have return types that are
-         * forward references can have semantic() run more than
-         * once on them.
-         * See test\interface2.d, test20
-         */
-        return;
-    }
-    parent = sc->parent;
-    Dsymbol *parent = toParent();
-
-=
+>
-    {
-        if (!parent->isClassDeclaration())
-            return;
-        // need to re-run semantic() in order to set the class's vtbl[]
-    }
-    else
-    {
-        assert(semanticRun <= PASSsemantic);
-        semanticRun = PASSsemantic;
-    }
-
-    unsigned dprogress_save = Module::dprogress;
-
-    foverrides.setDim(0);       // reset in case semantic() is being retried for this function
-
-    if (!type->deco)
-    {
-        type = type->semantic(loc, sc);
-    }
-    //type->print();

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

@@ -154 +154 @@
-
-void AggregateDeclaration::addField(Scope *sc, VarDeclaration *v)
-{
-    unsigned memsize;           // size of member
-    unsigned memalignsize;      // size of member for alignment purposes
-    unsigned xalign;            // alignment boundaries
-
-    //printf("AggregateDeclaration::addField('%s') %s\n", v->toChars(), toChars());
-
-    // Check for forward referenced types which will fail the size() call
-    Type *t = v->type->toBasetype();
-    if (t->ty == Tstruct /*&& isStructDeclaration()*/)
-    {   TypeStruct *ts = (TypeStruct *)t;
-#if DMDV2
-        if (ts->sym == this)
-        {
-            error("cannot have field %s with same struct type", v->toChars());
-        }
-#endif
-
+        if (ts->sym->sizeok != 1 && ts->sym->scope)
+            ts->sym->semantic(NULL);
-        if (ts->sym->sizeok != 1)
-        {
-            sizeok = 2;         // cannot finish; flag as forward referenced
-            return;
-        }
-    }
-    if (t->ty == Tident)
-    {
-        sizeok = 2;             // cannot finish; flag as forward referenced
-        return;
-    }
-
-    memsize = v->type->size(loc);
-    memalignsize = v->type->alignsize();
-    xalign = v->type->memalign(sc->structalign);
-    alignmember(xalign, memalignsize, &sc->offset);
-    v->offset = sc->offset;
-    sc->offset += memsize;
-    if (sc->offset > structsize)
-        structsize = sc->offset;

trunk/src/expression.c

@@ -258 +258 @@
-                     s = s->toParent())
-                {   FuncDeclaration *f = s->isFuncDeclaration();
-                    if (f->vthis)
-                    {
-                        //printf("rewriting e1 to %s's this\n", f->toChars());
-                        n++;
-                        e1 = new VarExp(loc, f->vthis);
-                    }
-                }
-                if (s && s->isClassDeclaration())
-                {   e1->type = s->isClassDeclaration()->type;
-                    if (n > 1)
-                        e1 = e1->semantic(sc);
-                }
-                else
-                    e1 = e1->semantic(sc);
-                goto L1;
-            }
-            /* Can't find a path from e1 to ad
-             */
-printf("t->ty = %d\n", t->ty);
-            e1->error("this for %s needs to be type %s not type %s",
-                var->toChars(), ad->toChars(), t->toChars());
-            e1 = new ErrorExp();
-        }
-    }
-    return e1;
-}
-
-/*****************************************
- * Determine if 'this' is available.
- * If it is, return the FuncDeclaration that has it.
- */
-
-FuncDeclaration *hasThis(Scope *sc)
-{   FuncDeclaration *fd;
-    FuncDeclaration *fdthis;
-
-    //printf("hasThis()\n");
-    fdthis = sc->parent->isFuncDeclaration();
-    //printf("fdthis = %p, '%s'\n", fdthis, fdthis ? fdthis->toChars() : "");
@@ -2428 +2427 @@
-            }
-            e = e->semantic(sc);
-            return e;
-        }
-
-        e = new VarExp(loc, v);
-        e->type = type;
-        e = e->semantic(sc);
-        return e->deref();
-    }
-    fld = s->isFuncLiteralDeclaration();
-    if (fld)
-    {   //printf("'%s' is a function literal\n", fld->toChars());
-        e = new FuncExp(loc, fld);
-        return e->semantic(sc);
-    }
-    f = s->isFuncDeclaration();
-    if (f)
-    {   //printf("'%s' is a function\n", f->toChars());
-
+        if (!f->originalType && f->scope)       // semantic not yet run
+            f->semantic(f->scope);
-        if (!f->type->deco)
-        {
-            error("forward reference to %s", toChars());
-            return new ErrorExp();
-        }
-        return new VarExp(loc, f, hasOverloads);
-    }
-    o = s->isOverloadSet();
-    if (o)
-    {   //printf("'%s' is an overload set\n", o->toChars());
-        return new OverExp(o);
-    }
-    cd = s->isClassDeclaration();
-    if (cd && thiscd && cd->isBaseOf(thiscd, NULL) && sc->func->needThis())
-    {
-        // We need to add an implicit 'this' if cd is this class or a base class.
-        DotTypeExp *dte;
-
-        dte = new DotTypeExp(loc, new ThisExp(loc), s);
-        return dte->semantic(sc);

trunk/src/func.c

@@ -117 +117 @@
-    printf("FuncDeclaration::semantic(sc = %p, this = %p, '%s', linkage = %d)\n", sc, this, toPrettyChars(), sc->linkage);
-    if (isFuncLiteralDeclaration())
-        printf("\tFuncLiteralDeclaration()\n");
-    printf("sc->parent = %s, parent = %s\n", sc->parent->toChars(), parent ? parent->toChars() : "");
-    printf("type: %p, %s\n", type, type->toChars());
-#endif
-
-    if (semanticRun != PASSinit && isFuncLiteralDeclaration())
-    {
-        /* Member functions that have return types that are
-         * forward references can have semantic() run more than
-         * once on them.
-         * See test\interface2.d, test20
-         */
-        return;
-    }
-
-    parent = sc->parent;
-    Dsymbol *parent = toParent();
-
-=
+>
-    {
-        if (!parent->isClassDeclaration())
-            return;
-        // need to re-run semantic() in order to set the class's vtbl[]
-    }
-    else
-    {
-        assert(semanticRun <= PASSsemantic);
-        semanticRun = PASSsemantic;
-    }
-
-    unsigned dprogress_save = Module::dprogress;
-
-    foverrides.setDim(0);       // reset in case semantic() is being retried for this function
-
-    storage_class |= sc->stc & ~STCref;
-    //printf("function storage_class = x%llx, sc->stc = x%llx, %x\n", storage_class, sc->stc, Declaration::isFinal());
-
-    if (!originalType)
-        originalType = type;

trunk/src/struct.c

@@ -162 +162 @@
-    unsigned xalign;            // alignment boundaries
-
-    //printf("AggregateDeclaration::addField('%s') %s\n", v->toChars(), toChars());
-    assert(!(v->storage_class & (STCstatic | STCextern | STCparameter | STCtls)));
-
-    // Check for forward referenced types which will fail the size() call
-    Type *t = v->type->toBasetype();
-    if (v->storage_class & STCref)
-    {   // References are the size of a pointer
-        t = Type::tvoidptr;
-    }
-    if (t->ty == Tstruct /*&& isStructDeclaration()*/)
-    {   TypeStruct *ts = (TypeStruct *)t;
-#if DMDV2
-        if (ts->sym == this)
-        {
-            error("cannot have field %s with same struct type", v->toChars());
-        }
-#endif
-
+        if (ts->sym->sizeok != 1 && ts->sym->scope)
+            ts->sym->semantic(NULL);
-        if (ts->sym->sizeok != 1)
-        {
-            sizeok = 2;         // cannot finish; flag as forward referenced
-            return;
-        }
-    }
-    if (t->ty == Tident)
-    {
-        sizeok = 2;             // cannot finish; flag as forward referenced
-        return;
-    }
-
-    memsize = t->size(loc);
-    memalignsize = t->alignsize();
-    xalign = t->memalign(sc->structalign);
-    alignmember(xalign, memalignsize, &sc->offset);
-    v->offset = sc->offset;
-    sc->offset += memsize;
-    if (sc->offset > structsize)
-        structsize = sc->offset;