From 71c10038d1739414c587d2d88cd858b213bd1453 Mon Sep 17 00:00:00 2001
From: Tom Tromey <tromey@redhat.com>
Date: Tue, 6 May 2008 17:15:07 +0000
Subject: PR preprocessor/35313, PR preprocessor/36088:

gcc/testsuite
	PR preprocessor/35313, PR preprocessor/36088:
	* gcc.dg/cpp/pr35313.c: New file.
	* gcc.dg/cpp/if-oppr.c: Remove test for ',' in a conditional
	expression.
	* gcc.dg/cpp/if-oppr2.c: New file.
libcpp
	PR preprocessor/35313, PR preprocessor/36088:
	* expr.c (optab) <QUERY, COMMA>: Set precedence to 4.
	(reduce) <case CPP_QUERY>: Special case CPP_COMMA and CPP_COLON.

From-SVN: r134989
---
 gcc/testsuite/ChangeLog             |  8 ++++++++
 gcc/testsuite/gcc.dg/cpp/if-oppr.c  |  7 +------
 gcc/testsuite/gcc.dg/cpp/if-oppr2.c | 10 ++++++++++
 gcc/testsuite/gcc.dg/cpp/pr35313.c  | 11 +++++++++++
 4 files changed, 30 insertions(+), 6 deletions(-)
 create mode 100644 gcc/testsuite/gcc.dg/cpp/if-oppr2.c
 create mode 100644 gcc/testsuite/gcc.dg/cpp/pr35313.c

(limited to 'gcc')

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index e5bf09b..4aacdf2 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2008-05-06  Tom Tromey  <tromey@redhat.com>
+
+	PR preprocessor/35313, PR preprocessor/36088:
+	* gcc.dg/cpp/pr35313.c: New file.
+	* gcc.dg/cpp/if-oppr.c: Remove test for ',' in a conditional
+	expression.
+	* gcc.dg/cpp/if-oppr2.c: New file.
+
 2008-05-06  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/36117
diff --git a/gcc/testsuite/gcc.dg/cpp/if-oppr.c b/gcc/testsuite/gcc.dg/cpp/if-oppr.c
index 9c4910f..a46a815 100644
--- a/gcc/testsuite/gcc.dg/cpp/if-oppr.c
+++ b/gcc/testsuite/gcc.dg/cpp/if-oppr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 Free Software Foundation, Inc.  */
+/* Copyright (C) 2000, 2008 Free Software Foundation, Inc.  */
 
 /* Test the full range of preprocessor operator precedence.  Each
    operator is tested with one of immediately higher precedence to
@@ -19,11 +19,6 @@
 #else
 #endif
 
-/* , not higher than ?.  This is not a syntax error if it is.  */
-#if 1 ? 0, 1: 1	/* { dg-error "without" "? higher precedence than ," } */
-#error
-#endif
-
 /* : strictly higher than ?.  This would give a syntax error otherwise.  */
 #if 0 ? 0 : 1 ? 1 : 1
 #endif
diff --git a/gcc/testsuite/gcc.dg/cpp/if-oppr2.c b/gcc/testsuite/gcc.dg/cpp/if-oppr2.c
new file mode 100644
index 0000000..bcfe7cc
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/if-oppr2.c
@@ -0,0 +1,10 @@
+/* Copyright (C) 2008 Free Software Foundation, Inc.  */
+
+/* Another test of operator precedence.  */
+
+/* { dg-do preprocess } */
+/* { dg-options "" } */
+
+#if 1 ? 2 : 3 , 0
+#error
+#endif
diff --git a/gcc/testsuite/gcc.dg/cpp/pr35313.c b/gcc/testsuite/gcc.dg/cpp/pr35313.c
new file mode 100644
index 0000000..e12636e
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/cpp/pr35313.c
@@ -0,0 +1,11 @@
+/* Test two failing cases for libcpp parser.  From PRs 35313, 36088*/
+/* { dg-do preprocess } */
+/* { dg-options "-std=c99 -pedantic-errors" } */
+
+extern int x;
+
+#if 0 ? 3,4 : 2
+#endif
+
+#if 1 ? 0 : 1 ? 1/0 : 1/0
+#endif
-- 
cgit v1.1