diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-08 16:47:47 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-08 16:47:47 +0000 |
commit | b16baa9272fbc9309614a625f7a1ad4876d6c839 (patch) | |
tree | bbce7743477820748f940f5770e05fe2d486f8b6 | |
parent | 70cf909fddaa3a4b1e08c1bfb6cfa6fdb12c4c8c (diff) | |
download | ruby-b16baa9272fbc9309614a625f7a1ad4876d6c839.tar.gz |
* eval.c (rb_make_exception): single argument to raise may be
string compatible object.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20585 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | eval.c | 6 |
2 files changed, 8 insertions, 3 deletions
@@ -72,6 +72,11 @@ Sat Dec 6 14:35:06 2008 NARUSE, Yui <naruse@ruby-lang.org> * pack.c (pack_unpack): ditto. +Fri Dec 5 22:56:24 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * eval.c (rb_make_exception): single argument to raise may be + string compatible object. + Fri Dec 5 21:45:45 2008 Tadayoshi Funaba <tadf@dotrb.org> * rational.c (nurat_{to_s,inspect}): performance improvement. @@ -477,13 +477,13 @@ rb_make_exception(int argc, VALUE *argv) mesg = Qnil; switch (argc) { case 0: - mesg = Qnil; break; case 1: if (NIL_P(argv[0])) break; - if (TYPE(argv[0]) == T_STRING) { - mesg = rb_exc_new3(rb_eRuntimeError, argv[0]); + mesg = rb_check_string_type(argv[0]); + if (!NIL_P(mesg)) { + mesg = rb_exc_new3(rb_eRuntimeError, mesg); break; } n = 0; |