moved cib::args from a cib::conditional arg to cib::config (#28)

Author: lukevalenty

benchmark/big_nexus.cpp

@@ -125,7 +125,6 @@ struct BigConfig {
     constexpr static auto config =
         cib::config(
             cib::components<
-                cib::args<>,
                 TestComponent<0>,
                 TestComponent<1>,
                 TestComponent<2>,

include/cib/config.hpp

@@ -25,7 +25,7 @@ namespace cib {
      * @see cib::conditional
      */
     template<auto... Args>
-    using args = detail::args<Args...>;
+    constexpr static detail::args<Args...> args{};
 
     /**
      * Container for project and component configuration declarations.
@@ -41,7 +41,12 @@ namespace cib {
      */
     template<typename... Configs>
     [[nodiscard]] CIB_CONSTEVAL auto config(Configs const & ... configs) {
-        return detail::config{configs...};
+        return detail::config{args<>, configs...};
+    }
+
+    template<auto... Args, typename... Configs>
+    [[nodiscard]] CIB_CONSTEVAL auto config(detail::args<Args...> config_args, Configs const & ... configs) {
+        return detail::config{config_args, configs...};
     }
 
     /**

include/cib/detail/components.hpp

@@ -12,37 +12,25 @@
 
 
 namespace cib::detail {
-    template<typename ComponentArgs, typename... Components>
+    template<typename... Components>
     struct components : public detail::config_item {
         template<typename Builders, typename... Args>
         [[nodiscard]] CIB_CONSTEVAL auto init(
             Builders const & builders_tuple,
             Args const & ... args
         ) const {
-            return apply([&](auto const & ... component_args){
-                return detail::fold_right(ordered_set{Components{}...}, builders_tuple, [&](auto const & c, auto const & builders){
-                    return c.config.init(builders, args..., component_args...);
-                });
-            }, ComponentArgs::value);
+            return detail::fold_right(ordered_set{Components{}...}, builders_tuple, [&](auto const & c, auto const & builders){
+                return c.config.init(builders, args...);
+            });
         }
 
         template<typename... Args>
         [[nodiscard]] CIB_CONSTEVAL auto exports_tuple(
             Args const & ... args
         ) const {
-            return apply([&](auto const & ... component_args){
-                return type_list_cat(Components::config.exports_tuple(args..., component_args...)...);
-            }, ComponentArgs::value);
+            return type_list_cat(Components::config.exports_tuple(args...)...);
         }
     };
-
-    template<auto Value>
-    CIB_CONSTEXPR static auto as_constant_v = std::integral_constant<std::remove_cv_t<std::remove_reference_t<decltype(Value)>>, Value>{};
-
-    template<auto... Args>
-    struct args {
-        static CIB_CONSTEXPR auto value = ordered_set{as_constant_v<Args>...};
-    };
 }
 
 

include/cib/detail/conditional.hpp

@@ -1,5 +1,6 @@
 #include "compiler.hpp"
 #include "config_item.hpp"
+#include "config_details.hpp"
 #include "ordered_set.hpp"
 #include "type_list.hpp"
 
@@ -16,13 +17,13 @@ namespace cib::detail {
         typename... Configs>
     struct conditional : public config_item {
         CIB_CONSTEXPR static Condition condition{};
-        detail::config<Configs...> body;
+        detail::config<detail::args<>, Configs...> body;
 
         CIB_CONSTEVAL explicit conditional(
             Condition,
             Configs const & ... configs
         )
-           : body{configs...}
+           : body{{}, configs...}
         {}
 
         template<

include/cib/detail/config_details.hpp

@@ -12,11 +12,20 @@
 
 
 namespace cib::detail {
-    template<typename... ConfigTs>
+    template<auto Value>
+    CIB_CONSTEXPR static auto as_constant_v = std::integral_constant<std::remove_cv_t<std::remove_reference_t<decltype(Value)>>, Value>{};
+
+    template<auto... Args>
+    struct args {
+        static CIB_CONSTEXPR auto value = ordered_set{as_constant_v<Args>...};
+    };
+
+    template<typename ConfigArgs, typename... ConfigTs>
     struct config : public detail::config_item {
         std::tuple<ConfigTs...> configs_tuple;
 
         CIB_CONSTEVAL explicit config(
+            ConfigArgs,
             ConfigTs const & ... configs
         )
             : configs_tuple{configs...}
@@ -29,18 +38,22 @@ namespace cib::detail {
             BuildersT const & builders_tuple,
             Args const & ... args
         ) const {
-            return fold_right(configs_tuple, builders_tuple, [&](auto const & c, auto builders){
-                return c.init(builders, args...);
-            });
+            return apply([&](auto const & ... config_args){
+                return fold_right(configs_tuple, builders_tuple, [&](auto const & c, auto builders){
+                    return c.init(builders, args..., config_args...);
+                });
+            }, ConfigArgs::value);
         }
 
         template<typename... Args>
         [[nodiscard]] CIB_CONSTEVAL auto exports_tuple(
             Args const & ... args
         ) const {
-            return apply([&](auto const & ... configs_pack){
-                return type_list_cat(configs_pack.exports_tuple(args...)...);
-            }, configs_tuple);
+            return apply([&](auto const & ... config_args){
+                return apply([&](auto const & ... configs_pack){
+                    return type_list_cat(configs_pack.exports_tuple(args..., config_args...)...);
+                }, configs_tuple);
+            }, ConfigArgs::value);
         }
     };
 }

test/nexus.cpp

@@ -86,7 +86,7 @@ struct Gorp {
 struct MediumConfig {
     constexpr static auto config =
         cib::config(
-            cib::components<cib::args<>, Foo, Bar, Gorp>
+            cib::components<Foo, Bar, Gorp>
         );
 };
 
@@ -161,10 +161,9 @@ template<int ConditionalValue>
 struct ConditionalTestProject {
     constexpr static auto config =
         cib::config(
+            cib::args<ConditionalValue>,
             cib::exports<TestCallback<0>>,
-            cib::components<
-                cib::args<ConditionalValue>,
-                SimpleConditionalComponent>
+            cib::components<SimpleConditionalComponent>
         );
 };
 
@@ -204,14 +203,15 @@ template<int EnabledId>
 struct ConditionalConfig {
     constexpr static auto config =
         cib::config(
+            cib::args<EnabledId>,
+
             cib::exports<
                 TestCallback<0>,
                 TestCallback<1>,
                 TestCallback<2>
             >,
 
             cib::components<
-                cib::args<EnabledId>,
                 ConditionalComponent<0>,
                 ConditionalComponent<1>,
                 ConditionalComponent<2>