diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | test/ruby/test_refinement.rb | 21 | ||||
| -rw-r--r-- | vm_eval.c | 2 | ||||
| -rw-r--r-- | vm_insnhelper.c | 13 |
4 files changed, 44 insertions, 5 deletions
@@ -1,3 +1,16 @@ +Sat Sep 7 15:36:00 2013 Charlie Somerville <charliesome@ruby-lang.org> + + * vm_eval.c (vm_call0): fix prototype, the id parameter should be of + type ID, not VALUE + + * vm_insnhelper.c (check_match): the rb_funcall family of functions + does not care about refinements. We need to use + rb_method_entry_with_refinements instead to call === with + refinements. Thanks to Jon Conley for reporting this bug. + [ruby-core:57051] [Bug #8872] + + * test/ruby/test_refinement.rb: add test + Sat Sep 7 13:49:40 2013 Kazuki Tsujimoto <kazuki@callcc.net> * variable.c (classname): the name of class that has diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb index ffecebd5e8..8efbb1a85a 100644 --- a/test/ruby/test_refinement.rb +++ b/test/ruby/test_refinement.rb @@ -961,6 +961,27 @@ class TestRefinement < Test::Unit::TestCase INPUT end + def test_case_dispatch_is_aware_of_refinements + assert_in_out_err([], <<-RUBY, ["refinement used"], []) + module RefineSymbol + refine Symbol do + def ===(other) + true + end + end + end + + using RefineSymbol + + case :a + when :b + puts "refinement used" + else + puts "refinement not used" + end + RUBY + end + private def eval_using(mod, s) @@ -34,7 +34,7 @@ static VALUE send_internal(int argc, const VALUE *argv, VALUE recv, call_type sc static VALUE vm_call0_body(rb_thread_t* th, rb_call_info_t *ci, const VALUE *argv); static VALUE -vm_call0(rb_thread_t* th, VALUE recv, VALUE id, int argc, const VALUE *argv, +vm_call0(rb_thread_t* th, VALUE recv, ID id, int argc, const VALUE *argv, const rb_method_entry_t *me, VALUE defined_class) { rb_call_info_t ci_entry, *ci = &ci_entry; diff --git a/vm_insnhelper.c b/vm_insnhelper.c index 545b45e034..dd6f26bdc5 100644 --- a/vm_insnhelper.c +++ b/vm_insnhelper.c @@ -931,18 +931,23 @@ rb_equal_opt(VALUE obj1, VALUE obj2) } static VALUE +vm_call0(rb_thread_t*, VALUE, ID, int, const VALUE*, const rb_method_entry_t*, VALUE); + +static VALUE check_match(VALUE pattern, VALUE target, enum vm_check_match_type type) { switch (type) { case VM_CHECKMATCH_TYPE_WHEN: return pattern; - case VM_CHECKMATCH_TYPE_CASE: - return rb_funcall2(pattern, idEqq, 1, &target); - case VM_CHECKMATCH_TYPE_RESCUE: { + case VM_CHECKMATCH_TYPE_RESCUE: if (!rb_obj_is_kind_of(pattern, rb_cModule)) { rb_raise(rb_eTypeError, "class or module required for rescue clause"); } - return RTEST(rb_funcall2(pattern, idEqq, 1, &target)); + /* fall through */ + case VM_CHECKMATCH_TYPE_CASE: { + VALUE defined_class; + rb_method_entry_t *me = rb_method_entry_with_refinements(CLASS_OF(pattern), idEqq, &defined_class); + return vm_call0(GET_THREAD(), pattern, idEqq, 1, &target, me, defined_class); } default: rb_bug("check_match: unreachable"); |