Skip to content

Commit

Permalink
Merge pull request #847 from cppalliance/detail_concepts
Browse files Browse the repository at this point in the history 
Move concepts into detail namespace
  • Loading branch information
@mborland
mborland authored Jan 31, 2025
2 parents f51da45 + 52e2d49 commit e02d08a
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 59 deletions.
104 changes: 50 additions & 54 deletions include/boost/decimal/detail/concepts.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,7 @@
#include <complex>
#endif

namespace boost::decimal::concepts {

namespace detail {
namespace boost::decimal::detail::concepts {

template <typename X, typename Y, typename Op>
struct op_valid_impl
Expand Down Expand Up @@ -115,8 +113,6 @@ BOOST_DECIMAL_HAS_MEMBER_FUNCTION(end)
BOOST_DECIMAL_HAS_MEMBER_FUNCTION(real)
BOOST_DECIMAL_HAS_MEMBER_FUNCTION(imag)

} // Namespace detail

template <typename T>
concept integral = boost::decimal::detail::is_integral_v<T>;

Expand Down Expand Up @@ -154,21 +150,21 @@ concept unsigned_arithmetic = arithmetic<T> && std::is_unsigned_v<T>;

template <typename T>
concept arbitrary_unsigned_arithmetic_type = unsigned_arithmetic<T> ||
(detail::op_valid_v<T, T, std::equal_to<>> &&
detail::op_valid_v<T, T, std::not_equal_to<>> &&
detail::op_valid_v<T, T, std::greater<>> &&
detail::op_valid_v<T, T, std::less<>> &&
detail::op_valid_v<T, T, std::greater_equal<>> &&
detail::op_valid_v<T, T, std::less_equal<>> &&
detail::op_valid_v<T, T, std::plus<>> &&
detail::op_valid_v<T, T, std::minus<>> &&
detail::op_valid_v<T, T, std::multiplies<>> &&
detail::op_valid_v<T, T, std::divides<>>);
(op_valid_v<T, T, std::equal_to<>> &&
op_valid_v<T, T, std::not_equal_to<>> &&
op_valid_v<T, T, std::greater<>> &&
op_valid_v<T, T, std::less<>> &&
op_valid_v<T, T, std::greater_equal<>> &&
op_valid_v<T, T, std::less_equal<>> &&
op_valid_v<T, T, std::plus<>> &&
op_valid_v<T, T, std::minus<>> &&
op_valid_v<T, T, std::multiplies<>> &&
op_valid_v<T, T, std::divides<>>);

template <typename T>
concept arbitrary_signed_arithmetic_type = signed_arithmetic<T> ||
(arbitrary_unsigned_arithmetic_type<T> &&
(detail::op_valid_v<T, T, std::negate<>> ||
(op_valid_v<T, T, std::negate<>> ||
std::numeric_limits<T>::is_signed));

template <typename T>
Expand All @@ -193,8 +189,8 @@ concept arbitrary_real_type = arbitrary_arithmetic_type<T> &&

template <typename T>
concept arbitrary_complex_type = complex<T> ||
(detail::has_real_v<T> &&
detail::has_imag_v<T>);
(has_real_v<T> &&
has_imag_v<T>);

template <typename T>
concept arbitrary_real_or_complex_type = arbitrary_real_type<T> ||
Expand Down Expand Up @@ -222,49 +218,49 @@ concept output_iterator = derived_from<typename std::iterator_traits<I>::iterato
derived_from<typename std::iterator_traits<T>::iterator_category, std::output_iterator_tag>;

template <typename T>
concept is_container = detail::has_begin_v<T> &&
detail::has_end_v<T>;
concept is_container = has_begin_v<T> &&
has_end_v<T>;

template <typename T>
concept random_access_container = is_container<T> &&
boost::decimal::concepts::random_access_iterator<typename T::iterator>;
boost::decimal::detail::concepts::random_access_iterator<typename T::iterator>;

template <typename T>
concept decimal_floating_point_type = boost::decimal::detail::is_decimal_floating_point_v<T>;

} // boost::decimal::concepts
} // boost::decimal::detail::concepts

#define BOOST_DECIMAL_HAS_CONCEPTS 1

#define BOOST_DECIMAL_INTEGRAL boost::decimal::concepts::integral
#define BOOST_DECIMAL_SIGNED_INTEGRAL boost::decimal::concepts::signed_integral
#define BOOST_DECIMAL_UNSIGNED_INTEGRAL boost::decimal::concepts::unsigned_integral
#define BOOST_DECIMAL_REAL boost::decimal::concepts::real
#define BOOST_DECIMAL_COMPLEX boost::decimal::concepts::complex
#define BOOST_DECIMAL_REAL_OR_COMPLEX boost::decimal::concepts::real_or_complex
#define BOOST_DECIMAL_ARITHMETIC boost::decimal::concepts::arithmetic
#define BOOST_DECIMAL_NUMERICAL boost::decimal::concepts::numerical
#define BOOST_DECIMAL_SIGNED_ARITHMETIC boost::decimal::concepts::signed_arithmetic
#define BOOST_DECIMAL_UNSIGNED_ARITHMETIC boost::decimal::concepts::unsigned_arithmetic
#define BOOST_DECIMAL_ARBITRARY_UNSIGNED_ARITHMETIC boost::decimal::concepts::arbitrary_unsigned_arithmetic_type
#define BOOST_DECIMAL_ARBITRARY_SIGNED_ARITHMETIC boost::decimal::concepts::arbitrary_signed_arithmetic_type
#define BOOST_DECIMAL_ARBITRARY_ARITHMETIC boost::decimal::concepts::arbitrary_arithmetic_type
#define BOOST_DECIMAL_ARBITRARY_UNSIGNED_INTEGER boost::decimal::concepts::arbitrary_unsigned_integer_type
#define BOOST_DECIMAL_ARBITRARY_SIGNED_INTEGER boost::decimal::concepts::arbitrary_signed_integer_type
#define BOOST_DECIMAL_ARBITRARY_INTEGER boost::decimal::concepts::arbitrary_integer_type
#define BOOST_DECIMAL_ARBITRARY_REAL boost::decimal::concepts::arbitrary_real_type
#define BOOST_DECIMAL_ARBITRARY_COMPLEX boost::decimal::concepts::arbitrary_complex_type
#define BOOST_DECIMAL_ARBITRARY_REAL_OR_COMPLEX boost::decimal::concepts::arbitrary_real_or_complex_type
#define BOOST_DECIMAL_ARBITRARY_NUMERICAL boost::decimal::concepts::arbitrary_numerical_type
#define BOOST_DECIMAL_DECIMAL_FLOATING_TYPE boost::decimal::concepts::decimal_floating_point_type

#define BOOST_DECIMAL_CONTAINER boost::decimal::concepts::is_container
#define BOOST_DECIMAL_RANDOM_ACCESS_CONTAINER boost::decimal::concepts::random_access_container

#define BOOST_DECIMAL_FORWARD_ITER boost::decimal::concepts::forward_iterator
#define BOOST_DECIMAL_BIDIRECTIONAL_ITER boost::decimal::concepts::bidirectional_iterator
#define BOOST_DECIMAL_RANDOM_ACCESS_ITER boost::decimal::concepts::random_access_iterator
#define BOOST_DECIMAL_OUTPUT_ITER(I, T) boost::decimal::concepts::output_iterator<I, T>
#define BOOST_DECIMAL_INTEGRAL boost::decimal::detail::concepts::integral
#define BOOST_DECIMAL_SIGNED_INTEGRAL boost::decimal::detail::concepts::signed_integral
#define BOOST_DECIMAL_UNSIGNED_INTEGRAL boost::decimal::detail::concepts::unsigned_integral
#define BOOST_DECIMAL_REAL boost::decimal::detail::concepts::real
#define BOOST_DECIMAL_COMPLEX boost::decimal::detail::concepts::complex
#define BOOST_DECIMAL_REAL_OR_COMPLEX boost::decimal::detail::concepts::real_or_complex
#define BOOST_DECIMAL_ARITHMETIC boost::decimal::detail::concepts::arithmetic
#define BOOST_DECIMAL_NUMERICAL boost::decimal::detail::concepts::numerical
#define BOOST_DECIMAL_SIGNED_ARITHMETIC boost::decimal::detail::concepts::signed_arithmetic
#define BOOST_DECIMAL_UNSIGNED_ARITHMETIC boost::decimal::detail::concepts::unsigned_arithmetic
#define BOOST_DECIMAL_ARBITRARY_UNSIGNED_ARITHMETIC boost::decimal::detail::concepts::arbitrary_unsigned_arithmetic_type
#define BOOST_DECIMAL_ARBITRARY_SIGNED_ARITHMETIC boost::decimal::detail::concepts::arbitrary_signed_arithmetic_type
#define BOOST_DECIMAL_ARBITRARY_ARITHMETIC boost::decimal::detail::concepts::arbitrary_arithmetic_type
#define BOOST_DECIMAL_ARBITRARY_UNSIGNED_INTEGER boost::decimal::detail::concepts::arbitrary_unsigned_integer_type
#define BOOST_DECIMAL_ARBITRARY_SIGNED_INTEGER boost::decimal::detail::concepts::arbitrary_signed_integer_type
#define BOOST_DECIMAL_ARBITRARY_INTEGER boost::decimal::detail::concepts::arbitrary_integer_type
#define BOOST_DECIMAL_ARBITRARY_REAL boost::decimal::detail::concepts::arbitrary_real_type
#define BOOST_DECIMAL_ARBITRARY_COMPLEX boost::decimal::detail::concepts::arbitrary_complex_type
#define BOOST_DECIMAL_ARBITRARY_REAL_OR_COMPLEX boost::decimal::detail::concepts::arbitrary_real_or_complex_type
#define BOOST_DECIMAL_ARBITRARY_NUMERICAL boost::decimal::detail::concepts::arbitrary_numerical_type
#define BOOST_DECIMAL_DECIMAL_FLOATING_TYPE boost::decimal::detail::concepts::decimal_floating_point_type

#define BOOST_DECIMAL_CONTAINER boost::decimal::detail::concepts::is_container
#define BOOST_DECIMAL_RANDOM_ACCESS_CONTAINER boost::decimal::detail::concepts::random_access_container

#define BOOST_DECIMAL_FORWARD_ITER boost::decimal::detail::concepts::forward_iterator
#define BOOST_DECIMAL_BIDIRECTIONAL_ITER boost::decimal::detail::concepts::bidirectional_iterator
#define BOOST_DECIMAL_RANDOM_ACCESS_ITER boost::decimal::detail::concepts::random_access_iterator
#define BOOST_DECIMAL_OUTPUT_ITER(I, T) boost::decimal::detail::concepts::output_iterator<I, T>
#define BOOST_DECIMAL_REQUIRES_ITER(X) requires X

#define BOOST_DECIMAL_REQUIRES(X, T) -> T requires X<T>
Expand All @@ -276,14 +272,14 @@ concept decimal_floating_point_type = boost::decimal::detail::is_decimal_floatin
#ifdef BOOST_DECIMAL_EXEC_COMPATIBLE
#include <execution>

namespace boost::decimal::concepts {
namespace boost::decimal::detail::concepts {

template <typename T>
concept execution_policy = std::is_execution_policy_v<std::remove_cvref_t<T>>;

} // Namespace boost::decimal::concepts
} // Namespace boost::decimal::detail::concepts

#define BOOST_DECIMAL_EXECUTION_POLICY boost::decimal::concepts::execution_policy
#define BOOST_DECIMAL_EXECUTION_POLICY boost::decimal::detail::concepts::execution_policy

#endif // Has <execution>

Expand Down
2 changes: 1 addition & 1 deletion include/boost/decimal/format.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ constexpr auto parse_impl(ParseContext &ctx)

namespace std {

template <boost::decimal::concepts::decimal_floating_point_type T>
template <boost::decimal::detail::concepts::decimal_floating_point_type T>
struct formatter<T>
{
constexpr formatter() : ctx_precision(6),
Expand Down
8 changes: 4 additions & 4 deletions test/test_format.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ using namespace boost::decimal;

#ifdef BOOST_DECIMAL_HAS_FORMAT_SUPPORT

template <concepts::decimal_floating_point_type T>
template <typename T>
void test_general()
{
// For unknown reasons Clang does not like this empty bracket and throws compiler errors
Expand Down Expand Up @@ -85,7 +85,7 @@ void test_general()
BOOST_TEST_EQ(std::format("{:G}", -std::numeric_limits<T>::signaling_NaN()), "-NAN(SNAN)");
}

template <concepts::decimal_floating_point_type T>
template <typename T>
void test_fixed()
{
BOOST_TEST_EQ(std::format("{:f}", T {21, 6, true}), "-21000000.000000");
Expand Down Expand Up @@ -116,7 +116,7 @@ void test_fixed()
BOOST_TEST_EQ(std::format("{:F}", -std::numeric_limits<T>::signaling_NaN()), "-NAN(SNAN)");
}

template <concepts::decimal_floating_point_type T>
template <typename T>
void test_scientific()
{
BOOST_TEST_EQ(std::format("{:e}", T {21, 6, true}), "-2.100000e+07");
Expand Down Expand Up @@ -147,7 +147,7 @@ void test_scientific()
BOOST_TEST_EQ(std::format("{:10.3E}", T {0}), " 0.000E+00");
}

template <concepts::decimal_floating_point_type T>
template <typename T>
void test_hex()
{
BOOST_TEST_EQ(std::format("{:.0a}", T {0}), "0p+00");
Expand Down

0 comments on commit e02d08a

Please sign in to comment.