From 3c000eab7cc53d194b9ac64c89563f824c990570 Mon Sep 17 00:00:00 2001 From: yugui Date: Wed, 28 Jan 2009 11:09:42 +0000 Subject: 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 --- eval_intern.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'eval_intern.h') diff --git a/eval_intern.h b/eval_intern.h index a4c4540b65..780be52791 100644 --- a/eval_intern.h +++ b/eval_intern.h @@ -162,9 +162,9 @@ enum ruby_tag_type { #define GET_THROWOBJ_CATCH_POINT(obj) ((VALUE*)RNODE((obj))->u2.value) #define GET_THROWOBJ_STATE(obj) ((int)RNODE((obj))->u3.value) -#define SCOPE_TEST(f) (vm_cref()->nd_visi & (f)) -#define SCOPE_CHECK(f) (vm_cref()->nd_visi == (f)) -#define SCOPE_SET(f) (vm_cref()->nd_visi = (f)) +#define SCOPE_TEST(f) (rb_vm_cref()->nd_visi & (f)) +#define SCOPE_CHECK(f) (rb_vm_cref()->nd_visi == (f)) +#define SCOPE_SET(f) (rb_vm_cref()->nd_visi = (f)) #define CHECK_STACK_OVERFLOW(cfp, margin) do \ if (((VALUE *)(cfp)->sp) + (margin) + sizeof(rb_control_frame_t) >= ((VALUE *)cfp)) { \ @@ -193,11 +193,11 @@ VALUE rb_make_exception(int argc, VALUE *argv); NORETURN(void rb_fiber_start(void)); NORETURN(void rb_print_undef(VALUE, ID, int)); -NORETURN(void vm_localjump_error(const char *,VALUE, int)); -NORETURN(void vm_jump_tag_but_local_jump(int, VALUE)); +NORETURN(void rb_vm_localjump_error(const char *,VALUE, int)); +NORETURN(void rb_vm_jump_tag_but_local_jump(int, VALUE)); -VALUE vm_make_jump_tag_but_local_jump(int state, VALUE val); -NODE *vm_cref(void); +VALUE rb_vm_make_jump_tag_but_local_jump(int state, VALUE val); +NODE *rb_vm_cref(void); rb_control_frame_t *vm_get_ruby_level_caller_cfp(rb_thread_t *th, rb_control_frame_t *cfp); VALUE rb_obj_is_proc(VALUE); VALUE rb_vm_call_cfunc(VALUE recv, VALUE (*func)(VALUE), VALUE arg, const rb_block_t *blockptr, VALUE filename); -- cgit v1.2.3