mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* gc.c (define_final): cannot define finalizer for immediate
values. [ruby-core:21500] * gc.c (define_final): freezes or hides internal values. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@21727 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
547f4725fa
commit
3ec5526268
2 changed files with 16 additions and 2 deletions
|
@ -1,3 +1,10 @@
|
||||||
|
Thu Jan 22 12:19:29 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* gc.c (define_final): cannot define finalizer for immediate
|
||||||
|
values. [ruby-core:21500]
|
||||||
|
|
||||||
|
* gc.c (define_final): freezes or hides internal values.
|
||||||
|
|
||||||
Thu Jan 22 11:57:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
Thu Jan 22 11:57:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
* gc.c (rb_gc_call_finalizer_at_exit): deffers IO finalization.
|
* gc.c (rb_gc_call_finalizer_at_exit): deffers IO finalization.
|
||||||
|
|
11
gc.c
11
gc.c
|
@ -1904,9 +1904,14 @@ define_final(argc, argv, os)
|
||||||
rb_obj_classname(block));
|
rb_obj_classname(block));
|
||||||
}
|
}
|
||||||
need_call_final = 1;
|
need_call_final = 1;
|
||||||
FL_SET(obj, FL_FINALIZE);
|
if (!FL_ABLE(obj)) {
|
||||||
|
rb_raise(rb_eArgError, "cannot define finalizer for %s",
|
||||||
|
rb_obj_classname(obj));
|
||||||
|
}
|
||||||
|
RBASIC(obj)->flags |= FL_FINALIZE;
|
||||||
|
|
||||||
block = rb_ary_new3(2, INT2FIX(ruby_safe_level), block);
|
block = rb_ary_new3(2, INT2FIX(ruby_safe_level), block);
|
||||||
|
OBJ_FREEZE(block);
|
||||||
|
|
||||||
if (!finalizer_table) {
|
if (!finalizer_table) {
|
||||||
finalizer_table = st_init_numtable();
|
finalizer_table = st_init_numtable();
|
||||||
|
@ -1915,7 +1920,9 @@ define_final(argc, argv, os)
|
||||||
rb_ary_push(table, block);
|
rb_ary_push(table, block);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
st_add_direct(finalizer_table, obj, rb_ary_new3(1, block));
|
table = rb_ary_new3(1, block);
|
||||||
|
RBASIC(table)->klass = 0;
|
||||||
|
st_add_direct(finalizer_table, obj, table);
|
||||||
}
|
}
|
||||||
return block;
|
return block;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue