diff options
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | insns.def | 11 | ||||
-rw-r--r-- | test/ruby/test_defined.rb | 25 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 38 insertions, 8 deletions
@@ -1,3 +1,11 @@ +Mon Nov 30 21:29:57 2015 Koichi Sasada <ko1@atdot.net> + + * insns.def (defined): skip respond_to_missing? when + a method is available. + [Bug #11211] + + * test/ruby/test_defined.rb: add a test for this fix. + Mon Nov 30 21:27:09 2015 NAKAMURA Usaku <usa@ruby-lang.org> * ext/digest/rmd160/rmd160.c: fixed commit mistake at r52797. @@ -738,15 +738,12 @@ defined const rb_method_entry_t *me = rb_method_entry(klass, SYM2ID(obj), 0); if (me) { - if (!(me->flag & NOEX_PRIVATE)) { - if (!((me->flag & NOEX_PROTECTED) && - !rb_obj_is_kind_of(GET_SELF(), - rb_class_real(klass)))) { - expr_type = DEFINED_METHOD; - } + if (!(me->flag & NOEX_PRIVATE) && + !((me->flag & NOEX_PROTECTED) && !rb_obj_is_kind_of(GET_SELF(), rb_class_real(klass)))) { + expr_type = DEFINED_METHOD; } } - { + else { VALUE args[2]; VALUE r; diff --git a/test/ruby/test_defined.rb b/test/ruby/test_defined.rb index 6c63c7fb27..fdae6789f1 100644 --- a/test/ruby/test_defined.rb +++ b/test/ruby/test_defined.rb @@ -209,4 +209,29 @@ class TestDefined < Test::Unit::TestCase def test_super_toplevel assert_separately([], "assert_nil(defined?(super))") end + + class ExampleRespondToMissing + attr_reader :called + + def initialize + @called = false + end + + def respond_to_missing? *args + @called = true + false + end + + def existing_method + end + end + + def test_method_by_respond_to_missing + bug_11211 = '[Bug #11211]' + obj = ExampleRespondToMissing.new + assert_equal("method", defined?(obj.existing_method), bug_11211) + assert_equal(false, obj.called, bug_11211) + assert_equal(nil, defined?(obj.non_existing_method), bug_11211) + assert_equal(true, obj.called, bug_11211) + end end @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.1.8" #define RUBY_RELEASE_DATE "2015-11-30" -#define RUBY_PATCHLEVEL 427 +#define RUBY_PATCHLEVEL 428 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 11 |