diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-06 18:22:57 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-06 18:22:57 +0000 |
| commit | 949ac512c47fe09094ca8246e3d25a7bf1f6225a (patch) | |
| tree | 8b13c0820378b6553f80e3632e649857679fcdfe | |
| parent | 86877e2f50f734094ee6e8a0f6d58cfe0592e077 (diff) | |
| download | ruby-949ac512c47fe09094ca8246e3d25a7bf1f6225a.tar.gz ruby-949ac512c47fe09094ca8246e3d25a7bf1f6225a.tar.xz ruby-949ac512c47fe09094ca8246e3d25a7bf1f6225a.zip | |
* eval.c (rb_exc_raise, rb_exc_fatal): nil is used to reraise.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24439 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | eval.c | 8 |
2 files changed, 10 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Fri Aug 7 03:22:50 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * eval.c (rb_exc_raise, rb_exc_fatal): nil is used to reraise. + Fri Aug 7 01:49:41 2009 Akinori MUSHA <knu@iDaemons.org> * ext/digest/sha2/sha2.c: The ULL suffix is not supported by @@ -413,14 +413,18 @@ rb_longjmp(int tag, volatile VALUE mesg) void rb_exc_raise(VALUE mesg) { - mesg = rb_make_exception(1, &mesg); + if (!NIL_P(mesg)) { + mesg = rb_make_exception(1, &mesg); + } rb_longjmp(TAG_RAISE, mesg); } void rb_exc_fatal(VALUE mesg) { - mesg = rb_make_exception(1, &mesg); + if (!NIL_P(mesg)) { + mesg = rb_make_exception(1, &mesg); + } rb_longjmp(TAG_FATAL, mesg); } |
