From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 130832 invoked by alias); 2 May 2015 15:18:55 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 130811 invoked by uid 89); 2 May 2015 15:18:54 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_HELO_PASS,SPF_PASS,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Sat, 02 May 2015 15:18:52 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 14D52B72CF; Sat, 2 May 2015 15:18:51 +0000 (UTC) Received: from localhost (ovpn-116-62.ams2.redhat.com [10.36.116.62]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t42FIoLW019818; Sat, 2 May 2015 11:18:50 -0400 Date: Sat, 02 May 2015 15:18:00 -0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [patch] std::experimental::gcd and std::experimental::lcd Message-ID: <20150502151849.GZ3618@redhat.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="RHnfto7yGd+QdmRl" Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-SW-Source: 2015-05/txt/msg00137.txt.bz2 --RHnfto7yGd+QdmRl Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline Content-length: 449 These where simple to implement (almost too simple ... I probably got something wrong!) Tested powerpc64le-linux, committed to trunk. (Apart from using common_type_t, which is easy to change, these functions meet the simpler rules for C++11 constexpr, so moving them out of would probably allow to be greatly simplified. I don't plan on doing that myself any time soon, but it would make sense to do it some day.) --RHnfto7yGd+QdmRl Content-Type: text/x-patch; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" Content-length: 7605 commit 75a262dbda438434ec7f7ba6144e7e3ca05f5dbc Author: Jonathan Wakely Date: Sat May 2 16:02:29 2015 +0100 * include/experimental/numeric: New. Define gcd and lcm. * include/Makefile.am: Add new header. * include/Makefile.in: Regenerate. * testsuite/experimental/numeric/gcd.cc: New. * testsuite/experimental/numeric/lcm.cc: New. * doc/xml/manual/status_cxx2017.xml: Update status. * doc/html/manual/status.html: Regenerate. diff --git a/libstdc++-v3/doc/xml/manual/status_cxx2017.xml b/libstdc++-v3/doc/xml/manual/status_cxx2017.xml index 80dd050..c30bf09 100644 --- a/libstdc++-v3/doc/xml/manual/status_cxx2017.xml +++ b/libstdc++-v3/doc/xml/manual/status_cxx2017.xml @@ -209,14 +209,13 @@ not in any particular release. - N4061 Greatest Common Divisor and Least Common Multiple - N + Y Library Fundamentals 2 TS diff --git a/libstdc++-v3/include/Makefile.am b/libstdc++-v3/include/Makefile.am index 6ba702c..92b386a 100644 --- a/libstdc++-v3/include/Makefile.am +++ b/libstdc++-v3/include/Makefile.am @@ -654,6 +654,7 @@ experimental_headers = \ ${experimental_srcdir}/list \ ${experimental_srcdir}/map \ ${experimental_srcdir}/memory \ + ${experimental_srcdir}/numeric \ ${experimental_srcdir}/optional \ ${experimental_srcdir}/ratio \ ${experimental_srcdir}/set \ diff --git a/libstdc++-v3/include/experimental/numeric b/libstdc++-v3/include/experimental/numeric new file mode 100644 index 0000000..a11516b --- /dev/null +++ b/libstdc++-v3/include/experimental/numeric @@ -0,0 +1,88 @@ +// -*- C++ -*- + +// Copyright (C) 2015 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. + +// Under Section 7 of GPL version 3, you are granted additional +// permissions described in the GCC Runtime Library Exception, version +// 3.1, as published by the Free Software Foundation. + +// You should have received a copy of the GNU General Public License and +// a copy of the GCC Runtime Library Exception along with this program; +// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see +// . + +/** @file experimental/numeric + * This is a TS C++ Library header. + */ + +// +// N4336 Working Draft, C++ Extensions for Library Fundamentals, Version 2 +// + +#ifndef _GLIBCXX_EXPERIMENTAL_NUMERIC +#define _GLIBCXX_EXPERIMENTAL_NUMERIC 1 + +#pragma GCC system_header + +#if __cplusplus <= 201103L +# include +#else + +#include +#include + +namespace std _GLIBCXX_VISIBILITY(default) +{ +namespace experimental +{ +inline namespace fundamentals_v2 +{ +_GLIBCXX_BEGIN_NAMESPACE_VERSION + +#define __cpp_lib_experimental_gcd_lcm 201411 + + // Greatest common divisor + template + constexpr common_type_t<_Mn, _Nn> + gcd(_Mn __m, _Nn __n) + { + static_assert(is_integral<_Mn>::value, "arguments to gcd are integers"); + static_assert(is_integral<_Nn>::value, "arguments to gcd are integers"); + + return __m == 0 ? std::abs(__n) + : __n == 0 ? std::abs(__m) + : fundamentals_v2::gcd(__n, __m % __n); + } + + // Least common multiple + template + constexpr common_type_t<_Mn, _Nn> + lcm(_Mn __m, _Nn __n) + { + static_assert(is_integral<_Mn>::value, "arguments to lcm are integers"); + static_assert(is_integral<_Nn>::value, "arguments to lcm are integers"); + + return (__m != 0 && __n != 0) + ? (std::abs(__m) / fundamentals_v2::gcd(__m, __n)) * std::abs(__n) + : 0; + } + +_GLIBCXX_END_NAMESPACE_VERSION +} // namespace fundamentals_v2 +} // namespace experimental +} // namespace std + +#endif // __cplusplus <= 201103L + +#endif // _GLIBCXX_EXPERIMENTAL_NUMERIC diff --git a/libstdc++-v3/testsuite/experimental/numeric/gcd.cc b/libstdc++-v3/testsuite/experimental/numeric/gcd.cc new file mode 100644 index 0000000..efbe273 --- /dev/null +++ b/libstdc++-v3/testsuite/experimental/numeric/gcd.cc @@ -0,0 +1,28 @@ +// Copyright (C) 2015 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 +// . + +// { dg-options "-std=gnu++14" } +// { dg-do compile } + +#include + +using std::experimental::fundamentals_v2::lcm; + +static_assert(lcm(21, 6) == 42, ""); +static_assert(lcm(41, 0) == 0, "LCD with zero is zero"); +static_assert(lcm(0, 7) == 0, "LCD with zero is zero"); +static_assert(lcm(0, 0) == 0, "no division by zero"); diff --git a/libstdc++-v3/testsuite/experimental/numeric/lcm.cc b/libstdc++-v3/testsuite/experimental/numeric/lcm.cc new file mode 100644 index 0000000..359fa09 --- /dev/null +++ b/libstdc++-v3/testsuite/experimental/numeric/lcm.cc @@ -0,0 +1,32 @@ +// Copyright (C) 2015 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 +// . + +// { dg-options "-std=gnu++14" } +// { dg-do compile } + +#include + +using std::experimental::fundamentals_v2::gcd; + +static_assert( gcd(1071, 462) == 21, "" ); +static_assert( gcd(2000, 20) == 20, "" ); +static_assert( gcd(2011, 17) == 1, "GCD of two primes is 1" ); +static_assert( gcd(200, 200) == 200, "GCD of equal numbers is that number" ); +static_assert( gcd(0, 13) == 13, "GCD of any number and 0 is that number" ); +static_assert( gcd(29, 0) == 29, "GCD of any number and 0 is that number" ); +static_assert( gcd(0, 0) == 0, "" ); + --RHnfto7yGd+QdmRl--