Commit 522d73ab by Neil Booth Committed by Neil Booth

* cppmacro.c (funlike_invocation_p): No need to restore context.

From-SVN: r45395
parent aead1ca3
2001-09-05 Neil Booth <neil@daikokuya.demon.co.uk>
* cppmacro.c (funlike_invocation_p): No need to restore context.
2001-09-04 Richard Henderson <rth@redhat.com> 2001-09-04 Richard Henderson <rth@redhat.com>
* reload.c (push_reload): Export. * reload.c (push_reload): Export.
......
...@@ -591,7 +591,6 @@ funlike_invocation_p (pfile, node, list) ...@@ -591,7 +591,6 @@ funlike_invocation_p (pfile, node, list)
const cpp_hashnode *node; const cpp_hashnode *node;
struct toklist *list; struct toklist *list;
{ {
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;
...@@ -599,7 +598,6 @@ funlike_invocation_p (pfile, node, list) ...@@ -599,7 +598,6 @@ funlike_invocation_p (pfile, node, list)
macro_pos = pfile->lexer_pos; macro_pos = pfile->lexer_pos;
pfile->state.parsing_args = 1; pfile->state.parsing_args = 1;
pfile->state.prevent_expansion++; pfile->state.prevent_expansion++;
orig = pfile->context;
cpp_start_lookahead (pfile); cpp_start_lookahead (pfile);
cpp_get_token (pfile, &maybe_paren); cpp_get_token (pfile, &maybe_paren);
...@@ -613,8 +611,6 @@ funlike_invocation_p (pfile, node, list) ...@@ -613,8 +611,6 @@ funlike_invocation_p (pfile, node, list)
"function-like macro \"%s\" must be used with arguments in traditional C", "function-like macro \"%s\" must be used with arguments in traditional C",
NODE_NAME (node)); NODE_NAME (node));
/* Restore original context. */
pfile->context = orig;
pfile->state.prevent_expansion--; pfile->state.prevent_expansion--;
pfile->state.parsing_args = 0; pfile->state.parsing_args = 0;
...@@ -886,8 +882,7 @@ _cpp_pop_context (pfile) ...@@ -886,8 +882,7 @@ _cpp_pop_context (pfile)
if (!pfile->context->prev && !pfile->state.parsing_args) if (!pfile->context->prev && !pfile->state.parsing_args)
unlock_pools (pfile); unlock_pools (pfile);
/* Re-enable a macro, temporarily if parsing_args, when leaving its /* Re-enable a macro when leaving its expansion. */
expansion. */
context->macro->disabled = 0; context->macro->disabled = 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