shithub: rgbds

Info  •  Files  •  Log  •  Branches

Fix captures beginning in expansions

Fixes #590

--- a/src/asm/lexer.c

+++ b/src/asm/lexer.c

@@ -1962,13 +1962,11 @@

 static char *startCapture(void)

 {

-	assert(!lexerState->expansions);

-

 	lexerState->capturing = true;

 	lexerState->captureSize = 0;

 	lexerState->disableMacroArgs = true;

-	if (lexerState->isMmapped) {

+	if (lexerState->isMmapped && !lexerState->expansions) {

 		return &lexerState->ptr[lexerState->offset];

 	} else {

 		lexerState->captureCapacity = 128; /* The initial size will be twice that */

--- /dev/null

+++ b/test/asm/equs-macrodef.asm

@@ -1,0 +1,3 @@

+DEFINE equs "mac: MACRO\nPRINTT \"Hello :D\\n\"\nENDM"

+DEFINE

+	mac

--- /dev/null

+++ b/test/asm/equs-macrodef.out

@@ -1,0 +1,1 @@

+Hello :D