aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNeil Booth <neil@daikokuya.demon.co.uk>2001-09-05 06:46:53 +0000
committerNeil Booth <neil@daikokuya.demon.co.uk>2001-09-05 06:46:53 +0000
commit89e38f6721cfd23eaf7a300bb48cecb2713c59fa (patch)
treecd8620748e55197085ef54059a1f56ada4751094
parentd35088312861f8c3dfc65ce782ff2cf1a439874b (diff)
* cppmacro.c (funlike_invocation_p): No need to restore context.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@45395 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog4
-rw-r--r--gcc/cppmacro.c7
2 files changed, 5 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 611fb9434de..6059426da08 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+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>
* reload.c (push_reload): Export.
diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c
index 1ee91b7b305..81828f156f0 100644
--- a/gcc/cppmacro.c
+++ b/gcc/cppmacro.c
@@ -591,7 +591,6 @@ funlike_invocation_p (pfile, node, list)
const cpp_hashnode *node;
struct toklist *list;
{
- cpp_context *orig;
cpp_token maybe_paren;
macro_arg *args = 0;
cpp_lexer_pos macro_pos;
@@ -599,7 +598,6 @@ funlike_invocation_p (pfile, node, list)
macro_pos = pfile->lexer_pos;
pfile->state.parsing_args = 1;
pfile->state.prevent_expansion++;
- orig = pfile->context;
cpp_start_lookahead (pfile);
cpp_get_token (pfile, &maybe_paren);
@@ -613,8 +611,6 @@ funlike_invocation_p (pfile, node, list)
"function-like macro \"%s\" must be used with arguments in traditional C",
NODE_NAME (node));
- /* Restore original context. */
- pfile->context = orig;
pfile->state.prevent_expansion--;
pfile->state.parsing_args = 0;
@@ -886,8 +882,7 @@ _cpp_pop_context (pfile)
if (!pfile->context->prev && !pfile->state.parsing_args)
unlock_pools (pfile);
- /* Re-enable a macro, temporarily if parsing_args, when leaving its
- expansion. */
+ /* Re-enable a macro when leaving its expansion. */
context->macro->disabled = 0;
}