From: H. Peter Anvin <hpa@zytor.com>
Date: Mon, 4 May 2009 17:11:22 +0000 (-0700)
Subject: preproc: handle %+ even during early token replacement
X-Git-Tag: nasm-2.11.05~1022
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ba7a0d056676521d54146a0655c1e80de0f48656;p=platform%2Fupstream%2Fnasm.git

preproc: handle %+ even during early token replacement

Preexisting code seems to rely on %+ being processed even during early
token replacement, e.g. Syslinux contains the following code:

%macro          superb 1
bx %+ %1        equ SuperInfo+($-superblock)*8+4
bs %+ %1        equ $
                zb 1
%endmacro

... which is expected to work when invoked as:

                superb Media

As a result, set handle_paste_tokens to true at all times; assuming
this turns out to be the way things are we can really just remove it
as an option.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
---

diff --git a/preproc.c b/preproc.c
index 0868e75..8c0863d 100644
--- a/preproc.c
+++ b/preproc.c
@@ -3583,7 +3583,7 @@ static Token *expand_mmac_params(Token * tline)
     *tail = NULL;
 
     if (changed)
-	paste_tokens(&thead, false);
+	paste_tokens(&thead, true);
 
     return thead;
 }