rice 4.5.0 → 4.6.1

data/rice/detail/RubyType.ipp

@@ -89,7 +89,9 @@ namespace Rice::detail
     static inline FromRuby_T fromRuby = rb_num2int_inline;
     static inline std::set<ruby_value_type> Exact = { RUBY_T_FIXNUM };
     static inline std::set<ruby_value_type> Castable = { };
-    static inline std::set<ruby_value_type> Narrowable = { };
+    // We allow bignum to integer because Ruby switches to bignum at about 2 billion on 64 bit systems,
+    // while int can go up to 4 billion
+    static inline std::set<ruby_value_type> Narrowable = { RUBY_T_BIGNUM };
     static inline std::string packTemplate = "i*";
   };
 
@@ -102,7 +104,9 @@ namespace Rice::detail
     static inline FromRuby_T fromRuby = RB_NUM2UINT;
     static inline std::set<ruby_value_type> Exact = { RUBY_T_FIXNUM };
     static inline std::set<ruby_value_type> Castable = { };
-    static inline std::set<ruby_value_type> Narrowable = { };
+    // We allow bignum to integer because Ruby switches to bignum at about 2 billion on 64 bit systems,
+    // while int can go up to 4 billion
+    static inline std::set<ruby_value_type> Narrowable = { RUBY_T_BIGNUM };
     static inline std::string packTemplate = "I*";
   };
 
@@ -115,7 +119,7 @@ namespace Rice::detail
     static inline FromRuby_T fromRuby = rb_num2long_inline;
     static inline std::set<ruby_value_type> Exact = { RUBY_T_FIXNUM };
     static inline std::set<ruby_value_type> Castable = { };
-    static inline std::set<ruby_value_type> Narrowable = { };
+    static inline std::set<ruby_value_type> Narrowable = { RUBY_T_BIGNUM };
     static inline std::string packTemplate = "l_*";
   };
 
@@ -128,7 +132,7 @@ namespace Rice::detail
     static inline FromRuby_T fromRuby = rb_num2ulong_inline;
     static inline std::set<ruby_value_type> Exact = { RUBY_T_FIXNUM  };
     static inline std::set<ruby_value_type> Castable = { };
-    static inline std::set<ruby_value_type> Narrowable = { };
+    static inline std::set<ruby_value_type> Narrowable = { RUBY_T_BIGNUM};
     static inline std::string packTemplate = "L_*";
   };
 
@@ -158,7 +162,6 @@ namespace Rice::detail
     static inline std::string packTemplate = "Q_*";
   };
 
-
   template<>
   class RubyType<float>
   {
@@ -184,4 +187,46 @@ namespace Rice::detail
     static inline std::set<ruby_value_type> Narrowable = { };
     static inline std::string packTemplate = "d*";
   };
+
+  template<>
+  class RubyType<void>
+  {
+  public:
+    static inline std::set<ruby_value_type> Exact = { };
+    static inline std::set<ruby_value_type> Castable = { };
+    static inline std::set<ruby_value_type> Narrowable = { };
+  };
+}
+
+namespace Rice::detail
+{
+  template<typename T>
+  inline Data_Type<T> define_ruby_type()
+  {
+    std::string name = detail::typeName(typeid(T*));
+    std::string klassName = detail::rubyClassName(name);
+    Identifier id(klassName);
+
+    Module rb_mRice = define_module("Rice");
+    return define_class_under<T>(rb_mRice, id);
+  }
+
+  inline void define_ruby_types()
+  {
+    define_ruby_type<bool>();
+    define_ruby_type<char>();
+    define_ruby_type<signed char>();
+    define_ruby_type<unsigned char>();
+    define_ruby_type<short>();
+    define_ruby_type<unsigned short>();
+    define_ruby_type<int>();
+    define_ruby_type<unsigned int>();
+    define_ruby_type<long>();
+    define_ruby_type<unsigned long>();
+    define_ruby_type<long long>();
+    define_ruby_type<unsigned long long>();
+    define_ruby_type<float>();
+    define_ruby_type<double>();
+    define_ruby_type<void>();
+  }
 }

data/rice/detail/Type.hpp

@@ -14,8 +14,10 @@ namespace Rice::detail
   // Return the name of a type
   std::string typeName(const std::type_info& typeInfo);
   std::string typeName(const std::type_index& typeIndex);
-  std::string makeClassName(const std::string& typeInfoName);
+  std::string cppClassName(const std::string& typeInfoName);
+  std::string rubyClassName(const std::string& typeInfoName);
   std::string findGroup(std::string& string, size_t start = 0);
+  void replaceGroup(std::string& string, std::regex regex, std::string replacement);
   void replaceAll(std::string& string, std::regex regex, std::string replacement);
 
   template<typename T>

data/rice/detail/Type.ipp

