From 22bd8cbb217bfefadc7e7865586a0582bf58a98f Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 20 Dec 2001 18:19:42 +0000 Subject: [PATCH] * eval.c (rb_mod_define_method): must not convert Method to Proc. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_6@1929 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ eval.c | 9 +++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f751ca3bd7..6d187dcba8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Dec 21 03:15:52 2001 Nobuyoshi Nakada + + * eval.c (rb_mod_define_method): must not convert Method to Proc. + Fri Dec 21 01:17:57 2001 Nobuyoshi Nakada * lib/mkmf.rb (with_destdir): new. diff --git a/eval.c b/eval.c index c0e2dc2012..54b5af4b0c 100644 --- a/eval.c +++ b/eval.c @@ -6874,11 +6874,8 @@ rb_mod_define_method(argc, argv, mod) else if (argc == 2) { id = rb_to_id(argv[0]); body = argv[1]; - if (rb_obj_is_kind_of(body, rb_cMethod)) { - body = method_proc(body); - } - else if (!rb_obj_is_proc(body)) { - rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc)", + if (!rb_obj_is_kind_of(body, rb_cMethod) && !rb_obj_is_proc(body)) { + rb_raise(rb_eTypeError, "wrong argument type %s (expected Proc/Method)", rb_class2name(CLASS_OF(body))); } } @@ -6893,7 +6890,7 @@ rb_mod_define_method(argc, argv, mod) } else { /* type error */ - rb_raise(rb_eTypeError, "wrong argument type (expected Proc)"); + rb_raise(rb_eTypeError, "wrong argument type (expected Proc/Method)"); } if (SCOPE_TEST(SCOPE_PRIVATE)) {