Changeset 811

Timestamp:

12/22/10 04:01:22 (1 year 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) (3 diffs)
• trunk/src/template.h (modified) (1 diff)

trunk/src/mars.c

@@ -93 +93 @@
-#endif
-    ;
-1
+2
-    global.structalign = 8;
-

trunk/src/template.c

@@ -1316 +1316 @@
-         * 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)
@@ -1324 +1321 @@
-            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
@@ -3720 +3717 @@
-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)
-    {

trunk/src/template.h

@@ -67 +67 @@
-    struct Previous
-    {   Previous *prev;
+        Scope *sc;
-        Objects *dedargs;
-    };