rice 4.7.1 → 4.8.0

data/rice/detail/Type.ipp

@@ -71,37 +71,20 @@ namespace Rice::detail
   {
   };
 
-  // ---------- TypeMapper ------------
-  template<typename T>
-  inline std::string TypeMapper<T>::demangle(char const* mangled_name)
+  // ---------- TypeIndexParser ------------
+  inline TypeIndexParser::TypeIndexParser(const std::type_index& typeIndex, bool isFundamental) :
+    typeIndex_(typeIndex), isFundamental_(isFundamental)
   {
-#ifdef __GNUC__
-    struct Helper
-    {
-      Helper(
-        char const* mangled_name)
-        : name_(0)
-      {
-        int status = 0;
-        name_ = abi::__cxa_demangle(mangled_name, 0, 0, &status);
-      }
-
-      ~Helper()
-      {
-        std::free(name_);
-      }
-
-      char* name_;
-
-    private:
-      Helper(Helper const&);
-      void operator=(Helper const&);
-    };
+  }
 
-    Helper helper(mangled_name);
-    if (helper.name_)
+  inline std::string TypeIndexParser::demangle(char const* mangled_name)
+  {
+#ifdef __GNUC__
+    int status = 0;
+    char* name = abi::__cxa_demangle(mangled_name, 0, 0, &status);
+    if (name)
     {
-      return helper.name_;
+      return name;
     }
     else
     {
@@ -112,17 +95,9 @@ namespace Rice::detail
 #endif
   }
 
-  template<typename T>
-  inline std::string TypeMapper<T>::name()
+  inline std::string TypeIndexParser::name()
   {
-    const std::type_index& typeIndex = typeid(T);
-    return demangle(typeIndex.name());
-  }
-
-  template<typename T>
-  inline std::string TypeMapper<T>::name(const std::type_index& typeIndex)
-  {
-    return demangle(typeIndex.name());
+    return this->demangle(this->typeIndex_.name());
   }
 
   // Find text inside of < > taking into account nested groups.
@@ -130,8 +105,7 @@ namespace Rice::detail
   // Example:
   //  
   //   std::vector<std::vector<int>, std::allocator<std::vector, std::allocator<int>>>
-  template<typename T>
-  inline std::string TypeMapper<T>::findGroup(std::string& string, size_t offset)
+  inline std::string TypeIndexParser::findGroup(std::string& string, size_t offset)
   {
     int depth = 0;
 
@@ -164,8 +138,7 @@ namespace Rice::detail
     throw std::runtime_error("Unbalanced Group");
   }
 
-  template<typename T>
-  inline void TypeMapper<T>::replaceAll(std::string& string, std::regex regex, std::string replacement)
+  inline void TypeIndexParser::replaceAll(std::string& string, std::regex regex, std::string replacement)
   {
     std::smatch match;
     while (std::regex_search(string, match, regex))
@@ -174,8 +147,7 @@ namespace Rice::detail
     }
   }
 
-  template<typename T>
-  inline void TypeMapper<T>::removeGroup(std::string& string, std::regex regex)
+  inline void TypeIndexParser::removeGroup(std::string& string, std::regex regex)
   {
     std::smatch match;
     while (std::regex_search(string, match, regex))
@@ -186,8 +158,7 @@ namespace Rice::detail
     }
   }
 
-  template<typename T>
-  inline void TypeMapper<T>::replaceGroup(std::string& string, std::regex regex, std::string replacement)
+  inline void TypeIndexParser::replaceGroup(std::string& string, std::regex regex, std::string replacement)
   {
     std::smatch match;
     while (std::regex_search(string, match, regex))
@@ -198,8 +169,7 @@ namespace Rice::detail
     }
   }
 
-  template<typename T>
-  inline std::string TypeMapper<T>::simplifiedName()
+  inline std::string TypeIndexParser::simplifiedName()
   {
     std::string base = this->name();
 
@@ -271,42 +241,9 @@ namespace Rice::detail
     return base;
   }
 
