shyouhei	2009-02-02 11:37:26 +0900 (Mon, 02 Feb 2009)

  New Revision: 21941

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21941

  Log:
    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]

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/variable.c
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 21940)
+++ ruby_1_8_7/ChangeLog	(revision 21941)
@@ -1,3 +1,9 @@
+Mon Feb  2 11:34:51 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@d...>
 
 	* lib/date.rb (today,now): should produce own instances.
Index: ruby_1_8_7/variable.c
===================================================================
--- ruby_1_8_7/variable.c	(revision 21940)
+++ ruby_1_8_7/variable.c	(revision 21941)
@@ -1338,12 +1338,8 @@
 	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 @@
     /* 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;
 }
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 21940)
+++ ruby_1_8_7/version.h	(revision 21941)
@@ -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 @@
 
 
 
+

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/