kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* vm_eval.c (check_funcall): Call respond_to? with matching arity for

Browse source 
legacy single-argument implementations.  [ruby-trunk - Bug #6000]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34564 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2012-02-11 19:15:36 +00:00
parent 3ab9be9245
commit 691a3a2bdc
3 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Feb 12 03:14:40 2012 Eric Hodel <drbrain@segment7.net>
* 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@ruby-lang.org> Sat Feb 11 12:04:05 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* compile.c (defined_expr): guard the whole expression. * compile.c (defined_expr): guard the whole expression.

14
test/ruby/test_object.rb
View file

@ -446,6 +446,20 @@ class TestObject < Test::Unit::TestCase
assert_equal([[:respond_to?, :to_ary, true]], called, bug5158) assert_equal([[:respond_to?, :to_ary, true]], called, bug5158)
end 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 def test_method_missing_passed_block
bug5731 = '[ruby-dev:44961]' bug5731 = '[ruby-dev:44961]'

5
vm_eval.c
View file

@ -274,10 +274,13 @@ check_funcall(VALUE recv, ID mid, int argc, VALUE *argv)
me = rb_method_entry(klass, idRespond_to); me = rb_method_entry(klass, idRespond_to);
if (me && !(me->flag & NOEX_BASIC)) { if (me && !(me->flag & NOEX_BASIC)) {
VALUE args[2]; VALUE args[2];
int arity = rb_method_entry_arity(me);
if (arity < 1 || arity > 3) arity = 2;
args[0] = ID2SYM(mid); args[0] = ID2SYM(mid);
args[1] = Qtrue; 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; return Qundef;
} }
} }