-  template<typename T>
-  inline void TypeMapper<T>::capitalizeHelper(std::string& content, std::regex& regex)
-  {
-    std::smatch match;
-    while (std::regex_search(content, match, regex))
-    {
-      std::string replacement = match[1];
-      std::transform(replacement.begin(), replacement.end(), replacement.begin(), ::toupper);
-      content.replace(match.position(), match.length(), replacement);
-    }
-  }
-
-  template<typename T>
-  inline std::string TypeMapper<T>::rubyTypeName()
-  {
-    using Intrinsic_T = detail::intrinsic_type<T>;
-
-    if constexpr (std::is_fundamental_v<T>)
-    {
-      return RubyType<Intrinsic_T>::name;
-    }
-    else if constexpr (std::is_same_v<std::remove_cv_t<T>, char*>)
-    {
-      return "String";
-    }
-    else
-    {
-      detail::TypeMapper<Intrinsic_T> typeIntrinsicMapper;
-      return typeIntrinsicMapper.simplifiedName();
-    }
-  }
-
-  template<typename T>
-  inline std::string TypeMapper<T>::rubyName()
+  inline std::string TypeIndexParser::rubyName(std::string rubyTypeName)
   {
-    std::string base = this->rubyTypeName();
+    std::string base = rubyTypeName;
 
     // Remove std:: these could be embedded in template types
     auto stdRegex = std::regex("std::");
@@ -318,50 +255,93 @@ namespace Rice::detail
     base = std::regex_replace(base, leadingNamespacesRegex, "");
 
     // Capitalize first letter
-    base[0] = std::toupper(base[0]);
+    base[0] = (char)std::toupper(base[0]);
 
     // Replace :: with unicode U+u02F8 (Modified Letter raised colon)
     auto colonRegex = std::regex(R"(:)");
-    replaceAll(base, colonRegex, "\uA789");
+    this->replaceAll(base, colonRegex, "\uA789");
 
     // Replace _ and capitalize the next letter
     std::regex underscoreRegex(R"(_(\w))");
-    capitalizeHelper(base, underscoreRegex);
+    this->capitalizeHelper(base, underscoreRegex);
 
-    if constexpr (std::is_fundamental_v<intrinsic_type<T>>)
+    if (this->isFundamental_)
     {
       // Replace space and capitalize the next letter
       std::regex spaceRegex(R"(\s+(\w))");
-      capitalizeHelper(base, spaceRegex);
+      this->capitalizeHelper(base, spaceRegex);
     }
     else
     {
       // Replace spaces with unicode U+u00A0 (Non breaking Space)
       std::regex spaceRegex = std::regex(R"(\s+)");
-      replaceAll(base, spaceRegex, "\u00A0");
+      this->replaceAll(base, spaceRegex, "\u00A0");
     }
 
     // Replace < with unicode U+227A (Precedes)
     auto lessThanRegex = std::regex("<");
     //replaceAll(base, lessThanRegex, "≺");
-    replaceAll(base, lessThanRegex, "\u227A");
+    this->replaceAll(base, lessThanRegex, "\u227A");
 
     // Replace > with unicode U+227B (Succeeds)
     auto greaterThanRegex = std::regex(">");
     //replaceAll(base, greaterThanRegex, "≻");
-    replaceAll(base, greaterThanRegex, "\u227B");
+    this->replaceAll(base, greaterThanRegex, "\u227B");
 
     // Replace , with Unicode Character (U+066C) - Arabic Thousands Separator
     auto commaRegex = std::regex(R"(,\s*)");
-    replaceAll(base, commaRegex, "\u201A");
+    this->replaceAll(base, commaRegex, "\u201A");
 
     // Replace * with Unicode Character (U+2217) -	Asterisk Operator
     auto asteriskRegex = std::regex(R"(\*)");
-    replaceAll(base, asteriskRegex, "\u2217");
+    this->replaceAll(base, asteriskRegex, "\u2217");
 
     return base;
   }
 
+  inline void TypeIndexParser::capitalizeHelper(std::string& content, std::regex& regex)
+  {
+    std::smatch match;
+    while (std::regex_search(content, match, regex))
+    {
+      std::string replacement = match[1];
+      std::transform(replacement.begin(), replacement.end(), replacement.begin(), 
+        [](unsigned char c) -> char
+        {
+          return static_cast<char>(std::toupper(c));
+        });
+      content.replace(match.position(), match.length(), replacement);
+    }
+  }
+
+  // ---------- TypeMapper ------------
+  template<typename T>
+  inline std::string TypeMapper<T>::rubyTypeName()
+  {
+    using Intrinsic_T = detail::intrinsic_type<T>;
+
+    if constexpr (std::is_fundamental_v<T>)
+    {
+      return RubyType<Intrinsic_T>::name;
+    }
+    else if constexpr (std::is_same_v<std::remove_cv_t<T>, char*>)
+    {
+      return "String";
+    }
+    else
+    {
+      detail::TypeIndexParser typeIndexParser(typeid(Intrinsic_T), std::is_fundamental_v<detail::intrinsic_type<Intrinsic_T>>);
+      return typeIndexParser.simplifiedName();
+    }
+  }
+
+  template<typename T>
+  inline std::string TypeMapper<T>::rubyName()
+  {
+    std::string base = this->rubyTypeName();
+    return this->typeIndexParser_.rubyName(base);
+  }
+
   template<typename T>
   inline VALUE TypeMapper<T>::rubyKlass()
   {

data/rice/detail/TypeRegistry.ipp

@@ -97,8 +97,9 @@ namespace Rice::detail
       return result.value();
     }
 
-    detail::TypeMapper<T> typeMapper;
-    raiseUnverifiedType(typeMapper.name());
+    detail::TypeIndexParser typeIndexParser(typeid(T), std::is_fundamental_v<detail::intrinsic_type<T>>);
+    raiseUnverifiedType(typeIndexParser.name());
+
     // Make the compiler happy
     return std::pair<VALUE, rb_data_type_t*>(Qnil, nullptr);
   }
