shithub: mc

Info  •  Files  •  Log  •  Branches

Don't bungle trait merging and exporting.

--- a/parse/stab.c

+++ b/parse/stab.c

@@ -523,9 +523,12 @@

 	st = findstab(st, n);

 	t = gettrait(st, n);

-	if (t && !mergetrait(t, c))

+	if (t) {

+		if (mergetrait(t, c))

+			return;

 		fatal(n, "trait %s already defined on %s:%d",

 			namestr(n), fname(t->loc), lnum(t->loc));

+	}

 	ty = gettype(st, n);

 	if (ty)

 		fatal(n, "trait %s defined as a type on %s:%d",

--- a/parse/use.c

+++ b/parse/use.c

@@ -1168,6 +1168,7 @@

 {

 	Stab *st;

 	void **k;

+	Trait *tr;

 	Node *s, *u;

 	size_t i, n;

@@ -1211,14 +1212,17 @@

 		}

 	}

-	for (i = 0; i < ntraittab; i++) {

-		if (i < Ntraits || i != traittab[i]->uid)

+	k = htkeys(st->tr, &n);

+	for (i = 0; i < n; i++) {

+		tr = gettrait(st, k[i]);

+		if (tr->uid < Ntraits)

 			continue;

-		if (traittab[i]->vis == Visexport || traittab[i]->vis == Vishidden) {

+		if (tr->vis == Visexport || tr->vis == Vishidden) {

 			wrbyte(f, 'R');

-			traitpickle(f, traittab[i]);

+			traitpickle(f, tr);

 		}

 	}

+	free(k);

 	k = htkeys(st->impl, &n);

 	for (i = 0; i < n; i++) {