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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 0dfe8d657f334ff8955983f4a76bd16cb45e4d74..e4016f1313823c63737fb8fdb07fc7f68f6aae7b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -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.

diff --git a/gcc/cpphash.h b/gcc/cpphash.h
index 380f12581e6760963adb2bf2f41c6af5a2f32f4d..6874c21d41c68221ff3bd27cf14c383d5e2436e2 100644 (file)
--- a/gcc/cpphash.h
+++ b/gcc/cpphash.h
@@ -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;

diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c
index aea7e5dab6d43a4e61796f91e84cc49d23c8614f..2d4663d46711584a591e5beaf5258cc9bf7478ad 100644 (file)
--- 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
        {