зеркало из https://github.com/github/ruby.git
* 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38452 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
ba6a2e7f74
Коммит
26221584a9
|
@ -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()
|
||||
|
|
|
@ -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));
|
||||
|
||||
|
|
2
load.c
2
load.c
|
@ -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)) {
|
||||
|
|
8
vm.c
8
vm.c
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче