From 01195a202cb9fcc6ddb6cf793868e4c7d85292dc Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 24 Dec 2014 03:16:31 +0000 Subject: ruby.h: parent in rb_data_type_t * ruby.h (rb_data_type_t): revert r48647 and revise parent member. [ruby-core:66969] [Bug #10621] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48962 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- error.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'error.c') diff --git a/error.c b/error.c index 70bbb233c9..0e8e17b195 100644 --- a/error.c +++ b/error.c @@ -541,8 +541,10 @@ rb_check_type(VALUE x, int t) int rb_typeddata_inherited_p(const rb_data_type_t *child, const rb_data_type_t *parent) { - rb_warn("rb_typeddata_inherited_p() is deprecated"); - if (child == parent) return 1; + while (child) { + if (child == parent) return 1; + child = child->parent; + } return 0; } @@ -550,7 +552,7 @@ int rb_typeddata_is_kind_of(VALUE obj, const rb_data_type_t *data_type) { if (!RB_TYPE_P(obj, T_DATA) || - !RTYPEDDATA_P(obj) || RTYPEDDATA_TYPE(obj) != data_type) { + !RTYPEDDATA_P(obj) || !rb_typeddata_inherited_p(RTYPEDDATA_TYPE(obj), data_type)) { return 0; } return 1; @@ -570,7 +572,7 @@ rb_check_typeddata(VALUE obj, const rb_data_type_t *data_type) etype = rb_obj_classname(obj); rb_raise(rb_eTypeError, mesg, etype, data_type->wrap_struct_name); } - else if (RTYPEDDATA_TYPE(obj) != data_type) { + else if (!rb_typeddata_inherited_p(RTYPEDDATA_TYPE(obj), data_type)) { etype = RTYPEDDATA_TYPE(obj)->wrap_struct_name; rb_raise(rb_eTypeError, mesg, etype, data_type->wrap_struct_name); } -- cgit v1.2.3