uxn

commit 037ab10b6aaf671261435a9bcd60171e5f87f20d
parent e70041017d8ef9605a96435eb604d4439286adb5
Author: neauoire <aliceffekt@gmail.com>
Date:   Mon, 11 Oct 2021 13:27:20 -0700

Fixed issue with raw bytes in macros

Diffstat:
M
src/uxnasm.c
 | 
11
+++++------

1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/uxnasm.c b/src/uxnasm.c
@@ -235,6 +235,10 @@ walktoken(char *w)
 			res += walktoken(m->items[i]);
 		return res;
 	}
+	if(sihx(w) && slen(w) == 2)
+		return 1;
+	else if(sihx(w) && slen(w) == 4)
+		return 1;
 	return error("Invalid token", w);
 }
 
@@ -392,12 +396,7 @@ cleanup(char *filename)
 			continue; /* Ignore capitalized labels(devices) */
 		else if(!p.labels[i].refs)
 			fprintf(stderr, "--- Unused label: %s\n", p.labels[i].name);
-	fprintf(stderr, "Assembled %s in %.2fkb(%.2f%% used), %d labels, %d macros.\n",
-		filename,
-		(p.length - TRIM) / 1024.0,
-		p.length / 652.80,
-		p.llen,
-		p.mlen);
+	fprintf(stderr, "Assembled %s in %.2fkb(%.2f%% used), %d labels, %d macros.\n", filename, (p.length - TRIM) / 1024.0, p.length / 652.80, p.llen, p.mlen);
 }
 
 int