Skip to content

Commit 584a8e0

Browse files
shreyans800755shreyans800755
committed
[SetTheoretic] Add SetTheoretic concept
It adds SetTheoretic concept for functions- union, intersection, difference, symmetric_difference. Closes #357
1 parent 59393ca commit 584a8e0

File tree

10 files changed

+150
-12
lines changed

10 files changed

+150
-12
lines changed

Diff for: ‎example/misc/infinite_set.cpp

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
#include <boost/hana/and.hpp>
66
#include <boost/hana/any_of.hpp>
7+
#include <boost/hana/concept/set_theoretic.hpp>
78
#include <boost/hana/flatten.hpp>
89
#include <boost/hana/functional/compose.hpp>
910
#include <boost/hana/functional/partial.hpp>
@@ -48,6 +49,11 @@ constexpr auto doubleton(X x, Y y) {
4849
}
4950

5051
namespace boost { namespace hana {
52+
template <>
53+
struct SetTheoretic<infinite_set_tag> {
54+
static constexpr bool value = true;
55+
};
56+
5157
template <>
5258
struct union_impl<infinite_set_tag> {
5359
template <typename Xs, typename Ys>

Diff for: ‎include/boost/hana/concept.hpp

+1
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ Distributed under the Boost Software License, Version 1.0.
3131
#include <boost/hana/concept/ring.hpp>
3232
#include <boost/hana/concept/searchable.hpp>
3333
#include <boost/hana/concept/sequence.hpp>
34+
#include <boost/hana/concept/set_theoretic.hpp>
3435
#include <boost/hana/concept/struct.hpp>
3536

3637
#endif // !BOOST_HANA_CONCEPT_HPP

Diff for: ‎include/boost/hana/concept/set_theoretic.hpp

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/*!
2+
@file
3+
Defines `boost::hana::SetTheoretic`.
4+
5+
@copyright Shreyans Doshi 2017
6+
Distributed under the Boost Software License, Version 1.0.
7+
(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
8+
*/
9+
10+
#ifndef BOOST_HANA_CONCEPT_SET_THEORETIC_HPP
11+
#define BOOST_HANA_CONCEPT_SET_THEORETIC_HPP
12+
13+
#include <boost/hana/fwd/concept/set_theoretic.hpp>
14+
15+
#include <boost/hana/config.hpp>
16+
#include <boost/hana/core/default.hpp>
17+
#include <boost/hana/core/tag_of.hpp>
18+
#include <boost/hana/detail/integral_constant.hpp>
19+
#include <boost/hana/difference.hpp>
20+
#include <boost/hana/intersection.hpp>
21+
#include <boost/hana/symmetric_difference.hpp>
22+
#include <boost/hana/union.hpp>
23+
24+
25+
BOOST_HANA_NAMESPACE_BEGIN
26+
template <typename STh>
27+
struct SetTheoretic
28+
: hana::integral_constant<bool,
29+
!is_default<difference_impl<typename tag_of<STh>::type>>::value &&
30+
!is_default<intersection_impl<typename tag_of<STh>::type>>::value &&
31+
!is_default<symmetric_difference_impl<typename tag_of<STh>::type>>::value &&
32+
!is_default<union_impl<typename tag_of<STh>::type>>::value
33+
>
34+
{ };
35+
BOOST_HANA_NAMESPACE_END
36+
37+
#endif // !BOOST_HANA_CONCEPT_SET_THEORETIC_HPP

Diff for: ‎include/boost/hana/difference.hpp

+14-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Distributed under the Boost Software License, Version 1.0.
1212

1313
#include <boost/hana/fwd/difference.hpp>
1414

15+
#include <boost/hana/concept/set_theoretic.hpp>
1516
#include <boost/hana/config.hpp>
1617
#include <boost/hana/core/dispatch.hpp>
1718
#include <boost/hana/erase_key.hpp>
@@ -21,11 +22,21 @@ BOOST_HANA_NAMESPACE_BEGIN
2122
//! @cond
2223
template <typename Xs, typename Ys>
2324
constexpr auto difference_t::operator()(Xs&& xs, Ys&& ys) const {
24-
using S = typename hana::tag_of<Xs>::type;
25-
using Difference = BOOST_HANA_DISPATCH_IF(difference_impl<S>,
26-
true
25+
using TX = typename hana::tag_of<Xs>::type;
26+
using TY = typename hana::tag_of<Ys>::type;
27+
using Difference = BOOST_HANA_DISPATCH_IF(difference_impl<TX>,
28+
hana::SetTheoretic<TX>::value &&
29+
std::is_same<TX, TY>::value
2730
);
2831

32+
#ifndef BOOST_HANA_CONFIG_DISABLE_CONCEPT_CHECKS
33+
static_assert(hana::SetTheoretic<TX>::value,
34+
"hana::difference(xs, ys) requires 'xs' to be SetTheoretic");
35+
36+
static_assert(std::is_same<TX, TY>::value,
37+
"hana::difference(xs, ys) requires 'xs' and 'ys' to be SetTheoretic");
38+
#endif
39+
2940
return Difference::apply(static_cast<Xs&&>(xs), static_cast<Ys&&>(ys));
3041
}
3142
//! @endcond

Diff for: ‎include/boost/hana/fwd/concept/set_theoretic.hpp

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
/*!
2+
@file
3+
Forward declares `boost::hana::SetTheoretic`.
4+
5+
@copyright Shreyans Doshi 2017
6+
Distributed under the Boost Software License, Version 1.0.
7+
(See accompanying file LICENSE.md or copy at http://boost.org/LICENSE_1_0.txt)
8+
*/
9+
10+
#ifndef BOOST_HANA_FWD_CONCEPT_SET_THEORETIC_HPP
11+
#define BOOST_HANA_FWD_CONCEPT_SET_THEORETIC_HPP
12+
13+
#include <boost/hana/config.hpp>
14+
15+
16+
BOOST_HANA_NAMESPACE_BEGIN
17+
//! @ingroup group-concepts
18+
//! @defgroup group-SetTheoretic SetTheoretic
19+
//! The `SetTheoretic` concept represents data structures supporting
20+
//! set-theoretic functions like union, instersection, difference,
21+
//! and symmetric_difference.
22+
//!
23+
//! Minimal complete definition
24+
//! ---------------------------
25+
//! `union_`, `intersection`, `difference` and `symmetric_difference`
26+
//!
27+
//! Concrete models
28+
//! ---------------
29+
//! `hana::set`, `hana::map`
30+
//!
31+
//!
32+
//! [1]: https://github.com/boostorg/hana/issues/357
33+
template <typename STh>
34+
struct SetTheoretic;
35+
BOOST_HANA_NAMESPACE_END
36+
37+
#endif // !BOOST_HANA_FWD_CONCEPT_SET_THEORETIC_HPP

Diff for: ‎include/boost/hana/intersection.hpp

+14-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Distributed under the Boost Software License, Version 1.0.
1212

1313
#include <boost/hana/fwd/intersection.hpp>
1414

15+
#include <boost/hana/concept/set_theoretic.hpp>
1516
#include <boost/hana/config.hpp>
1617
#include <boost/hana/core/dispatch.hpp>
1718

@@ -20,10 +21,20 @@ BOOST_HANA_NAMESPACE_BEGIN
2021
//! @cond
2122
template <typename Xs, typename Ys>
2223
constexpr auto intersection_t::operator()(Xs&& xs, Ys&& ys) const {
23-
using S = typename hana::tag_of<Xs>::type;
24-
using Intersection = BOOST_HANA_DISPATCH_IF(intersection_impl<S>,
25-
true
24+
using TX = typename hana::tag_of<Xs>::type;
25+
using TY = typename hana::tag_of<Ys>::type;
26+
using Intersection = BOOST_HANA_DISPATCH_IF(intersection_impl<TX>,
27+
hana::SetTheoretic<TX>::value &&
28+
std::is_same<TX, TY>::value
2629
);
30+
31+
#ifndef BOOST_HANA_CONFIG_DISABLE_CONCEPT_CHECKS
32+
static_assert(hana::SetTheoretic<TX>::value,
33+
"hana::intersection(xs, ys) requires 'xs' to be SetTheoretic");
34+
35+
static_assert(std::is_same<TX, TY>::value,
36+
"hana::intersection(xs, ys) requires 'xs' and 'ys' to be SetTheoretic");
37+
#endif
2738

2839
return Intersection::apply(static_cast<Xs&&>(xs), static_cast<Ys&&>(ys));
2940
}

Diff for: ‎include/boost/hana/map.hpp

+7
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Distributed under the Boost Software License, Version 1.0.
1818
#include <boost/hana/concept/comparable.hpp>
1919
#include <boost/hana/concept/constant.hpp>
2020
#include <boost/hana/concept/product.hpp>
21+
#include <boost/hana/concept/set_theoretic.hpp>
2122
#include <boost/hana/config.hpp>
2223
#include <boost/hana/contains.hpp>
2324
#include <boost/hana/core/is_a.hpp>
@@ -207,6 +208,12 @@ BOOST_HANA_NAMESPACE_BEGIN
207208
using type = detail::map_impl<HashTable, Storage>;
208209
};
209210
}
211+
212+
template <>
213+
struct SetTheoretic<map_tag> {
214+
static constexpr bool value = true;
215+
};
216+
210217

211218
//////////////////////////////////////////////////////////////////////////
212219
// make<map_tag>

Diff for: ‎include/boost/hana/set.hpp

+6
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ Distributed under the Boost Software License, Version 1.0.
1717
#include <boost/hana/concept/comparable.hpp>
1818
#include <boost/hana/concept/constant.hpp>
1919
#include <boost/hana/concept/hashable.hpp>
20+
#include <boost/hana/concept/set_theoretic.hpp>
2021
#include <boost/hana/config.hpp>
2122
#include <boost/hana/contains.hpp>
2223
#include <boost/hana/core/make.hpp>
@@ -77,6 +78,11 @@ BOOST_HANA_NAMESPACE_BEGIN
7778
constexpr set(set&& other) = default;
7879
};
7980
//! @endcond
81+
82+
template <>
83+
struct SetTheoretic<set_tag> {
84+
static constexpr bool value = true;
85+
};
8086

8187
//////////////////////////////////////////////////////////////////////////
8288
// Operators

Diff for: ‎include/boost/hana/symmetric_difference.hpp

+14-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Distributed under the Boost Software License, Version 1.0.
1212

1313
#include <boost/hana/fwd/symmetric_difference.hpp>
1414

15+
#include <boost/hana/concept/set_theoretic.hpp>
1516
#include <boost/hana/config.hpp>
1617
#include <boost/hana/core/dispatch.hpp>
1718
#include <boost/hana/difference.hpp>
@@ -22,10 +23,20 @@ BOOST_HANA_NAMESPACE_BEGIN
2223
//! @cond
2324
template <typename Xs, typename Ys>
2425
constexpr auto symmetric_difference_t::operator()(Xs&& xs, Ys&& ys) const {
25-
using S = typename hana::tag_of<Xs>::type;
26-
using SymmetricDifference = BOOST_HANA_DISPATCH_IF(symmetric_difference_impl<S>,
27-
true
26+
using TX = typename hana::tag_of<Xs>::type;
27+
using TY = typename hana::tag_of<Ys>::type;
28+
using SymmetricDifference = BOOST_HANA_DISPATCH_IF(symmetric_difference_impl<TX>,
29+
hana::SetTheoretic<TX>::value &&
30+
std::is_same<TX, TY>::value
2831
);
32+
33+
#ifndef BOOST_HANA_CONFIG_DISABLE_CONCEPT_CHECKS
34+
static_assert(hana::SetTheoretic<TX>::value,
35+
"hana::symmetric_difference(xs, ys) requires 'xs' to be SetTheoretic");
36+
37+
static_assert(std::is_same<TX, TY>::value,
38+
"hana::symmetric_difference(xs, ys) requires 'xs' and 'ys' to be SetTheoretic");
39+
#endif
2940

3041
return SymmetricDifference::apply(static_cast<Xs&&>(xs), static_cast<Ys&&>(ys));
3142
}

Diff for: ‎include/boost/hana/union.hpp

+14-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Distributed under the Boost Software License, Version 1.0.
1212

1313
#include <boost/hana/fwd/union.hpp>
1414

15+
#include <boost/hana/concept/set_theoretic.hpp>
1516
#include <boost/hana/config.hpp>
1617
#include <boost/hana/core/dispatch.hpp>
1718

@@ -20,11 +21,21 @@ BOOST_HANA_NAMESPACE_BEGIN
2021
//! @cond
2122
template <typename Xs, typename Ys>
2223
constexpr auto union_t::operator()(Xs&& xs, Ys&& ys) const {
23-
using S = typename hana::tag_of<Xs>::type;
24-
using Union = BOOST_HANA_DISPATCH_IF(union_impl<S>,
25-
true
24+
using TX = typename hana::tag_of<Xs>::type;
25+
using TY = typename hana::tag_of<Ys>::type;
26+
using Union = BOOST_HANA_DISPATCH_IF(union_impl<TX>,
27+
hana::SetTheoretic<TX>::value &&
28+
std::is_same<TX, TY>::value
2629
);
2730

31+
#ifndef BOOST_HANA_CONFIG_DISABLE_CONCEPT_CHECKS
32+
static_assert(hana::SetTheoretic<TX>::value,
33+
"hana::union_(xs, ys) requires 'xs' to be SetTheoretic");
34+
35+
static_assert(std::is_same<TX, TY>::value,
36+
"hana::union_(xs, ys) requires 'xs' and 'ys' to be SetTheoretic");
37+
#endif
38+
2839
return Union::apply(static_cast<Xs&&>(xs), static_cast<Ys&&>(ys));
2940
}
3041
//! @endcond

0 commit comments

Comments
 (0)