shithub: mc

Info  •  Files  •  Log  •  Branches

Fix missing tysearch()

	We were erronously saying that two types were not equal,
	even though we'd already unified them.

--- a/parse/infer.c

+++ b/parse/infer.c

@@ -948,8 +948,9 @@

 	}

 	r = NULL;

-	if (a->type == Tyvar) {

+	if (a->type == Tyvar || tyeq(a, b))

 		tytab[a->tid] = b;

+	if (a->type == Tyvar) {

 		ea = basetype(st, a);

 		eb = basetype(st, b);

 		if (ea && eb)

--- a/parse/type.c

+++ b/parse/type.c

@@ -667,6 +667,8 @@

 	if (!a || !b)

 		return a == b;

+	a = tysearch(a);

+	b = tysearch(b);

 	if (a->type != b->type)

 		return 0;

 	if (a->narg != b->narg)

@@ -685,7 +687,9 @@

 	bsput(visited, b->tid);

 	switch (a->type) {

-	case Typaram:	return streq(a->pname, b->pname);	break;

+	case Typaram:

+		return streq(a->pname, b->pname);

+		break;

 	case Tyvar:

 		if (a->tid != b->tid)

 			return 0;