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

2 files changed, 4 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 71d54388c0..20dfe50f73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,3 @@
-Fri Dec 19 07:45:37 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
-
-	* error.c (exc_equal): duck typing equal to make it transitive.
-	  [ruby-dev:34808]
-
 Mon Dec 22 15:25:03 2008  Yuki Sonoda (Yugui)  <yugui@yugui.jp>
 
 	* thread.c (Thread#set_trace_func, #add_trace_func): removed.
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;
 }