diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-23 16:53:42 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-03-23 16:53:42 +0000 |
commit | 2898d5c5a8a6be42888bdabaf2f812c711bda88a (patch) | |
tree | 7bd66bfccb58d1765475a8fa8070e0057dd94d22 /eval.c | |
parent | a8ba0adb5cfddd91dfb01af885994b603e66dcfd (diff) |
* eval.c (ruby_cleanup): exit by SystemExit and SignalException in END
block. [ruby-core:10609]
* test/ruby/test_beginendblock.rb (test_should_propagate_exit_code):
test for exit in END block. [ruby-core:10760]
* test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
test for signal in END block.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 14 |
1 files changed, 9 insertions, 5 deletions
@@ -1562,11 +1562,15 @@ ruby_cleanup(ex) int ex; { int state; - volatile VALUE err = ruby_errinfo; + VALUE err; + volatile VALUE errs[2]; + int nerr; + errs[0] = ruby_errinfo; ruby_safe_level = 0; Init_stack((void*)&state); ruby_finalize_0(); + errs[1] = ruby_errinfo; PUSH_TAG(PROT_NONE); PUSH_ITER(ITER_NOT); if ((state = EXEC_TAG()) == 0) { @@ -1577,15 +1581,15 @@ ruby_cleanup(ex) ex = state; } POP_ITER(); - ruby_errinfo = err; + ruby_errinfo = errs[0]; ex = error_handle(ex); ruby_finalize_1(); POP_TAG(); - if (err) { + for (nerr = sizeof(errs) / sizeof(errs[0]); nerr;) { + if (!(err = errs[--nerr])) continue; if (rb_obj_is_kind_of(err, rb_eSystemExit)) { - VALUE st = rb_iv_get(err, "status"); - return NUM2INT(st); + return sysexit_status(err); } else if (rb_obj_is_kind_of(err, rb_eSignal)) { VALUE sig = rb_iv_get(err, "signo"); |