diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-27 20:31:58 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-11-27 20:31:58 +0000 |
commit | b6f5c225679980f595f0182f2727bcd925be6370 (patch) | |
tree | 56fb9fe18e775695c685daafb74aec6422ce60f1 | |
parent | 1e6623004955553923c9316d7daf26bc37122461 (diff) |
merge revision(s) 50737: [Backport #11211]
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@52768 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-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 | 6 |
4 files changed, 40 insertions, 10 deletions
@@ -1,3 +1,11 @@ +Sat Nov 28 05:21:06 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. + Wed Nov 25 01:05:29 2015 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> * ext/digest/sha1/sha1ossl.c: fix defs.h path to catch up changes in @@ -740,15 +740,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 d5e84185cc..64757615ec 100644 --- a/test/ruby/test_defined.rb +++ b/test/ruby/test_defined.rb @@ -208,4 +208,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,10 +1,10 @@ #define RUBY_VERSION "2.2.4" -#define RUBY_RELEASE_DATE "2015-11-25" -#define RUBY_PATCHLEVEL 200 +#define RUBY_RELEASE_DATE "2015-11-28" +#define RUBY_PATCHLEVEL 201 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 25 +#define RUBY_RELEASE_DAY 28 #include "ruby/version.h" |