summaryrefslogtreecommitdiff
path: root/proc.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-28 11:09:42 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-28 11:09:42 +0000
commit3c000eab7cc53d194b9ac64c89563f824c990570 (patch)
tree8266926bd4e3eee7b049ea6d91022094bbee5196 /proc.c
parentb1c531524e384880a4415826bace244f573335dd (diff)
merges r21659 from trunk into ruby_1_9_1.
* vm.c: add a prefix "rb_" to exposed functions vm_get_ruby_level_next_cfp(), rb_vm_make_env_object(), vm_stack_to_heap(), vm_make_proc(), vm_invoke_proc(), vm_get_sourceline(), vm_cref(), vm_localjump_error(), vm_make_jump_tag_but_local_jump(), vm_jump_tag_but_local_jump(). This changes may affect only core because most of renamed functions require a pointer of not-exposed struct such as rb_thread_t or NODE. In short, they are core functions. * cont.c, eval.c, eval_intern.h, load.c, proc.c, thread.c, vm_core.h, vm_dump.c, vm_eval.c, vm_exec.c, vm_insnhelper.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21849 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'proc.c')
-rw-r--r--proc.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/proc.c b/proc.c
index 914b742279..747b6bceb7 100644
--- a/proc.c
+++ b/proc.c
@@ -271,13 +271,13 @@ binding_clone(VALUE self)
return bindval;
}
-rb_control_frame_t *vm_get_ruby_level_next_cfp(rb_thread_t *th, rb_control_frame_t *cfp);
+rb_control_frame_t *rb_vm_get_ruby_level_next_cfp(rb_thread_t *th, rb_control_frame_t *cfp);
VALUE
rb_binding_new(void)
{
rb_thread_t *th = GET_THREAD();
- rb_control_frame_t *cfp = vm_get_ruby_level_next_cfp(th, th->cfp);
+ rb_control_frame_t *cfp = rb_vm_get_ruby_level_next_cfp(th, th->cfp);
VALUE bindval = binding_alloc(rb_cBinding);
rb_binding_t *bind;
@@ -286,7 +286,7 @@ rb_binding_new(void)
}
GetBindingPtr(bindval, bind);
- bind->env = vm_make_env_object(th, cfp);
+ bind->env = rb_vm_make_env_object(th, cfp);
return bindval;
}
@@ -382,7 +382,7 @@ proc_new(VALUE klass, int is_lambda)
}
}
- procval = vm_make_proc(th, block, klass);
+ procval = rb_vm_make_proc(th, block, klass);
if (is_lambda) {
rb_proc_t *proc;
@@ -521,8 +521,8 @@ proc_call(int argc, VALUE *argv, VALUE procval)
}
}
- return vm_invoke_proc(GET_THREAD(), proc, proc->block.self,
- argc, argv, blockptr);
+ return rb_vm_invoke_proc(GET_THREAD(), proc, proc->block.self,
+ argc, argv, blockptr);
}
VALUE
@@ -530,8 +530,8 @@ rb_proc_call(VALUE self, VALUE args)
{
rb_proc_t *proc;
GetProcPtr(self, proc);
- return vm_invoke_proc(GET_THREAD(), proc, proc->block.self,
- RARRAY_LEN(args), RARRAY_PTR(args), 0);
+ return rb_vm_invoke_proc(GET_THREAD(), proc, proc->block.self,
+ RARRAY_LEN(args), RARRAY_PTR(args), 0);
}
VALUE
@@ -547,8 +547,8 @@ rb_proc_call_with_block(VALUE self, int argc, VALUE *argv, VALUE pass_procval)
block = &pass_proc->block;
}
- return vm_invoke_proc(GET_THREAD(), proc, proc->block.self,
- argc, argv, block);
+ return rb_vm_invoke_proc(GET_THREAD(), proc, proc->block.self,
+ argc, argv, block);
}
/*