@@ -131,8 +132,8 @@ namespace Rice::detail
 
     for (const std::type_index& typeIndex : this->unverified_)
     {
-      detail::TypeMapper<int> typeMapper;
-      stream << "  " << typeMapper.name(typeIndex) << "\n";
+      detail::TypeIndexParser typeIndexParser(typeIndex);
+      stream << "  " << typeIndexParser.name() << "\n";
     }
 
     throw std::invalid_argument(stream.str());

data/rice/detail/Wrapper.hpp

@@ -77,7 +77,7 @@ namespace Rice::detail
 
   // ---- Helper Functions ---------
   template <typename T>
-  void wrapConstructed(VALUE value, rb_data_type_t* rb_data_type, T* data, bool isOwner);
+  void wrapConstructed(VALUE value, rb_data_type_t* rb_data_type, T* data);
 
   template <typename T>
   VALUE wrap(VALUE klass, rb_data_type_t* rb_data_type, T& data, bool isOwner);

data/rice/detail/Wrapper.ipp

@@ -29,6 +29,7 @@ namespace Rice::detail
   template <typename T>
   inline Wrapper<T>::Wrapper(T& data): data_(data)
   {
+    this->isConst_ = std::is_const_v<std::remove_reference_t<T>>;
   }
 
   template <typename T>
@@ -139,7 +140,7 @@ namespace Rice::detail
       result = TypedData_Wrap_Struct(klass, rb_data_type, wrapper);
     }
 
-    // std::is_copy_constructible_v<std::vector<std::unique_ptr<T>>>> return true. Sigh.
+    // std::is_copy_constructible_v<std::vector<std::unique_ptr<T>>>> returns true. Sigh.
     else if constexpr (detail::is_std_vector_v<T>)
     {
       if constexpr (std::is_copy_constructible_v<typename T::value_type>)
@@ -170,9 +171,9 @@ namespace Rice::detail
 
     else
     {
-      detail::TypeMapper<T> typeMapper;
+      detail::TypeIndexParser typeIndexParser(typeid(T), std::is_fundamental_v<detail::intrinsic_type<T>>);
       std::string message = "Rice was directed to take ownership of a C++ object but it does not have an accessible copy or move constructor. Type: " +
-        typeMapper.name();
+        typeIndexParser.name();
       throw std::runtime_error(message);
     }
 
@@ -201,7 +202,8 @@ namespace Rice::detail
   {
     if (rb_type(value) != RUBY_T_DATA)
     {
-      std::string message = "The provided Ruby object does not wrap a C++ object";
+      std::string message = "The Ruby object does not wrap a C++ object. It is actually a " +
+        std::string(detail::protect(rb_obj_classname, value)) + ".";
       throw std::runtime_error(message);
     }
 
@@ -233,12 +235,18 @@ namespace Rice::detail
   inline WrapperBase* getWrapper(VALUE value)
   {
     // Turn off spurious warning on g++ 12
-    #if defined(__GNUC__) || defined(__clang__)
-    #pragma GCC diagnostic push
-    #pragma GCC diagnostic ignored "-Warray-bounds"
-    #endif
+#if defined(__GNUC__) || defined(__clang__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Warray-bounds"
+#endif
+
+    if (!RTYPEDDATA_P(value))
+    {
+      throw Exception(rb_eTypeError, "wrong argument type %s (expected %s)",
+        detail::protect(rb_obj_classname, value), "wrapped C++ object");
+    }
 
-    return RTYPEDDATA_P(value) ? static_cast<WrapperBase*>(RTYPEDDATA_DATA(value)) : nullptr;
+    return static_cast<WrapperBase*>(RTYPEDDATA_DATA(value));
     
     #if defined(__GNUC__) || defined(__clang__)
     #pragma GCC diagnostic pop
@@ -246,7 +254,7 @@ namespace Rice::detail
   }
 
   template <typename T>
-  inline void wrapConstructed(VALUE value, rb_data_type_t* rb_data_type, T* data, bool isOwner)
+  inline void wrapConstructed(VALUE value, rb_data_type_t* rb_data_type, T* data)
   {
     using Wrapper_T = Wrapper<T*>;
     

data/rice/detail/from_ruby.hpp

@@ -30,13 +30,15 @@ namespace Rice::detail
   template <typename T>
   class From_Ruby;
 
-  enum class Convertible: uint8_t
+  // Overload resolution scoring constants
+  struct Convertible
   {
-      None   = 0b0000,
-      Narrow = 0b0001,
-      Cast   = 0b0011,
-      Const  = 0b0111,
-      Exact  = 0b1111
+    static constexpr double Exact = 1.0;           // Perfect type match
+    static constexpr double None = 0.0;            // Cannot convert
+    static constexpr double IntToFloat = 0.5;      // Domain change penalty when converting int to float
+    static constexpr double SignedToUnsigned = 0.5;// Penalty for signed to unsigned (can't represent negatives)
+    static constexpr double FloatToInt = 0.5;      // Domain change penalty when converting float to int (lossy)
+    static constexpr double ConstMismatch = 0.99;  // Penalty for const mismatch
   };
 }