ruby-changes:7404
From: ko1 <ko1@a...>
Date: Fri, 29 Aug 2008 20:23:29 +0900 (JST)
Subject: [ruby-changes:7404] Ruby:r18923 (trunk): * gc.c, include/ruby/ruby.h: rename T_DEFERRED to T_ZOMBIE.
ko1 2008-08-29 20:22:42 +0900 (Fri, 29 Aug 2008) New Revision: 18923 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=18923 Log: * gc.c, include/ruby/ruby.h: rename T_DEFERRED to T_ZOMBIE. Modified files: trunk/ChangeLog trunk/gc.c trunk/include/ruby/ruby.h Index: include/ruby/ruby.h =================================================================== --- include/ruby/ruby.h (revision 18922) +++ include/ruby/ruby.h (revision 18923) @@ -319,7 +319,7 @@ RUBY_T_UNDEF = 0x1b, RUBY_T_NODE = 0x1c, RUBY_T_ICLASS = 0x1d, - RUBY_T_DEFERRED = 0x1e, + RUBY_T_ZOMBIE = 0x1e, RUBY_T_MASK = 0x1f }; @@ -348,7 +348,7 @@ #define T_COMPLEX RUBY_T_COMPLEX #define T_UNDEF RUBY_T_UNDEF #define T_NODE RUBY_T_NODE -#define T_DEFERRED RUBY_T_DEFERRED +#define T_ZOMBIE RUBY_T_ZOMBIE #define T_MASK RUBY_T_MASK #define BUILTIN_TYPE(x) (((struct RBasic*)(x))->flags & T_MASK) Index: ChangeLog =================================================================== --- ChangeLog (revision 18922) +++ ChangeLog (revision 18923) @@ -1,3 +1,7 @@ +Fri Aug 29 19:46:02 2008 Koichi Sasada <ko1@a...> + + * gc.c, include/ruby/ruby.h: rename T_DEFERRED to T_ZOMBIE. + Fri Aug 29 18:22:27 2008 NARUSE, Yui <naruse@r...> * encoding.c (enc_compatible_p): raise TypeError when argument is not Index: gc.c =================================================================== --- gc.c (revision 18922) +++ gc.c (revision 18923) @@ -1652,7 +1652,7 @@ ((deferred = obj_free(objspace, (VALUE)p)) || ((FL_TEST(p, FL_FINALIZE)) && need_call_final))) { if (!deferred) { - p->as.free.flags = T_DEFERRED; + p->as.free.flags = T_ZOMBIE; RDATA(p)->dfree = 0; } p->as.free.flags |= FL_MARK; @@ -1665,7 +1665,7 @@ free_num++; } } - else if (BUILTIN_TYPE(p) == T_DEFERRED) { + else if (BUILTIN_TYPE(p) == T_ZOMBIE) { /* objects to be finalized */ /* do nothing remain marked */ } @@ -1724,7 +1724,7 @@ static inline void make_deferred(RVALUE *p) { - p->as.basic.flags = (p->as.basic.flags & ~T_MASK) | T_DEFERRED; + p->as.basic.flags = (p->as.basic.flags & ~T_MASK) | T_ZOMBIE; } static int @@ -2127,7 +2127,7 @@ case T_NONE: case T_ICLASS: case T_NODE: - case T_DEFERRED: + case T_ZOMBIE: continue; case T_CLASS: if (FL_TEST(p, FL_SINGLETON)) continue; @@ -2327,8 +2327,8 @@ { RVALUE *p = (RVALUE *)key, **final_list = (RVALUE **)arg; if (p->as.basic.flags & FL_FINALIZE) { - if (BUILTIN_TYPE(p) != T_DEFERRED) { - p->as.free.flags = FL_MARK | T_DEFERRED; /* remain marked */ + if (BUILTIN_TYPE(p) != T_ZOMBIE) { + p->as.free.flags = FL_MARK | T_ZOMBIE; /* remain marked */ RDATA(p)->dfree = 0; } p->as.free.next = *final_list; @@ -2622,7 +2622,7 @@ COUNT_TYPE(T_UNDEF); COUNT_TYPE(T_NODE); COUNT_TYPE(T_ICLASS); - COUNT_TYPE(T_DEFERRED); + COUNT_TYPE(T_ZOMBIE); #undef COUNT_TYPE default: type = INT2NUM(i); break; } -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/