From ef8623b378150fe2470f7791a81c91616b702600 Mon Sep 17 00:00:00 2001
From: Diego Novillo <dnovillo@google.com>
Date: Fri, 18 Mar 2011 15:54:32 -0400
Subject: [PATCH] mixed-mode-arith_neg.cc: Rename from mixed-mode_neg.cc

	* mixed-mode-arith_neg.cc: Rename from mixed-mode_neg.cc
	* mixed-mode-cmp_neg.cc: Factor out of mixed-mode-arith_neg.cc

From-SVN: r171161
---
 libstdc++-v3/ChangeLog                             |   5 +
 .../{mixed-mode_neg.cc => mixed-mode-arith_neg.cc} |  76 +--------------
 .../testsuite/decimal/mixed-mode-cmp_neg.cc        | 106 +++++++++++++++++++++
 3 files changed, 116 insertions(+), 71 deletions(-)
 rename libstdc++-v3/testsuite/decimal/{mixed-mode_neg.cc => mixed-mode-arith_neg.cc} (65%)
 create mode 100644 libstdc++-v3/testsuite/decimal/mixed-mode-cmp_neg.cc

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 4bd1e599597..4eb500d296b 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2011-03-18  Diego Novillo  <dnovillo@google.com>
+
+	* mixed-mode-arith_neg.cc: Rename from mixed-mode_neg.cc
+	* mixed-mode-cmp_neg.cc: Factor out of mixed-mode-arith_neg.cc
+
 2011-03-18  Paolo Carlini  <paolo.carlini@oracle.com>
 
 	* testsuite/util/testsuite_random.h: New.
diff --git a/libstdc++-v3/testsuite/decimal/mixed-mode_neg.cc b/libstdc++-v3/testsuite/decimal/mixed-mode-arith_neg.cc
similarity index 65%
rename from libstdc++-v3/testsuite/decimal/mixed-mode_neg.cc
rename to libstdc++-v3/testsuite/decimal/mixed-mode-arith_neg.cc
index 7f9da43ed43..5cc67fbec7f 100644
--- a/libstdc++-v3/testsuite/decimal/mixed-mode_neg.cc
+++ b/libstdc++-v3/testsuite/decimal/mixed-mode-arith_neg.cc
@@ -18,11 +18,11 @@
 // { dg-do compile }
 // { dg-require-effective-target dfp }
 
-// Test that binary operators do not accept mixed decimal and generic
-// floating-point operands.  This isn't explicity prohibited in
-// ISO/IEC TR 24733 but it is prohibited in C, and in C++ there should
-// not be an implicit conversion from a decimal floating-point type to
-// a generic floating-point type.
+// Test that binary arithmetic operators do not accept mixed decimal
+// and generic floating-point operands.  This isn't explicity
+// prohibited in ISO/IEC TR 24733 but it is prohibited in C, and in C++
+// there should not be an implicit conversion from a decimal
+// floating-point type to a generic floating-point type.
 
 #include <decimal/decimal>
 #include <testsuite_hooks.h>
@@ -82,72 +82,6 @@ bad_divide (void)
 }
 
 void
-bad_eq (void)
-{
-  b1 = b32 == f;	// { dg-error "error" }
-  b2 = ld == b32;	// { dg-error "error" }
-  b3 = b64 == d;	// { dg-error "error" }
-  b4 = ld == b64;	// { dg-error "error" }
-  b5 = b128 == ld;	// { dg-error "error" }
-  b6 = d == b128;	// { dg-error "error" }
-}
-
-void
-bad_ne (void)
-{
-  b1 = b32 != f;	// { dg-error "error" }
-  b2 = ld != b32;	// { dg-error "error" }
-  b3 = b64 != d;	// { dg-error "error" }
-  b4 = ld != b64;	// { dg-error "error" }
-  b5 = b128 != ld;	// { dg-error "error" }
-  b6 = d != b128;	// { dg-error "error" }
-}
-
-void
-bad_lt (void)
-{
-  b1 = b32 < f;		// { dg-error "error" }
-  b2 = ld < b32;	// { dg-error "error" }
-  b3 = b64 < d;		// { dg-error "error" }
-  b4 = ld < b64;	// { dg-error "error" }
-  b5 = b128 < ld;	// { dg-error "error" }
-  b6 = d < b128;	// { dg-error "error" }
-}
-
-void
-bad_le (void)
-{
-  b1 = b32 <= f;	// { dg-error "error" }
-  b2 = ld <= b32;	// { dg-error "error" }
-  b3 = b64 <= d;	// { dg-error "error" }
-  b4 = ld <= b64;	// { dg-error "error" }
-  b5 = b128 <= ld;	// { dg-error "error" }
-  b6 = d <= b128;	// { dg-error "error" }
-}
-
-void
-bad_gt (void)
-{
-  b1 = b32 > f;		// { dg-error "error" }
-  b2 = ld > b32;	// { dg-error "error" }
-  b3 = b64 > d;		// { dg-error "error" }
-  b4 = ld > b64;	// { dg-error "error" }
-  b5 = b128 > ld;	// { dg-error "error" }
-  b6 = d > b128;	// { dg-error "error" }
-}
-
-void
-bad_ge (void)
-{
-  b1 = b32 >= f;	// { dg-error "error" }
-  b2 = ld >= b32;	// { dg-error "error" }
-  b3 = b64 >= d;	// { dg-error "error" }
-  b4 = ld >= b64;	// { dg-error "error" }
-  b5 = b128 >= ld;	// { dg-error "error" }
-  b6 = d >= b128;	// { dg-error "error" }
-}
-
-void
 bad_pluseq (void)
 {
   a32 += f;		// { dg-error "error" }
diff --git a/libstdc++-v3/testsuite/decimal/mixed-mode-cmp_neg.cc b/libstdc++-v3/testsuite/decimal/mixed-mode-cmp_neg.cc
new file mode 100644
index 00000000000..46a38acd3ed
--- /dev/null
+++ b/libstdc++-v3/testsuite/decimal/mixed-mode-cmp_neg.cc
@@ -0,0 +1,106 @@
+// Copyright (C) 2009 Free Software Foundation, Inc.
+//
+// This file is part of the GNU ISO C++ Library.  This library is free
+// software; you can redistribute it and/or modify it under the
+// terms of the GNU General Public License as published by the
+// Free Software Foundation; either version 3, or (at your option)
+// any later version.
+
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License along
+// with this library; see the file COPYING3.  If not see
+// <http://www.gnu.org/licenses/>.
+
+// { dg-do compile }
+// { dg-require-effective-target dfp }
+
+// Test that binary comparison operators do not accept mixed decimal
+// and generic floating-point operands.  This isn't explicity prohibited
+// in ISO/IEC TR 24733 but it is prohibited in C, and in C++ there should
+// not be an implicit conversion from a decimal floating-point type to a
+// generic floating-point type.
+
+#include <decimal/decimal>
+#include <testsuite_hooks.h>
+
+using namespace std::decimal;
+
+decimal32 a32, b32, c32;
+decimal64 a64, b64, c64;
+decimal128 a128, b128, c128;
+float f;
+double d;
+long double ld;
+bool b1, b2, b3, b4, b5, b6;
+
+void
+bad_eq (void)
+{
+  b1 = b32 == f;	// { dg-error "error" }
+  b2 = ld == b32;	// { dg-error "error" }
+  b3 = b64 == d;	// { dg-error "error" }
+  b4 = ld == b64;	// { dg-error "error" }
+  b5 = b128 == ld;	// { dg-error "error" }
+  b6 = d == b128;	// { dg-error "error" }
+}
+
+void
+bad_ne (void)
+{
+  b1 = b32 != f;	// { dg-error "error" }
+  b2 = ld != b32;	// { dg-error "error" }
+  b3 = b64 != d;	// { dg-error "error" }
+  b4 = ld != b64;	// { dg-error "error" }
+  b5 = b128 != ld;	// { dg-error "error" }
+  b6 = d != b128;	// { dg-error "error" }
+}
+
+void
+bad_lt (void)
+{
+  b1 = b32 < f;		// { dg-error "error" }
+  b2 = ld < b32;	// { dg-error "error" }
+  b3 = b64 < d;		// { dg-error "error" }
+  b4 = ld < b64;	// { dg-error "error" }
+  b5 = b128 < ld;	// { dg-error "error" }
+  b6 = d < b128;	// { dg-error "error" }
+}
+
+void
+bad_le (void)
+{
+  b1 = b32 <= f;	// { dg-error "error" }
+  b2 = ld <= b32;	// { dg-error "error" }
+  b3 = b64 <= d;	// { dg-error "error" }
+  b4 = ld <= b64;	// { dg-error "error" }
+  b5 = b128 <= ld;	// { dg-error "error" }
+  b6 = d <= b128;	// { dg-error "error" }
+}
+
+void
+bad_gt (void)
+{
+  b1 = b32 > f;		// { dg-error "error" }
+  b2 = ld > b32;	// { dg-error "error" }
+  b3 = b64 > d;		// { dg-error "error" }
+  b4 = ld > b64;	// { dg-error "error" }
+  b5 = b128 > ld;	// { dg-error "error" }
+  b6 = d > b128;	// { dg-error "error" }
+}
+
+void
+bad_ge (void)
+{
+  b1 = b32 >= f;	// { dg-error "error" }
+  b2 = ld >= b32;	// { dg-error "error" }
+  b3 = b64 >= d;	// { dg-error "error" }
+  b4 = ld >= b64;	// { dg-error "error" }
+  b5 = b128 >= ld;	// { dg-error "error" }
+  b6 = d >= b128;	// { dg-error "error" }
+}
+
+// { dg-excess-errors "notes about candidates" }
-- 
2.11.4.GIT