1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vm_args.c: search symbol proc in super classes

Browse Source 
* vm_args.c (refine_sym_proc_call): traverse ancestors to search
  inherited methods for symbol proc.
  [ruby-dev:50741] [Bug #15489]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-12-30 21:42:52 +00:00
parent 7e4e641c00
commit f964fd3fa5
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/ruby/test_symbol.rb
View File

@ -191,6 +191,12 @@ class TestSymbol < Test::Unit::TestCase
assert_equal(:hogehoge, _test_to_proc_arg_with_refinements_call(&:hoge))
end
def test_to_proc_arg_with_refinements_undefined
assert_raise(NoMethodError) do
_test_to_proc_arg_with_refinements_call(&:foo)
end
end
private def return_from_proc
Proc.new { return 1 }.tap(&:call)
end

10
vm_args.c
View File

@ -853,6 +853,7 @@ refine_sym_proc_call(RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg))
rb_execution_context_t *ec;
const VALUE symbol = RARRAY_AREF(callback_arg, 0);
const VALUE refinements = RARRAY_AREF(callback_arg, 1);
VALUE klass;
if (argc-- < 1) {
rb_raise(rb_eArgError, "no receiver given");
@ -860,8 +861,13 @@ refine_sym_proc_call(RB_BLOCK_CALL_FUNC_ARGLIST(yielded_arg, callback_arg))
obj = *argv++;
mid = SYM2ID(symbol);
me = rb_callable_method_entry(CLASS_OF(obj), mid);
me = rb_resolve_refined_method_callable(refinements, me);
for (klass = CLASS_OF(obj); klass; klass = RCLASS_SUPER(klass)) {
me = rb_callable_method_entry(klass, mid);
if (me) {
me = rb_resolve_refined_method_callable(refinements, me);
if (me) break;
}
}
ec = GET_EC();
if (!NIL_P(blockarg)) {