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

Allowed long tokens within comments (typically URLs)

This commit is contained in:
Andrew Alderwick 2021-08-25 22:56:24 +01:00
parent 5b4ec0be6b
commit 61b8750bae
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/uxnasm.c
View File

@ -157,12 +157,12 @@ makemacro(char *name, FILE *f)
return error("Macro name is invalid", name); return error("Macro name is invalid", name);
m = &p.macros[p.mlen++]; m = &p.macros[p.mlen++];
scpy(name, m->name, 64); scpy(name, m->name, 64);
while(fscanf(f, "%s", word)) { while(fscanf(f, "%63s", word)) {
if(word[0] == '{') continue; if(word[0] == '{') continue;
if(word[0] == '}') break; if(word[0] == '}') break;
if(m->len > 64) if(m->len > 64)
return error("Macro too large", name); return error("Macro too large", name);
if(slen(word) >= 64) if(slen(word) >= 63)
return error("Word too long", name); return error("Word too long", name);
scpy(word, m->items[m->len++], 64); scpy(word, m->items[m->len++], 64);
} }
@ -290,8 +290,10 @@ pass1(FILE *f)
int ccmnt = 0; int ccmnt = 0;
Uint16 addr = 0; Uint16 addr = 0;
char w[64], scope[64], subw[64]; char w[64], scope[64], subw[64];
while(fscanf(f, "%s", w) == 1) { while(fscanf(f, "%63s", w) == 1) {
if(skipblock(w, &ccmnt, '(', ')')) continue; if(skipblock(w, &ccmnt, '(', ')')) continue;
if(slen(w) == 63)
fprintf(stderr, "Warning: token beginning with \"%s\" is too long\n", w);
if(w[0] == '|') { if(w[0] == '|') {
if(!sihx(w + 1)) if(!sihx(w + 1))
return error("Pass 1 - Invalid padding", w); return error("Pass 1 - Invalid padding", w);
@ -320,7 +322,7 @@ pass2(FILE *f)
{ {
int ccmnt = 0, cmacr = 0; int ccmnt = 0, cmacr = 0;
char w[64], scope[64], subw[64]; char w[64], scope[64], subw[64];
while(fscanf(f, "%s", w) == 1) { while(fscanf(f, "%63s", w) == 1) {
if(w[0] == '%') continue; if(w[0] == '%') continue;
if(w[0] == '&') continue; if(w[0] == '&') continue;
if(w[0] == '[') continue; if(w[0] == '[') continue;