mirror/nasm
2
0
Fork 0
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-04-12 18:40:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

preproc: always reprocess smacros after %+ - pasting

Browse Source 
We always need to process %+ at least once, but we also always need to
reprocess smacros after pasting.  The solution to this is to make sure
we always reprocess %+ after the first expansion pass.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin 2009-07-07 16:00:58 -07:00
parent a23aa4a3e9
commit 8287daf2a4
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
preproc.c
View File

@ -3638,7 +3638,7 @@ static Token *expand_smacro(Token * tline)
Context *ctx;
const char *mname;
int deadman = DEADMAN_LIMIT;
bool expanded, pasted;
bool expanded;
/*
* Trick: we should avoid changing the start token pointer since it can
@ -3655,10 +3655,11 @@ static Token *expand_smacro(Token * tline)
org_tline->text = NULL;
}
expanded = true; /* Always expand %+ at least once */
again:
tail = &thead;
thead = NULL;
expanded = false;
while (tline) { /* main token loop */
if (!--deadman) {
@ -3928,13 +3929,13 @@ again:
* Also we look for %+ tokens and concatenate the tokens before and after
* them (without white spaces in between).
*/
pasted = paste_tokens(&thead, true);
if (expanded && pasted) {
if (expanded && paste_tokens(&thead, true)) {
/*
* If we concatenated something, *and* we had previously expanded
* an actual macro, scan the lines again for macros...
*/
tline = thead;
expanded = false;
goto again;
}