diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-08 15:35:59 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-08 15:35:59 +0000 |
commit | d6872f21d21406abcc4621231d89a63ba69999bf (patch) | |
tree | 8b421033a37a5211151424ae716e7caf2660e684 /eval.c | |
parent | 00feff5fbab8dc5127cfcc148cfbf4a86064b6d0 (diff) | |
download | ruby-d6872f21d21406abcc4621231d89a63ba69999bf.tar.gz ruby-d6872f21d21406abcc4621231d89a63ba69999bf.tar.xz ruby-d6872f21d21406abcc4621231d89a63ba69999bf.zip |
merges r24403 and r24439 from trunk into ruby_1_9_1.
--
* eval.c (rb_exc_raise, rb_exc_fatal): require exception object.
[ruby-core:24767]
--
* eval.c (rb_exc_raise, rb_exc_fatal): nil is used to reraise.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@24476 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'eval.c')
-rw-r--r-- | eval.c | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -413,12 +413,18 @@ rb_longjmp(int tag, VALUE mesg) void rb_exc_raise(VALUE mesg) { + if (!NIL_P(mesg)) { + mesg = rb_make_exception(1, &mesg); + } rb_longjmp(TAG_RAISE, mesg); } void rb_exc_fatal(VALUE mesg) { + if (!NIL_P(mesg)) { + mesg = rb_make_exception(1, &mesg); + } rb_longjmp(TAG_FATAL, mesg); } |