Add strings as 'b "foo"'

lisc/emit.c

@@ -549,9 +549,12 @@ emitdat(Dat *d, FILE *f)
 			d->u.str, d->u.str, d->u.str
 		);
 		break;
-	case DA:
+	case DB:
-		fprintf(f, "\t.asciz \"%s\"\n", d->u.str);
+		if (d->isstr) {
+			fprintf(f, "\t.ascii \"%s\"\n", d->u.str);
 			break;
+		}
+		/* fallthrough */
 	default:
 		if (d->isref)
 			fprintf(f, "%s %s+%"PRId64"\n", dtoa[d->type], d->u.ref.nam, d->u.ref.off);

lisc/lisc.h

@@ -429,7 +429,6 @@ struct Dat {
 		DEnd,
 		DName,
 		DAlign,
-		DA,
 		DB,
 		DH,
 		DW,
@@ -446,6 +445,7 @@ struct Dat {
 		} ref;
 	} u;
 	char isref;
+	char isstr;
 };
 
 

lisc/parse.c

@@ -769,10 +769,13 @@ parsetyp()
 static void
 parsedataref(Dat *d)
 {
+	int t;
+
 	d->isref = 1;
 	d->u.ref.nam = tokval.str;
 	d->u.ref.off = 0;
-	if (peek() == TPlus) {
+	t = peek();
+	if (t == TPlus) {
 		next();
 		if (next() != TInt)
 			err("invalid token after offset in ref");
@@ -780,6 +783,13 @@ parsedataref(Dat *d)
 	}
 }
 
+static void
+parsedatastr(Dat *d)
+{
+	d->isstr = 1;
+	d->u.str = tokval.str;
+}
+
 static void
 parsedat(void cb(Dat *))
 {
@@ -804,14 +814,9 @@ parsedat(void cb(Dat *))
 	d.type = DName;
 	d.u.str = s;
 	cb(&d);
-	if (t == TStr) {
+
-		d.type = DA;
-		d.u.str = tokval.str;
-		d.isref = 0;
-		cb(&d);
-	} else {
 	if (t != TLBrace)
-			err("data contents must be { .. } or \" .. \"");
+		err("expected data contents in { .. }");
 	for (;;) {
 		switch (nextnl()) {
 		default: err("invalid size specifier %c in data", tokval.chr);
@@ -826,6 +831,7 @@ parsedat(void cb(Dat *))
 		t = nextnl();
 		do {
 			d.isref = 0;
+			d.isstr = 0;
 			memset(&d.u, 0, sizeof d.u);
 			if (t == TFlts)
 				d.u.flts = tokval.flts;
@@ -835,6 +841,8 @@ parsedat(void cb(Dat *))
 				d.u.num = tokval.num;
 			else if (t == TGlo)
 				parsedataref(&d);
+			else if (t == TStr)
+				parsedatastr(&d);
 			else
 				err("constant literal expected");
 			cb(&d);
@@ -845,7 +853,6 @@ parsedat(void cb(Dat *))
 		if (t != TComma)
 			err(", or } expected");
 	}
-	}
 Done:
 	d.type = DEnd;
 	cb(&d);

minic/minic.y

@@ -950,6 +950,6 @@ main()
 	if (yyparse() != 0)
 		die("parse error");
 	for (i=1; i<nglo; i++)
-		fprintf(of, "data $glo%d = %s\n", i, ini[i]);
+		fprintf(of, "data $glo%d = {b %s, b 0 }\n", i, ini[i]);
 	return 0;
 }