Fix label_map case insensitivity and allow numbers in label names

1 files changed, 7 insertions, 3 deletions

diff --git a/asm.c b/asm.c
index 632dacf..7d02652 100644
--- a/asm.c
+++ b/asm.c
@@ -6,7 +6,9 @@
 #include <string.h>
 #include <stdint.h>
 
-#define NAMEALPH "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_"
+#define TEXTALPH "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_"
+#define NUMALPH "0123456789"
+#define NAMEALPH TEXTALPH NUMALPH
 #define WHITESPACE " \t\v\r\n,"
 
 enum asm_tok {
@@ -178,14 +180,16 @@ tok_next(struct asm_tokenizer *tok)
 	} else if (*s == '#') {
 		tok->off += strlen(tok->linebuf + tok->off);
 		return TOK_COMMENT;
-	} else if (len && strspn(s, NAMEALPH) == len-1 && s[len-1] == ':') {
+	} else if (len && strchr(TEXTALPH, *s)
+			&& strspn(s, NAMEALPH) == len-1 && s[len-1] == ':') {
 		s[len-1] = '\0';
 		return TOK_LABEL;
 	} else if (*s == 'X' && atoi(s+1) > 0) {
 		return TOK_XPOS;
 	} else if (*s == 'Y' && atoi(s+1) > 0) {
 		return TOK_YPOS;
-	} else if (strspn(s, NAMEALPH) == strlen(s)) {
+	} else if (strchr(TEXTALPH, *s)
+			&& strspn(s, NAMEALPH) == strlen(s)) {
 		return TOK_NAME;
 	} else {
 		die("load: line %lu, invalid token '%s'", tok->lineno, s);