shithub: scc

Info  •  Files  •  Log  •  Branches

Use eqtype() before of decay()

When we have matrices of multiple dimensions the type returned
by initlist() is an array, which must match the type of the
row of the outer array. If we call decay() then the type of the
array is lost.

--- a/cc1/init.c

+++ b/cc1/init.c

@@ -98,9 +98,11 @@

 	np = (accept('{')) ? initlist(tp) : assign();

 	sym = np->sym;

-	if (sym && (sym->flags & ISSTRING) != 0 && tp->op == ARY) {

+	if (sym && sym->flags&ISSTRING && tp->op == ARY) {

 		btp = tp->type;

-		if (btp != chartype && btp != uchartype && btp != schartype) {

+		if (btp != chartype &&

+		    btp != uchartype &&

+		    btp != schartype) {

 			errorp("array of inappropriate type initialized from string constant");

 			goto return_zero;

 		}

@@ -117,6 +119,8 @@

 		return np;

 	}

+	if (eqtype(tp, np->type))

+		return np;

 	if ((aux = convert(decay(np), tp, 0)) != NULL)

 		return aux;