d6
/
uxn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

(uxnasm) Report the correct line number in references

This commit is contained in:
Devine Lu Linvega 2024-04-03 20:35:24 -07:00
parent aae4446dfb
commit 182c727680
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/uxnasm.c
View File

@ -112,7 +112,7 @@ walkcomment(FILE *f, Context *ctx)
char c; char c;
int depth = 1; int depth = 1;
while(f && fread(&c, 1, 1, f)) { while(f && fread(&c, 1, 1, f)) {
if(c == 0xa) ctx->line += 1; if(c == 0xa) ctx->line++;
if(c == '(') depth++; if(c == '(') depth++;
if(c == ')' && --depth < 1) return 1; if(c == ')' && --depth < 1) return 1;
} }
@ -139,11 +139,10 @@ walkfile(FILE *f, Context *ctx)
{ {
char c, *cptr = token; char c, *cptr = token;
while(f && fread(&c, 1, 1, f)) { while(f && fread(&c, 1, 1, f)) {
if(c == 0xa) ctx->line += 1;
if(c < 0x21) { if(c < 0x21) {
*cptr++ = 0x00; *cptr++ = 0x00;
if(token[0] && !parse(token, f, ctx)) if(token[0] && !parse(token, f, ctx)) return 0;
return 0; if(c == 0xa) ctx->line++;
cptr = token; cptr = token;
} else if(cptr - token < 0x3f) } else if(cptr - token < 0x3f)
*cptr++ = c; *cptr++ = c;
@ -177,9 +176,9 @@ makemacro(char *name, FILE *f, Context *ctx)
m->name = push(name, 0); m->name = push(name, 0);
m->data = dictnext; m->data = dictnext;
while(f && fread(&c, 1, 1, f) && c != '{') 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)) { 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 == '%') return error_top("Macro nested", name);
if(c == '{') depth++; if(c == '{') depth++;
if(c == '}' && --depth) break; if(c == '}' && --depth) break;