Commit 673b13e2 by Neil Booth Committed by Neil Booth

cppmacro.c (funlike_invocation_p): Don't move back up to the context of the top of the stack.

        * cppmacro.c (funlike_invocation_p): Don't move back up to the
        context of the top of the stack.

From-SVN: r39152
parent a42a5f59
2001-01-20 Neil Booth <neil@daikokuya.demon.co.uk>
* cppmacro.c (funlike_invocation_p): Don't move back up to the
context of the top of the stack.
2001-01-20 Jakub Jelinek <jakub@redhat.com> 2001-01-20 Jakub Jelinek <jakub@redhat.com>
* function.c (fixup_var_refs): Move CALL_PLACEHOLDER handling... * function.c (fixup_var_refs): Move CALL_PLACEHOLDER handling...
......
...@@ -596,7 +596,7 @@ funlike_invocation_p (pfile, node, list) ...@@ -596,7 +596,7 @@ funlike_invocation_p (pfile, node, list)
const cpp_hashnode *node; const cpp_hashnode *node;
struct toklist *list; struct toklist *list;
{ {
cpp_context *orig, *final; cpp_context *orig;
cpp_token maybe_paren; cpp_token maybe_paren;
macro_arg *args = 0; macro_arg *args = 0;
cpp_lexer_pos macro_pos; cpp_lexer_pos macro_pos;
...@@ -618,7 +618,6 @@ funlike_invocation_p (pfile, node, list) ...@@ -618,7 +618,6 @@ funlike_invocation_p (pfile, node, list)
node->name); node->name);
/* Restore original context. */ /* Restore original context. */
final = pfile->context;
pfile->context = orig; pfile->context = orig;
pfile->state.prevent_expansion--; pfile->state.prevent_expansion--;
pfile->state.parsing_args = 0; pfile->state.parsing_args = 0;
...@@ -639,13 +638,6 @@ funlike_invocation_p (pfile, node, list) ...@@ -639,13 +638,6 @@ funlike_invocation_p (pfile, node, list)
free (args); free (args);
} }
/* Re-disable macros *after* pre-expansion. */
while (final != orig)
{
final = final->next;
final->macro->disabled = 1;
}
return args != 0; return args != 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment