Patchwork [v3] libstdc++/45866

login
register
mail settings
Submitter Paolo Carlini
Date Oct. 18, 2010, 5:29 p.m.
Message ID <4CBC83E3.3090708@oracle.com>
Download mbox | patch
Permalink /patch/68217/
State New
Headers show

Comments

Paolo Carlini - Oct. 18, 2010, 5:29 p.m.
Hi,

tested x86_64-linux, committed to mainline.

Paolo.

////////////////////
2010-10-18  Paolo Carlini  <paolo.carlini@oracle.com>

	PR libstdc++/45866
	* include/std/ratio (ratio<>::type): Add.
	(ratio_add<>::num, ratio_add<>::den,
	ratio_subtract<>::num, ratio_subtract<>::den,
	ratio_multiply<>::num, ratio_multiply<>::den,
	ratio_divide<>::num, ratio_divide<>::den): Likewise.
	* testsuite/20_util/ratio/operations/45866.cc: New.

Patch

Index: include/std/ratio
===================================================================
--- include/std/ratio	(revision 165645)
+++ include/std/ratio	(working copy)
@@ -160,6 +160,8 @@ 
 
       static const intmax_t den =
         __static_abs<_Den>::value / __static_gcd<_Num, _Den>::value;
+
+      typedef ratio<num, den> type;
     };
 
   template<intmax_t _Num, intmax_t _Den>
@@ -182,8 +184,17 @@ 
           __safe_multiply<_R1::num, (_R2::den / __gcd)>::value,
           __safe_multiply<_R2::num, (_R1::den / __gcd)>::value>::value,
         __safe_multiply<_R1::den, (_R2::den / __gcd)>::value> type;
+
+      static const intmax_t num = type::num;
+      static const intmax_t den = type::den;
     };
 
+  template<typename _R1, typename _R2>
+    const intmax_t ratio_add<_R1, _R2>::num;
+
+  template<typename _R1, typename _R2>
+    const intmax_t ratio_add<_R1, _R2>::den;
+
   /// ratio_subtract
   template<typename _R1, typename _R2>
     struct ratio_subtract
@@ -191,8 +202,17 @@ 
       typedef typename ratio_add<
         _R1,
         ratio<-_R2::num, _R2::den>>::type type;
+
+      static const intmax_t num = type::num;
+      static const intmax_t den = type::den;
     };
 
+  template<typename _R1, typename _R2>
+    const intmax_t ratio_subtract<_R1, _R2>::num;
+
+  template<typename _R1, typename _R2>
+    const intmax_t ratio_subtract<_R1, _R2>::den;
+
   /// ratio_multiply
   template<typename _R1, typename _R2>
     struct ratio_multiply
@@ -209,8 +229,17 @@ 
                         (_R2::num / __gcd2)>::value,
         __safe_multiply<(_R1::den / __gcd2),
                         (_R2::den / __gcd1)>::value> type;
+
+      static const intmax_t num = type::num;
+      static const intmax_t den = type::den;
     };
 
+  template<typename _R1, typename _R2>
+    const intmax_t ratio_multiply<_R1, _R2>::num;
+
+  template<typename _R1, typename _R2>
+    const intmax_t ratio_multiply<_R1, _R2>::den;
+
   /// ratio_divide
   template<typename _R1, typename _R2>
     struct ratio_divide
@@ -220,8 +249,17 @@ 
       typedef typename ratio_multiply<
         _R1,
         ratio<_R2::den, _R2::num>>::type type;
+
+      static const intmax_t num = type::num;
+      static const intmax_t den = type::den;
     };
 
+  template<typename _R1, typename _R2>
+    const intmax_t ratio_divide<_R1, _R2>::num;
+
+  template<typename _R1, typename _R2>
+    const intmax_t ratio_divide<_R1, _R2>::den;
+
   /// ratio_equal
   template<typename _R1, typename _R2>
     struct ratio_equal
Index: testsuite/20_util/ratio/operations/45866.cc
===================================================================
--- testsuite/20_util/ratio/operations/45866.cc	(revision 0)
+++ testsuite/20_util/ratio/operations/45866.cc	(revision 0)
@@ -0,0 +1,67 @@ 
+// { dg-options "-std=gnu++0x" }
+// { dg-require-cstdint "" }
+
+// 2010-10-18  Paolo Carlini  <paolo.carlini@oracle.com>
+
+// Copyright (C) 2010 Free Software Foundation
+//
+// 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/>.
+
+#include <ratio>
+#include <testsuite_hooks.h>
+
+// libstdc++/45866
+void test01()
+{
+  bool test __attribute__((unused)) = true;
+
+  typedef std::ratio<1, 4>::type r_type1;
+  typedef std::ratio<3, 2>::type r_type2;
+
+  typedef std::ratio_add<r_type1, r_type2> ra_type;
+
+  VERIFY( ra_type::num == ra_type::type::num );
+  VERIFY( ra_type::den == ra_type::type::den );
+  VERIFY( ra_type::num == 7 );
+  VERIFY( ra_type::den == 4 );
+
+  typedef std::ratio_subtract<r_type1, r_type2> rs_type;
+
+  VERIFY( rs_type::num == rs_type::type::num );
+  VERIFY( rs_type::den == rs_type::type::den );
+  VERIFY( rs_type::num == -5 );
+  VERIFY( rs_type::den == 4 );
+
+  typedef std::ratio_multiply<r_type1, r_type2> rm_type;
+
+  VERIFY( rm_type::num == rm_type::type::num );
+  VERIFY( rm_type::den == rm_type::type::den );
+  VERIFY( rm_type::num == 3 );
+  VERIFY( rm_type::den == 8 );
+
+  typedef std::ratio_divide<r_type1, r_type2> rd_type;
+
+  VERIFY( rd_type::num == rd_type::type::num );
+  VERIFY( rd_type::den == rd_type::type::den );
+  VERIFY( rd_type::num == 1 );
+  VERIFY( rd_type::den == 6 );
+}
+
+int main()
+{
+  test01();
+  return 0;
+}