Add C API function rb_proc_call_with_block_kw

Author: andrykonchin

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

@@ -84,6 +84,10 @@ VALUE proc_spec_rb_proc_call_with_block(VALUE self, VALUE prc, VALUE args, VALUE
   return rb_proc_call_with_block(prc, RARRAY_LENINT(args), RARRAY_PTR(args), block);
 }
 
+static VALUE proc_spec_rb_proc_call_with_block_kw(VALUE self, VALUE prc, VALUE args, VALUE block) {
+  return rb_proc_call_with_block_kw(prc, RARRAY_LENINT(args), RARRAY_PTR(args), block, RB_PASS_KEYWORDS);
+}
+
 VALUE proc_spec_rb_obj_is_proc(VALUE self, VALUE prc) {
   return rb_obj_is_proc(prc);
 }
@@ -133,6 +137,7 @@ void Init_proc_spec(void) {
   rb_define_method(cls, "rb_proc_call", proc_spec_rb_proc_call, 2);
   rb_define_method(cls, "rb_proc_call_kw", proc_spec_rb_proc_call_kw, 2);
   rb_define_method(cls, "rb_proc_call_with_block", proc_spec_rb_proc_call_with_block, 3);
+  rb_define_method(cls, "rb_proc_call_with_block_kw", proc_spec_rb_proc_call_with_block_kw, 3);
   rb_define_method(cls, "rb_Proc_new", proc_spec_rb_Proc_new, 1);
   rb_define_method(cls, "rb_obj_is_proc", proc_spec_rb_obj_is_proc, 1);
 }

spec/ruby/optional/capi/proc_spec.rb

@@ -113,6 +113,32 @@
     end
   end
 
+  describe "rb_proc_call_with_block_kw" do
+    it "passes keyword arguments and a block to the proc" do
+      prc = proc { |*args, **kw, &block| [args, kw, block.call(42)] }
+      block = proc { |n| n }
+
+      @p.rb_proc_call_with_block_kw(prc, [{}], block).should == [[], {}, 42]
+      @p.rb_proc_call_with_block_kw(prc, [{a: 1}], block).should == [[], {a: 1}, 42]
+      @p.rb_proc_call_with_block_kw(prc, [{b: 2}, {a: 1}], block).should == [[{b: 2}], {a: 1}, 42]
+      @p.rb_proc_call_with_block_kw(prc, [{b: 2}, {}], block).should == [[{b: 2}], {}, 42]
+    end
+
+    it "raises TypeError if the last argument is not a Hash" do
+      prc = proc { |*args, **kwargs, &block| [args, kw, block.call(42)] }
+
+      -> {
+        @p.rb_proc_call_with_block_kw(prc, [42], proc {})
+      }.should raise_error(TypeError, 'no implicit conversion of Integer into Hash')
+    end
+
+    it "passes keyword arguments to the proc when a block is nil" do
+      prc = proc { |*args, **kw| [args, kw] }
+
+      @p.rb_proc_call_with_block_kw(prc, [{}], nil).should == [[], {}]
+    end
+  end
+
   describe "rb_obj_is_proc" do
     it "returns true for Proc" do
       prc = Proc.new {|a,b| a * b }

src/main/c/cext/proc.c

@@ -27,6 +27,10 @@ VALUE rb_proc_call_with_block(VALUE recv, int argc, const VALUE *argv, VALUE pro
   return rb_funcall_with_block(recv, rb_intern("call"), argc, argv, proc);
 }
 
+VALUE rb_proc_call_with_block_kw(VALUE recv, int argc, const VALUE *argv, VALUE proc, int kw_splat) {
+  return rb_funcall_with_block_kw(recv, rb_intern("call"), argc, argv, proc, kw_splat);
+}
+
 int rb_proc_arity(VALUE self) {
   return polyglot_as_i32(RUBY_INVOKE_NO_WRAP(self, "arity"));
 }