ruby-changes:22511
From: drbrain <ko1@a...>
Date: Mon, 13 Feb 2012 08:52:22 +0900 (JST)
Subject: [ruby-changes:22511] drbrain:r34564 (trunk): * vm_eval.c (check_funcall): Call respond_to? with matching arity for
drbrain 2012-02-12 04:15:36 +0900 (Sun, 12 Feb 2012) New Revision: 34564 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34564 Log: * vm_eval.c (check_funcall): Call respond_to? with matching arity for legacy single-argument implementations. [ruby-trunk - Bug #6000] Modified files: trunk/ChangeLog trunk/test/ruby/test_object.rb trunk/vm_eval.c Index: ChangeLog =================================================================== --- ChangeLog (revision 34563) +++ ChangeLog (revision 34564) @@ -1,3 +1,8 @@ +Sun Feb 12 03:14:40 2012 Eric Hodel <drbrain@s...> + + * vm_eval.c (check_funcall): Call respond_to? with matching arity for + legacy single-argument implementations. [ruby-trunk - Bug #6000] + Sat Feb 11 12:04:05 2012 Nobuyoshi Nakada <nobu@r...> * compile.c (defined_expr): guard the whole expression. Index: vm_eval.c =================================================================== --- vm_eval.c (revision 34563) +++ vm_eval.c (revision 34564) @@ -274,10 +274,13 @@ me = rb_method_entry(klass, idRespond_to); if (me && !(me->flag & NOEX_BASIC)) { VALUE args[2]; + int arity = rb_method_entry_arity(me); + if (arity < 1 || arity > 3) arity = 2; + args[0] = ID2SYM(mid); args[1] = Qtrue; - if (!RTEST(vm_call0(th, recv, idRespond_to, 2, args, me))) { + if (!RTEST(vm_call0(th, recv, idRespond_to, arity, args, me))) { return Qundef; } } Index: test/ruby/test_object.rb =================================================================== --- test/ruby/test_object.rb (revision 34563) +++ test/ruby/test_object.rb (revision 34564) @@ -446,6 +446,20 @@ assert_equal([[:respond_to?, :to_ary, true]], called, bug5158) end + def test_implicit_respond_to_arity_1 + p = Object.new + + called = [] + p.singleton_class.class_eval do + define_method(:respond_to?) do |a| + called << [:respond_to?, a] + false + end + end + [[p]].flatten + assert_equal([[:respond_to?, :to_ary]], called, '[bug:6000]') + end + def test_method_missing_passed_block bug5731 = '[ruby-dev:44961]' -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/