ruby-changes:9409
From: yugui <ko1@a...>
Date: Tue, 23 Dec 2008 20:47:33 +0900 (JST)
Subject: [ruby-changes:9409] Ruby:r20947 (ruby_1_9_1): merges r20866 and r20891 from trunk into ruby_1_9_1.
yugui 2008-12-23 20:47:14 +0900 (Tue, 23 Dec 2008) New Revision: 20947 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20947 Log: merges r20866 and r20891 from trunk into ruby_1_9_1. * error.c (exc_equal): duck typing equal to make it transitive. [ruby-dev:34880] Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/error.c Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 20946) +++ ruby_1_9_1/ChangeLog (revision 20947) @@ -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:34808] + Mon Dec 22 15:25:03 2008 Yuki Sonoda (Yugui) <yugui@y...> * thread.c (Thread#set_trace_func, #add_trace_func): removed. Index: ruby_1_9_1/error.c =================================================================== --- ruby_1_9_1/error.c (revision 20946) +++ ruby_1_9_1/error.c (revision 20947) @@ -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/