diff options
| author | Neil Booth <neil@daikokuya.demon.co.uk> | 2001-01-31 07:48:54 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2001-01-31 07:48:54 +0000 |
| commit | ec1a23e60be615ad0d491952df1dad0a96b2b1e5 (patch) | |
| tree | 8b9564ea8b420982bc623a4c87b79e5a4a0cd950 /gcc/cppmacro.c | |
| parent | 5d0e648684ed1f9d4d24bf1ba2b98a78e183256a (diff) | |
| download | gcc-ec1a23e60be615ad0d491952df1dad0a96b2b1e5.zip gcc-ec1a23e60be615ad0d491952df1dad0a96b2b1e5.tar.gz gcc-ec1a23e60be615ad0d491952df1dad0a96b2b1e5.tar.bz2 | |
cpphash.h (struct cpp_reader): New saved_flags.
* 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.
From-SVN: r39366
Diffstat (limited to 'gcc/cppmacro.c')
| -rw-r--r-- | gcc/cppmacro.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c index aea7e5d..2d4663d 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 { |