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

(uxnasm) makesub use global scope

This commit is contained in:
Devine Lu Linvega 2024-03-26 11:47:16 -07:00
parent 7819add659
commit 20a11c0f4c
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

@ -70,7 +70,7 @@ static char *scat(char *dst, const char *src) { char *ptr = dst + slen(dst); whi
/* clang-format on */ /* clang-format on */
static int parse(char *w, FILE *f); static int parse(char *w, FILE *f);
static char *makesublabel(char *src, char *scope, char *name); static char *makesublabel(char *src, char *name);
static int static int
error_top(const char *name, const char *msg) error_top(const char *name, const char *msg)
@ -101,7 +101,7 @@ findlabel(char *name)
{ {
int i; int i;
if(name[0] == '&') if(name[0] == '&')
name = makesublabel(sublabel, scope, name + 1); name = makesublabel(sublabel, name + 1);
for(i = 0; i < p.label_len; i++) for(i = 0; i < p.label_len; i++)
if(scmp(p.labels[i].name, name, 0x40)) if(scmp(p.labels[i].name, name, 0x40))
return &p.labels[i]; return &p.labels[i];
@ -169,7 +169,7 @@ makelabel(char *name)
{ {
Label *l; Label *l;
if(name[0] == '&') if(name[0] == '&')
name = makesublabel(sublabel, scope, name + 1); name = makesublabel(sublabel, name + 1);
if(!slen(name)) return error_asm("Label is empty"); if(!slen(name)) return error_asm("Label is empty");
if(findlabel(name)) return error_asm("Label is duplicate"); if(findlabel(name)) return error_asm("Label is duplicate");
if(sihx(name)) return error_asm("Label is hex number"); if(sihx(name)) return error_asm("Label is hex number");
@ -194,7 +194,7 @@ makelambda(int id)
} }
static char * static char *
makesublabel(char *buf, char *scope, char *name) makesublabel(char *buf, char *name)
{ {
if(slen(scope) + slen(name) >= 0x3f) { if(slen(scope) + slen(name) >= 0x3f) {
error_asm("Sublabel length too long"); error_asm("Sublabel length too long");
@ -229,7 +229,7 @@ addref(char *label, char rune, Uint16 addr)
p.lambda_stack[p.lambda_ptr++] = p.lambda_len; p.lambda_stack[p.lambda_ptr++] = p.lambda_len;
scpy(makelambda(p.lambda_len++), r->name, 0x40); scpy(makelambda(p.lambda_len++), r->name, 0x40);
} else if(label[0] == '&' || label[0] == '/') { } else if(label[0] == '&' || label[0] == '/') {
if(!makesublabel(r->name, scope, label + 1)) if(!makesublabel(r->name, label + 1))
return error_asm("Invalid sublabel"); return error_asm("Invalid sublabel");
} else { } else {
int pos = cndx(label, '/'); int pos = cndx(label, '/');