From 0bedb2e07f50044ef9625c6d71d1e73f4d9fc977 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 27 Sep 2004 04:46:54 +0000 Subject: * intern.h, struct.c (rb_struct_s_members, rb_struct_members): public accessors. [ruby-dev:24342] * marshal.c (w_object, r_object0): use accessors. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6963 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ intern.h | 2 ++ marshal.c | 7 ++----- struct.c | 37 +++++++++++++++++-------------------- 4 files changed, 28 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 35ca51cb29..a21f1261b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Mon Sep 27 13:46:45 2004 Nobuyoshi Nakada + + * intern.h, struct.c (rb_struct_s_members, rb_struct_members): public + accessors. [ruby-dev:24342] + + * marshal.c (w_object, r_object0): use accessors. + Sun Sep 26 08:05:10 2004 Tadayoshi Funaba * lib/date.rb: provides {Time,Date,DateTime}#to_{time,date,datetime}. diff --git a/intern.h b/intern.h index 25adfd72e3..a798c82b13 100644 --- a/intern.h +++ b/intern.h @@ -444,6 +444,8 @@ VALUE rb_struct_aref _((VALUE, VALUE)); VALUE rb_struct_aset _((VALUE, VALUE, VALUE)); VALUE rb_struct_getmember _((VALUE, ID)); VALUE rb_struct_iv_get _((VALUE, char*)); +VALUE rb_struct_s_members _((VALUE)); +VALUE rb_struct_members _((VALUE)); /* time.c */ VALUE rb_time_new _((time_t, time_t)); /* variable.c */ diff --git a/marshal.c b/marshal.c index 473aee9ccd..f602fffca3 100644 --- a/marshal.c +++ b/marshal.c @@ -635,10 +635,7 @@ w_object(obj, arg, limit) long i; w_long(len, arg); - mem = rb_struct_iv_get(rb_obj_class(obj), "__member__"); - if (mem == Qnil) { - rb_raise(rb_eTypeError, "uninitialized struct"); - } + mem = rb_struct_members(obj); for (i=0; iptr[i]), arg); w_object(RSTRUCT(obj)->ptr[i], arg, limit); @@ -1196,7 +1193,7 @@ r_object0(arg, proc, ivp, extmod) ID slot; klass = path2class(r_unique(arg)); - mem = rb_struct_iv_get(klass, "__member__"); + mem = rb_struct_s_members(klass); if (mem == Qnil) { rb_raise(rb_eTypeError, "uninitialized struct"); } diff --git a/struct.c b/struct.c index 77a5dc128a..65f4eb7863 100644 --- a/struct.c +++ b/struct.c @@ -33,8 +33,8 @@ rb_struct_iv_get(c, name) } } -static VALUE -struct_s_members(klass) +VALUE +rb_struct_s_members(klass) VALUE klass; { VALUE members = rb_struct_iv_get(klass, "__members__"); @@ -45,15 +45,12 @@ struct_s_members(klass) return members; } -static VALUE -struct_members(s) +VALUE +rb_struct_members(s) VALUE s; { - VALUE members = struct_s_members(rb_obj_class(s)); + VALUE members = rb_struct_s_members(rb_obj_class(s)); - if (NIL_P(members)) { - rb_bug("non-initialized struct"); - } if (RSTRUCT(s)->len != RARRAY(members)->len) { rb_raise(rb_eTypeError, "struct size differs (%d required %d given)", RARRAY(members)->len, RSTRUCT(s)->len); @@ -62,13 +59,13 @@ struct_members(s) } static VALUE -rb_struct_s_members(klass) +rb_struct_s_members_m(klass) VALUE klass; { VALUE members, ary; VALUE *p, *pend; - members = struct_s_members(klass); + members = rb_struct_s_members(klass); ary = rb_ary_new2(RARRAY(members)->len); p = RARRAY(members)->ptr; pend = p + RARRAY(members)->len; while (p < pend) { @@ -92,10 +89,10 @@ rb_struct_s_members(klass) */ static VALUE -rb_struct_members(obj) +rb_struct_members_m(obj) VALUE obj; { - return rb_struct_s_members(rb_obj_class(obj)); + return rb_struct_s_members_m(rb_obj_class(obj)); } VALUE @@ -106,7 +103,7 @@ rb_struct_getmember(obj, id) VALUE members, slot; long i; - members = struct_members(obj); + members = rb_struct_members(obj); slot = ID2SYM(id); for (i=0; ilen; i++) { if (RARRAY(members)->ptr[i] == slot) { @@ -164,7 +161,7 @@ rb_struct_set(obj, val) VALUE members, slot; long i; - members = struct_members(obj); + members = rb_struct_members(obj); rb_struct_modify(obj); for (i=0; ilen; i++) { slot = RARRAY(members)->ptr[i]; @@ -209,7 +206,7 @@ make_struct(name, members, klass) rb_define_alloc_func(nstr, struct_alloc); rb_define_singleton_method(nstr, "new", rb_class_new_instance, -1); rb_define_singleton_method(nstr, "[]", rb_class_new_instance, -1); - rb_define_singleton_method(nstr, "members", rb_struct_s_members, 0); + rb_define_singleton_method(nstr, "members", rb_struct_s_members_m, 0); for (i=0; i< RARRAY(members)->len; i++) { ID id = SYM2ID(RARRAY(members)->ptr[i]); if (i<10) { @@ -457,7 +454,7 @@ rb_struct_each_pair(s) VALUE members; long i; - members = struct_members(s); + members = rb_struct_members(s); for (i=0; ilen; i++) { rb_yield_values(2, rb_ary_entry(members, i), RSTRUCT(s)->ptr[i]); } @@ -472,7 +469,7 @@ inspect_struct(s) VALUE str, members; long i; - members = struct_members(s); + members = rb_struct_members(s); str = rb_str_buf_new2("#len; for (i=0; iptr[i]) == id) { @@ -622,7 +619,7 @@ rb_struct_aset_id(s, id, val) VALUE members; long i, len; - members = struct_members(s); + members = rb_struct_members(s); rb_struct_modify(s); len = RARRAY(members)->len; if (RSTRUCT(s)->len != RARRAY(members)->len) { @@ -909,5 +906,5 @@ Init_Struct() rb_define_method(rb_cStruct, "select", rb_struct_select, -1); rb_define_method(rb_cStruct, "values_at", rb_struct_values_at, -1); - rb_define_method(rb_cStruct, "members", rb_struct_members, 0); + rb_define_method(rb_cStruct, "members", rb_struct_members_m, 0); } -- cgit v1.2.3