@@ -13,21 +13,16 @@ namespace Rice::detail
     {
       return true;
     }
+    else if constexpr (std::is_array_v<T> && std::is_fundamental_v<std::remove_extent_t<T>>)
+    {
+      return true;
+    }
     else
     {
       return Registries::instance.types.verify<T>();
     }
   }
 
-  template<>
-  struct Type<void>
-  {
-    static bool verify()
-    {
-      return true;
-    }
-  };
-
   template<typename T>
   void verifyType()
   {
@@ -35,7 +30,7 @@ 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>(), ...);
   }
@@ -43,10 +38,8 @@ namespace Rice::detail
   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)
@@ -156,7 +149,18 @@ namespace Rice::detail
     }
   }
 
-  inline std::string makeClassName(const std::string& typeInfoName)
+  inline void replaceGroup(std::string& string, std::regex regex, std::string replacement)
+  {
+    std::smatch match;
+    while (std::regex_search(string, match, regex))
+    {
+      std::string group = findGroup(string, match.position());
+      group = match.str() + group;
+      string.replace(match.position(), group.length(), replacement);
+    }
+  }
+
+  inline std::string cppClassName(const std::string& typeInfoName)
   {
     std::string base = typeInfoName;
 
@@ -170,34 +174,26 @@ namespace Rice::detail
 
     // Remove std::__[^:]*::
     auto stdClangRegex = std::regex("std::__[^:]+::");
-    base = std::regex_replace(base, stdClangRegex, "");
-      
-    // Remove std::
-    auto stdRegex = std::regex("std::");
-    base = std::regex_replace(base, stdRegex, "");
+    base = std::regex_replace(base, stdClangRegex, "std::");
 
-    // Replace basic_string with string
-    auto basicStringRegex = std::regex(R"(basic_string)");
-    replaceAll(base, basicStringRegex, "string");
-      
     // Remove allocators
-    std::regex allocatorRegex(R"(,\s*allocator)");
+    std::regex allocatorRegex(R"(,\s*std::allocator)");
     removeGroup(base, allocatorRegex);
 
     // Remove char_traits
-    std::regex charTraitsRegex(R"(,\s*char_traits)");
+    std::regex charTraitsRegex(R"(,\s*std::char_traits)");
     removeGroup(base, charTraitsRegex);
 
     // Remove less (std::map)
-    std::regex lessRegex(R"(,\s*less)");
+    std::regex lessRegex(R"(,\s*std::less)");
     removeGroup(base, lessRegex);
 
     // Remove hash (std::unordered_map)
-    std::regex hashRegex(R"(,\s*hash)");
+    std::regex hashRegex(R"(,\s*std::hash)");
     removeGroup(base, hashRegex);
 
     // Remove equal_to (std::unordered_map)
-    std::regex equalRegex(R"(,\s*equal_to)");
+    std::regex equalRegex(R"(,\s*std::equal_to)");
     removeGroup(base, equalRegex);
 
     // Remove spaces before pointers
@@ -216,6 +212,35 @@ namespace Rice::detail
     auto commaSpaceRegex = std::regex(R"(,(\S))");
     replaceAll(base, commaSpaceRegex, ", $1");
 
+    // Fix strings
+    auto stringRegex = std::regex(R"(basic_string<char>)");
+    replaceAll(base, stringRegex, "string");
+
+    auto wstringRegex = std::regex(R"(basic_string<wchar_t>)");
+    replaceAll(base, wstringRegex, "wstring");
+
+    // Normalize Anonymous namespace
+    auto anonymousNamespaceGcc = std::regex(R"(\(anonymous namespace\))");
+    replaceAll(base, anonymousNamespaceGcc, "AnonymousNamespace");
+    auto anonymousNamespaceMsvc = std::regex(R"(`anonymous namespace')");
+    replaceAll(base, anonymousNamespaceMsvc, "AnonymousNamespace");
+
+    return base;
+  }
+
+  inline std::string rubyClassName(const std::string& typeInfoName)
+  {
+    std::string base = cppClassName(typeInfoName);
+
+    // Remove std:: these could be embedded in template types
+    auto stdRegex = std::regex("std::");
+    base = std::regex_replace(base, stdRegex, "");
+
+    // Remove leading namespaces. This will not remove namespaces
+    // embedded in template types like std::vector<mynamespace::foo>
+    auto leadingNamespacesRegex = std::regex("^[^<]*::");
+    base = std::regex_replace(base, leadingNamespacesRegex, "");
+
     // Capitalize first letter
     base[0] = std::toupper(base[0]);
 
@@ -239,18 +264,22 @@ namespace Rice::detail
 
     // Replace < with unicode U+227A (Precedes)
     auto lessThanRegex = std::regex("<");
-    //replaceAll(base, lessThanRegex, u8"≺");
+    //replaceAll(base, lessThanRegex, "≺");
     replaceAll(base, lessThanRegex, "\u227A");
 
     // Replace > with unicode U+227B (Succeeds)
     auto greaterThanRegex = std::regex(">");
-    //replaceAll(base, greaterThanRegex, u8"≻");
+    //replaceAll(base, greaterThanRegex, "≻");
     replaceAll(base, greaterThanRegex, "\u227B");
 
     // Replace , with Unicode Character (U+066C) - Arabic Thousands Separator
     auto commaRegex = std::regex(R"(,\s*)");
     replaceAll(base, commaRegex, "\u201A");
 
+    // Replace * with Unicode Character (U+2217) -	Asterisk Operator
+    auto asteriskRegex = std::regex(R"(\*)");
+    replaceAll(base, asteriskRegex, "\u2217");
+
     return base;
   }
 }

