kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases 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/branches/ruby_1_8@17615 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2008-06-27 12:56:45 +00:00
parent 477ba18291
commit 4f7c0a79fd
2 changed files with 20 additions and 10 deletions
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 15:05:06 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri Jun 27 15:05:06 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (-IF-NO-STRING-LITERAL-CONCATENATION-): make description * common.mk (-IF-NO-STRING-LITERAL-CONCATENATION-): make description

25
struct.c
View file

@ -206,7 +206,6 @@ make_struct(name, members, 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(members)->len));
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);
@ -326,6 +325,17 @@ rb_struct_s_def(argc, argv, 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);
}
/* /*
*/ */
@ -334,12 +344,10 @@ rb_struct_initialize(self, values)
VALUE self, values; VALUE self, 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(values)->len) { if (n < RARRAY(values)->len) {
rb_raise(rb_eArgError, "struct size differs"); rb_raise(rb_eArgError, "struct size differs");
} }
@ -355,13 +363,11 @@ static VALUE
struct_alloc(klass) struct_alloc(klass)
VALUE klass; 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);
st->ptr = ALLOC_N(VALUE, n); st->ptr = ALLOC_N(VALUE, n);
rb_mem_clear(st->ptr, n); rb_mem_clear(st->ptr, n);
@ -386,12 +392,11 @@ rb_struct_new(klass, va_alist)
va_dcl va_dcl
#endif #endif
{ {
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_init_list(args, klass); va_init_list(args, klass);
for (i=0; i<size; i++) { for (i=0; i<size; i++) {