From 29c96651de1c43e59b7db58a4f06ff21dc854125 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Thu, 8 Jul 2010 08:35:32 -0700 Subject: Revert "BR3005117: Expland local single macro before pasting tokens" This reverts commit ec88c1beac003bd6660037da3cef3aebeee7af20. Revert due to BR 3026808. Signed-off-by: H. Peter Anvin --- preproc.c | 26 -------------------------- 1 file changed, 26 deletions(-) (limited to 'preproc.c') diff --git a/preproc.c b/preproc.c index a881dcef..91fa665c 100644 --- a/preproc.c +++ b/preproc.c @@ -3820,32 +3820,6 @@ 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_NUMBER) || - tok_type_(tline->next, TOK_FLOAT))) { - /* - * In a sake of backward compatibility we allow - * to expand local single macro that early before - * pasting token code have place - * - * NOTE: that new code MUST use %+ macro to obtain - * same result - */ - t = tline; - tline = tline->next; - tt = tokenize(t->text); - tt = expand_smacro(tt); - *tail = tt; - while (tt) { - tt->a.mac = NULL; - tail = &tt->next; - tt = tt->next; - } - delete_Token(t); - changed = true; } else { t = *tail = tline; tline = tline->next; -- cgit v1.2.1