aniani/nasm
0
0
Fork 1
mirror of https://github.com/netwide-assembler/nasm.git synced 2025-09-22 10:43:39 -04:00
Code Activity

Handle weird cases of token pasting

Browse Source 
Especially when token pasting involves floating-point numbers, we can
have some really strange effects from token pasting: for example,
pasting the two tokens "xyzzy" and "1e+10" ends up with *three*
tokens: "xyzzy1e" "+" "10".  The easiest way to deal with this is to
explicitly combine the string and then run tokenize() on it.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
This commit is contained in:
H. Peter Anvin
2009-04-07 21:59:24 -07:00
parent 1582d52863
commit 9bb46df4b7
2 changed files with 54 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
preproc.c
View File

@@ -159,7 +159,7 @@ enum pp_token_type {
TOK_NUMBER, TOK_FLOAT, TOK_SMAC_END, TOK_OTHER,
TOK_INTERNAL_STRING,
TOK_PREPROC_Q, TOK_PREPROC_QQ,
TOK_INDIRECT, /* %[...] */
TOK_INDIRECT, /* %[...] */
TOK_SMAC_PARAM, /* MUST BE LAST IN THE LIST!!! */
TOK_MAX = INT_MAX /* Keep compiler from reducing the range */
};
@@ -3467,29 +3467,56 @@ static Token *expand_mmac_params(Token * tline)
*tail = NULL;
/* Now handle token pasting... */
t = thead;
while (t && (tt = t->next)) {
tail = &thead;
while ((t = *tail) && (tt = t->next)) {
switch (t->type) {
case TOK_WHITESPACE:
if (tt->type == TOK_WHITESPACE) {
t->next = delete_Token(tt);
} else {
t = tt;
tail = &t->next;
}
break;
case TOK_ID:
case TOK_NUMBER:
if (tt->type == t->type || tt->type == TOK_NUMBER) {
char *tmp = nasm_strcat(t->text, tt->text);
nasm_free(t->text);
t->text = tmp;
t->next = delete_Token(tt);
} else {
t = tt;
case TOK_FLOAT:
{
size_t len = 0;
char *tmp, *p;
while (tt &&
(tt->type == TOK_ID || tt->type == TOK_NUMBER ||
tt->type == TOK_FLOAT)) {
len += strlen(tt->text);
tt = tt->next;
}
break;
/* Now tt points to the first token after the potential
paste area... */
if (tt != t->next) {
/* We have at least two tokens... */
len += strlen(t->text);
p = tmp = nasm_malloc(len+1);
while (t != tt) {
strcpy(p, t->text);
p = strchr(p, '\0');
t = delete_Token(t);
}
t = *tail = tokenize(tmp);
nasm_free(tmp);
while (t->next)
t = t->next;
t->next = tt; /* Attach the remaining token chain */
}
tail = &t->next;
break;
}
default:
t = tt;
tail = &t->next;
break;
}
}

14
test/weirdpaste.asm Normal file
View File

@@ -0,0 +1,14 @@
;Testname=preproc; Arguments=-E; Files=stdout stderr
;Testname=bin; Arguments=-fbin -oweirdpaste.bin; Files=stdout stderr weirdpaste.bin
%define foo xyzzy
%define bar 1e+10
%define xyzzy1e 15
%macro dx 2
%assign xx %1%2
dw xx
%endmacro
dx foo, bar