summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-02 02:37:26 +0000
committershyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-02 02:37:26 +0000
commitc34256906e27f8381649423efa1ffa4c7d372428 (patch)
tree57fef6f5e4451255daf4539e0bb2a75b4c51d81b
parent18b9473a6cf09fae0a75e88d4ac64177bd32ed47 (diff)
merge revision(s) 19710:
* variable.c (autoload_delete, autoload_file): should not delete autoload table, since it may be shared with duplicated modules. [ruby-core:19181] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@21941 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--variable.c12
-rw-r--r--version.h11
3 files changed, 14 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 9fb82fd..5f5e23b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Feb 2 11:34:51 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * variable.c (autoload_delete, autoload_file): should not delete
+ autoload table, since it may be shared with duplicated modules.
+ [ruby-core:19181]
+
Thu Jan 29 11:54:22 2009 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb (today,now): should produce own instances.
diff --git a/variable.c b/variable.c
index ed5bd84..53143ca 100644
--- a/variable.c
+++ b/variable.c
@@ -1338,12 +1338,8 @@ autoload_delete(mod, id)
st_delete(tbl, (st_data_t*)&id, &load);
if (tbl->num_entries == 0) {
- DATA_PTR(val) = 0;
- st_free_table(tbl);
id = autoload;
- if (st_delete(RCLASS(mod)->iv_tbl, (st_data_t*)&id, &val)) {
- rb_gc_force_recycle(val);
- }
+ st_delete(RCLASS(mod)->iv_tbl, (st_data_t*)&id, &val);
}
}
@@ -1389,12 +1385,8 @@ autoload_file(mod, id)
/* already loaded but not defined */
st_delete(tbl, (st_data_t*)&id, 0);
if (!tbl->num_entries) {
- DATA_PTR(val) = 0;
- st_free_table(tbl);
id = autoload;
- if (st_delete(RCLASS(mod)->iv_tbl, (st_data_t*)&id, &val)) {
- rb_gc_force_recycle(val);
- }
+ st_delete(RCLASS(mod)->iv_tbl, (st_data_t*)&id, &val);
}
return Qnil;
}
diff --git a/version.h b/version.h
index fc4754c..63159da 100644
--- a/version.h
+++ b/version.h
@@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2009-01-29"
+#define RUBY_RELEASE_DATE "2009-02-02"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20090129
-#define RUBY_PATCHLEVEL 101
+#define RUBY_RELEASE_CODE 20090202
+#define RUBY_PATCHLEVEL 102
#define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2009
-#define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 29
+#define RUBY_RELEASE_MONTH 2
+#define RUBY_RELEASE_DAY 2
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];
@@ -31,3 +31,4 @@ RUBY_EXTERN const char *ruby_copyright;
+