From 881bc7db37d9dc2e8836338d4167f23ab34a8163 Mon Sep 17 00:00:00 2001
From: Neil Booth <neilb@earthling.net>
Date: Sun, 3 Dec 2000 12:07:40 +0000
Subject: [PATCH] * gcc.dg/cpp/macro6.c: New test cases.

From-SVN: r37972
---
 gcc/testsuite/ChangeLog           |  4 ++++
 gcc/testsuite/gcc.dg/cpp/macro6.c | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 gcc/testsuite/gcc.dg/cpp/macro6.c

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index b205469..c1f0c03 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2000-12-03  Neil Booth  <neilb@earthling.net>
+
+        * gcc.dg/cpp/macro6.c: New test cases.
+
 2000-12-02  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
 
 	* gcc.c-torture/execute/string-opt-9.c: New test.
diff --git a/gcc/testsuite/gcc.dg/cpp/macro6.c b/gcc/testsuite/gcc.dg/cpp/macro6.c
new file mode 100644
index 0000000..0fe52ee
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/macro6.c
@@ -0,0 +1,32 @@
+/* { dg-do run } */
+
+/* Test that, when a macro expansion spills into the source file, we
+   expand macros we suck in from there, as the standard clearly states
+   they are not nested.
+
+   Submitter: Neil Booth, with minor modifications to the originals. 3
+   Dec 2000.
+   Source: PR 962 and Thomas Pornin.  */
+
+extern void abort (void);
+int e = 10, f = 100;
+
+#define e(n) 4 + n
+#define X e
+#define f(x) x
+#define h(x) x + f
+
+int
+main ()
+{
+  if (X(X) != 14)		/* Should expand to "4 + e".  */
+    abort ();
+
+  if (X(X(f)) != 108)		/* Should expand to "4 + 4 + f".  */
+    abort ();
+
+  if (h(e)(h(e)) != 120)	/* Should expand to "e + e + f".  */
+    abort ();
+
+  return 0;
+}
-- 
2.7.4