diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-30 21:42:52 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-12-30 21:42:52 +0000 |
commit | f964fd3fa5070b95cb412cb529b47e168c0af25a (patch) | |
tree | 0f2b153ac4fb185912f23f4ce60c5c2f99f28d0d | |
parent | 7e4e641c009fede540a9e307ac1d3bb9dcf00f7a (diff) | |
download | ruby-f964fd3fa5070b95cb412cb529b47e168c0af25a.tar.gz |
vm_args.c: search symbol proc in super classes
* 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
-rw-r--r-- | test/ruby/test_symbol.rb | 6 | ||||
-rw-r--r-- | vm_args.c | 10 |
2 files changed, 14 insertions, 2 deletions
diff --git a/test/ruby/test_symbol.rb b/test/ruby/test_symbol.rb index 6438ec8771..13d7cc9d57 100644 --- a/test/ruby/test_symbol.rb +++ b/test/ruby/test_symbol.rb @@ -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 @@ -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)) { |