Bug #15114 » fix_symbol_to_proc.patch
| method.h | ||
|---|---|---|
|
const rb_method_entry_t *rb_method_entry_without_refinements(VALUE klass, ID id, VALUE *defined_class);
|
||
|
const rb_method_entry_t *rb_resolve_refined_method(VALUE refinements, const rb_method_entry_t *me);
|
||
|
RUBY_SYMBOL_EXPORT_BEGIN
|
||
|
const rb_callable_method_entry_t *rb_resolve_refined_method_callable(VALUE refinements, const rb_callable_method_entry_t *me);
|
||
|
const rb_method_entry_t *rb_resolve_me_location(const rb_method_entry_t *, VALUE[5]);
|
||
|
RUBY_SYMBOL_EXPORT_END
|
||
| test/ruby/test_symbol.rb | ||
|---|---|---|
|
assert_equal(1, first, bug11594)
|
||
|
end
|
||
|
class TestToPRocArgWithRefinements; end
|
||
|
def _test_to_proc_arg_with_refinements_call(&block)
|
||
|
block.call TestToPRocArgWithRefinements.new
|
||
|
end
|
||
|
using Module.new {
|
||
|
refine TestToPRocArgWithRefinements do
|
||
|
def hoge
|
||
|
:hoge
|
||
|
end
|
||
|
end
|
||
|
}
|
||
|
def test_to_proc_arg_with_refinements
|
||
|
assert_equal(:hoge, _test_to_proc_arg_with_refinements_call(&:hoge))
|
||
|
end
|
||
|
using Module.new {
|
||
|
refine TestToPRocArgWithRefinements do
|
||
|
def hoge
|
||
|
:hogehoge
|
||
|
end
|
||
|
end
|
||
|
}
|
||
|
def test_to_proc_arg_with_refinements_override
|
||
|
assert_equal(:hogehoge, _test_to_proc_arg_with_refinements_call(&:hoge))
|
||
|
end
|
||
|
private def return_from_proc
|
||
|
Proc.new { return 1 }.tap(&:call)
|
||
|
end
|
||
| vm_args.c | ||
|---|---|---|
|
ID mid;
|
||
|
const rb_callable_method_entry_t *me;
|
||
|
rb_execution_context_t *ec;
|
||
|
const VALUE symbol = RARRAY_AREF(callback_arg, 0);
|
||
|
const VALUE refinements = RARRAY_AREF(callback_arg, 1);
|
||
|
if (argc-- < 1) {
|
||
|
rb_raise(rb_eArgError, "no receiver given");
|
||
|
}
|
||
|
obj = *argv++;
|
||
|
mid = SYM2ID(callback_arg);
|
||
|
me = rb_callable_method_entry_with_refinements(CLASS_OF(obj), mid, NULL);
|
||
|
mid = SYM2ID(symbol);
|
||
|
me = rb_resolve_refined_method_callable(refinements, (const rb_callable_method_entry_t *)rb_method_entry(CLASS_OF(obj), mid));
|
||
|
ec = GET_EC();
|
||
|
if (!NIL_P(blockarg)) {
|
||
|
vm_passed_block_handler_set(ec, blockarg);
|
||
| ... | ... | |
|
const rb_cref_t *cref = vm_env_cref(reg_cfp->ep);
|
||
|
if (cref && !NIL_P(cref->refinements)) {
|
||
|
VALUE ref = cref->refinements;
|
||
|
VALUE func = rb_hash_lookup(ref, block_code);
|
||
|
if (NIL_P(func)) {
|
||
|
/* TODO: limit cached funcs */
|
||
|
func = rb_func_proc_new(refine_sym_proc_call, block_code);
|
||
|
rb_hash_aset(ref, block_code, func);
|
||
|
}
|
||
|
VALUE callback_arg = rb_ary_new_from_args(2, block_code, ref);
|
||
|
VALUE func = rb_func_proc_new(refine_sym_proc_call, callback_arg);
|
||
|
block_code = func;
|
||
|
}
|
||
|
return block_code;
|
||
| vm_method.c | ||
|---|---|---|
|
return resolve_refined_method(refinements, me, NULL);
|
||
|
}
|
||
|
static const rb_callable_method_entry_t *
|
||
|
const rb_callable_method_entry_t *
|
||
|
rb_resolve_refined_method_callable(VALUE refinements, const rb_callable_method_entry_t *me)
|
||
|
{
|
||
|
VALUE defined_class = me->defined_class;
|
||