etc
/
uxn
mirror of https://git.sr.ht/~rabbits/uxn
0
1
Fork 0
Code Issues Projects Releases Wiki Activity

(uxnasm) Display the correct line number on error

This commit is contained in:
Devine Lu Linvega 2024-03-27 13:34:44 -07:00
parent aafef20ba5
commit c3738a9eb0
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
etc/hello.tal
View File

@ -18,7 +18,6 @@
POP2 POP2
#010f DEO #010f DEO
@1234
BRK BRK

8
src/uxnasm.c
View File

@ -105,7 +105,7 @@ walkcomment(FILE *f, int *ln)
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) *ln++; if(c == 0xa) *ln += 1;
if(c == '(') depth++; if(c == '(') depth++;
if(c == ')' && --depth < 1) return 1; if(c == ')' && --depth < 1) return 1;
} }
@ -132,7 +132,7 @@ walkfile(FILE *f, int *ln)
{ {
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) *ln++; if(c == 0xa) *ln += 1;
if(c < 0x21) { if(c < 0x21) {
*cptr++ = 0x00; *cptr++ = 0x00;
if(token[0] && !parse(token, f, ln)) if(token[0] && !parse(token, f, ln))
@ -160,9 +160,9 @@ makemacro(char *name, FILE *f, int *ln)
m->name = push(name, 0); m->name = push(name, 0);
m->content = dictnext; m->content = dictnext;
while(f && fread(&c, 1, 1, f) && c != '{') while(f && fread(&c, 1, 1, f) && c != '{')
if(c == 0xa) *ln++; if(c == 0xa) *ln += 1;
while(f && fread(&c, 1, 1, f) && c != '}') { while(f && fread(&c, 1, 1, f) && c != '}') {
if(c == 0xa) *ln++; if(c == 0xa) *ln += 1;
if(c == '%') return 0; if(c == '%') return 0;
if(c == '(') walkcomment(f, ln); if(c == '(') walkcomment(f, ln);
*dictnext++ = c; *dictnext++ = c;