From a070c4fbe3cff184d224d1abb8a3101e3c11fc48 Mon Sep 17 00:00:00 2001 From: akr Date: Mon, 19 Nov 2007 09:09:38 +0000 Subject: * configure.in: check struct timespec, clock_gettime, utimensat, struct stat.st_atim, struct stat.st_atimespec, struct stat.st_atimensec, struct stat.st_mtim, struct stat.st_mtimespec, struct stat.st_mtimensec, struct stat.st_ctim, struct stat.st_ctimespec, struct stat.st_ctimensec. * include/ruby/missing.h: provide struct timespec if not available. * time.c: support nanosecond-resolution using struct timespec. * include/ruby/intern.h: provide rb_time_nano_new. * file.c (utime_internal): use utimensat if available. (rb_file_s_utime): refactored. (rb_f_test): use stat_atime, stat_mtime, stat_ctime. (rb_stat_cmp): check tv_nsec. (stat_atimespec): new function. (stat_atime): ditto. (stat_mtimespec): ditto. (stat_mtime): ditto. (stat_ctimespec): ditto. (stat_ctime): ditto. (rb_stat_atime): use stat_atime. (rb_file_s_atime): ditto. (rb_file_atime): ditto. (rb_stat_mtime): use stat_mtime. (rb_file_s_mtime): ditto. (rb_file_mtime): ditto. (rb_file_ctime): use stat_ctime. (rb_file_s_ctime): ditto. (rb_stat_ctime): ditto. * variable.c (rb_copy_generic_ivar): clear clone's instance variables if obj has no instance variable. * marshal.c (w_object): dump instance variables of generated string for TYPE_USERDEF, even if original object has instance variables. * lib/time.rb (Time#xmlschema): use nsec instead of usec. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13968 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- variable.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'variable.c') diff --git a/variable.c b/variable.c index 5106c8af41..6700ead280 100644 --- a/variable.c +++ b/variable.c @@ -907,10 +907,20 @@ rb_copy_generic_ivar(VALUE clone, VALUE obj) st_data_t data; if (!generic_iv_tbl) return; - if (!FL_TEST(obj, FL_EXIVAR)) return; + if (!FL_TEST(obj, FL_EXIVAR)) { +clear: + if (FL_TEST(clone, FL_EXIVAR)) { + rb_free_generic_ivar(clone); + FL_UNSET(clone, FL_EXIVAR); + } + return; + } if (st_lookup(generic_iv_tbl, obj, &data)) { st_table *tbl = (st_table *)data; + if (tbl->num_entries == 0) + goto clear; + if (st_lookup(generic_iv_tbl, clone, &data)) { st_free_table((st_table *)data); st_insert(generic_iv_tbl, clone, (st_data_t)st_copy(tbl)); -- cgit v1.2.3