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

merge revision(s) 19710:

Browse source 
* 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_6@21939 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
shyouhei 2009-02-02 02:34:12 +00:00
parent 3a23aad61c
commit 1201b970ee
3 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Mon Feb 2 11:33:26 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:53:14 2009 Tadayoshi Funaba <tadf@dotrb.org> Thu Jan 29 11:53:14 2009 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb (today,now): should produce own instances. * lib/date.rb (today,now): should produce own instances.

12
variable.c
View file

@ -1325,12 +1325,8 @@ autoload_delete(mod, id)
st_delete(tbl, (st_data_t*)&id, &load); st_delete(tbl, (st_data_t*)&id, &load);
if (tbl->num_entries == 0) { if (tbl->num_entries == 0) {
DATA_PTR(val) = 0;
st_free_table(tbl);
id = autoload; id = autoload;
if (st_delete(RCLASS(mod)->iv_tbl, (st_data_t*)&id, &val)) { st_delete(RCLASS(mod)->iv_tbl, (st_data_t*)&id, &val);
rb_gc_force_recycle(val);
}
} }
} }
@ -1376,12 +1372,8 @@ autoload_file(mod, id)
/* already loaded but not defined */ /* already loaded but not defined */
st_delete(tbl, (st_data_t*)&id, 0); st_delete(tbl, (st_data_t*)&id, 0);
if (!tbl->num_entries) { if (!tbl->num_entries) {
DATA_PTR(val) = 0;
st_free_table(tbl);
id = autoload; id = autoload;
if (st_delete(RCLASS(mod)->iv_tbl, (st_data_t*)&id, &val)) { st_delete(RCLASS(mod)->iv_tbl, (st_data_t*)&id, &val);
rb_gc_force_recycle(val);
}
} }
return Qnil; return Qnil;
} }

11
version.h
View file

@ -1,15 +1,15 @@
#define RUBY_VERSION "1.8.6" #define RUBY_VERSION "1.8.6"
#define RUBY_RELEASE_DATE "2009-01-29" #define RUBY_RELEASE_DATE "2009-02-02"
#define RUBY_VERSION_CODE 186 #define RUBY_VERSION_CODE 186
#define RUBY_RELEASE_CODE 20090129 #define RUBY_RELEASE_CODE 20090202
#define RUBY_PATCHLEVEL 315 #define RUBY_PATCHLEVEL 316
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
#define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_MINOR 8
#define RUBY_VERSION_TEENY 6 #define RUBY_VERSION_TEENY 6
#define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 1 #define RUBY_RELEASE_MONTH 2
#define RUBY_RELEASE_DAY 29 #define RUBY_RELEASE_DAY 2
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];
@ -20,3 +20,4 @@ RUBY_EXTERN const int ruby_patchlevel;