Merge pull request #259 from ruby-rice/dev

Dev
ruby-rice · Feb 19, 2025 · 853fea1 · 853fea1
2 parents 8b02a3c + 7fa36c4
commit 853fea1
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 27 deletions.
diff --git a/rice/detail/TupleIterator.hpp b/rice/detail/TupleIterator.hpp
diff --git a/rice/detail/Type.ipp b/rice/detail/Type.ipp
@@ -30,18 +30,16 @@ namespace Rice::detail
   }
 
   template<typename Tuple_T, size_t...Is>
-  void verifyTypesImpl()
+  void verifyTypesImpl(std::index_sequence<Is...> indexes)
   {
     (verifyType<typename std::tuple_element<Is, Tuple_T>::type>(), ...);
   }
 
   template<typename Tuple_T>
   void verifyTypes()
   {
-    if constexpr (std::tuple_size<Tuple_T>::value > 0)
-    {
-      verifyTypesImpl<Tuple_T, std::tuple_size<Tuple_T>::value - 1>();
-    }
+    std::make_index_sequence<std::tuple_size_v<Tuple_T>> indexes;
+    verifyTypesImpl<Tuple_T>(indexes);
   }
 
   inline std::string demangle(char const* mangled_name)

diff --git a/rice/rice.hpp b/rice/rice.hpp
@@ -21,9 +21,6 @@
 #include "traits/method_traits.hpp"
 #include "traits/attribute_traits.hpp"
 
-// Helpers
-#include "detail/TupleIterator.hpp"
-
 // Code for C++ to call Ruby
 #include "Exception.hpp"
 #include "JumpException.hpp"

diff --git a/rice/stl/tuple.ipp b/rice/stl/tuple.ipp
@@ -1,5 +1,4 @@
 #include <tuple>
-#include "../detail/TupleIterator.hpp"
 
 namespace Rice::detail
 {

diff --git a/rice/stl/variant.ipp b/rice/stl/variant.ipp
@@ -1,5 +1,4 @@
 #include <variant>
-#include "../detail/TupleIterator.hpp"
 
 namespace Rice::detail
 {

diff --git a/rice/traits/rice_traits.hpp b/rice/traits/rice_traits.hpp
@@ -142,6 +142,15 @@ namespace Rice
     template<class T>
     constexpr bool is_pointer_pointer_v = is_pointer_pointer<T>::value;
 
+    // See https://www.cppstories.com/2022/tuple-iteration-apply/
+    template <typename Tuple_T, typename Function_T>
+    void for_each_tuple(Tuple_T&& tuple, Function_T&& callable)
+    {
+      std::apply([&callable](auto&& ...args)
+        {
+          (callable(std::forward<decltype(args)>(args)), ...);
+        }, std::forward<Tuple_T>(tuple));
+    }
   } // detail
 } // Rice