diff options
author | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-24 12:02:21 +0000 |
---|---|---|
committer | ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-24 12:02:21 +0000 |
commit | 7160543aeb8a9f5d7b2f26d3c7b0d7702016f831 (patch) | |
tree | f21bae4ea5f45f4a5cfe178ea7fac157a91bf427 /error.c | |
parent | f0da2e1657e645233faff25faeb05905dd350623 (diff) | |
download | ruby-7160543aeb8a9f5d7b2f26d3c7b0d7702016f831.tar.gz |
* error.c (exc_equal): == method should not raise Exception.
[ruby-dev:37519]
* sample/test.rb: fix test.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'error.c')
-rw-r--r-- | error.c | 15 |
1 files changed, 13 insertions, 2 deletions
@@ -559,14 +559,25 @@ exc_equal(VALUE exc, VALUE obj) if (exc == obj) return Qtrue; CONST_ID(id_mesg, "mesg"); + if (rb_obj_class(exc) != rb_obj_class(obj)) { - mesg = rb_funcall(obj, rb_intern("message"), 0, 0); - backtrace = rb_funcall(obj, rb_intern("backtrace"), 0, 0); + ID id_message, id_backtrace; + CONST_ID(id_message, "message"); + CONST_ID(id_backtrace, "backtrace"); + + if (rb_respond_to(obj, id_message) && rb_respond_to(obj, id_backtrace)) { + mesg = rb_funcall(obj, id_message, 0, 0); + backtrace = rb_funcall(obj, id_backtrace, 0, 0); + } + else { + return Qfalse; + } } else { mesg = rb_attr_get(obj, id_mesg); backtrace = exc_backtrace(obj); } + if (!rb_equal(rb_attr_get(exc, id_mesg), mesg)) return Qfalse; if (!rb_equal(exc_backtrace(exc), backtrace)) |