asm/parser: print the actual token in an error, not its value

H. Peter Anvin · H. Peter Anvin · commit 5b9099c05896 · 2025-10-06T14:07:33.000-07:00
Printing an internal token value is not very user-friendly :) Print the contents of the actual token in question. Fixes: #90 Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
diff --git a/asm/parser.c b/asm/parser.c
@@ -1202,7 +1202,8 @@ insn *parse_line(char *buffer, insn *result, const int bits)
                 i = tokval.t_type;
             }
             if (!recover && i != 0 && i != ',') {
-                nasm_nonfatal("comma, decorator or end of line expected, got %d", i);
+                nasm_nonfatal("comma, decorator or end of line expected, got `%*s'",
+                              (int)tokval.t_len, tokval.t_start);
                 recover = true;
             }
         } else {                /* immediate operand */

Original file line number	Diff line number	Diff line change
`@@ -1202,7 +1202,8 @@ insn parse_line(char buffer, insn *result, const int bits)`
`1202`	`1202`	`i = tokval.t_type;`
`1203`	`1203`	`}`
`1204`	`1204`	`if (!recover && i != 0 && i != ',') {`
`1205`		`- nasm_nonfatal("comma, decorator or end of line expected, got %d", i);`
	`1205`	+ nasm_nonfatal("comma, decorator or end of line expected, got `%*s'",
	`1206`	`+ (int)tokval.t_len, tokval.t_start);`
`1206`	`1207`	`recover = true;`
`1207`	`1208`	`}`
`1208`	`1209`	`} else { /* immediate operand */`