diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | proc.c | 4 | ||||
| -rw-r--r-- | test/ruby/test_object.rb | 2 |
3 files changed, 5 insertions, 5 deletions
@@ -1,6 +1,4 @@ -Fri Sep 25 13:05:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> - - * proc.c (missing_wrap): new_arg is already given if argc > 1. +Fri Sep 25 13:04:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * proc.c (mnew): fix for instance method of Module, BasicObjec and subclass of a class which overrides respond_to_missing?. @@ -884,12 +884,12 @@ rb_obj_is_method(VALUE m) } static VALUE -missing_wrap(VALUE new_args, VALUE args, int argc, VALUE *argv) +missing_wrap(VALUE dummy, VALUE args, int argc, VALUE *argv) { + VALUE new_args = rb_ary_new4(argc, argv); VALUE obj = RARRAY_PTR(args)[0]; VALUE sym = RARRAY_PTR(args)[1]; - if (argc <= 1) new_args = rb_ary_new4(argc, argv); rb_ary_unshift(new_args, sym); return rb_funcall2(obj, rb_intern("method_missing"), check_argc(RARRAY_LEN(new_args)), RARRAY_PTR(new_args)); diff --git a/test/ruby/test_object.rb b/test/ruby/test_object.rb index 37317cfd47..e4026eccba 100644 --- a/test/ruby/test_object.rb +++ b/test/ruby/test_object.rb @@ -325,6 +325,7 @@ class TestObject < Test::Unit::TestCase foo = c.new assert_equal([:foo], foo.foobar); assert_equal([:foo, 1], foo.foobar(1)); + assert_equal([:foo, 1, 2, 3, 4, 5], foo.foobar(1, 2, 3, 4, 5)); assert(foo.respond_to?(:foobar)) assert_equal(false, foo.respond_to?(:foobarbaz)) assert_raise(NoMethodError) do @@ -334,6 +335,7 @@ class TestObject < Test::Unit::TestCase foobar = foo.method(:foobar) assert_equal([:foo], foobar.call); assert_equal([:foo, 1], foobar.call(1)); + assert_equal([:foo, 1, 2, 3, 4, 5], foobar.call(1, 2, 3, 4, 5)); c = Class.new(c) assert_equal(false, c.method_defined?(:foobar)) |