nobu	2012-01-13 16:44:50 +0900 (Fri, 13 Jan 2012)

  New Revision: 34291

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34291

  Log:
    * error.c (exc_equal): try implicit conversion for delegator.
      [ruby-core:41979] [Bug #5865]

  Modified files:
    trunk/ChangeLog
    trunk/error.c
    trunk/test/ruby/test_exception.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34290)
+++ ChangeLog	(revision 34291)
@@ -1,3 +1,8 @@
+Fri Jan 13 16:44:45 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* error.c (exc_equal): try implicit conversion for delegator.
+	  [ruby-core:41979] [Bug #5865]
+
 Fri Jan 13 03:46:53 2012  Akinori MUSHA  <knu@i...>
 
 	* lib/shellwords.rb (Shellwords#shellescape): shellescape() now
Index: error.c
===================================================================
--- error.c	(revision 34290)
+++ error.c	(revision 34291)
@@ -732,10 +732,14 @@
     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);
Index: test/ruby/test_exception.rb
===================================================================
--- test/ruby/test_exception.rb	(revision 34290)
+++ test/ruby/test_exception.rb	(revision 34291)
@@ -380,4 +380,10 @@
       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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/