shyouhei	2009-12-14 03:50:31 +0900 (Mon, 14 Dec 2009)

  New Revision: 26083

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

  Log:
    merge revision(s) 25693:
    * eval.c (method_inspect, method_name, mnew): Bug fix when
      method created from an alias.
      Based on a patch by Peter Vanbroekhoven [ruby-core:22040]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/eval.c
    branches/ruby_1_8_7/test/runner.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 26082)
+++ ruby_1_8_7/ChangeLog	(revision 26083)
@@ -1,3 +1,9 @@
+Mon Dec 14 03:36:20 2009  Marc-Andre Lafortune  <ruby-core@m...>
+
+	* eval.c (method_inspect, method_name, mnew): Bug fix when
+	  method created from an alias.
+	  Based on a patch by Peter Vanbroekhoven [ruby-core:22040]
+
 Mon Dec 14 03:21:59 2009  Nobuyoshi Nakada  <nobu@r...>
 
 	* eval.c (call_trace_func): remove the trace hook if any exception
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 26082)
+++ ruby_1_8_7/version.h	(revision 26083)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2009-12-14"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20091214
-#define RUBY_PATCHLEVEL 229
+#define RUBY_PATCHLEVEL 230
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/test/runner.rb
===================================================================
--- ruby_1_8_7/test/runner.rb	(revision 26082)
+++ ruby_1_8_7/test/runner.rb	(revision 26083)
@@ -1,7 +1,7 @@
 require 'test/unit'
 
 rcsid = %w$Id$
-Version = rcsid[2].scan(/\d+/).collect!(&method(:Integer)).freeze
-Release = rcsid[3].freeze
+Version = rcsid[2].scan(/\d+/).collect!(&method(:Integer)).freeze rescue nil
+Release = rcsid[3].freeze rescue nil
 
 exit Test::Unit::AutoRunner.run(true, File.dirname($0))
Index: ruby_1_8_7/eval.c
===================================================================
--- ruby_1_8_7/eval.c	(revision 26082)
+++ ruby_1_8_7/eval.c	(revision 26083)
@@ -9273,8 +9273,8 @@
     ID oid = id;
 
   again:
-    if ((body = rb_get_method_body(&klass, &id, &noex)) == 0) {
-	print_undef(rklass, oid);
+    if ((body = rb_get_method_body(&klass, &oid, &noex)) == 0) {
+	print_undef(rklass, id);
     }
 
     if (nd_type(body) == NODE_ZSUPER) {
@@ -9415,7 +9415,7 @@
     struct METHOD *data;
 
     Data_Get_Struct(obj, struct METHOD, data);
-    return rb_str_new2(rb_id2name(data->oid));
+    return rb_str_new2(rb_id2name(data->id));
 }
 
 /*
@@ -9841,7 +9841,7 @@
 	}
     }
     rb_str_buf_cat2(str, sharp);
-    rb_str_buf_cat2(str, rb_id2name(data->oid));
+    rb_str_buf_cat2(str, rb_id2name(data->id));
     rb_str_buf_cat2(str, ">");
 
     return str;

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