From c60e282b3034c3ae58a2622432860b63baf77722 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 7 May 2014 02:00:28 +0000 Subject: rename variables * vm.c (vm_collect_local_variables_in_heap): rename an argument. * vm_eval.c (rb_f_local_variables): rename a local variable. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- vm_eval.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'vm_eval.c') diff --git a/vm_eval.c b/vm_eval.c index 23e0b772b2..f12e5d0886 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -18,7 +18,7 @@ static inline VALUE vm_yield_with_block(rb_thread_t *th, int argc, const VALUE * static NODE *vm_cref_push(rb_thread_t *th, VALUE klass, int noex, rb_block_t *blockptr); static VALUE vm_exec(rb_thread_t *th); static void vm_set_eval_stack(rb_thread_t * th, VALUE iseqval, const NODE *cref, rb_block_t *base_block); -static int vm_collect_local_variables_in_heap(rb_thread_t *th, VALUE *dfp, VALUE ary); +static int vm_collect_local_variables_in_heap(rb_thread_t *th, VALUE *dfp, VALUE vars); /* vm_backtrace.c */ VALUE rb_vm_backtrace_str_ary(rb_thread_t *th, int lev, int n); @@ -1886,7 +1886,7 @@ rb_catch_protect(VALUE t, rb_block_call_func *func, VALUE data, int *stateptr) static VALUE rb_f_local_variables(void) { - VALUE ary = rb_ary_new(); + VALUE vars = rb_ary_new(); rb_thread_t *th = GET_THREAD(); rb_control_frame_t *cfp = vm_get_ruby_level_caller_cfp(th, RUBY_VM_PREVIOUS_CONTROL_FRAME(th->cfp)); @@ -1900,7 +1900,7 @@ rb_f_local_variables(void) const char *vname = rb_id2name(lid); /* should skip temporary variable */ if (vname) { - rb_ary_push(ary, ID2SYM(lid)); + rb_ary_push(vars, ID2SYM(lid)); } } } @@ -1909,7 +1909,7 @@ rb_f_local_variables(void) /* block */ VALUE *ep = VM_CF_PREV_EP(cfp); - if (vm_collect_local_variables_in_heap(th, ep, ary)) { + if (vm_collect_local_variables_in_heap(th, ep, vars)) { break; } else { @@ -1922,7 +1922,7 @@ rb_f_local_variables(void) break; } } - return ary; + return vars; } /* -- cgit v1.2.3