shithub: mc

Info  •  Files  •  Log  •  Branches

Don't bail early in tyfreshen()

    Because structs aren't generics, and have no subs, we
    were returning them instead of trying to freshen them.

--- a/parse/infer.c

+++ b/parse/infer.c

@@ -124,9 +124,10 @@

     Type *ret;

     size_t i;

+    st->ingeneric++;

     t = tf(st, t);

-    if (t->type != Typaram && t->nsub == 0)

-        return t;

+    st->ingeneric--;

+

     switch (t->type) {

         case Typaram:

             if (hthas(ht, t->pname))

@@ -149,9 +150,13 @@

             die("Freshening unions is not yet implemented");

             break;

         default:

-            ret = tydup(t);

-            for (i = 0; i < t->nsub; i++)

-                ret->sub[i] = tyspecialize(st, ht, t->sub[i]);

+            if (t->nsub > 0) {

+                ret = tydup(t);

+                for (i = 0; i < t->nsub; i++)

+                    ret->sub[i] = tyspecialize(st, ht, t->sub[i]);

+            } else {

+                ret = t;

+            }

             break;

     }

     return ret;