diff options
| -rw-r--r-- | proc.c | 16 | ||||
| -rw-r--r-- | test/ruby/test_method.rb | 20 | ||||
| -rw-r--r-- | test/ruby/test_proc.rb | 17 |
3 files changed, 34 insertions, 19 deletions
@@ -3052,7 +3052,7 @@ compose(VALUE dummy, VALUE args, int argc, VALUE *argv, VALUE passed_proc) VALUE f, g, fargs; f = RARRAY_AREF(args, 0); g = RARRAY_AREF(args, 1); - fargs = rb_ary_new3(1, rb_proc_call_with_block(g, argc, argv, passed_proc)); + fargs = rb_ary_new3(1, rb_funcall_with_block(g, idCall, argc, argv, passed_proc)); return rb_proc_call(f, fargs); } @@ -3061,7 +3061,7 @@ compose(VALUE dummy, VALUE args, int argc, VALUE *argv, VALUE passed_proc) * call-seq: * prc * g -> a_proc * - * Returns a proc that is the composition of this proc and the given proc <i>g</i>. + * Returns a proc that is the composition of this proc and the given <i>g</i>. * The returned proc takes a variable number of arguments, calls <i>g</i> with them * then calls this proc with the result. * @@ -3077,16 +3077,6 @@ proc_compose(VALUE self, VALUE g) rb_proc_t *procp; int is_lambda; - if (!rb_obj_is_method(g) && !rb_obj_is_proc(g)) { - rb_raise(rb_eTypeError, - "wrong argument type %s (expected Proc/Method)", - rb_obj_classname(g)); - } - - if (rb_obj_is_method(g)) { - g = method_to_proc(g); - } - args = rb_ary_new3(2, self, g); GetProcPtr(self, procp); @@ -3103,7 +3093,7 @@ proc_compose(VALUE self, VALUE g) * call-seq: * meth * g -> a_proc * - * Returns a proc that is the composition of this method and the given proc <i>g</i>. + * Returns a proc that is the composition of this method and the given <i>g</i>. * The returned proc takes a variable number of arguments, calls <i>g</i> with them * then calls this method with the result. * diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb index 80a2669633..5193ac6889 100644 --- a/test/ruby/test_method.rb +++ b/test/ruby/test_method.rb @@ -1064,14 +1064,28 @@ class TestMethod < Test::Unit::TestCase assert_equal(6, h.call(2)) end - def test_compose_with_nonproc_or_method + def test_compose_with_callable + c = Class.new { + def f(x) x * 2 end + } + c2 = Class.new { + def call(x) x + 1 end + } + f = c.new.method(:f) + g = f * c2.new + + assert_equal(6, g.call(2)) + end + + def test_compose_with_noncallable c = Class.new { def f(x) x * 2 end } f = c.new.method(:f) + g = f * 5 - assert_raise(TypeError) { - f * 5 + assert_raise(NoMethodError) { + g.call(2) } end end diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb index 7ea4556e8a..f70345ed74 100644 --- a/test/ruby/test_proc.rb +++ b/test/ruby/test_proc.rb @@ -1460,11 +1460,22 @@ class TestProc < Test::Unit::TestCase assert_equal(6, h.call(2)) end - def test_compose_with_nonproc_or_method + def test_compose_with_callable f = proc {|x| x * 2} + c = Class.new { + def call(x) x + 1 end + } + g = f * c.new + + assert_equal(6, g.call(2)) + end + + def test_compose_with_noncallable + f = proc {|x| x * 2} + g = f * 5 - assert_raise(TypeError) { - f * 5 + assert_raise(NoMethodError) { + g.call(2) } end end |