diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-09 00:05:03 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-09 00:05:03 +0000 |
commit | 0b85e2a0a7d95a7572fff1650d0217d66d7defda (patch) | |
tree | 111f6c70763de59fd2d88381ad817d9a9ddf1642 /gc.c | |
parent | 2d281863caef13ca12530822f682d174f833cee6 (diff) |
merge revision(s) 21727:
* 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_7@22834 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'gc.c')
-rw-r--r-- | gc.c | 11 |
1 files changed, 9 insertions, 2 deletions
@@ -1887,9 +1887,14 @@ define_final(argc, argv, os) rb_obj_classname(block)); } 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); + OBJ_FREEZE(block); if (!finalizer_table) { finalizer_table = st_init_numtable(); @@ -1898,7 +1903,9 @@ define_final(argc, argv, os) rb_ary_push(table, block); } 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; } |