shyouhei	2009-01-28 22:51:14 +0900 (Wed, 28 Jan 2009)

  New Revision: 21855

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21855

  Log:
    merge revision(s) 19690:
    * eval.c (rb_mod_modfunc): method undefined in included module
      may not have nd_body.  [ruby-core:18738]

  Modified files:
    branches/ruby_1_8_6/ChangeLog
    branches/ruby_1_8_6/eval.c
    branches/ruby_1_8_6/version.h

Index: ruby_1_8_6/ChangeLog
===================================================================
--- ruby_1_8_6/ChangeLog	(revision 21854)
+++ ruby_1_8_6/ChangeLog	(revision 21855)
@@ -1,3 +1,8 @@
+Wed Jan 28 22:48:00 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* marshal.c (marshal_dump): fixed for check_dump_arg.
Index: ruby_1_8_6/version.h
===================================================================
--- ruby_1_8_6/version.h	(revision 21854)
+++ ruby_1_8_6/version.h	(revision 21855)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-01-28"
 #define RUBY_VERSION_CODE 186
 #define RUBY_RELEASE_CODE 20090128
-#define RUBY_PATCHLEVEL 313
+#define RUBY_PATCHLEVEL 314
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_6/eval.c
===================================================================
--- ruby_1_8_6/eval.c	(revision 21854)
+++ ruby_1_8_6/eval.c	(revision 21855)
@@ -7577,7 +7577,7 @@
 		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 */

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/