diff options
-rw-r--r-- | libstdc++-v3/ChangeLog | 8 | ||||
-rw-r--r-- | libstdc++-v3/include/std/complex | 34 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/26_numerics/complex/literals/types.cc | 46 | ||||
-rw-r--r-- | libstdc++-v3/testsuite/26_numerics/complex/literals/values.cc | 48 |
4 files changed, 136 insertions, 0 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1a4f6eb..f3f7c4b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,11 @@ +2013-10-22 Ed Smith-Rowland <3dw4rd@verizon.net> + + Implement N3779 - User-defined Literals for std::complex, + part 2 of UDL for Standard Library Types + * include/std/complex: Add complex literal operators. + * testsuite/26_numerics/complex/literals/types.cc: New. + * testsuite/26_numerics/complex/literals/values.cc: New. + 2013-10-21 Edward Smith-Rowland <3dw4rd@verizon.net> PR libstdc++/58804 diff --git a/libstdc++-v3/include/std/complex b/libstdc++-v3/include/std/complex index 58edb4f..ff04ae6 100644 --- a/libstdc++-v3/include/std/complex +++ b/libstdc++-v3/include/std/complex @@ -1924,6 +1924,40 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION conj(_Tp __x) { return __x; } +#if __cplusplus > 201103L + +inline namespace literals { +inline namespace complex_literals { + + constexpr std::complex<float> + operator""if(long double __num) + { return std::complex<float>{0.0F, static_cast<float>(__num)}; } + + constexpr std::complex<float> + operator""if(unsigned long long __num) + { return std::complex<float>{0.0F, static_cast<float>(__num)}; } + + constexpr std::complex<double> + operator""i(long double __num) + { return std::complex<double>{0.0, static_cast<double>(__num)}; } + + constexpr std::complex<double> + operator""i(unsigned long long __num) + { return std::complex<double>{0.0, static_cast<double>(__num)}; } + + constexpr std::complex<long double> + operator""il(long double __num) + { return std::complex<long double>{0.0L, __num}; } + + constexpr std::complex<long double> + operator""il(unsigned long long __num) + { return std::complex<long double>{0.0L, static_cast<long double>(__num)}; } + +} // inline namespace complex_literals +} // inline namespace literals + +#endif // C++14 + _GLIBCXX_END_NAMESPACE_VERSION } // namespace diff --git a/libstdc++-v3/testsuite/26_numerics/complex/literals/types.cc b/libstdc++-v3/testsuite/26_numerics/complex/literals/types.cc new file mode 100644 index 0000000..e5f9b8c --- /dev/null +++ b/libstdc++-v3/testsuite/26_numerics/complex/literals/types.cc @@ -0,0 +1,46 @@ +// { dg-options "-std=c++1y" } +// { dg-do compile } + +// Copyright (C) 2013 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/>. + +#include <complex> +#include <type_traits> + +void +test02() +{ + using namespace std::literals::complex_literals; + + static_assert(std::is_same<decltype(1.0if), std::complex<float>>::value, + "1.0if is std::complex<float>"); + + static_assert(std::is_same<decltype(1if), std::complex<float>>::value, + "1if is std::complex<float>"); + + static_assert(std::is_same<decltype(1.0i), std::complex<double>>::value, + "1.0i is std::complex<double>"); + + static_assert(std::is_same<decltype(1i), std::complex<double>>::value, + "1i is std::complex<double>"); + + static_assert(std::is_same<decltype(1.0il), std::complex<long double>>::value, + "1.0il is std::complex<long double>"); + + static_assert(std::is_same<decltype(1il), std::complex<long double>>::value, + "1il is std::complex<long double>"); +} diff --git a/libstdc++-v3/testsuite/26_numerics/complex/literals/values.cc b/libstdc++-v3/testsuite/26_numerics/complex/literals/values.cc new file mode 100644 index 0000000..e56727e --- /dev/null +++ b/libstdc++-v3/testsuite/26_numerics/complex/literals/values.cc @@ -0,0 +1,48 @@ +// { dg-options "-std=gnu++1y" } +// { dg-do run } + +// Copyright (C) 2013 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/>. + +#include <complex> +#include <testsuite_hooks.h> + +void +test02() +{ + using namespace std::literals::complex_literals; + + std::complex<float> j1 = 1.0if; + std::complex<float> k1 = 1if; + std::complex<double> j2 = 2.0i; + std::complex<double> k2 = 2i; + std::complex<long double> j4 = 4.0il; + std::complex<long double> k4 = 4il; + + VERIFY( j1 == std::complex<float>(0.0F, 1.0F) ); + VERIFY( k1 == std::complex<float>(0.0F, 1.0F) ); + VERIFY( j2 == std::complex<double>(0.0, 2.0) ); + VERIFY( k2 == std::complex<double>(0.0, 2.0) ); + VERIFY( j4 == std::complex<long double>(0.0L, 4.0L) ); + VERIFY( k4 == std::complex<long double>(0.0L, 4.0L) ); +} + +int +main() +{ + test02(); +} |