Implement rb_yield_values2

Author: bjfish

CHANGELOG.md

@@ -30,6 +30,7 @@ Compatibility:
 * Skip upgraded default gems while loading RubyGems (#2075).
 * Verify that gem paths are correct before loading RubyGems (#2075).
 * Implement `rb_ivar_count`.
+* Implemented `rb_yield_values2`.
 
 Performance:
 

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

@@ -270,6 +270,15 @@ static VALUE kernel_spec_rb_yield_values(VALUE self, VALUE obj1, VALUE obj2) {
   return rb_yield_values(2, obj1, obj2);
 }
 
+static VALUE kernel_spec_rb_yield_values2(VALUE self, VALUE ary) {
+  long len = RARRAY_LEN(ary);
+  VALUE *args = (VALUE*)alloca(sizeof(VALUE) * len);
+  for (int i = 0; i < len; i++) {
+    args[i] = rb_ary_entry(ary, i);
+  }
+  return rb_yield_values2((int)len, args);
+}
+
 static VALUE do_rec(VALUE obj, VALUE arg, int is_rec) {
   if(is_rec) {
     return obj;
@@ -351,6 +360,7 @@ void Init_kernel_spec(void) {
   rb_define_method(cls, "rb_yield_indirected", kernel_spec_rb_yield_indirected, 1);
   rb_define_method(cls, "rb_yield_define_each", kernel_spec_rb_yield_define_each, 1);
   rb_define_method(cls, "rb_yield_values", kernel_spec_rb_yield_values, 2);
+  rb_define_method(cls, "rb_yield_values2", kernel_spec_rb_yield_values2, 1);
   rb_define_method(cls, "rb_yield_splat", kernel_spec_rb_yield_splat, 1);
   rb_define_method(cls, "rb_exec_recursive", kernel_spec_rb_exec_recursive, 1);
   rb_define_method(cls, "rb_set_end_proc", kernel_spec_rb_set_end_proc, 1);

spec/ruby/optional/capi/kernel_spec.rb

@@ -238,6 +238,18 @@
     end
   end
 
+  describe "rb_yield_values2" do
+    it "yields passed arguments" do
+      ret = nil
+      @s.rb_yield_values2([1, 2]) { |x, y| ret = x + y }
+      ret.should == 3
+    end
+
+    it "returns the result from block evaluation" do
+      @s.rb_yield_values2([1, 2]) { |x, y| x + y }.should == 3
+    end
+  end
+
   describe "rb_yield_splat" do
     it "yields with passed array's contents" do
       ret = nil

src/main/c/cext/call.c

@@ -93,6 +93,14 @@ VALUE rb_yield_values(int n, ...) {
   return rb_yield_splat(values);
 }
 
+VALUE rb_yield_values2(int n, const VALUE *argv) {
+  VALUE values = rb_ary_new_capa(n);
+  for (int i = 0; i < n; i++) {
+    rb_ary_store(values, i, (VALUE) argv[i]);
+  }
+  return rb_yield_splat(values);
+}
+
 void *rb_thread_call_with_gvl(gvl_call function, void *data1) {
   return polyglot_invoke(RUBY_CEXT, "rb_thread_call_with_gvl", function, data1);
 }