data/rice/detail/Wrapper.hpp

@@ -1,50 +1,85 @@
 #ifndef Rice__detail__Wrapper__hpp_
 #define Rice__detail__Wrapper__hpp_
 
-namespace Rice
-{
-namespace detail
+namespace Rice::detail
 {
+  class WrapperBase
+  {
+  public:
+    WrapperBase() = default;
+    virtual ~WrapperBase() = default;
+    virtual void* get() = 0;
+    bool isConst();
 
-class Wrapper
-{
-public:
-  Wrapper(bool isOwner = false);
-  virtual ~Wrapper() = default;
-  virtual void* get() = 0;
+    void ruby_mark();
+    void addKeepAlive(VALUE value);
+    void setOwner(bool value);
 
-  void ruby_mark();
-  void addKeepAlive(VALUE value);
-  void setOwner(bool value);
+  protected:
+    bool isOwner_ = false;
+    bool isConst_ = false;
 
-protected:
-  bool isOwner_ = false;
+  private:
+    // We use a vector for speed and memory locality versus a set which does
+    // not scale well when getting to tens of thousands of objects (not expecting
+    // that to happen...but just in case)
+    std::vector<VALUE> keepAlive_;
+  };
 
-private:
-  // We use a vector for speed and memory locality versus a set which does
-  // not scale well when getting to tens of thousands of objects (not expecting
-  // that to happen...but just in case)
-  std::vector<VALUE> keepAlive_;
-};
+  template <typename T>
+  class Wrapper : public WrapperBase
+  {
+  public:
+    Wrapper(T& data);
+    Wrapper(T&& data);
+    ~Wrapper();
+    void* get() override;
 
-template <typename T, typename Wrapper_T = void>
-VALUE wrap(VALUE klass, rb_data_type_t* rb_type, T& data, bool isOwner);
+  private:
+    T data_;
+  };
 
-template <typename T, typename Wrapper_T = void>
-VALUE wrap(VALUE klass, rb_data_type_t* rb_type, T* data, bool isOwner);
+  template<typename T>
+  class Wrapper<T&> : public WrapperBase
+  {
+  public:
+    Wrapper(T& data);
+    ~Wrapper();
+    void* get() override;
 
-template <typename T>
-T* unwrap(VALUE value, rb_data_type_t* rb_type, bool takeOwnership);
+  private:
+    T& data_;
+  };
 
-Wrapper* getWrapper(VALUE value, rb_data_type_t* rb_type);
+  template <typename T>
+  class Wrapper<T*> : public WrapperBase
+  {
+  public:
+    Wrapper(T* data, bool isOwner);
+    ~Wrapper();
+    void* get() override;
 
-template <typename T>
-void replace(VALUE value, rb_data_type_t* rb_type, T* data, bool isOwner);
+  private:
+    T* data_ = nullptr;
+  };
 
-Wrapper* getWrapper(VALUE value);
+  // ---- Helper Functions ---------
+  template <typename T>
+  void wrapConstructed(VALUE value, rb_data_type_t* rb_data_type, T* data, bool isOwner);
 
-} // namespace detail
-} // namespace Rice
+  template <typename T>
+  VALUE wrap(VALUE klass, rb_data_type_t* rb_data_type, T& data, bool isOwner);
 
-#endif // Rice__detail__Wrapper__hpp_
+  template <typename T>
+  VALUE wrap(VALUE klass, rb_data_type_t* rb_data_type, T* data, bool isOwner);
 
+  template <typename T>
+  T* unwrap(VALUE value, rb_data_type_t* rb_data_type, bool takeOwnership);
+
+  template <typename Wrapper_T = WrapperBase>
+  Wrapper_T* getWrapper(VALUE value, rb_data_type_t* rb_data_type);
+
+  WrapperBase* getWrapper(VALUE value);
+}
+#endif // Rice__detail__Wrapper__hpp_
+