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
This commit is contained in:
Neil Booth 2001-01-31 07:48:54 +00:00 committed by Neil Booth
parent 5d0e648684
commit ec1a23e60b
3 changed files with 16 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2001-01-31 Neil Booth <neil@daikokuya.demon.co.uk>
* 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.
2001-01-31 Alexandre Oliva <aoliva@redhat.com>
* libgcc2.h (Wtype_MAX, Wtype_MIN): Define.

View file

@ -331,6 +331,9 @@ struct cpp_reader
/* We're printed a warning recommending against using #import. */
unsigned char import_warning;
/* Used to flag the token after a paste AVOID_LPASTE. */
unsigned char saved_flags;
/* True after cpp_start_read completes. Used to inhibit some
warnings while parsing the command line. */
unsigned char done_initializing;

View file

@ -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
{