summaryrefslogtreecommitdiff
path: root/vm_eval.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 /vm_eval.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 'vm_eval.c')
-rw-r--r--vm_eval.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/vm_eval.c b/vm_eval.c
index 88fdae7624..74d70d33d7 100644
--- a/vm_eval.c
+++ b/vm_eval.c
@@ -734,7 +734,7 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char
/* save new env */
GetISeqPtr(iseqval, iseq);
if (bind && iseq->local_size > 0) {
- bind->env = vm_make_env_object(th, th->cfp);
+ bind->env = rb_vm_make_env_object(th, th->cfp);
}
/* kick */
@@ -898,7 +898,7 @@ rb_eval_cmd(VALUE cmd, VALUE arg, int level)
POP_TAG();
rb_set_safe_level_force(safe);
- if (state) vm_jump_tag_but_local_jump(state, val);
+ if (state) rb_vm_jump_tag_but_local_jump(state, val);
return val;
}