ruby-changes:38671
From: ko1 <ko1@a...>
Date: Thu, 4 Jun 2015 04:12:47 +0900 (JST)
Subject: [ruby-changes:38671] ko1:r50752 (trunk): * vm_core.h (rb_vm_rewrite_cref_stack): rename to rb_vm_rewrite_cref().
ko1 2015-06-04 04:12:26 +0900 (Thu, 04 Jun 2015) New Revision: 50752 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50752 Log: * vm_core.h (rb_vm_rewrite_cref_stack): rename to rb_vm_rewrite_cref(). * class.c (clone_method): use renamed name. * vm_insnhelper.c (rb_vm_rewrite_cref): do not use `node' in variable names. Modified files: trunk/ChangeLog trunk/class.c trunk/vm_core.h trunk/vm_insnhelper.c Index: ChangeLog =================================================================== --- ChangeLog (revision 50751) +++ ChangeLog (revision 50752) @@ -1,3 +1,12 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Thu Jun 4 04:10:43 2015 Koichi Sasada <ko1@a...> + + * vm_core.h (rb_vm_rewrite_cref_stack): rename to rb_vm_rewrite_cref(). + + * class.c (clone_method): use renamed name. + + * vm_insnhelper.c (rb_vm_rewrite_cref): do not use `node' in variable + names. + Wed Jun 3 23:03:50 2015 Koichi Sasada <ko1@a...> * vm_method.c: rename `rb_frame_...' to `rb_scope_...'. Index: vm_core.h =================================================================== --- vm_core.h (revision 50751) +++ vm_core.h (revision 50752) @@ -1005,7 +1005,7 @@ void rb_gc_mark_machine_stack(rb_thread_ https://github.com/ruby/ruby/blob/trunk/vm_core.h#L1005 int rb_autoloading_value(VALUE mod, ID id, VALUE* value); -void rb_vm_rewrite_cref_stack(rb_cref_t *node, VALUE old_klass, VALUE new_klass, rb_cref_t **new_cref_ptr); +void rb_vm_rewrite_cref(rb_cref_t *node, VALUE old_klass, VALUE new_klass, rb_cref_t **new_cref_ptr); const rb_method_entry_t *rb_vm_frame_method_entry(const rb_control_frame_t *cfp); Index: class.c =================================================================== --- class.c (revision 50751) +++ class.c (revision 50752) @@ -247,7 +247,7 @@ clone_method(VALUE klass, ID mid, const https://github.com/ruby/ruby/blob/trunk/class.c#L247 VALUE newiseqval; rb_cref_t *new_cref; newiseqval = rb_iseq_clone(me->def->body.iseq.iseqptr->self, klass); - rb_vm_rewrite_cref_stack(me->def->body.iseq.cref, me->klass, klass, &new_cref); + rb_vm_rewrite_cref(me->def->body.iseq.cref, me->klass, klass, &new_cref); rb_add_method_iseq(klass, mid, newiseqval, new_cref, me->def->flags.visi); RB_GC_GUARD(newiseqval); } Index: vm_insnhelper.c =================================================================== --- vm_insnhelper.c (revision 50751) +++ vm_insnhelper.c (revision 50752) @@ -465,23 +465,23 @@ rb_vm_get_cref(const VALUE *ep) https://github.com/ruby/ruby/blob/trunk/vm_insnhelper.c#L465 } void -rb_vm_rewrite_cref_stack(rb_cref_t *node, VALUE old_klass, VALUE new_klass, rb_cref_t **new_cref_ptr) +rb_vm_rewrite_cref(rb_cref_t *cref, VALUE old_klass, VALUE new_klass, rb_cref_t **new_cref_ptr) { - rb_cref_t *new_node; + rb_cref_t *new_cref; - while (node) { - if (CREF_CLASS(node) == old_klass) { - new_node = vm_cref_new(new_klass, 0, NULL); - COPY_CREF_OMOD(new_node, node); - CREF_NEXT_SET(new_node, CREF_NEXT(node)); - *new_cref_ptr = new_node; + while (cref) { + if (CREF_CLASS(cref) == old_klass) { + new_cref = vm_cref_new(new_klass, 0, NULL); + COPY_CREF_OMOD(new_cref, cref); + CREF_NEXT_SET(new_cref, CREF_NEXT(cref)); + *new_cref_ptr = new_cref; return; } - new_node = vm_cref_new(CREF_CLASS(node), 0, NULL); - COPY_CREF_OMOD(new_node, node); - node = CREF_NEXT(node); - *new_cref_ptr = new_node; - new_cref_ptr = (rb_cref_t **)&new_node->next; + new_cref = vm_cref_new(CREF_CLASS(cref), 0, NULL); + COPY_CREF_OMOD(new_cref, cref); + cref = CREF_NEXT(cref); + *new_cref_ptr = new_cref; + new_cref_ptr = (rb_cref_t **)&new_cref->next; } *new_cref_ptr = NULL; } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/