From c3a46d6acab5ab063cc6b5808c2b344f110bef12 Mon Sep 17 00:00:00 2001 From: nari Date: Sat, 20 Oct 2012 06:57:51 +0000 Subject: * include/ruby/ruby.h: add C APIs. VALUE rb_newobj_of(VALUE klass, VALUE flags) #define NEWOBJ_OF(obj,type,klass,flags) These allow to change a allocation strategy depending on klass or flags. * gc.c: ditto * array.c: use new C API. * bignum.c: ditto * class.c: ditto * complex.c: ditto * ext/socket/ancdata.c: ditto * ext/socket/option.c: ditto * hash.c: ditto * io.c: ditto * marshal.c: ditto * numeric.c: ditto * object.c: ditto * random.c: ditto * range.c: ditto * rational.c: ditto * re.c: ditto * string.c: ditto * struct.c: ditto [Feature #7177][Feature #7047] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37275 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- hash.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'hash.c') diff --git a/hash.c b/hash.c index 1ddf23aea2..ea9dd87d8d 100644 --- a/hash.c +++ b/hash.c @@ -207,8 +207,7 @@ rb_hash_foreach(VALUE hash, int (*func)(ANYARGS), VALUE farg) static VALUE hash_alloc(VALUE klass) { - NEWOBJ(hash, struct RHash); - OBJSETUP(hash, klass, T_HASH); + NEWOBJ_OF(hash, struct RHash, klass, T_HASH); RHASH_IFNONE(hash) = Qnil; @@ -224,8 +223,11 @@ rb_hash_new(void) VALUE rb_hash_dup(VALUE hash) { - NEWOBJ(ret, struct RHash); - DUPSETUP(ret, hash); + NEWOBJ_OF(ret, struct RHash, + rb_obj_class(hash), + (RBASIC(hash)->flags)&(T_MASK|FL_EXIVAR|FL_TAINT|FL_UNTRUSTED)); + if (FL_TEST((hash), FL_EXIVAR)) + rb_copy_generic_ivar((VALUE)(ret),(VALUE)(hash)); if (!RHASH_EMPTY_P(hash)) ret->ntbl = st_copy(RHASH(hash)->ntbl); -- cgit v1.2.3