diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | eval_intern.h | 2 | ||||
| -rw-r--r-- | load.c | 2 | ||||
| -rw-r--r-- | vm.c | 8 |
4 files changed, 14 insertions, 7 deletions
@@ -1,3 +1,12 @@ +Wed Dec 19 01:51:24 2012 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org> + + * vm.c (rb_vm_jump_tag_but_local_jump): remove unnessesary 2nd + argument. + + * load.c (rb_load_internal): ditto. + + * eval_intern.h (rb_vm_jump_tag_but_local_jump): ditto. + Tue Dec 18 18:57:58 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * io.c (rb_io_wait_writable): don't use rb_thread_wait_fd() diff --git a/eval_intern.h b/eval_intern.h index 421900b147..3c86f98c46 100644 --- a/eval_intern.h +++ b/eval_intern.h @@ -184,7 +184,7 @@ NORETURN(void rb_fiber_start(void)); NORETURN(void rb_print_undef(VALUE, ID, int)); NORETURN(void rb_print_undef_str(VALUE, VALUE)); NORETURN(void rb_vm_localjump_error(const char *,VALUE, int)); -NORETURN(void rb_vm_jump_tag_but_local_jump(int, VALUE)); +NORETURN(void rb_vm_jump_tag_but_local_jump(int)); NORETURN(void rb_raise_method_missing(rb_thread_t *th, int argc, VALUE *argv, VALUE obj, int call_status)); @@ -571,7 +571,7 @@ rb_load_internal(VALUE fname, int wrap) rb_exc_raise(GET_THREAD()->errinfo); } if (state) { - rb_vm_jump_tag_but_local_jump(state, Qundef); + rb_vm_jump_tag_but_local_jump(state); } if (!NIL_P(GET_THREAD()->errinfo)) { @@ -929,12 +929,10 @@ rb_vm_make_jump_tag_but_local_jump(int state, VALUE val) } void -rb_vm_jump_tag_but_local_jump(int state, VALUE val) +rb_vm_jump_tag_but_local_jump(int state) { - if (val != Qnil) { - VALUE exc = rb_vm_make_jump_tag_but_local_jump(state, val); - if (!NIL_P(exc)) rb_exc_raise(exc); - } + VALUE exc = rb_vm_make_jump_tag_but_local_jump(state, Qundef); + if (!NIL_P(exc)) rb_exc_raise(exc); JUMP_TAG(state); } |