Implement and spec rb_class_new_instance_kw()

Author: eregon

lib/cext/ABI_check.txt

@@ -1 +1 @@
-5
+6

lib/truffle/truffle/cext.rb

@@ -1183,6 +1183,15 @@ def rb_class_new_instance(klass, args)
     obj
   end
 
+  def rb_class_new_instance_kw(klass, args)
+    *args, kwargs = args
+    kwargs = Truffle::Type.rb_convert_type kwargs, Hash, :to_hash
+
+    obj = klass.send(:__allocate__)
+    obj.send(:initialize, *args, **kwargs)
+    obj
+  end
+
   def rb_f_sprintf(args)
     sprintf(*args)
   end

spec/ruby/optional/capi/class_spec.rb

@@ -108,17 +108,37 @@
 
   describe "rb_class_new_instance" do
     it "allocates and initializes a new object" do
-      o = @s.rb_class_new_instance(0, nil, CApiClassSpecs::Alloc)
+      o = @s.rb_class_new_instance([], CApiClassSpecs::Alloc)
       o.class.should == CApiClassSpecs::Alloc
       o.initialized.should be_true
     end
 
     it "passes arguments to the #initialize method" do
-      o = @s.rb_class_new_instance(2, [:one, :two], CApiClassSpecs::Alloc)
+      o = @s.rb_class_new_instance([:one, :two], CApiClassSpecs::Alloc)
       o.arguments.should == [:one, :two]
     end
   end
 
+  ruby_version_is "3.0" do
+    describe "rb_class_new_instance_kw" do
+      it "passes arguments and keywords to the #initialize method" do
+        obj = @s.rb_class_new_instance_kw([{pos: 1}, {kw: 2}], CApiClassSpecs::KeywordAlloc)
+        obj.args.should == [{pos: 1}]
+        obj.kwargs.should == {kw: 2}
+
+        obj = @s.rb_class_new_instance_kw([{}], CApiClassSpecs::KeywordAlloc)
+        obj.args.should == []
+        obj.kwargs.should == {}
+      end
+
+      it "raises TypeError if the last argument is not a Hash" do
+        -> {
+          @s.rb_class_new_instance_kw([42], CApiClassSpecs::KeywordAlloc)
+        }.should raise_error(TypeError, 'no implicit conversion of Integer into Hash')
+      end
+    end
+  end
+
   describe "rb_include_module" do
     it "includes a module into a class" do
       c = Class.new

spec/ruby/optional/capi/ext/class_spec.c

@@ -61,18 +61,15 @@ static VALUE class_spec_rb_class_new(VALUE self, VALUE super) {
   return rb_class_new(super);
 }
 
-static VALUE class_spec_rb_class_new_instance(VALUE self,
-                                      VALUE nargs, VALUE args,
-                                      VALUE klass) {
-  int c_nargs = FIX2INT(nargs);
-  VALUE *c_args = (VALUE*)alloca(sizeof(VALUE) * c_nargs);
-  int i;
-
-  for (i = 0; i < c_nargs; i++)
-    c_args[i] = rb_ary_entry(args, i);
+static VALUE class_spec_rb_class_new_instance(VALUE self, VALUE args, VALUE klass) {
+  return rb_class_new_instance(RARRAY_LENINT(args), RARRAY_PTR(args), klass);
+}
 
-  return rb_class_new_instance(c_nargs, c_args, klass);
+#ifdef RUBY_VERSION_IS_3_0
+static VALUE class_spec_rb_class_new_instance_kw(VALUE self, VALUE args, VALUE klass) {
+  return rb_class_new_instance_kw(RARRAY_LENINT(args), RARRAY_PTR(args), klass, RB_PASS_KEYWORDS);
 }
+#endif
 
 static VALUE class_spec_rb_class_real(VALUE self, VALUE object) {
   if(rb_type_p(object, T_FIXNUM)) {
@@ -171,7 +168,10 @@ void Init_class_spec(void) {
   rb_define_method(cls, "rb_class_protected_instance_methods", class_spec_rb_class_protected_instance_methods, -1);
   rb_define_method(cls, "rb_class_private_instance_methods", class_spec_rb_class_private_instance_methods, -1);
   rb_define_method(cls, "rb_class_new", class_spec_rb_class_new, 1);
-  rb_define_method(cls, "rb_class_new_instance", class_spec_rb_class_new_instance, 3);
+  rb_define_method(cls, "rb_class_new_instance", class_spec_rb_class_new_instance, 2);
+#ifdef RUBY_VERSION_IS_3_0
+  rb_define_method(cls, "rb_class_new_instance_kw", class_spec_rb_class_new_instance_kw, 2);
+#endif
   rb_define_method(cls, "rb_class_real", class_spec_rb_class_real, 1);
   rb_define_method(cls, "rb_class_superclass", class_spec_rb_class_superclass, 1);
   rb_define_method(cls, "rb_cvar_defined", class_spec_cvar_defined, 2);

spec/ruby/optional/capi/fixtures/class.rb

@@ -15,6 +15,16 @@ def initialize(*args)
     end
   end
 
+  class KeywordAlloc
+    attr_reader :initialized, :args, :kwargs
+
+    def initialize(*args, **kwargs)
+      @initialized = true
+      @args = args
+      @kwargs = kwargs
+    end
+  end
+
   class Attr
     def initialize
       @foo, @bar, @baz = 1, 2, 3

src/main/c/cext/class.c

@@ -86,8 +86,11 @@ VALUE rb_class_new_instance(int argc, const VALUE *argv, VALUE klass) {
 }
 
 VALUE rb_class_new_instance_kw(int argc, const VALUE *argv, VALUE klass, int kw_splat) {
-  // Ignoring kw_splat for now
-  return rb_class_new_instance(argc, argv, klass);
+  if (kw_splat && argc > 0) {
+    return RUBY_CEXT_INVOKE("rb_class_new_instance_kw", klass, rb_ary_new4(argc, argv));
+  } else {
+    return rb_class_new_instance(argc, argv, klass);
+  }
 }
 
 VALUE rb_cvar_defined(VALUE klass, ID id) {