summaryrefslogtreecommitdiff
path: root/error.c
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-23 11:51:03 +0000
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-23 11:51:03 +0000
commit353da8cccd6fdf47fc834ef95c48c95c62af38a6 (patch)
tree689693452d1cbc502b936ea167d0d8cef22c41f7 /error.c
parenteb9cbe40959598413e4fa0c8794d1514315ccfb1 (diff)
Revert r20947. This feature is still under development.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'error.c')
-rw-r--r--error.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/error.c b/error.c
index 90a7d417e5..c28a855ea7 100644
--- a/error.c
+++ b/error.c
@@ -554,22 +554,15 @@ exc_set_backtrace(VALUE exc, VALUE bt)
static VALUE
exc_equal(VALUE exc, VALUE obj)
{
- VALUE mesg, backtrace;
ID id_mesg;
if (exc == obj) return Qtrue;
+ if (rb_obj_class(exc) != rb_obj_class(obj))
+ return Qfalse;
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);
- }
- else {
- mesg = rb_attr_get(obj, id_mesg);
- backtrace = exc_backtrace(obj);
- }
- if (!rb_equal(rb_attr_get(exc, id_mesg), mesg))
+ if (!rb_equal(rb_attr_get(exc, id_mesg), rb_attr_get(obj, id_mesg)))
return Qfalse;
- if (!rb_equal(exc_backtrace(exc), backtrace))
+ if (!rb_equal(exc_backtrace(exc), exc_backtrace(obj)))
return Qfalse;
return Qtrue;
}