diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-07 02:25:43 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-05-07 02:25:43 +0000 |
| commit | 11eb87013653ba6d2321ecf4db07fb052fe19a98 (patch) | |
| tree | 50e25af0b8ca68222fd4af9e73779720b67e7b08 /vm_eval.c | |
| parent | c8dbc43de6003e6d97bd5d7043598a481c4fa694 (diff) | |
vm_eval.c: exclude hidden variables
* vm_eval.c (rb_f_local_variables): exclude variables hidden by
shadowing. [ruby-core:60501] [Bug #9486]
* vm.c (collect_local_variables_in_iseq): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45850 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_eval.c')
| -rw-r--r-- | vm_eval.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -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 vars = rb_ary_new(); + VALUE vars = rb_hash_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(vars, ID2SYM(lid)); + rb_hash_aset(vars, ID2SYM(lid), Qtrue); } } } @@ -1922,7 +1922,9 @@ rb_f_local_variables(void) break; } } - return vars; + /* TODO: rb_hash_keys() directly, or something not to depend on + * the order of st_table */ + return rb_funcallv(vars, rb_intern("keys"), 0, 0); } /* |