From e2384dd69c624555916b1162b0e7f9bd6a8480a4 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 16 Nov 2015 09:21:56 +0000 Subject: struct.c: dig * object.c (rb_obj_dig): dig in nested structs too. * struct.c (rb_struct_dig): new method Struct#dig. [Feature #11688] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52596 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- object.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'object.c') diff --git a/object.c b/object.c index ed5d12ea2c..5023f64b0d 100644 --- a/object.c +++ b/object.c @@ -3165,7 +3165,7 @@ dig_basic_p(VALUE obj, struct dig_method *cache) VALUE rb_obj_dig(int argc, VALUE *argv, VALUE obj, VALUE notfound) { - struct dig_method hash = {Qnil}, ary = {Qnil}; + struct dig_method hash = {Qnil}, ary = {Qnil}, strt = {Qnil}; for (; argc > 0; ++argv, --argc) { if (!SPECIAL_CONST_P(obj)) { @@ -3181,6 +3181,13 @@ rb_obj_dig(int argc, VALUE *argv, VALUE obj, VALUE notfound) obj = rb_ary_at(obj, *argv); continue; } + break; + case T_STRUCT: + if (dig_basic_p(obj, &strt)) { + obj = rb_struct_lookup(obj, *argv); + continue; + } + break; } } return rb_check_funcall_default(obj, id_dig, argc, argv, notfound); -- cgit v1.2.3