archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-15 16:44:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merges r20866 and r20891 from trunk into ruby_1_9_1.

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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20947 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2008-12-23 11:47:14 +00:00
parent e31e4f2a6b
commit eafe686380
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
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> Mon Dec 22 15:25:03 2008 Yuki Sonoda (Yugui) <yugui@yugui.jp>
* thread.c (Thread#set_trace_func, #add_trace_func): removed. * thread.c (Thread#set_trace_func, #add_trace_func): removed.

15
error.c
View file

@ -554,15 +554,22 @@ exc_set_backtrace(VALUE exc, VALUE bt)
static VALUE static VALUE
exc_equal(VALUE exc, VALUE obj) exc_equal(VALUE exc, VALUE obj)
{ {
VALUE mesg, backtrace;
ID id_mesg; ID id_mesg;
if (exc == obj) return Qtrue; if (exc == obj) return Qtrue;
if (rb_obj_class(exc) != rb_obj_class(obj))
return Qfalse;
CONST_ID(id_mesg, "mesg"); 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; return Qfalse;
if (!rb_equal(exc_backtrace(exc), exc_backtrace(obj))) if (!rb_equal(exc_backtrace(exc), backtrace))
return Qfalse; return Qfalse;
return Qtrue; return Qtrue;
} }