aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2010-06-02 11:57:05 +0400
committerCyrill Gorcunov <gorcunov@gmail.com>2010-06-02 20:31:46 +0400
commit51fd86e0fed8f5162f8c1e45e4ceaf237d6e5539 (patch)
treeda3607d2fba09f5a2722e268c3147ddb43f1c21b
parentec88c1beac003bd6660037da3cef3aebeee7af20 (diff)
downloadnasm-test-51fd86e0fed8f5162f8c1e45e4ceaf237d6e5539.tar.gz
nasm-test-51fd86e0fed8f5162f8c1e45e4ceaf237d6e5539.tar.xz
nasm-test-51fd86e0fed8f5162f8c1e45e4ceaf237d6e5539.zip
expand_mmac_params: Don't forget to handle TOK_OTHER
TOK_OTHER is legitime to follow TOK_PREPROC_ID so don't forget to handle it as well. [ An addition to commit ec88c1beac00 ] Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
-rw-r--r--preproc.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/preproc.c b/preproc.c
index 86366ed4..406d568e 100644
--- a/preproc.c
+++ b/preproc.c
@@ -3746,8 +3746,9 @@ static Token *expand_mmac_params(Token * tline)
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_FLOAT))) {
+ tok_type_(tline->next, TOK_OTHER))) {
/*
* In a sake of backward compatibility we allow
* to expand local single macro that early before