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

Allow lambdas in macros

This commit is contained in:
Devine Lu Linvega 2024-04-02 12:03:24 -07:00
parent 6bc1232bad
commit f4df46b5b7
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/uxnasm.c
View File

@ -165,6 +165,7 @@ makelambda(int id)
static int static int
makemacro(char *name, FILE *f, Context *ctx) makemacro(char *name, FILE *f, Context *ctx)
{ {
int depth = 0;
char c; char c;
Item *m; Item *m;
if(macro_len >= 0x100) return error_asm("Macros limit exceeded"); if(macro_len >= 0x100) return error_asm("Macros limit exceeded");
@ -175,9 +176,11 @@ makemacro(char *name, FILE *f, Context *ctx)
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) ctx->line += 1; if(c == 0xa) ctx->line += 1;
while(f && fread(&c, 1, 1, f) && c != '}') { while(f && fread(&c, 1, 1, f)) {
if(c == 0xa) ctx->line += 1; if(c == 0xa) ctx->line += 1;
if(c == '%') return error_top("Macro nested", name); if(c == '%') return error_top("Macro nested", name);
if(c == '{') depth++;
if(c == '}' && --depth) break;
if(c == '(' && !walkcomment(f, ctx)) if(c == '(' && !walkcomment(f, ctx))
return 0; return 0;
else else
@ -400,7 +403,7 @@ main(int argc, char *argv[])
{ {
ptr = PAGE; ptr = PAGE;
copy("on-reset", scope, 0); copy("on-reset", scope, 0);
if(argc == 2 && scmp(argv[1], "-v", 2)) return !fprintf(stdout, "Uxnasm - Uxntal Assembler, 30 Mar 2024.\n"); if(argc == 2 && scmp(argv[1], "-v", 2)) return !fprintf(stdout, "Uxnasm - Uxntal Assembler, 2 Apr 2024.\n");
if(argc != 3) return error_top("usage", "uxnasm [-v] input.tal output.rom"); if(argc != 3) return error_top("usage", "uxnasm [-v] input.tal output.rom");
if(!assemble(argv[1])) return 1; if(!assemble(argv[1])) return 1;
if(!resolve(argv[2])) return 1; if(!resolve(argv[2])) return 1;