Merge pull request #279 from ruby-rice/dev

Dev

Author: cfis

include/rice/stl.hpp

@@ -3990,8 +3990,9 @@ namespace Rice
               return element;
             });
 
-            rb_define_alias(klass_, "<<", "push");
-            rb_define_alias(klass_, "append", "push");
+        rb_define_alias(klass_, "push_back", "push");
+        rb_define_alias(klass_, "<<", "push");
+        rb_define_alias(klass_, "append", "push");
       }
 
       void define_enumerable()
@@ -4119,7 +4120,10 @@ namespace Rice
             return Data_Type<std::vector<T>>::is_descendant(value) ? Convertible::Exact : Convertible::None;
             break;
           case RUBY_T_ARRAY:
-            return Convertible::Cast;
+            if constexpr (std::is_default_constructible_v<T>)
+            {
+              return Convertible::Cast;
+            }
             break;
           default:
             return Convertible::None;
@@ -4180,7 +4184,10 @@ namespace Rice
             return Data_Type<std::vector<T>>::is_descendant(value) ? Convertible::Exact : Convertible::None;
             break;
           case RUBY_T_ARRAY:
-            return Convertible::Cast;
+            if constexpr (std::is_default_constructible_v<T>)
+            {
+              return Convertible::Cast;
+            }
             break;
           default:
             return Convertible::None;
@@ -4240,7 +4247,10 @@ namespace Rice
             return Convertible::Exact;
             break;
           case RUBY_T_ARRAY:
-            return Convertible::Cast;
+            if constexpr (std::is_default_constructible_v<T>)
+            {
+              return Convertible::Cast;
+            }
             break;
           default:
             return Convertible::None;

rice/stl/vector.ipp

@@ -280,8 +280,9 @@ namespace Rice
               return element;
             });
 
-            rb_define_alias(klass_, "<<", "push");
-            rb_define_alias(klass_, "append", "push");
+        rb_define_alias(klass_, "push_back", "push");
+        rb_define_alias(klass_, "<<", "push");
+        rb_define_alias(klass_, "append", "push");
       }
 
       void define_enumerable()
@@ -409,7 +410,10 @@ namespace Rice
             return Data_Type<std::vector<T>>::is_descendant(value) ? Convertible::Exact : Convertible::None;
             break;
           case RUBY_T_ARRAY:
-            return Convertible::Cast;
+            if constexpr (std::is_default_constructible_v<T>)
+            {
+              return Convertible::Cast;
+            }
             break;
           default:
             return Convertible::None;
@@ -470,7 +474,10 @@ namespace Rice
             return Data_Type<std::vector<T>>::is_descendant(value) ? Convertible::Exact : Convertible::None;
             break;
           case RUBY_T_ARRAY:
-            return Convertible::Cast;
+            if constexpr (std::is_default_constructible_v<T>)
+            {
+              return Convertible::Cast;
+            }
             break;
           default:
             return Convertible::None;
@@ -530,7 +537,10 @@ namespace Rice
             return Convertible::Exact;
             break;
           case RUBY_T_ARRAY:
-            return Convertible::Cast;
+            if constexpr (std::is_default_constructible_v<T>)
+            {
+              return Convertible::Cast;
+            }
             break;
           default:
             return Convertible::None;

test/test_Stl_Variant.cpp

@@ -1,4 +1,4 @@
-#include "unittest.hpp"
+#include "unittest.hpp"
 #include "embed_ruby.hpp"
 #include <rice/rice.hpp>
 #include <rice/stl.hpp>
@@ -349,3 +349,56 @@ TESTCASE(ClassRoundtripRef)
   ASSERT_EQUAL("Hi from MyClass2", detail::From_Ruby<std::string>().convert(hello));
 }
 #endif
+
+
+namespace
+{
+  class MyClass4
+  {
+  public:
+    size_t variantIndex(std::variant<std::vector<std::string>, std::vector<int>> variant)
+    {
+      return variant.index();
+    }
+  };
+}
+
+TESTCASE(VariantWithTwoVectors)
+{
+  using namespace std::complex_literals;
+
+  define_class<MyClass4>("MyClass4").
+    define_constructor(Constructor<MyClass4>()).
+    define_method("variant_index", &MyClass4::variantIndex);
+
+  Module m = define_module("Testing");
+
+  std::string code = u8R"(vector = Std::Vector≺string≻.new
+                          vector << "a" << "b" << "c"
+                          my_class = MyClass4.new
+                          my_class.variant_index(vector))";
+
+  Object result = m.module_eval(code);
+  ASSERT_EQUAL(0, detail::From_Ruby<size_t>().convert(result));
+
+  code = u8R"(vector = Std::Vector≺int≻.new
+              vector.push_back(4)
+              my_class = MyClass4.new
+              my_class.variant_index(vector))";
+  result = m.module_eval(code);
+  ASSERT_EQUAL(1, detail::From_Ruby<size_t>().convert(result));
+
+  code = u8R"(my_class = MyClass4.new
+              my_class.variant_index(["x", "y", "z"]))";
+  result = m.module_eval(code);
+  ASSERT_EQUAL(0, detail::From_Ruby<size_t>().convert(result));
+
+  code = u8R"(my_class = MyClass4.new
+              my_class.variant_index([5, 6]))";
+
+  ASSERT_EXCEPTION_CHECK(
+    Exception,
+    m.module_eval(code),
+    ASSERT_EQUAL("wrong argument type Integer (expected String)", ex.what())
+  );
+}