1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* object.c (init_copy): call initialize_copy at the end of copy

process.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3836 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2003-05-20 08:40:50 +00:00
parent fdc0d3306c
commit 56a4cc27ed
2 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Tue May 20 17:39:15 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* object.c (init_copy): call initialize_copy at the end of copy
process.
Tue May 20 17:15:55 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* error.c (syserr_initialize): use Errno constants as default

View file

@ -112,7 +112,6 @@ init_copy(dest, obj)
}
RBASIC(dest)->flags &= ~(T_MASK|FL_EXIVAR);
RBASIC(dest)->flags |= RBASIC(obj)->flags & (T_MASK|FL_EXIVAR|FL_TAINT);
rb_funcall(dest, id_init_copy, 1, obj);
if (FL_TEST(obj, FL_EXIVAR)) {
rb_copy_generic_ivar(dest, obj);
}
@ -129,6 +128,7 @@ init_copy(dest, obj)
ROBJECT(dest)->iv_tbl = st_copy(ROBJECT(obj)->iv_tbl);
}
}
rb_funcall(dest, id_init_copy, 1, obj);
}
VALUE
@ -141,9 +141,9 @@ rb_obj_clone(obj)
rb_raise(rb_eTypeError, "can't clone %s", rb_obj_classname(obj));
}
clone = rb_obj_alloc(rb_obj_class(obj));
init_copy(clone, obj);
RBASIC(clone)->klass = rb_singleton_class_clone(obj);
RBASIC(clone)->flags = RBASIC(obj)->flags | FL_TEST(clone, FL_TAINT);
init_copy(clone, obj);
return clone;
}