diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-28 09:21:08 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-28 09:21:08 +0000 |
commit | 508874c8af7ce2f0a8708256e166b001f62870e1 (patch) | |
tree | afce60ccfc66c2e06e02ed7685df03c77c2d13ff | |
parent | 681a27d1f32acfa642aa39491bf2dd85474365c8 (diff) |
merges the 1/2 of r21727 from trunk into ruby_1_9_1.
* gc.c (define_final): cannot define finalizer for immediate
values. [ruby-core:21500]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21820 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | gc.c | 7 |
2 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,8 @@ +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] + Thu Jan 22 11:33:08 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * thread.c (rb_time_timeval): made a real prototype. a patch from @@ -2290,9 +2290,14 @@ define_final(int argc, VALUE *argv, VALUE os) rb_raise(rb_eArgError, "wrong type argument %s (should be callable)", rb_obj_classname(block)); } - 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(rb_safe_level()), block); + OBJ_FREEZE(block); if (!finalizer_table) { finalizer_table = st_init_numtable(); |