From a5bfe7ca837c81e2df0329d4004fabfb4178362e Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 13 Jan 2012 07:44:50 +0000 Subject: [PATCH] * error.c (exc_equal): try implicit conversion for delegator. [ruby-core:41979] [Bug #5865] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34291 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ error.c | 6 +++++- test/ruby/test_exception.rb | 6 ++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 42548dc844..eaa61bdf0a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Fri Jan 13 16:44:45 2012 Nobuyoshi Nakada + + * error.c (exc_equal): try implicit conversion for delegator. + [ruby-core:41979] [Bug #5865] + Fri Jan 13 03:46:53 2012 Akinori MUSHA * lib/shellwords.rb (Shellwords#shellescape): shellescape() now diff --git a/error.c b/error.c index 6844f992a6..a600b171db 100644 --- a/error.c +++ b/error.c @@ -732,10 +732,14 @@ exc_equal(VALUE exc, VALUE obj) CONST_ID(id_mesg, "mesg"); if (rb_obj_class(exc) != rb_obj_class(obj)) { - ID id_message, id_backtrace; + ID id_exception, id_message, id_backtrace; + CONST_ID(id_exception, "exception"); CONST_ID(id_message, "message"); CONST_ID(id_backtrace, "backtrace"); + obj = rb_check_funcall(obj, id_exception, 0, 0); + if (obj == Qundef) return Qfalse; + if (rb_obj_class(exc) != rb_obj_class(obj)) return Qfalse; mesg = rb_check_funcall(obj, id_message, 0, 0); if (mesg == Qundef) return Qfalse; backtrace = rb_check_funcall(obj, id_backtrace, 0, 0); diff --git a/test/ruby/test_exception.rb b/test/ruby/test_exception.rb index 028391d1e6..22ac2aca1f 100644 --- a/test/ruby/test_exception.rb +++ b/test/ruby/test_exception.rb @@ -380,4 +380,10 @@ end.join load(t.path) end end + + def test_equal + bug5865 = '[ruby-core:41979]' + assert_equal(RuntimeError.new("a"), RuntimeError.new("a"), bug5865) + assert_not_equal(RuntimeError.new("a"), StandardError.new("a"), bug5865) + end end