Fixed issue with comments in macros, fixed by jjbliss
This commit is contained in:
parent
3a696f8fa9
commit
bb57b85f57
|
@ -184,9 +184,9 @@ makemacro(char *name, FILE *f, Context *ctx)
|
||||||
if(c == '%') return error_asm("Macro nested");
|
if(c == '%') return error_asm("Macro nested");
|
||||||
if(c == '{') depth++;
|
if(c == '{') depth++;
|
||||||
if(c == '}' && --depth) break;
|
if(c == '}' && --depth) break;
|
||||||
if(c == '(' && !walkcomment(f, ctx))
|
if(c == '(') {
|
||||||
return 0;
|
if(!walkcomment(f, ctx)) return 0;
|
||||||
else
|
} else
|
||||||
*dictnext++ = c;
|
*dictnext++ = c;
|
||||||
}
|
}
|
||||||
*dictnext++ = 0;
|
*dictnext++ = 0;
|
||||||
|
@ -409,7 +409,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 !printf("Uxnasm - Uxntal Assembler, 13 Apr 2024.\n");
|
if(argc == 2 && scmp(argv[1], "-v", 2)) return !printf("Uxnasm - Uxntal Assembler, 10 May 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;
|
||||||
|
|
Loading…
Reference in New Issue