summaryrefslogtreecommitdiff
path: root/gcc/cppmacro.c
diff options
context:
space:
mode:
authorneil <neil@138bc75d-0d04-0410-961f-82ee72b054a4>2001-01-31 07:48:54 +0000
committerneil <neil@138bc75d-0d04-0410-961f-82ee72b054a4>2001-01-31 07:48:54 +0000
commite55de93e696ec066f6dd65ecb1d9973721833c11 (patch)
tree8b9564ea8b420982bc623a4c87b79e5a4a0cd950 /gcc/cppmacro.c
parent7429c938827aa98bf3b02c4ac89510f4d28ef0b1 (diff)
downloadgcc-e55de93e696ec066f6dd65ecb1d9973721833c11.tar.gz
* cpphash.h (struct cpp_reader): New saved_flags.
* cppmacro.c (cpp_get_token): Use saved_flags to remember to avoid a paste after a pasted token. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@39366 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cppmacro.c')
-rw-r--r--gcc/cppmacro.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c
index aea7e5dab6d..2d4663d4671 100644
--- a/gcc/cppmacro.c
+++ b/gcc/cppmacro.c
@@ -906,7 +906,9 @@ cpp_get_token (pfile, token)
cpp_reader *pfile;
cpp_token *token;
{
- unsigned char flags = 0;
+ unsigned char flags = pfile->saved_flags;
+
+ pfile->saved_flags = 0;
for (;;)
{
@@ -922,7 +924,10 @@ cpp_get_token (pfile, token)
*token = *context->list.first++;
/* PASTE_LEFT tokens can only appear in macro expansions. */
if (token->flags & PASTE_LEFT)
- paste_all_tokens (pfile, token);
+ {
+ paste_all_tokens (pfile, token);
+ pfile->saved_flags = AVOID_LPASTE;
+ }
}
else
{