summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-05 14:07:06 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-10-05 14:07:06 +0000
commit5cd86d4f44205ceb3c9672420d7a98f748f181ae (patch)
tree2f07a02a7b5c41601f837c276ba57d4462285414
parentc16b63d50e815ddcbc7b7932f01f5caf5c946d81 (diff)
downloadruby-5cd86d4f44205ceb3c9672420d7a98f748f181ae.tar.gz
ruby-5cd86d4f44205ceb3c9672420d7a98f748f181ae.tar.xz
ruby-5cd86d4f44205ceb3c9672420d7a98f748f181ae.zip
* vm_method.c (rb_mod_modfunc): method undefined in included module
may not have nd_body. [ruby-core:18738] git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19691 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--vm_method.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index a0c4c1380..d1c94cb57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Oct 5 23:06:55 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * vm_method.c (rb_mod_modfunc): method undefined in included module
+ may not have nd_body. [ruby-core:18738]
+
Sun Oct 5 21:28:58 2008 Tadayoshi Funaba <tadf@dotrb.org>
* lib/rational.rb: resolved conflicts of aliases.
diff --git a/vm_method.c b/vm_method.c
index 53369f431..3f9d5025a 100644
--- a/vm_method.c
+++ b/vm_method.c
@@ -1030,7 +1030,7 @@ rb_mod_modfunc(int argc, VALUE *argv, VALUE module)
fbody = search_method(rb_cObject, id, &m);
}
if (fbody == 0 || fbody->nd_body == 0) {
- rb_bug("undefined method `%s'; can't happen", rb_id2name(id));
+ rb_print_undef(module, id, 0);
}
if (nd_type(fbody->nd_body->nd_body) != NODE_ZSUPER) {
break; /* normal case: need not to follow 'super' link */