shyouhei	2008-06-28 19:23:54 +0900 (Sat, 28 Jun 2008)

  New Revision: 17626

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/class.c
    branches/ruby_1_8_7/version.h

  Log:
    merge revision(s) 17625:
    * class.c (clone_method): use rb_copy_node_scope.
      fixed [ruby-list:45102]
      fixed [ruby-core:17393]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/class.c?r1=17626&r2=17625&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ChangeLog?r1=17626&r2=17625&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/version.h?r1=17626&r2=17625&diff_format=u

Index: ruby_1_8_7/class.c
===================================================================
--- ruby_1_8_7/class.c	(revision 17625)
+++ ruby_1_8_7/class.c	(revision 17626)
@@ -62,10 +62,7 @@
     NODE *fbody = body->nd_body;
 
     if (fbody && nd_type(fbody) == NODE_SCOPE) {
-	VALUE cref = data->klass ?
-	    (VALUE)NEW_NODE(NODE_CREF,data->klass,0,fbody->nd_rval) :
-	    fbody->nd_rval;
-	fbody = NEW_NODE(NODE_SCOPE, fbody->nd_tbl, cref, fbody->nd_next);
+	fbody = rb_copy_node_scope(fbody, ruby_cref);
     }
     st_insert(data->tbl, mid, (st_data_t)NEW_METHOD(fbody, body->nd_noex));
     return ST_CONTINUE;
Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 17625)
+++ ruby_1_8_7/ChangeLog	(revision 17626)
@@ -1,3 +1,9 @@
+Sat Jun 28 19:23:40 2008  URABE Shyouhei  <shyouhei@r...>
+
+	* class.c (clone_method): use rb_copy_node_scope.
+	  fixed [ruby-list:45102]
+	  fixed [ruby-core:17393]
+
 Sat Jun 28 18:49:50 2008  URABE Shyouhei  <shyouhei@r...>
 
 	* class.c: revert to r15855.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 17625)
+++ ruby_1_8_7/version.h	(revision 17626)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-28"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20080628
-#define RUBY_PATCHLEVEL 22
+#define RUBY_PATCHLEVEL 23
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8

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