From: Neil Booth <neil@daikokuya.demon.co.uk>
Date: Fri, 24 May 2002 19:13:48 +0000 (+0000)
Subject: re PR preprocessor/6780 (Incorrect diagnosis of token pasting)
X-Git-Tag: releases/gcc-3.1.1~275
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52fc15ab5ef4ff9c4337c8a5e9e6bd7fe862edbc;p=thirdparty%2Fgcc.git

re PR preprocessor/6780 (Incorrect diagnosis of token pasting)

	PR preprocessor/6780
	* cppmacro.c (enter_macro_context): Clear state.angled_headers.
testsuite:
	* gcc.dg/cpp/paste12.c: New test.

From-SVN: r53848
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index dde3ea05e2ca..af5dd08dbf02 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2002-05-24  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+	PR preprocessor/6780
+	* cppmacro.c (enter_macro_context): Clear state.angled_headers.
+
 2002-05-21  Richard Earnshaw  <rearnsha@arm.com>
 
 	* bitmap.c (bitmap_find_bit): Return early if we have the correct
diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c
index b351f96631f7..e9f9e7ba7ad5 100644
--- a/gcc/cppmacro.c
+++ b/gcc/cppmacro.c
@@ -673,6 +673,8 @@ enter_macro_context (pfile, node)
   /* The presence of a macro invalidates a file's controlling macro.  */
   pfile->mi_valid = false;
 
+  pfile->state.angled_headers = false;
+
   /* Handle standard macros.  */
   if (! (node->flags & NODE_BUILTIN))
     {
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 55aaf0c102f4..226aec5d7292 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2002-05-24  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+	* gcc.dg/cpp/paste12.c: New test.
+
 2002-05-24  Neil Booth  <neil@daikokuya.demon.co.uk>
 
 	* g++.dg/parse/named_ops.C: New test.
diff --git a/gcc/testsuite/gcc.dg/cpp/paste12.c b/gcc/testsuite/gcc.dg/cpp/paste12.c
new file mode 100644
index 000000000000..e61ec51433c0
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/paste12.c
@@ -0,0 +1,8 @@
+/* { dg-do preprocess } */
+
+/* Test correct diagnostics when pasting in #include.
+   Source: PR preprocessor/6780.  */
+
+#define inc2(a,b) <##a.b>
+#define INC(X) inc2(X,h)
+#include INC(stdio) /* { dg-error "pasting \"<\" and \"stdio\" does not" } */