rice 4.3.3 → 4.6.0

data/rice/detail/ruby.hpp

@@ -9,6 +9,7 @@
 #include <cmath>
 
 #include <ruby.h>
+#include <ruby/encoding.h>
 
 // ruby.h has a few defines that conflict with Visual Studio's STL
 #if defined(_MSC_VER)
@@ -33,5 +34,22 @@ extern "C" typedef VALUE (*RUBY_VALUE_FUNC)(VALUE);
   extern "C" typedef VALUE (*RUBY_METHOD_FUNC)(ANYARGS);
 #endif
 
+// This is a terrible hack for Ruby 3.1 and maybe earlier to avoid crashes when test_Attribute unit cases
+// are run. If ruby_options is called to initialize the interpeter (previously it was not), when
+// the attribute unit tests intentionally cause exceptions to happen, the exception is correctly processed.
+// However any calls back to Ruby, for example to get the exception message, crash because the ruby 
+// execution context tag has been set to null. This does not happen in newer versions of Ruby. It is
+// unknown if this happens in real life or just the test caes.
+// Should be removed when Rice no longer supports Ruby 3.1
+#if RUBY_API_VERSION_MAJOR == 3 && RUBY_API_VERSION_MINOR < 2
+  constexpr bool oldRuby = true;
+#elif RUBY_API_VERSION_MAJOR < 3
+  constexpr bool oldRuby = true;
+#else
+  constexpr bool oldRuby = false;
+#endif 
+
+
+
 #endif // Rice__detail__ruby__hpp_
 

data/rice/detail/to_ruby.hpp

@@ -1,8 +1,46 @@
 #ifndef Rice__detail__to_ruby__hpp_
 #define Rice__detail__to_ruby__hpp_
 
-#include "to_ruby_defn.hpp"
-#include "to_ruby.ipp"
+namespace Rice
+{
+  namespace detail
+  {
+    //! Convert a C++ object to Ruby.
+    /*! If x is a pointer, wraps the pointee as a Ruby object.  If x is an
+     *  Object, returns x.
+     *
+     *  If no conversion exists a compile-time error is generated.
+     *
+     *  \param x the object to convert.
+     *  \return a Ruby representation of the C++ object.
+     *
+     *  Example:
+     *  \code
+     *    rb_p(to_ruby(42));
+     *
+     *    Foo * p_foo = new Foo();
+     *    rb_p(to_ruby(p_foo));
+     *  \endcode
+     */
+    template <typename T>
+    class To_Ruby;
+   
+    // Helper template function that let's users avoid having to specify the template type - its deduced
+    template <typename T>
+    VALUE to_ruby(T&& x)
+    {
+      using Unqualified_T = remove_cv_recursive_t<T>;
+      return To_Ruby<Unqualified_T>().convert(std::forward<T>(x));
+    }
 
-#endif // Rice__detail__to_ruby__hpp_
+    // Helper template function that let's users avoid having to specify the template type - its deduced
+    template <typename T>
+    VALUE to_ruby(T* x)
+    {
+      using Unqualified_T = remove_cv_recursive_t<T>;
+      return To_Ruby<Unqualified_T*>().convert(x);
+    }
+  } // detail
+} // Rice
 
+#endif // Rice__detail__to_ruby__hpp_