diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-14 16:23:17 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-07-14 16:23:17 +0000 |
commit | a82ce7c55626086ad264a0d26de63b7603956de9 (patch) | |
tree | ff3adfddbfac7be95ed9e90d0cc029d13f4eb175 /vm_core.h | |
parent | 50ae75064639807c8620f3afebc7cc32274b1f4c (diff) | |
download | ruby-a82ce7c55626086ad264a0d26de63b7603956de9.tar.gz |
* vm.c: refactoring Proc/Env related code.
* vm_core.h: remove blockprocval field from rb_proc_t and rb_binding_t.
Instead of this field, mark given block in Proc at rb_env_t::env.
* vm.c (vm_make_env_each): make an Env object with this layout.
And also simplify parameters.
* proc.c: catch up this fix.
* vm_core.h: remove rb_env_t::local_size because it is not used.
* vm_dump.c (rb_vmdebug_env_dump_raw): catch up this fix.
* vm_core.h (rb_vm_make_env_object): remove rb_vm_make_env_object()
because it is only refered from vm.c.
* vm_eval.c (eval_string_with_cref): catch up this fix.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51243 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_core.h')
-rw-r--r-- | vm_core.h | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -786,7 +786,6 @@ typedef struct { rb_block_t block; VALUE envval; /* for GC mark */ - VALUE blockprocval; int8_t safe_level; /* 0..1 */ int8_t is_from_method; /* bool */ int8_t is_lambda; /* bool */ @@ -797,7 +796,6 @@ typedef struct { typedef struct { int env_size; - int local_size; VALUE prev_envval; /* for GC mark */ rb_block_t block; VALUE env[1]; /* flexible array */ @@ -811,7 +809,6 @@ extern const rb_data_type_t ruby_binding_data_type; typedef struct { VALUE env; VALUE path; - VALUE blockprocval; /* for GC mark */ unsigned short first_lineno; } rb_binding_t; @@ -961,7 +958,6 @@ VALUE rb_vm_invoke_proc(rb_thread_t *th, rb_proc_t *proc, VALUE rb_vm_make_proc_lambda(rb_thread_t *th, const rb_block_t *block, VALUE klass, int8_t is_lambda); VALUE rb_vm_make_proc(rb_thread_t *th, const rb_block_t *block, VALUE klass); VALUE rb_vm_make_binding(rb_thread_t *th, const rb_control_frame_t *src_cfp); -VALUE rb_vm_make_env_object(rb_thread_t *th, rb_control_frame_t *cfp); VALUE rb_vm_env_local_variables(VALUE envval); VALUE *rb_binding_add_dynavars(rb_binding_t *bind, int dyncount, const ID *dynvars); void rb_vm_inc_const_missing_count(void); |