Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make sure core metafunctions return IntegralConstants #310

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Make sure core metafunctions return IntegralConstants #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions include/boost/hana/core/common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@ Distributed under the Boost Software License, Version 1.0.
#include <boost/hana/config.hpp>
#include <boost/hana/core/when.hpp>
#include <boost/hana/detail/canonical_constant.hpp>
#include <boost/hana/detail/integral_constant.hpp>
#include <boost/hana/detail/std_common_type.hpp>
#include <boost/hana/detail/void_t.hpp>

#include <type_traits>


BOOST_HANA_NAMESPACE_BEGIN
//////////////////////////////////////////////////////////////////////////
Expand All @@ -45,11 +44,11 @@ BOOST_HANA_NAMESPACE_BEGIN
// has_common
//////////////////////////////////////////////////////////////////////////
template <typename T, typename U, typename>
struct has_common : std::false_type { };
struct has_common : hana::integral_constant<bool, false> { };

template <typename T, typename U>
struct has_common<T, U, detail::void_t<typename common<T, U>::type>>
: std::true_type
: hana::integral_constant<bool, true>
{ };

//////////////////////////////////////////////////////////////////////////
Expand Down
7 changes: 3 additions & 4 deletions include/boost/hana/core/default.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,18 @@ Distributed under the Boost Software License, Version 1.0.
#include <boost/hana/fwd/core/default.hpp>

#include <boost/hana/config.hpp>

#include <type_traits>
#include <boost/hana/detail/integral_constant.hpp>


BOOST_HANA_NAMESPACE_BEGIN
template <typename Method, typename>
struct is_default : std::false_type { };
struct is_default : hana::integral_constant<bool, false> { };

template <typename Method>
struct is_default<Method, decltype((void)
static_cast<default_>(*(Method*)0)
)>
: std::true_type
: hana::integral_constant<bool, true>
{ };
BOOST_HANA_NAMESPACE_END

Expand Down
9 changes: 5 additions & 4 deletions include/boost/hana/core/to.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ Distributed under the Boost Software License, Version 1.0.
#include <boost/hana/core/common.hpp>
#include <boost/hana/core/dispatch.hpp>
#include <boost/hana/core/make.hpp>
#include <boost/hana/detail/integral_constant.hpp>
#include <boost/hana/detail/wrong.hpp>
#include <boost/hana/unpack.hpp>
#include <boost/hana/value.hpp>
Expand Down Expand Up @@ -146,23 +147,23 @@ BOOST_HANA_NAMESPACE_BEGIN
// is_convertible
//////////////////////////////////////////////////////////////////////////
template <typename From, typename To, typename>
struct is_convertible : std::true_type { };
struct is_convertible : hana::integral_constant<bool, true> { };

template <typename From, typename To>
struct is_convertible<From, To, decltype((void)
static_cast<convert_detail::no_conversion>(*(to_impl<To, From>*)0)
)> : std::false_type { };
)> : hana::integral_constant<bool, false> { };

//////////////////////////////////////////////////////////////////////////
// is_embedded
//////////////////////////////////////////////////////////////////////////
template <typename From, typename To, typename>
struct is_embedded : std::false_type { };
struct is_embedded : hana::integral_constant<bool, false> { };

template <typename From, typename To>
struct is_embedded<From, To, decltype((void)
static_cast<embedding<true>>(*(to_impl<To, From>*)0)
)> : std::true_type { };
)> : hana::integral_constant<bool, true> { };

//////////////////////////////////////////////////////////////////////////
// Conversion for Constants
Expand Down
4 changes: 4 additions & 0 deletions test/core/common.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)

#include <boost/hana/concept/integral_constant.hpp>
#include <boost/hana/core/common.hpp>
#include <boost/hana/not.hpp>

#include <type_traits>
namespace hana = boost::hana;
Expand All @@ -29,4 +31,6 @@ static_assert(!hana::has_common<T, void>{}, "");
static_assert(!hana::has_common<invalid, T>{}, "");
static_assert(!hana::has_common<T, invalid>{}, "");

static_assert(hana::IntegralConstant<hana::has_common<T, T>>{}, "");

int main() { }
4 changes: 4 additions & 0 deletions test/core/default.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)

#include <boost/hana/core/default.hpp>

#include <boost/hana/concept/integral_constant.hpp>
namespace hana = boost::hana;


Expand All @@ -15,4 +17,6 @@ struct method_impl<int> { };
static_assert(hana::is_default<method_impl<void>>{}, "");
static_assert(!hana::is_default<method_impl<int>>{}, "");

static_assert(hana::IntegralConstant<hana::is_default<method_impl<void>>>{}, "");

int main() { }
3 changes: 3 additions & 0 deletions test/core/is_embedded.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,16 @@
// Distributed under the Boost Software License, Version 1.0.
// (See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)

#include <boost/hana/concept/integral_constant.hpp>
#include <boost/hana/core/to.hpp>
#include <boost/hana/equal.hpp>

#include <climits>
namespace hana = boost::hana;


static_assert(hana::IntegralConstant<hana::is_embedded<float, double>>{}, "");

// This test makes sure that fundamental types are properly embedded in
// each other, when sensible.

Expand Down
3 changes: 3 additions & 0 deletions test/core/to.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
#include <boost/hana/core/to.hpp>

#include <boost/hana/assert.hpp>
#include <boost/hana/concept/integral_constant.hpp>
#include <boost/hana/core/tag_of.hpp>

#include <string>
Expand Down Expand Up @@ -103,4 +104,6 @@ int main() {

static_assert(hana::is_convertible<int, void>{}, "");
static_assert(!hana::is_embedded<int, void>{}, "");

static_assert(hana::IntegralConstant<hana::is_convertible<int, void>>{}, "");
}