Debian BTS Bug #157416

	Debian BTS Bug #157416
	* cpplib.c (destringize_and_run): Kludge around getting
	tokens from in-progress macros.
	(_cpp_do__Pragma): Simplify.

From-SVN: r57862

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d0703853fd0a897a89eb8b50b305651af31fc01e..70af48b069421c4524781890eb0f5500d06e242b 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2002-10-06  Neil Booth  <neil@daikokuya.co.uk>
+
+       Debian BTS Bug #157416
+       * cpplib.c (destringize_and_run): Kludge around getting
+       tokens from in-progress macros.
+       (_cpp_do__Pragma): Simplify.
+
 2002-10-06  Frank Ch. Eigler  <fche@redhat.com>
 
        * cppinit.c (init_standard_includes, parse_option): Use strncmp.

diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index 096a7113960fd0a847f8787642de896de2fdd052..cff9eeb04286bf1aa98a773ac4a78b05a6062190 100644 (file)
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -1224,6 +1224,9 @@ destringize_and_run (pfile, in)
 {
   const unsigned char *src, *limit;
   char *dest, *result;
+  cpp_context saved_context;
+  cpp_context *saved_cur_context;
+  unsigned int saved_line;
 
   dest = result = alloca (in->len + 1);
   for (src = in->text, limit = src + in->len; src < limit;)
@@ -1235,7 +1238,40 @@ destringize_and_run (pfile, in)
     }
   *dest = '\0';
 
+  /* FIXME.  All this saving is a horrible kludge to handle the case
+     when we're in a macro expansion.
+                                     
+     A better strategy it to not convert _Pragma to #pragma if doing
+     preprocessed output, but to just pass it through as-is, unless it
+     is a CPP pragma in which case is should be processed normally.
+     When compiling the preprocessed output the _Pragma should be  
+     handled.  This will be become necessary when we move to     
+     line-at-a-time lexing since we will be macro-expanding the line                   
+     before outputting / compiling it.  */
+  saved_line = pfile->line;
+  saved_context = pfile->base_context;
+  saved_cur_context = pfile->context;
+  pfile->context = &pfile->base_context;
   run_directive (pfile, T_PRAGMA, result, dest - result);
+  pfile->context = saved_cur_context;
+  pfile->base_context = saved_context;
+  pfile->line = saved_line;
+
+  /* See above comment.  For the moment, we'd like
+
+     token1 _Pragma ("foo") token2
+
+     to be output as
+
+             token1
+             # 7 "file.c"
+             #pragma foo
+             # 7 "file.c"
+                            token2
+
+      Getting the line markers is a little tricky.  */
+  if (pfile->cb.line_change)
+    (*pfile->cb.line_change) (pfile, pfile->cur_token, false);
 }
 
 /* Handle the _Pragma operator.  */
@@ -1245,25 +1281,10 @@ _cpp_do__Pragma (pfile)
 {
   const cpp_token *string = get__Pragma_string (pfile);
 
-  if (!string)
-    cpp_error (pfile, "_Pragma takes a parenthesized string literal");
+  if (string)
+    destringize_and_run (pfile, &string->val.str);
   else
-    {
-      /* Ideally, we'd like
-                       token1 _Pragma ("foo") token2
-        to be output as
-                       token1
-                       # 7 "file.c"
-                       #pragma foo
-                       # 7 "file.c"
-                                              token2
-        Getting these correct line markers is a little tricky.  */
-
-      unsigned int orig_line = pfile->line;
-      destringize_and_run (pfile, &string->val.str);
-      pfile->line = orig_line;
-      pfile->buffer->saved_flags = BOL;
-    }
+    cpp_error (pfile, "_Pragma takes a parenthesized string literal");
 }
 
 /* Just ignore #sccs, on systems where we define it at all.  */