diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-08 06:37:46 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-02-08 06:37:46 +0000 |
commit | 9c574383a430c815406fb343e9adba18e348b5a3 (patch) | |
tree | 4c4a826810bfa165017a86b763bc716e24195981 /eval_intern.h | |
parent | 522f948a0ce5caaf3a44c06045a439c190d8f861 (diff) |
* blockinlining.c, error.c, eval.c, eval_error.h, eval_intern.h,
eval_jump.h, eval_load.c, eval_safe.h, gc.c, proc.c, signal.c,
thread.c, thread_pthread.ci, thread_win32.ci, vm.c, vm.h,
vm_dump.c, vm_evalbody.ci, yarvcore.c, yarvcore.h:
fix typo (rb_thead_t -> rb_thread_t).
* eval_intern.h: remove unused definitions.
* common.mk: fix around vm_opts.h path
and remove harmful argument passed to insns2vm.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11658 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval_intern.h')
-rw-r--r-- | eval_intern.h | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/eval_intern.h b/eval_intern.h index 0407b0bb92..5c811d9639 100644 --- a/eval_intern.h +++ b/eval_intern.h @@ -118,7 +118,7 @@ char *strrchr _((const char *, const char)); #include <sys/stat.h> #define TH_PUSH_TAG(th) do { \ - rb_thead_t * const _th = th; \ + rb_thread_t * const _th = th; \ struct rb_vm_tag _tag; \ _tag.tag = 0; \ _tag.prev = _th->tag; \ @@ -183,23 +183,6 @@ char *strrchr _((const char *, const char)); { \ ruby_cref()->nd_visi = (f); \ } - -struct ruby_env { - struct ruby_env *prev; - struct FRAME *frame; - struct SCOPE *scope; - struct BLOCK *block; - struct iter *iter; - struct tag *tag; - NODE *cref; -}; - -typedef struct thread *rb_thread_t; - -extern VALUE rb_cBinding; -extern VALUE rb_eThreadError; -extern VALUE rb_eLocalJumpError; -extern VALUE rb_eSysStackError; extern VALUE exception_error; extern VALUE sysstack_error; @@ -207,8 +190,8 @@ extern VALUE sysstack_error; void rb_thread_cleanup _((void)); void rb_thread_wait_other_threads _((void)); -int thread_set_raised(rb_thead_t *th); -int thread_reset_raised(rb_thead_t *th); +int thread_set_raised(rb_thread_t *th); +int thread_reset_raised(rb_thread_t *th); VALUE rb_f_eval(int argc, VALUE *argv, VALUE self); VALUE rb_make_exception _((int argc, VALUE *argv)); @@ -218,14 +201,14 @@ NORETURN(void print_undef _((VALUE, ID))); NORETURN(void th_localjump_error(const char *, VALUE, int)); NORETURN(void th_jump_tag_but_local_jump(int, VALUE)); -VALUE th_compile(rb_thead_t *th, VALUE str, VALUE file, VALUE line); +VALUE th_compile(rb_thread_t *th, VALUE str, VALUE file, VALUE line); -NODE *th_get_cref(rb_thead_t *th, rb_iseq_t *iseq, rb_control_frame_t *cfp); -NODE *th_cref_push(rb_thead_t *th, VALUE, int); -NODE *th_set_special_cref(rb_thead_t *th, VALUE *lfp, NODE * cref_stack); +NODE *th_get_cref(rb_thread_t *th, rb_iseq_t *iseq, rb_control_frame_t *cfp); +NODE *th_cref_push(rb_thread_t *th, VALUE, int); +NODE *th_set_special_cref(rb_thread_t *th, VALUE *lfp, NODE * cref_stack); static rb_control_frame_t * -th_get_ruby_level_cfp(rb_thead_t *th, rb_control_frame_t *cfp) +th_get_ruby_level_cfp(rb_thread_t *th, rb_control_frame_t *cfp) { rb_iseq_t *iseq = 0; while (!RUBY_VM_CONTROL_FRAME_STACK_OVERFLOW_P(th, cfp)) { @@ -244,12 +227,12 @@ th_get_ruby_level_cfp(rb_thead_t *th, rb_control_frame_t *cfp) static inline NODE * ruby_cref() { - rb_thead_t *th = GET_THREAD(); + rb_thread_t *th = GET_THREAD(); rb_control_frame_t *cfp = th_get_ruby_level_cfp(th, th->cfp); return th_get_cref(th, cfp->iseq, cfp); } -VALUE th_get_cbase(rb_thead_t *th); +VALUE th_get_cbase(rb_thread_t *th); VALUE rb_obj_is_proc(VALUE); void rb_vm_check_redefinition_opt_method(NODE *node); void rb_thread_terminate_all(void); |