shithub: mc

Info  •  Files  •  Log  •  Branches

Allow global variable array initialziers.

--- a/6/simp.c

+++ b/6/simp.c

@@ -1440,7 +1440,9 @@

 			simpcode(s, e);

 		else

 			lappend(&s->blobs, &s->nblobs, dcl);

-	} else if (dcl->decl.isconst) {

+	} else if (!dcl->decl.isconst && !e) {

+		lappend(&s->blobs, &s->nblobs, dcl);

+	} else if (e->expr.isconst) {

 		switch (exprop(e)) {

 		case Oarr:

 		case Ostruct:

@@ -1452,8 +1454,6 @@

 			fatal(dcl, "unsupported initializer for %s", declname(dcl));

 			break;

 		}

-	} else if (!dcl->decl.isconst && !e) {

-		lappend(&s->blobs, &s->nblobs, dcl);

 	} else {

 		die("Non-constant initializer for %s\n", declname(dcl));

 	}