uxn

commit 182c7276807f8095902bc5602a036796a9d3141b
parent aae4446dfb769367deb520929449755bd1e7c240
Author: Devine Lu Linvega <aliceffekt@gmail.com>
Date:   Wed,  3 Apr 2024 20:35:24 -0700

(uxnasm) Report the correct line number in references

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

1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/uxnasm.c b/src/uxnasm.c
@@ -112,7 +112,7 @@ walkcomment(FILE *f, Context *ctx)
 	char c;
 	int depth = 1;
 	while(f && fread(&c, 1, 1, f)) {
-		if(c == 0xa) ctx->line += 1;
+		if(c == 0xa) ctx->line++;
 		if(c == '(') depth++;
 		if(c == ')' && --depth < 1) return 1;
 	}
@@ -139,11 +139,10 @@ walkfile(FILE *f, Context *ctx)
 {
 	char c, *cptr = token;
 	while(f && fread(&c, 1, 1, f)) {
-		if(c == 0xa) ctx->line += 1;
 		if(c < 0x21) {
 			*cptr++ = 0x00;
-			if(token[0] && !parse(token, f, ctx))
-				return 0;
+			if(token[0] && !parse(token, f, ctx)) return 0;
+			if(c == 0xa) ctx->line++;
 			cptr = token;
 		} else if(cptr - token < 0x3f)
 			*cptr++ = c;
@@ -177,9 +176,9 @@ makemacro(char *name, FILE *f, Context *ctx)
 	m->name = push(name, 0);
 	m->data = dictnext;
 	while(f && fread(&c, 1, 1, f) && c != '{')
-		if(c == 0xa) ctx->line += 1;
+		if(c == 0xa) ctx->line++;
 	while(f && fread(&c, 1, 1, f)) {
-		if(c == 0xa) ctx->line += 1;
+		if(c == 0xa) ctx->line++;
 		if(c == '%') return error_top("Macro nested", name);
 		if(c == '{') depth++;
 		if(c == '}' && --depth) break;