diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | proc.c | 4 | ||||
| -rw-r--r-- | test/ruby/test_refinement.rb | 18 | ||||
| -rw-r--r-- | version.h | 2 |
4 files changed, 27 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Thu Feb 19 16:07:03 2015 Seiei Higa <hanachin@gmail.com> + + * proc.c (rb_obj_singleton_method): Kernel#singleton_method should + not use refinements, as well as Kernel#method. + [ruby-core:67603] [Bug #10744] + Thu Feb 19 15:32:26 2015 Dave Stevens <dave@crowdlab.com> * string.c (str_make_independent_expand): terminate String when @@ -1528,7 +1528,8 @@ rb_obj_singleton_method(VALUE obj, VALUE vid) QUOTE(vid), obj); } if (NIL_P(klass = rb_singleton_class_get(obj)) || - !(me = rb_method_entry_at(klass, id))) { + UNDEFINED_METHOD_ENTRY_P(me = rb_method_entry_at(klass, id)) || + UNDEFINED_REFINED_METHOD_P(me->def)) { rb_name_error(id, "undefined singleton method `%"PRIsVALUE"' for `%"PRIsVALUE"'", QUOTE_ID(id), obj); } @@ -2831,4 +2832,3 @@ Init_Binding(void) rb_define_method(rb_cBinding, "receiver", bind_receiver, 0); rb_define_global_function("binding", rb_f_binding, 0); } - diff --git a/test/ruby/test_refinement.rb b/test/ruby/test_refinement.rb index 400a72cbf7..5837f45d0f 100644 --- a/test/ruby/test_refinement.rb +++ b/test/ruby/test_refinement.rb @@ -1217,6 +1217,24 @@ class TestRefinement < Test::Unit::TestCase end; end + def test_singleton_method_should_not_use_refinements + assert_separately([], <<-"end;") + bug10744 = '[ruby-core:67603] [Bug #10744]' + + class C + end + + module RefinementBug + refine C.singleton_class do + def foo + end + end + end + + assert_raise(NameError, bug10744) { C.singleton_method(:foo) } + end; + end + def test_refined_method_defined assert_separately([], <<-"end;") bug10753 = '[ruby-core:67656] [Bug #10753]' @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.0" #define RUBY_RELEASE_DATE "2015-02-19" -#define RUBY_PATCHLEVEL 56 +#define RUBY_PATCHLEVEL 57 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 2 |