summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-28 13:54:21 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-28 13:54:21 +0000
commit8e7303ae4ef0e4b4d8fa6c482fc3e1d2cce78f3d (patch)
treef1cd8b2554dc0caf9d6cbdda092e24aefc1aa25d
parentcac277075356946b9eb4f9f0f2fe63eb6a90d0c9 (diff)
merge revision(s) 19690:
* eval.c (rb_mod_modfunc): method undefined in included module may not have nd_body. [ruby-core:18738] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@21857 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--eval.c2
-rw-r--r--version.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index c521d4e..e3661ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jan 28 22:51:55 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_mod_modfunc): method undefined in included module
+ may not have nd_body. [ruby-core:18738]
+
Wed Jan 28 20:53:27 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* marshal.c (marshal_dump): fixed for check_dump_arg.
diff --git a/eval.c b/eval.c
index e9da97f..8eb1685 100644
--- a/eval.c
+++ b/eval.c
@@ -7697,7 +7697,7 @@ rb_mod_modfunc(argc, argv, module)
body = search_method(rb_cObject, id, &m);
}
if (body == 0 || body->nd_body == 0) {
- rb_bug("undefined method `%s'; can't happen", rb_id2name(id));
+ print_undef(module, id);
}
if (nd_type(body->nd_body) != NODE_ZSUPER) {
break; /* normal case: need not to follow 'super' link */
diff --git a/version.h b/version.h
index 9fe33e0..3a90eee 100644
--- a/version.h
+++ b/version.h
@@ -2,7 +2,7 @@
#define RUBY_RELEASE_DATE "2009-01-28"
#define RUBY_VERSION_CODE 187
#define RUBY_RELEASE_CODE 20090128
-#define RUBY_PATCHLEVEL 99
+#define RUBY_PATCHLEVEL 100
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8