aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2010-06-08 18:39:56 +0400
committerCyrill Gorcunov <gorcunov@gmail.com>2010-06-08 18:39:56 +0400
commit1f6741fc78413236816c42d26b34134ab18ba4f1 (patch)
treea91651e969722a59f81f7a582d2697438c2e8e34
parentb714cb27cbf8b3b158b11841875a4aa6ff71b17d (diff)
downloadnasm-test-1f6741fc78413236816c42d26b34134ab18ba4f1.tar.gz
nasm-test-1f6741fc78413236816c42d26b34134ab18ba4f1.tar.xz
nasm-test-1f6741fc78413236816c42d26b34134ab18ba4f1.zip
expand_mmac_params: Expand local single macros unconditionally
Peter proposed to expand local single macros unconditionally. This should not hurt but give us more cleaner code in result. Reported-by: "H. Peter Anvin" <hpa@zytor.com> Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
-rw-r--r--preproc.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/preproc.c b/preproc.c
index 1b0c74a2..01cefd71 100644
--- a/preproc.c
+++ b/preproc.c
@@ -3821,12 +3821,7 @@ static Token *expand_mmac_params(Token * tline)
delete_Token(t);
changed = true;
} else if (tline->type == TOK_PREPROC_ID &&
- tline->text[0] == '%' && tline->text[1] == '$' &&
- (tok_type_(tline->next, TOK_ID) ||
- tok_type_(tline->next, TOK_PREPROC_ID) ||
- tok_type_(tline->next, TOK_FLOAT) ||
- tok_type_(tline->next, TOK_NUMBER) ||
- tok_type_(tline->next, TOK_OTHER))) {
+ tline->text[0] == '%' && tline->text[1] == '$') {
/*
* In a sake of backward compatibility we allow
* to expand local single macro that early before