From 6c0b8a537c9c643efb8ef5d1646421696ba9098f Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Sat, 2 May 2015 16:18:36 +0100 Subject: [PATCH] numeric: New. * 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. From-SVN: r222724 --- libstdc++-v3/ChangeLog | 26 ++++-- libstdc++-v3/doc/html/manual/status.html | 4 +- .../doc/xml/manual/status_cxx2017.xml | 3 +- libstdc++-v3/include/Makefile.am | 1 + libstdc++-v3/include/Makefile.in | 1 + libstdc++-v3/include/experimental/numeric | 88 +++++++++++++++++++ .../testsuite/experimental/numeric/gcd.cc | 28 ++++++ .../testsuite/experimental/numeric/lcm.cc | 32 +++++++ 8 files changed, 171 insertions(+), 12 deletions(-) create mode 100644 libstdc++-v3/include/experimental/numeric create mode 100644 libstdc++-v3/testsuite/experimental/numeric/gcd.cc create mode 100644 libstdc++-v3/testsuite/experimental/numeric/lcm.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 09b46521605..9d790b20771 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,14 +1,24 @@ +2015-05-02 Jonathan Wakely + + * 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. + 2015-05-02 Edward Smith-Rowland <3dw4rd@verizon.net> Revert addition of feature macros from other headers per latest SD-6. - * include/experimental/deque: Remove feature-test macro. - * include/experimental/forward_list: Ditto. - * include/experimental/list: Ditto. - * include/experimental/map: Ditto. - * include/experimental/set: Ditto. - * include/experimental/string: Ditto. - * include/experimental/unordered_map: Ditto. - * include/experimental/unordered_set: Ditto. + * include/experimental/deque: Remove feature-test macro. + * include/experimental/forward_list: Ditto. + * include/experimental/list: Ditto. + * include/experimental/map: Ditto. + * include/experimental/set: Ditto. + * include/experimental/string: Ditto. + * include/experimental/unordered_map: Ditto. + * include/experimental/unordered_set: Ditto. 2015-05-02 Jonathan Wakely diff --git a/libstdc++-v3/doc/html/manual/status.html b/libstdc++-v3/doc/html/manual/status.html index 3a9bf218273..413deae6d74 100644 --- a/libstdc++-v3/doc/html/manual/status.html +++ b/libstdc++-v3/doc/html/manual/status.html @@ -516,11 +516,11 @@ not in any particular release. N4273 - Uniform Container ErasureYLibrary Fundamentals 2 TS + Uniform Container ErasureYLibrary Fundamentals 2 TS N4061 - Greatest Common Divisor and Least Common MultipleNLibrary Fundamentals 2 TS + Greatest Common Divisor and Least Common MultipleYLibrary Fundamentals 2 TS N4257 diff --git a/libstdc++-v3/doc/xml/manual/status_cxx2017.xml b/libstdc++-v3/doc/xml/manual/status_cxx2017.xml index 80dd050ccab..c30bf09cdf4 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 6ba702c4e10..92b386a1adb 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/Makefile.in b/libstdc++-v3/include/Makefile.in index f23ff63d540..4a721a296c8 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -921,6 +921,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 00000000000..a11516b4432 --- /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 00000000000..efbe273523f --- /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 00000000000..359fa09fb8a --- /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, "" ); + -- 2.30.2