1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* gc.c: __size__ removed. use the length of __members__ instead.

Browse Source 
(num_members): new function.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17615 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-06-27 12:56:45 +00:00
parent 4bcf877beb
commit dfbf04166a
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Jun 27 21:38:57 2008 Tanaka Akira <akr@fsij.org>
* gc.c: __size__ removed. use the length of __members__ instead.
(num_members): new function.
Fri Jun 27 21:19:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Jun 27 21:19:08 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* test/inlinetest.rb (InlineTest.in_progname): workaround for frozen * test/inlinetest.rb (InlineTest.in_progname): workaround for frozen

26
struct.c
View File

@ -193,7 +193,6 @@ make_struct(VALUE name, VALUE members, VALUE klass)
} }
nstr = rb_define_class_under(klass, rb_id2name(id), klass); nstr = rb_define_class_under(klass, rb_id2name(id), klass);
} }
rb_iv_set(nstr, "__size__", LONG2NUM(RARRAY_LEN(members)));
rb_iv_set(nstr, "__members__", members); rb_iv_set(nstr, "__members__", members);
rb_define_alloc_func(nstr, struct_alloc); rb_define_alloc_func(nstr, struct_alloc);
@ -249,7 +248,6 @@ rb_struct_define_without_accessor(const char *class_name, VALUE super, rb_alloc_
rb_class_inherited(super, klass); rb_class_inherited(super, klass);
} }
rb_iv_set(klass, "__size__", LONG2NUM(RARRAY_LEN(members)));
rb_iv_set(klass, "__members__", members); rb_iv_set(klass, "__members__", members);
if (alloc) if (alloc)
@ -340,6 +338,17 @@ rb_struct_s_def(int argc, VALUE *argv, VALUE klass)
return st; return st;
} }
static size_t
num_members(VALUE klass)
{
VALUE members;
members = rb_struct_iv_get(klass, "__members__");
if (TYPE(members) != T_ARRAY) {
rb_raise(rb_eTypeError, "broken members");
}
return RARRAY_LEN(members);
}
/* /*
*/ */
@ -347,12 +356,10 @@ VALUE
rb_struct_initialize(VALUE self, VALUE values) rb_struct_initialize(VALUE self, VALUE values)
{ {
VALUE klass = rb_obj_class(self); VALUE klass = rb_obj_class(self);
VALUE size;
long n; long n;
rb_struct_modify(self); rb_struct_modify(self);
size = rb_struct_iv_get(klass, "__size__"); n = num_members(klass);
n = FIX2LONG(size);
if (n < RARRAY_LEN(values)) { if (n < RARRAY_LEN(values)) {
rb_raise(rb_eArgError, "struct size differs"); rb_raise(rb_eArgError, "struct size differs");
} }
@ -367,13 +374,11 @@ rb_struct_initialize(VALUE self, VALUE values)
static VALUE static VALUE
struct_alloc(VALUE klass) struct_alloc(VALUE klass)
{ {
VALUE size;
long n; long n;
NEWOBJ(st, struct RStruct); NEWOBJ(st, struct RStruct);
OBJSETUP(st, klass, T_STRUCT); OBJSETUP(st, klass, T_STRUCT);
size = rb_struct_iv_get(klass, "__size__"); n = num_members(klass);
n = FIX2LONG(size);
if (0 < n && n <= RSTRUCT_EMBED_LEN_MAX) { if (0 < n && n <= RSTRUCT_EMBED_LEN_MAX) {
RBASIC(st)->flags &= ~RSTRUCT_EMBED_LEN_MASK; RBASIC(st)->flags &= ~RSTRUCT_EMBED_LEN_MASK;
@ -398,12 +403,11 @@ rb_struct_alloc(VALUE klass, VALUE values)
VALUE VALUE
rb_struct_new(VALUE klass, ...) rb_struct_new(VALUE klass, ...)
{ {
VALUE sz, *mem; VALUE *mem;
long size, i; long size, i;
va_list args; va_list args;
sz = rb_struct_iv_get(klass, "__size__"); size = num_members(klass);
size = FIX2LONG(sz);
mem = ALLOCA_N(VALUE, size); mem = ALLOCA_N(VALUE, size);
va_start(args, klass); va_start(args, klass);
for (i=0; i<size; i++) { for (i=0; i<size; i++) {