more policy splitting

Author: jll63

include/yorel/yomm2/detail/compiler.hpp

@@ -36,32 +36,32 @@ struct aggregate_reports;
 
 template<class... Reports, class Facet, class... MoreFacets>
 struct aggregate_reports<
-    boost::mp11::mp_list<Reports...>,
-    boost::mp11::mp_list<Facet, MoreFacets...>,
+    types<Reports...>,
+    types<Facet, MoreFacets...>,
     std::void_t<typename Facet::report>> {
     using type = typename aggregate_reports<
-        boost::mp11::mp_list<Reports..., typename Facet::report>,
-        boost::mp11::mp_list<MoreFacets...>>::type;
+        types<Reports..., typename Facet::report>,
+        types<MoreFacets...>>::type;
 };
 
 template<class... Reports, class Facet, class... MoreFacets, typename Void>
 struct aggregate_reports<
-    boost::mp11::mp_list<Reports...>,
-    boost::mp11::mp_list<Facet, MoreFacets...>, Void> {
+    types<Reports...>,
+    types<Facet, MoreFacets...>, Void> {
     using type = typename aggregate_reports<
-        boost::mp11::mp_list<Reports...>,
-        boost::mp11::mp_list<MoreFacets...>>::type;
+        types<Reports...>,
+        types<MoreFacets...>>::type;
 };
 
 template<class... Reports, typename Void>
 struct aggregate_reports<
-    boost::mp11::mp_list<Reports...>, boost::mp11::mp_list<>, Void> {
+    types<Reports...>, types<>, Void> {
     struct type : Reports... {};
 };
 
 template<class Policy>
 using report_type = typename aggregate_reports<
-    boost::mp11::mp_list<update_report>, typename Policy::facets>::type;
+    types<update_report>, typename Policy::facets>::type;
 
 inline void merge_into(boost::dynamic_bitset<>& a, boost::dynamic_bitset<>& b) {
     if (b.size() < a.size()) {
@@ -229,7 +229,7 @@ struct compiler : generic_compiler {
     using type_index_type = decltype(Policy::type_index(0));
 
     typename aggregate_reports<
-        boost::mp11::mp_list<update_report>, typename Policy::facets>::type
+        types<update_report>, typename Policy::facets>::type
         report;
 
     std::unordered_map<type_index_type, class_*> class_map;

include/yorel/yomm2/detail/types.hpp

@@ -0,0 +1,40 @@
+#ifndef YOREL_YOMM2_DETAIL_TYPES_HPP
+#define YOREL_YOMM2_DETAIL_TYPES_HPP
+
+#include <cstdint>
+#include <limits>
+
+#if defined(YOMM2_SHARED)
+#if defined(_MSC_VER)
+#if !defined(yOMM2_API_msc)
+#define yOMM2_API_msc __declspec(dllimport)
+#endif
+#endif
+#endif
+
+#if !defined(yOMM2_API_gcc)
+#define yOMM2_API_gcc
+#endif
+
+#if !defined(yOMM2_API_msc)
+#define yOMM2_API_msc
+#endif
+
+#define yOMM2_API yOMM2_API_gcc yOMM2_API_msc
+
+namespace yorel {
+namespace yomm2 {
+
+using type_id = std::uintptr_t;
+constexpr type_id invalid_type = (std::numeric_limits<type_id>::max)();
+
+namespace detail {
+
+template<typename... Types>
+struct types;
+
+}
+} // namespace yomm2
+} // namespace yorel
+
+#endif

include/yorel/yomm2/policies/core.hpp

@@ -6,41 +6,14 @@
 #ifndef YOREL_YOMM2_POLICIES_CORE_HPP
 #define YOREL_YOMM2_POLICIES_CORE_HPP
 
+#include <yorel/yomm2/detail/types.hpp>
 #include <yorel/yomm2/detail/static_list.hpp>
 
 #include <boost/mp11/algorithm.hpp>
 #include <boost/mp11/bind.hpp>
 
-#if defined(YOMM2_SHARED)
-#if defined(_MSC_VER)
-#if !defined(yOMM2_API_msc)
-#define yOMM2_API_msc __declspec(dllimport)
-#endif
-#endif
-#endif
-
-#if !defined(yOMM2_API_gcc)
-#define yOMM2_API_gcc
-#endif
-
-#if !defined(yOMM2_API_msc)
-#define yOMM2_API_msc
-#endif
-
-#define yOMM2_API yOMM2_API_gcc yOMM2_API_msc
-
-// -----------------------------------------------------------------------------
-// Forward declarations needed by "detail.hpp"
-
 namespace yorel {
 namespace yomm2 {
-
-struct context;
-struct catalog;
-
-using type_id = std::uintptr_t;
-constexpr type_id invalid_type = (std::numeric_limits<type_id>::max)();
-
 namespace detail {
 
 // -----------------------------------------------------------------------------
@@ -217,7 +190,7 @@ template<class Policy, class... Facets>
 struct basic_policy : virtual abstract_policy,
                       virtual basic_domain<Policy>,
                       virtual Facets... {
-    using facets = boost::mp11::mp_list<Facets...>;
+    using facets = detail::types<Facets...>;
 
     template<class Facet>
     static constexpr bool has_facet = std::is_base_of_v<Facet, Policy>;

include/yorel/yomm2/policies/std_rtti.hpp

@@ -9,6 +9,12 @@
 
 #include <yorel/yomm2/policies/core.hpp>
 
+#ifndef BOOST_NO_RTTI
+#include <typeindex>
+#include <typeinfo>
+#include <boost/core/demangle.hpp>
+#endif
+
 namespace yorel {
 namespace yomm2 {
 namespace policy {

include/yorel/yomm2/policy.hpp

@@ -17,12 +17,6 @@
 #include <variant>
 #include <vector>
 
-#ifndef BOOST_NO_RTTI
-#include <typeindex>
-#include <typeinfo>
-#include <boost/core/demangle.hpp>
-#endif
-
 #include <yorel/yomm2/policies/core.hpp>
 
 #include <yorel/yomm2/detail.hpp>

include/yorel/yomm2/templates.hpp

@@ -32,7 +32,7 @@ using templates = types<template_<Templates>...>;
 namespace detail {
 
 // template <template <typename...> typename... F>
-// using mp_list_q = boost::mp11::mp_list<boost::mp11::mp_quote<F>...>;
+// using mp_list_q = types<boost::mp11::mp_quote<F>...>;
 
 template<typename...>
 struct product_impl;