empathicqubit/cc65
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix/workaround for a problem with nested macros.

Browse source 
git-svn-id: svn://svn.cc65.org/cc65/trunk@5053 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
uz 2011-06-13 10:03:26 +00:00
parent 4709e8251e
commit 00f57bbc87
1 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/ca65/macro.c
View file

@ -654,6 +654,7 @@ static int MacExpand (void* Data)
/* We're expanding a macro. Check if we are expanding one of the /* We're expanding a macro. Check if we are expanding one of the
* macro parameters. * macro parameters.
*/ */
ExpandParam:
if (Mac->ParamExp) { if (Mac->ParamExp) {
/* Ok, use token from parameter list, but don't use its line info */ /* Ok, use token from parameter list, but don't use its line info */
@ -664,7 +665,6 @@ static int MacExpand (void* Data)
/* Done */ /* Done */
return 1; return 1;
} }
/* We're not expanding macro parameters. Check if we have tokens left from /* We're not expanding macro parameters. Check if we have tokens left from
@ -689,10 +689,10 @@ static int MacExpand (void* Data)
if (CurTok.Tok == TOK_MACPARAM) { if (CurTok.Tok == TOK_MACPARAM) {
/* Start to expand the parameter token list */ /* Start to expand the parameter token list */
Mac->ParamExp = Mac->Params [CurTok.IVal]; Mac->ParamExp = Mac->Params[CurTok.IVal];
/* Recursive call to expand the parameter */ /* Go back and expand the parameter */
return MacExpand (Mac); goto ExpandParam;
} }
/* If it's an identifier, it may in fact be a local symbol */ /* If it's an identifier, it may in fact be a local symbol */
@ -730,7 +730,6 @@ static int MacExpand (void* Data)
/* The token was successfully set */ /* The token was successfully set */
return 1; return 1;
} }
/* No more macro tokens. Do we have a final token? */ /* No more macro tokens. Do we have a final token? */
@ -741,9 +740,21 @@ static int MacExpand (void* Data)
FreeTokNode (Mac->Final); FreeTokNode (Mac->Final);
Mac->Final = 0; Mac->Final = 0;
/* Problem: When a .define style macro is expanded within the call
* of a classic one, the latter may be terminated and removed while
* the expansion of the .define style macro is still active. Because
* line info slots are "stacked", this runs into a CHECK FAILED. For
* now, we will fix that by removing the .define style macro expansion
* immediately, once the final token is placed. The better solution
* would probably be to not require AllocLineInfoSlot/FreeLineInfoSlot
* to be called in FIFO order, but this is a bigger change.
*/
/* End of macro expansion and pop the input function */
FreeMacExp (Mac);
PopInput ();
/* The token was successfully set */ /* The token was successfully set */
return 1; return 1;
} }
MacEnd: MacEnd: