Skip to content

Commit

Permalink
* vm_method.c (obj_respond_to): fix the respond_to_missing? override
Browse files Browse the repository at this point in the history
  case.  based on the patch by Jeremy Evans at [ruby-core:38417].
  [Feature ruby#5072]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32685 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information
nobu committed Jul 26, 2011
1 parent 3fbc65d commit 298349d
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 2 deletions.
6 changes: 5 additions & 1 deletion ChangeLog
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
Wed Jul 27 01:05:23 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
Wed Jul 27 01:05:28 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>

* vm_method.c (obj_respond_to): fix the respond_to_missing? override
case. based on the patch by Jeremy Evans at [ruby-core:38417].
[Feature #5072]

* parse.y (rb_check_id): make the given name a symbol or a string.
based on the second patch by Jeremy Evans at [ruby-core:38447]
Expand Down
13 changes: 13 additions & 0 deletions test/ruby/test_object.rb
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,19 @@ def method_missing(meth, *args)
assert_nothing_raised(bug2494) {[b].flatten}
end

def test_respond_to_missing_string
c = Class.new do
def respond_to_missing?(id, priv)
!(id !~ /\Agadzoks\d+\z/) ^ priv
end
end
foo = c.new
assert_equal(false, foo.respond_to?("gadzooks16"))
assert_equal(true, foo.respond_to?("gadzooks17", true))
assert_equal(true, foo.respond_to?("gadzoks16"))
assert_equal(false, foo.respond_to?("gadzoks17", true))
end

def test_respond_to_missing
c = Class.new do
def respond_to_missing?(id, priv)
Expand Down
9 changes: 8 additions & 1 deletion vm_method.c
Original file line number Diff line number Diff line change
Expand Up @@ -1259,8 +1259,15 @@ obj_respond_to(int argc, VALUE *argv, VALUE obj)
ID id;

rb_scan_args(argc, argv, "11", &mid, &priv);
if (!(id = rb_check_id(&mid)))
if (!(id = rb_check_id(&mid))) {
if (!rb_method_basic_definition_p(CLASS_OF(obj), respond_to_missing)) {
VALUE args[2];
args[0] = ID2SYM(rb_to_id(mid));
args[1] = priv;
return rb_funcall2(obj, respond_to_missing, 2, args);
}
return Qfalse;
}
if (basic_obj_respond_to(obj, id, !RTEST(priv)))
return Qtrue;
return Qfalse;
Expand Down

0 comments on commit 298349d

Please sign in to comment.