matz	2008-12-19 08:42:00 +0900 (Fri, 19 Dec 2008)

  New Revision: 20866

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

  Log:
    * error.c (exc_equal): duck typing equal to make it transitive.
      [ruby-dev:34880]

  Modified files:
    trunk/ChangeLog
    trunk/error.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 20865)
+++ ChangeLog	(revision 20866)
@@ -1,3 +1,8 @@
+Fri Dec 19 07:45:37 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* error.c (exc_equal): duck typing equal to make it transitive.
+	  [ruby-dev:34880]
+
 Thu Dec 18 19:31:54 2008  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* lib/irb/init.rb (IRB.opt_parse): (M17N) adds -U and -E as command
Index: error.c
===================================================================
--- error.c	(revision 20865)
+++ error.c	(revision 20866)
@@ -554,15 +554,22 @@
 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_equal(rb_attr_get(exc, id_mesg), rb_attr_get(obj, id_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))
 	return Qfalse;
-    if (!rb_equal(exc_backtrace(exc), exc_backtrace(obj)))
+    if (!rb_equal(exc_backtrace(exc), backtrace))
 	return Qfalse;
     return Qtrue;
 }

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