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

Saveguard against empty file

This commit is contained in:
Devine Lu Linvega 2024-03-27 12:11:51 -07:00
parent 4713261184
commit 56131efa43
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etc/hello.tal
View File

@ -1,6 +1,6 @@
( init ) ( init )
%emit ( byte -- ) { #18 DEO } %emit ( byte -- ) { ( macro comment ) #18 DEO }
|0100 @program |0100 @program

10
src/uxnasm.c
View File

@ -104,7 +104,7 @@ walkcomment(FILE *f)
{ {
char c; char c;
int depth = 1; int depth = 1;
while(fread(&c, 1, 1, f)) { while(f && fread(&c, 1, 1, f)) {
if(c == 0xa) line++; if(c == 0xa) line++;
if(c == '(') depth++; if(c == '(') depth++;
if(c == ')' && --depth < 1) return 1; if(c == ')' && --depth < 1) return 1;
@ -131,7 +131,7 @@ static int
walkfile(FILE *f) walkfile(FILE *f)
{ {
char c, *cptr = token; char c, *cptr = token;
while(fread(&c, 1, 1, f)) { while(f && fread(&c, 1, 1, f)) {
if(c == 0xa) line++; if(c == 0xa) line++;
if(c < 0x21) { if(c < 0x21) {
*cptr++ = 0x00; *cptr++ = 0x00;
@ -149,8 +149,8 @@ walkfile(FILE *f)
static int static int
makemacro(char *name, FILE *f) makemacro(char *name, FILE *f)
{ {
Item *m;
char c; char c;
Item *m;
if(!slen(name)) return error_asm("Macro is empty"); if(!slen(name)) return error_asm("Macro is empty");
if(findmacro(name)) return error_asm("Macro is duplicate"); if(findmacro(name)) return error_asm("Macro is duplicate");
if(sihx(name)) return error_asm("Macro is hex number"); if(sihx(name)) return error_asm("Macro is hex number");
@ -159,9 +159,9 @@ makemacro(char *name, FILE *f)
m = &macros[macro_len++]; m = &macros[macro_len++];
m->name = push(name, 0); m->name = push(name, 0);
m->content = dictnext; m->content = dictnext;
while(fread(&c, 1, 1, f) && c != '{') while(f && fread(&c, 1, 1, f) && c != '{')
if(c == 0xa) line++; if(c == 0xa) line++;
while(fread(&c, 1, 1, f) && c != '}') { while(f && fread(&c, 1, 1, f) && c != '}') {
if(c == 0xa) line++; if(c == 0xa) line++;
if(c == '%') return 0; if(c == '%') return 0;
if(c == '(') walkcomment(f); if(c == '(') walkcomment(f);