@@ -1,3 +1,9 @@ +Sat Jun 28 19:26:43 2008 URABE Shyouhei <shyouhei@ruby-lang.org> + + * class.c (clone_method): use rb_copy_node_scope. + fixed [ruby-list:45102] + fixed [ruby-core:17393] + Sat Jun 28 19:25:56 2008 Akinori MUSHA <knu@iDaemons.org> * eval.c (rb_copy_node_scope), node.h: Rename from copy_node_scope ChangeLog @@ -62,10 +62,7 @@ clone_method(mid, body, data) 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; class.c @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-28" #define RUBY_VERSION_CODE 186 #define RUBY_RELEASE_CODE 20080628 -#define RUBY_PATCHLEVEL 237 +#define RUBY_PATCHLEVEL 238 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 version.h 297708b9e7c8b6f908b6a40011963c3e54619c90 shyouhei shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e http://github.com/FooBarWidget/rubyenterpriseedition/commit/84a9a12d569999d28b52b244ed9cbe18fab8983a 84a9a12d569999d28b52b244ed9cbe18fab8983a 2008-06-28T03:27:21-07:00 2008-06-28T03:27:21-07:00 merge revision(s) 17625: * class.c (clone_method): use rb_copy_node_scope. fixed [ruby-list:45102] fixed [ruby-core:17393] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_6@17630 b2dd03c8-39d4-4d8f-98ff-823fe69b080e d36fdbb570f6ef64cbff9dbe844602d3f87d8757 shyouhei shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e