Changeset 811

Timestamp:

12/22/10 09:01:22 (14 years ago)

Author:

walter

Message:

better fix for the recursive template constraint issue

Files:

• trunk/src/mars.c (modified) (1 diff)
• trunk/src/template.c (modified) (2 diffs)
• trunk/src/template.h (modified) (1 diff)

trunk/src/mars.c

@@ -75 +75 @@
-#else
-#error "fix this"
-#endif
-
-#if TARGET_WINDOS
-    dll_ext  = "dll";
-#elif TARGET_LINUX || TARGET_FREEBSD || TARGET_SOLARIS
-    dll_ext  = "so";
-#elif TARGET_OSX
-    dll_ext = "dylib";
-#else
-#error "fix this"
-#endif
-
-    copyright = "Copyright (c) 1999-2010 by Digital Mars";
-    written = "written by Walter Bright"
-#if TARGET_NET
-    "\nMSIL back-end (alpha release) by Cristian L. Vlasceanu and associates.";
-#endif
-    ;
-1
+2
-    global.structalign = 8;
-
-    memset(&params, 0, sizeof(Param));
-}
-
-char *Loc::toChars()
-{
-    OutBuffer buf;
-    char *p;
-
-    if (filename)
-    {
-        buf.printf("%s", filename);
-    }
-
-    if (linnum)
-        buf.printf("(%d)", linnum);
-    buf.writeByte(0);
-    return (char *)buf.extractData();
-}

trunk/src/template.c

@@ -1298 +1298 @@
-            }
-            declareParameter(paramscope, tparam, oded);
-            dedargs->data[i] = (void *)oded;
-        }
-    }
-
-#if DMDV2
-    if (constraint)
-    {   /* Check to see if constraint is satisfied.
-         */
-        makeParamNamesVisibleInConstraint(paramscope);
-        Expression *e = constraint->syntaxCopy();
-        paramscope->flags |= SCOPEstaticif;
-
-        /* Detect recursive attempts to instantiate this template declaration,
-         * Bugzilla 4072
-         *  void foo(T)(T x) if (is(typeof(foo(x)))) { }
-         *  static assert(!is(typeof(foo(7))));
-         * Recursive attempts are regarded as a constraint failure.
-         */
-        /* Previous should also store the scope, as instantiations along a different scope branch
-         * should not conflict
-         */
-        int nmatches = 0;
-        for (Previous *p = previous; p; p = p->prev)
-        {
-            if (arrayObjectMatch(p->dedargs, dedargs, this, sc))
-            {
-
-
+
+
+
+
+
+
+
+
+
-            }
-            /* BUG: should also check for ref param differences
-             */
-        }
-        /* Look for 2 matches at least, because sometimes semantic3() gets run causing what appears to
-         * be recursion but isn't.
-         * Template A's constraint instantiates B, B's semantic3() run includes something that has A in its constraint.
-         * Perhaps a better solution is to always defer semantic3() rather than doing it eagerly. The risk
-         * with that is what if semantic3() fails, but our constraint "succeeded"?
-         */
-        if (nmatches >= 2)
-            goto Lnomatch;
-
-        Previous pr;
-        pr.prev = previous;
+        pr.sc = paramscope;
-        pr.dedargs = dedargs;
-        previous = ≺                 // add this to threaded list
-
-        int nerrors = global.errors;
-
-        e = e->semantic(paramscope);
-
-        previous = pr.prev;             // unlink from threaded list
-
-        if (nerrors != global.errors)   // if any errors from evaluating the constraint, no match
-            goto Lnomatch;
-
-        e = e->optimize(WANTvalue | WANTinterpret);
-        if (e->isBool(TRUE))
-            ;
-        else if (e->isBool(FALSE))
-            goto Lnomatch;
-        else
-        {
-            e->error("constraint %s is not constant or does not evaluate to a bool", e->toChars());
@@ -3702 +3699 @@
-
-    if (s)
-        ti = (TemplateInstance *)s;
-    else
-        ti = new TemplateInstance(loc, name);
-
-    ti->tiargs = arraySyntaxCopy(tiargs);
-
-    ScopeDsymbol::syntaxCopy(ti);
-    return ti;
-}
-
-
-void TemplateInstance::semantic(Scope *sc)
-{
-    semantic(sc, NULL);
-}
-
-void TemplateInstance::semantic(Scope *sc, Expressions *fargs)
-{
-)\n", toChars(), this, global.gag
+, sc = %p)\n", toChars(), this, global.gag, sc
-    if (global.errors && name != Id::AssociativeArray)
-    {
-        //printf("not instantiating %s due to %d errors\n", toChars(), global.errors);
-        if (!global.gag)
-        {
-            /* Trying to soldier on rarely generates useful messages
-             * at this point.
-             */
-            fatal();
-        }
-//        return;
-    }
-#if LOG
-    printf("\n+TemplateInstance::semantic('%s', this=%p)\n", toChars(), this);
-#endif
-    if (inst)           // if semantic() was already run
-    {
-#if LOG
-        printf("-TemplateInstance::semantic('%s', this=%p) already run\n", inst->toChars(), inst);
-#endif

trunk/src/template.h

@@ -49 +49 @@
-struct TemplateDeclaration : ScopeDsymbol
-{
-    TemplateParameters *parameters;     // array of TemplateParameter's
-
-    TemplateParameters *origParameters; // originals for Ddoc
-    Expression *constraint;
-    Array instances;                    // array of TemplateInstance's
-
-    TemplateDeclaration *overnext;      // next overloaded TemplateDeclaration
-    TemplateDeclaration *overroot;      // first in overnext list
-
-    int semanticRun;                    // 1 semantic() run
-
-    Dsymbol *onemember;         // if !=NULL then one member of this template
-
-    int literal;                // this template declaration is a literal
-    int ismixin;                // template declaration is only to be used as a mixin
-
-    struct Previous
-    {   Previous *prev;
+        Scope *sc;
-        Objects *dedargs;
-    };
-    Previous *previous;         // threaded list of previous instantiation attempts on stack
-
-    TemplateDeclaration(Loc loc, Identifier *id, TemplateParameters *parameters,
-        Expression *constraint, Dsymbols *decldefs, int ismixin);
-    Dsymbol *syntaxCopy(Dsymbol *);
-    void semantic(Scope *sc);
-    int overloadInsert(Dsymbol *s);
-    void toCBuffer(OutBuffer *buf, HdrGenState *hgs);
-    const char *kind();
-    char *toChars();
-
-    void emitComment(Scope *sc);
-    void toJsonBuffer(OutBuffer *buf);
-//    void toDocBuffer(OutBuffer *buf);
-
-    MATCH matchWithInstance(TemplateInstance *ti, Objects *atypes, int flag);
-    MATCH leastAsSpecialized(TemplateDeclaration *td2);
-