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

(uxnasm) Renamed conflicting function

This commit is contained in:
neauoire 2021-11-29 16:19:47 -08:00
parent 34f75968c7
commit 074a049ff2
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/uxnasm.c
View File

@ -63,7 +63,7 @@ static char *scat(char *dst, const char *src) { char *ptr = dst + slen(dst); whi
/* clang-format on */ /* clang-format on */
static int tokenize(char *w, FILE *f); static int parse(char *w, FILE *f);
static int static int
error(const char *name, const char *msg) error(const char *name, const char *msg)
@ -227,14 +227,14 @@ doinclude(const char *filename)
if(!(f = fopen(filename, "r"))) if(!(f = fopen(filename, "r")))
return error("Include missing", filename); return error("Include missing", filename);
while(fscanf(f, "%63s", w) == 1) while(fscanf(f, "%63s", w) == 1)
if(!tokenize(w, f)) if(!parse(w, f))
return error("Unknown token", w); return error("Unknown token", w);
fclose(f); fclose(f);
return 1; return 1;
} }
static int static int
tokenize(char *w, FILE *f) parse(char *w, FILE *f)
{ {
int i = 0; int i = 0;
char word[64], subw[64], c; char word[64], subw[64], c;
@ -324,7 +324,7 @@ tokenize(char *w, FILE *f)
/* macro */ /* macro */
else if((m = findmacro(w))) { else if((m = findmacro(w))) {
for(i = 0; i < m->len; ++i) for(i = 0; i < m->len; ++i)
if(!tokenize(m->items[i], f)) if(!parse(m->items[i], f))
return 0; return 0;
return 1; return 1;
} else } else
@ -380,7 +380,7 @@ assemble(FILE *f)
char w[64]; char w[64];
scpy("on-reset", p.scope, 64); scpy("on-reset", p.scope, 64);
while(fscanf(f, "%63s", w) == 1) while(fscanf(f, "%63s", w) == 1)
if(!tokenize(w, f)) if(!parse(w, f))
return error("Unknown token", w); return error("Unknown token", w);
resolve(); resolve();
return 1; return 1;