diff options
Diffstat (limited to 'struct.c')
| -rw-r--r-- | struct.c | 698 |
1 files changed, 381 insertions, 317 deletions
@@ -3,74 +3,74 @@ struct.c - $Author$ - $Date$ created at: Tue Mar 22 18:44:30 JST 1995 - Copyright (C) 1993-2003 Yukihiro Matsumoto + Copyright (C) 1993-2007 Yukihiro Matsumoto **********************************************************************/ -#include "ruby.h" -#include "env.h" +#include "ruby/ruby.h" VALUE rb_cStruct; +static ID id_members; -static VALUE struct_alloc _((VALUE)); +static VALUE struct_alloc(VALUE); -VALUE -rb_struct_iv_get(c, name) - VALUE c; - char *name; +static inline VALUE +struct_ivar_get(VALUE c, ID id) { - ID id; - - id = rb_intern(name); for (;;) { if (rb_ivar_defined(c, id)) return rb_ivar_get(c, id); - c = RCLASS(c)->super; + c = RCLASS_SUPER(c); if (c == 0 || c == rb_cStruct) return Qnil; } } VALUE -rb_struct_s_members(klass) - VALUE klass; +rb_struct_iv_get(VALUE c, const char *name) +{ + return struct_ivar_get(c, rb_intern(name)); +} + +VALUE +rb_struct_s_members(VALUE klass) { - VALUE members = rb_struct_iv_get(klass, "__members__"); + VALUE members = struct_ivar_get(klass, id_members); if (NIL_P(members)) { - rb_bug("non-initialized struct"); + rb_raise(rb_eTypeError, "uninitialized struct"); + } + if (TYPE(members) != T_ARRAY) { + rb_raise(rb_eTypeError, "corrupted struct"); } return members; } VALUE -rb_struct_members(s) - VALUE s; +rb_struct_members(VALUE s) { VALUE members = rb_struct_s_members(rb_obj_class(s)); - if (RSTRUCT(s)->len != RARRAY(members)->len) { - rb_raise(rb_eTypeError, "struct size differs (%d required %d given)", - RARRAY(members)->len, RSTRUCT(s)->len); + if (RSTRUCT_LEN(s) != RARRAY_LEN(members)) { + rb_raise(rb_eTypeError, "struct size differs (%ld required %ld given)", + RARRAY_LEN(members), RSTRUCT_LEN(s)); } return members; } static VALUE -rb_struct_s_members_m(klass) - VALUE klass; +rb_struct_s_members_m(VALUE klass) { VALUE members, ary; VALUE *p, *pend; members = rb_struct_s_members(klass); - ary = rb_ary_new2(RARRAY(members)->len); - p = RARRAY(members)->ptr; pend = p + RARRAY(members)->len; + ary = rb_ary_new2(RARRAY_LEN(members)); + p = RARRAY_PTR(members); pend = p + RARRAY_LEN(members); while (p < pend) { - rb_ary_push(ary, rb_str_new2(rb_id2name(SYM2ID(*p)))); + rb_ary_push(ary, *p); p++; } @@ -79,36 +79,36 @@ rb_struct_s_members_m(klass) /* * call-seq: - * struct.members => array - * + * struct.members -> array + * * Returns an array of strings representing the names of the instance * variables. - * + * * Customer = Struct.new(:name, :address, :zip) * joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345) - * joe.members #=> ["name", "address", "zip"] + * joe.members #=> [:name, :address, :zip] */ static VALUE -rb_struct_members_m(obj) - VALUE obj; +rb_struct_members_m(VALUE obj) { return rb_struct_s_members_m(rb_obj_class(obj)); } VALUE -rb_struct_getmember(obj, id) - VALUE obj; - ID id; +rb_struct_getmember(VALUE obj, ID id) { - VALUE members, slot; - long i; + VALUE members, slot, *ptr, *ptr_members; + long i, len; + ptr = RSTRUCT_PTR(obj); members = rb_struct_members(obj); + ptr_members = RARRAY_PTR(members); slot = ID2SYM(id); - for (i=0; i<RARRAY(members)->len; i++) { - if (RARRAY(members)->ptr[i] == slot) { - return RSTRUCT(obj)->ptr[i]; + len = RARRAY_LEN(members); + for (i=0; i<len; i++) { + if (ptr_members[i] == slot) { + return ptr[i]; } } rb_name_error(id, "%s is not struct member", rb_id2name(id)); @@ -116,24 +116,26 @@ rb_struct_getmember(obj, id) } static VALUE -rb_struct_ref(obj) - VALUE obj; +rb_struct_ref(VALUE obj) { - return rb_struct_getmember(obj, ruby_frame->orig_func); + return rb_struct_getmember(obj, rb_frame_this_func()); } -static VALUE rb_struct_ref0(obj) VALUE obj; {return RSTRUCT(obj)->ptr[0];} -static VALUE rb_struct_ref1(obj) VALUE obj; {return RSTRUCT(obj)->ptr[1];} -static VALUE rb_struct_ref2(obj) VALUE obj; {return RSTRUCT(obj)->ptr[2];} -static VALUE rb_struct_ref3(obj) VALUE obj; {return RSTRUCT(obj)->ptr[3];} -static VALUE rb_struct_ref4(obj) VALUE obj; {return RSTRUCT(obj)->ptr[4];} -static VALUE rb_struct_ref5(obj) VALUE obj; {return RSTRUCT(obj)->ptr[5];} -static VALUE rb_struct_ref6(obj) VALUE obj; {return RSTRUCT(obj)->ptr[6];} -static VALUE rb_struct_ref7(obj) VALUE obj; {return RSTRUCT(obj)->ptr[7];} -static VALUE rb_struct_ref8(obj) VALUE obj; {return RSTRUCT(obj)->ptr[8];} -static VALUE rb_struct_ref9(obj) VALUE obj; {return RSTRUCT(obj)->ptr[9];} +static VALUE rb_struct_ref0(VALUE obj) {return RSTRUCT_PTR(obj)[0];} +static VALUE rb_struct_ref1(VALUE obj) {return RSTRUCT_PTR(obj)[1];} +static VALUE rb_struct_ref2(VALUE obj) {return RSTRUCT_PTR(obj)[2];} +static VALUE rb_struct_ref3(VALUE obj) {return RSTRUCT_PTR(obj)[3];} +static VALUE rb_struct_ref4(VALUE obj) {return RSTRUCT_PTR(obj)[4];} +static VALUE rb_struct_ref5(VALUE obj) {return RSTRUCT_PTR(obj)[5];} +static VALUE rb_struct_ref6(VALUE obj) {return RSTRUCT_PTR(obj)[6];} +static VALUE rb_struct_ref7(VALUE obj) {return RSTRUCT_PTR(obj)[7];} +static VALUE rb_struct_ref8(VALUE obj) {return RSTRUCT_PTR(obj)[8];} +static VALUE rb_struct_ref9(VALUE obj) {return RSTRUCT_PTR(obj)[9];} + +#define numberof(array) (int)(sizeof(array) / sizeof((array)[0])) +#define N_REF_FUNC numberof(ref_func) -static VALUE (*ref_func[10])() = { +static VALUE (*const ref_func[])(VALUE) = { rb_struct_ref0, rb_struct_ref1, rb_struct_ref2, @@ -147,43 +149,41 @@ static VALUE (*ref_func[10])() = { }; static void -rb_struct_modify(s) - VALUE s; +rb_struct_modify(VALUE s) { if (OBJ_FROZEN(s)) rb_error_frozen("Struct"); - if (!OBJ_TAINTED(s) && rb_safe_level() >= 4) + if (!OBJ_UNTRUSTED(s) && rb_safe_level() >= 4) rb_raise(rb_eSecurityError, "Insecure: can't modify Struct"); } static VALUE -rb_struct_set(obj, val) - VALUE obj, val; +rb_struct_set(VALUE obj, VALUE val) { - VALUE members, slot; - ID id; - long i; + VALUE members, slot, *ptr, *ptr_members; + long i, len; members = rb_struct_members(obj); + ptr_members = RARRAY_PTR(members); + len = RARRAY_LEN(members); rb_struct_modify(obj); - id = ruby_frame->orig_func; - for (i=0; i<RARRAY(members)->len; i++) { - slot = RARRAY(members)->ptr[i]; - if (rb_id_attrset(SYM2ID(slot)) == id) { - return RSTRUCT(obj)->ptr[i] = val; + ptr = RSTRUCT_PTR(obj); + for (i=0; i<len; i++) { + slot = ptr_members[i]; + if (rb_id_attrset(SYM2ID(slot)) == rb_frame_this_func()) { + return ptr[i] = val; } } - rb_name_error(ruby_frame->last_func, "`%s' is not a struct member", - rb_id2name(id)); + rb_name_error(rb_frame_this_func(), "`%s' is not a struct member", + rb_id2name(rb_frame_this_func())); return Qnil; /* not reached */ } static VALUE -make_struct(name, members, klass) - VALUE name, members, klass; +make_struct(VALUE name, VALUE members, VALUE klass) { - VALUE nstr; + VALUE nstr, *ptr_members; ID id; - long i; + long i, len; OBJ_FREEZE(members); if (NIL_P(name)) { @@ -192,28 +192,30 @@ make_struct(name, members, klass) rb_class_inherited(klass, nstr); } else { - char *cname = StringValuePtr(name); - id = rb_intern(cname); + /* old style: should we warn? */ + name = rb_str_to_str(name); + id = rb_to_id(name); if (!rb_is_const_id(id)) { - rb_name_error(id, "identifier %s needs to be constant", cname); + rb_name_error(id, "identifier %s needs to be constant", StringValuePtr(name)); } if (rb_const_defined_at(klass, id)) { - rb_warn("redefining constant Struct::%s", cname); + rb_warn("redefining constant Struct::%s", StringValuePtr(name)); rb_mod_remove_const(klass, ID2SYM(id)); } - nstr = rb_define_class_under(klass, rb_id2name(id), klass); + nstr = rb_define_class_id_under(klass, id, klass); } - rb_iv_set(nstr, "__size__", LONG2NUM(RARRAY(members)->len)); - rb_iv_set(nstr, "__members__", members); + rb_ivar_set(nstr, id_members, members); 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_m, 0); - for (i=0; i< RARRAY(members)->len; i++) { - ID id = SYM2ID(RARRAY(members)->ptr[i]); + ptr_members = RARRAY_PTR(members); + len = RARRAY_LEN(members); + for (i=0; i< len; i++) { + ID id = SYM2ID(ptr_members[i]); if (rb_is_local_id(id) || rb_is_const_id(id)) { - if (i<10) { + if (i < N_REF_FUNC) { rb_define_method_id(nstr, id, ref_func[i], 0); } else { @@ -226,22 +228,51 @@ make_struct(name, members, klass) return nstr; } -#ifdef HAVE_STDARG_PROTOTYPES -#include <stdarg.h> -#define va_init_list(a,b) va_start(a,b) -#else -#include <varargs.h> -#define va_init_list(a,b) va_start(a) -#endif +VALUE +rb_struct_alloc_noinit(VALUE klass) +{ + return struct_alloc(klass); +} + +VALUE +rb_struct_define_without_accessor(const char *class_name, VALUE super, rb_alloc_func_t alloc, ...) +{ + VALUE klass; + va_list ar; + VALUE members; + long i; + char *name; + + members = rb_ary_new2(0); + va_start(ar, alloc); + i = 0; + while ((name = va_arg(ar, char*)) != NULL) { + rb_ary_push(members, ID2SYM(rb_intern(name))); + } + va_end(ar); + OBJ_FREEZE(members); + + if (class_name) { + klass = rb_define_class(class_name, super); + } + else { + klass = rb_class_new(super); + rb_make_metaclass(klass, RBASIC(super)->klass); + rb_class_inherited(super, klass); + } + + rb_ivar_set(klass, id_members, members); + + if (alloc) + rb_define_alloc_func(klass, alloc); + else + rb_define_alloc_func(klass, struct_alloc); + + return klass; +} VALUE -#ifdef HAVE_STDARG_PROTOTYPES rb_struct_define(const char *name, ...) -#else -rb_struct_define(name, va_alist) - const char *name; - va_dcl -#endif { va_list ar; VALUE nm, ary; @@ -251,7 +282,7 @@ rb_struct_define(name, va_alist) else nm = rb_str_new2(name); ary = rb_ary_new(); - va_init_list(ar, name); + va_start(ar, name); while ((mem = va_arg(ar, char*)) != 0) { ID slot = rb_intern(mem); rb_ary_push(ary, ID2SYM(slot)); @@ -263,9 +294,9 @@ rb_struct_define(name, va_alist) /* * call-seq: - * Struct.new( [aString] [, aSym]+> ) => StructClass - * StructClass.new(arg, ...) => obj - * StructClass[arg, ...] => obj + * Struct.new( [aString] [, aSym]+> ) -> StructClass + * StructClass.new(arg, ...) -> obj + * StructClass[arg, ...] -> obj * * Creates a new class, named by <i>aString</i>, containing accessor * methods for the given symbols. If the name <i>aString</i> is @@ -275,31 +306,28 @@ rb_struct_define(name, va_alist) * <code>Struct</code>s in the system and should start with a capital * letter. Assigning a structure class to a constant effectively gives * the class the name of the constant. - * + * * <code>Struct::new</code> returns a new <code>Class</code> object, * which can then be used to create specific instances of the new * structure. The number of actual parameters must be * less than or equal to the number of attributes defined for this - * class; unset parameters default to \nil{}. Passing too many - * parameters will raise an \E{ArgumentError}. + * class; unset parameters default to <code>nil</code>. Passing too many + * parameters will raise an <code>ArgumentError</code>. * * The remaining methods listed in this section (class and instance) - * are defined for this generated class. - * + * are defined for this generated class. + * * # Create a structure with a name in Struct * Struct.new("Customer", :name, :address) #=> Struct::Customer - * Struct::Customer.new("Dave", "123 Main") #=> #<Struct::Customer name="Dave", address="123 Main"> - * + * Struct::Customer.new("Dave", "123 Main") #=> #<struct Struct::Customer name="Dave", address="123 Main"> + * * # Create a structure named by its constant * Customer = Struct.new(:name, :address) #=> Customer - * Customer.new("Dave", "123 Main") #=> #<Customer name="Dave", address="123 Main"> + * Customer.new("Dave", "123 Main") #=> #<struct Customer name="Dave", address="123 Main"> */ static VALUE -rb_struct_s_def(argc, argv, klass) - int argc; - VALUE *argv; - VALUE klass; +rb_struct_s_def(int argc, VALUE *argv, VALUE klass) { VALUE name, rest; long i; @@ -311,9 +339,9 @@ rb_struct_s_def(argc, argv, klass) rb_ary_unshift(rest, name); name = Qnil; } - for (i=0; i<RARRAY(rest)->len; i++) { - id = rb_to_id(RARRAY(rest)->ptr[i]); - RARRAY(rest)->ptr[i] = ID2SYM(id); + for (i=0; i<RARRAY_LEN(rest); i++) { + id = rb_to_id(RARRAY_PTR(rest)[i]); + RARRAY_PTR(rest)[i] = ID2SYM(id); } st = make_struct(name, rest, klass); if (rb_block_given_p()) { @@ -323,74 +351,86 @@ rb_struct_s_def(argc, argv, klass) return st; } +static long +num_members(VALUE klass) +{ + VALUE members; + members = struct_ivar_get(klass, id_members); + if (TYPE(members) != T_ARRAY) { + rb_raise(rb_eTypeError, "broken members"); + } + return RARRAY_LEN(members); +} + /* */ static VALUE -rb_struct_initialize(self, values) - VALUE self, values; +rb_struct_initialize_m(int argc, VALUE *argv, VALUE self) { VALUE klass = rb_obj_class(self); - VALUE size; long n; rb_struct_modify(self); - size = rb_struct_iv_get(klass, "__size__"); - n = FIX2LONG(size); - if (n < RARRAY(values)->len) { + n = num_members(klass); + if (n < argc) { rb_raise(rb_eArgError, "struct size differs"); } - MEMCPY(RSTRUCT(self)->ptr, RARRAY(values)->ptr, VALUE, RARRAY(values)->len); - if (n > RARRAY(values)->len) { - rb_mem_clear(RSTRUCT(self)->ptr+RARRAY(values)->len, - n-RARRAY(values)->len); + MEMCPY(RSTRUCT_PTR(self), argv, VALUE, argc); + if (n > argc) { + rb_mem_clear(RSTRUCT_PTR(self)+argc, n-argc); } return Qnil; } +VALUE +rb_struct_initialize(VALUE self, VALUE values) +{ + return rb_struct_initialize_m(RARRAY_LENINT(values), RARRAY_PTR(values), self); +} + static VALUE -struct_alloc(klass) - VALUE klass; +struct_alloc(VALUE klass) { - VALUE size; long n; NEWOBJ(st, struct RStruct); OBJSETUP(st, klass, T_STRUCT); - size = rb_struct_iv_get(klass, "__size__"); - n = FIX2LONG(size); + n = num_members(klass); - st->ptr = ALLOC_N(VALUE, n); - rb_mem_clear(st->ptr, n); - st->len = n; + if (0 < n && n <= RSTRUCT_EMBED_LEN_MAX) { + RBASIC(st)->flags &= ~RSTRUCT_EMBED_LEN_MASK; + RBASIC(st)->flags |= n << RSTRUCT_EMBED_LEN_SHIFT; + rb_mem_clear(st->as.ary, n); + } + else { + st->as.heap.ptr = ALLOC_N(VALUE, n); + rb_mem_clear(st->as.heap.ptr, n); + st->as.heap.len = n; + } return (VALUE)st; } VALUE -rb_struct_alloc(klass, values) - VALUE klass, values; +rb_struct_alloc(VALUE klass, VALUE values) { - return rb_class_new_instance(RARRAY(values)->len, RARRAY(values)->ptr, klass); + return rb_class_new_instance(RARRAY_LENINT(values), RARRAY_PTR(values), klass); } VALUE -#ifdef HAVE_STDARG_PROTOTYPES rb_struct_new(VALUE klass, ...) -#else -rb_struct_new(klass, va_alist) - VALUE klass; - va_dcl -#endif { - VALUE sz, *mem; - long size, i; + VALUE tmpargs[N_REF_FUNC], *mem = tmpargs; + int size, i; va_list args; - sz = rb_struct_iv_get(klass, "__size__"); - size = FIX2LONG(sz); - mem = ALLOCA_N(VALUE, size); - va_init_list(args, klass); + size = rb_long2int(num_members(klass)); + if (size > numberof(tmpargs)) { + tmpargs[0] = rb_ary_tmp_new(size); + mem = RARRAY_PTR(tmpargs[0]); + } + va_start(args, klass); for (i=0; i<size; i++) { mem[i] = va_arg(args, VALUE); } @@ -401,97 +441,112 @@ rb_struct_new(klass, va_alist) /* * call-seq: - * struct.each {|obj| block } => struct - * + * struct.each {|obj| block } -> struct + * struct.each -> an_enumerator + * * Calls <i>block</i> once for each instance variable, passing the * value as a parameter. - * + * + * If no block is given, an enumerator is returned instead. + * * Customer = Struct.new(:name, :address, :zip) * joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345) * joe.each {|x| puts(x) } - * + * * <em>produces:</em> - * + * * Joe Smith * 123 Maple, Anytown NC * 12345 */ static VALUE -rb_struct_each(s) - VALUE s; +rb_struct_each(VALUE s) { long i; - for (i=0; i<RSTRUCT(s)->len; i++) { - rb_yield(RSTRUCT(s)->ptr[i]); + RETURN_ENUMERATOR(s, 0, 0); + for (i=0; i<RSTRUCT_LEN(s); i++) { + rb_yield(RSTRUCT_PTR(s)[i]); } return s; } /* * call-seq: - * struct.each_pair {|sym, obj| block } => struct - * + * struct.each_pair {|sym, obj| block } -> struct + * struct.each_pair -> an_enumerator + * * Calls <i>block</i> once for each instance variable, passing the name * (as a symbol) and the value as parameters. - * + * + * If no block is given, an enumerator is returned instead. + * * Customer = Struct.new(:name, :address, :zip) * joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345) * joe.each_pair {|name, value| puts("#{name} => #{value}") } - * + * * <em>produces:</em> - * + * * name => Joe Smith * address => 123 Maple, Anytown NC * zip => 12345 */ static VALUE -rb_struct_each_pair(s) - VALUE s; +rb_struct_each_pair(VALUE s) { VALUE members; long i; + RETURN_ENUMERATOR(s, 0, 0); members = rb_struct_members(s); - for (i=0; i<RSTRUCT(s)->len; i++) { - rb_yield_values(2, rb_ary_entry(members, i), RSTRUCT(s)->ptr[i]); + for (i=0; i<RSTRUCT_LEN(s); i++) { + rb_yield_values(2, rb_ary_entry(members, i), RSTRUCT_PTR(s)[i]); } return s; } static VALUE -inspect_struct(s) - VALUE s; +inspect_struct(VALUE s, VALUE dummy, int recur) { - char *cname = rb_class2name(rb_obj_class(s)); - VALUE str, members; - long i; + VALUE cname = rb_class_name(rb_obj_class(s)); + VALUE members, str = rb_str_new2("#<struct "); + VALUE *ptr, *ptr_members; + long i, len; + char first = RSTRING_PTR(cname)[0]; + + if (recur || first != '#') { + rb_str_append(str, cname); + } + if (recur) { + return rb_str_cat2(str, ":...>"); + } members = rb_struct_members(s); - str = rb_str_buf_new2("#<struct "); - rb_str_cat2(str, cname); - rb_str_cat2(str, " "); - for (i=0; i<RSTRUCT(s)->len; i++) { + ptr_members = RARRAY_PTR(members); + ptr = RSTRUCT_PTR(s); + len = RSTRUCT_LEN(s); + for (i=0; i<len; i++) { VALUE slot; ID id; - char *p; if (i > 0) { rb_str_cat2(str, ", "); } - slot = RARRAY(members)->ptr[i]; + else if (first != '#') { + rb_str_cat2(str, " "); + } + slot = ptr_members[i]; id = SYM2ID(slot); if (rb_is_local_id(id) || rb_is_const_id(id)) { - p = rb_id2name(id); - rb_str_cat2(str, p); + rb_str_append(str, rb_id2str(id)); } else { rb_str_append(str, rb_inspect(slot)); } rb_str_cat2(str, "="); - rb_str_append(str, rb_inspect(RSTRUCT(s)->ptr[i])); + rb_str_append(str, rb_inspect(ptr[i])); } rb_str_cat2(str, ">"); OBJ_INFECT(str, s); @@ -501,78 +556,66 @@ inspect_struct(s) /* * call-seq: - * struct.to_s => string - * struct.inspect => string + * struct.to_s -> string + * struct.inspect -> string * * Describe the contents of this struct in a string. */ static VALUE -rb_struct_inspect(s) - VALUE s; +rb_struct_inspect(VALUE s) { - if (rb_inspecting_p(s)) { - char *cname = rb_class2name(rb_obj_class(s)); - size_t len = strlen(cname) + 14; - VALUE str = rb_str_new(0, len); - - snprintf(RSTRING(str)->ptr, len+1, "#<struct %s:...>", cname); - RSTRING(str)->len = strlen(RSTRING(str)->ptr); - return str; - } - return rb_protect_inspect(inspect_struct, s, 0); + return rb_exec_recursive(inspect_struct, s, 0); } /* * call-seq: - * struct.to_a => array - * struct.values => array - * + * struct.to_a -> array + * struct.values -> array + * * Returns the values for this instance as an array. - * + * * Customer = Struct.new(:name, :address, :zip) * joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345) * joe.to_a[1] #=> "123 Maple, Anytown NC" */ static VALUE -rb_struct_to_a(s) - VALUE s; +rb_struct_to_a(VALUE s) { - return rb_ary_new4(RSTRUCT(s)->len, RSTRUCT(s)->ptr); + return rb_ary_new4(RSTRUCT_LEN(s), RSTRUCT_PTR(s)); } /* :nodoc: */ -static VALUE -rb_struct_init_copy(copy, s) - VALUE copy, s; +VALUE +rb_struct_init_copy(VALUE copy, VALUE s) { if (copy == s) return copy; rb_check_frozen(copy); if (!rb_obj_is_instance_of(s, rb_obj_class(copy))) { rb_raise(rb_eTypeError, "wrong argument class"); } - if (RSTRUCT(copy)->len != RSTRUCT(s)->len) { + if (RSTRUCT_LEN(copy) != RSTRUCT_LEN(s)) { rb_raise(rb_eTypeError, "struct size mismatch"); } - MEMCPY(RSTRUCT(copy)->ptr, RSTRUCT(s)->ptr, VALUE, RSTRUCT(copy)->len); + MEMCPY(RSTRUCT_PTR(copy), RSTRUCT_PTR(s), VALUE, RSTRUCT_LEN(copy)); return copy; } static VALUE -rb_struct_aref_id(s, id) - VALUE s; - ID id; +rb_struct_aref_id(VALUE s, ID id) { - VALUE members; + VALUE *ptr, members, *ptr_members; long i, len; + ptr = RSTRUCT_PTR(s); members = rb_struct_members(s); - len = RARRAY(members)->len; + ptr_members = RARRAY_PTR(members); + len = RARRAY_LEN(members); for (i=0; i<len; i++) { - if (SYM2ID(RARRAY(members)->ptr[i]) == id) { - return RSTRUCT(s)->ptr[i]; + if (SYM2ID(ptr_members[i]) == id) { + return ptr[i]; } } rb_name_error(id, "no member '%s' in struct", rb_id2name(id)); @@ -581,26 +624,25 @@ rb_struct_aref_id(s, id) /* * call-seq: - * struct[symbol] => anObject - * struct[fixnum] => anObject - * + * struct[symbol] -> anObject + * struct[fixnum] -> anObject + * * Attribute Reference---Returns the value of the instance variable * named by <i>symbol</i>, or indexed (0..length-1) by * <i>fixnum</i>. Will raise <code>NameError</code> if the named * variable does not exist, or <code>IndexError</code> if the index is * out of range. - * + * * Customer = Struct.new(:name, :address, :zip) * joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345) - * + * * joe["name"] #=> "Joe Smith" * joe[:name] #=> "Joe Smith" * joe[0] #=> "Joe Smith" */ VALUE -rb_struct_aref(s, idx) - VALUE s, idx; +rb_struct_aref(VALUE s, VALUE idx) { long i; @@ -609,34 +651,34 @@ rb_struct_aref(s, idx) } i = NUM2LONG(idx); - if (i < 0) i = RSTRUCT(s)->len + i; + if (i < 0) i = RSTRUCT_LEN(s) + i; if (i < 0) rb_raise(rb_eIndexError, "offset %ld too small for struct(size:%ld)", - i, RSTRUCT(s)->len); - if (RSTRUCT(s)->len <= i) + i, RSTRUCT_LEN(s)); + if (RSTRUCT_LEN(s) <= i) rb_raise(rb_eIndexError, "offset %ld too large for struct(size:%ld)", - i, RSTRUCT(s)->len); - return RSTRUCT(s)->ptr[i]; + i, RSTRUCT_LEN(s)); + return RSTRUCT_PTR(s)[i]; } static VALUE -rb_struct_aset_id(s, id, val) - VALUE s, val; - ID id; +rb_struct_aset_id(VALUE s, ID id, VALUE val) { - VALUE members; + VALUE members, *ptr, *ptr_members; long i, len; members = rb_struct_members(s); + len = RARRAY_LEN(members); rb_struct_modify(s); - len = RARRAY(members)->len; - if (RSTRUCT(s)->len != RARRAY(members)->len) { - rb_raise(rb_eTypeError, "struct size differs (%d required %d given)", - RARRAY(members)->len, RSTRUCT(s)->len); + if (RSTRUCT_LEN(s) != len) { + rb_raise(rb_eTypeError, "struct size differs (%ld required %ld given)", + len, RSTRUCT_LEN(s)); } + ptr = RSTRUCT_PTR(s); + ptr_members = RARRAY_PTR(members); for (i=0; i<len; i++) { - if (SYM2ID(RARRAY(members)->ptr[i]) == id) { - RSTRUCT(s)->ptr[i] = val; + if (SYM2ID(ptr_members[i]) == id) { + ptr[i] = val; return val; } } @@ -645,28 +687,27 @@ rb_struct_aset_id(s, id, val) /* * call-seq: - * struct[symbol] = obj => obj - * struct[fixnum] = obj => obj - * + * struct[symbol] = obj -> obj + * struct[fixnum] = obj -> obj + * * Attribute Assignment---Assigns to the instance variable named by * <i>symbol</i> or <i>fixnum</i> the value <i>obj</i> and * returns it. Will raise a <code>NameError</code> if the named * variable does not exist, or an <code>IndexError</code> if the index * is out of range. - * + * * Customer = Struct.new(:name, :address, :zip) * joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345) - * + * * joe["name"] = "Luke" * joe[:zip] = "90210" - * + * * joe.name #=> "Luke" * joe.zip #=> "90210" */ VALUE -rb_struct_aset(s, idx, val) - VALUE s, idx, val; +rb_struct_aset(VALUE s, VALUE idx, VALUE val) { long i; @@ -675,37 +716,34 @@ rb_struct_aset(s, idx, val) } i = NUM2LONG(idx); - if (i < 0) i = RSTRUCT(s)->len + i; + if (i < 0) i = RSTRUCT_LEN(s) + i; if (i < 0) { rb_raise(rb_eIndexError, "offset %ld too small for struct(size:%ld)", - i, RSTRUCT(s)->len); + i, RSTRUCT_LEN(s)); } - if (RSTRUCT(s)->len <= i) { + if (RSTRUCT_LEN(s) <= i) { rb_raise(rb_eIndexError, "offset %ld too large for struct(size:%ld)", - i, RSTRUCT(s)->len); + i, RSTRUCT_LEN(s)); } rb_struct_modify(s); - return RSTRUCT(s)->ptr[i] = val; + return RSTRUCT_PTR(s)[i] = val; } -static VALUE struct_entry _((VALUE, long)); static VALUE -struct_entry(s, n) - VALUE s; - long n; +struct_entry(VALUE s, long n) { return rb_struct_aref(s, LONG2NUM(n)); } -/* +/* * call-seq: - * struct.values_at(selector,... ) => an_array + * struct.values_at(selector,... ) -> an_array * * Returns an array containing the elements in - * _self_ corresponding to the given selector(s). The selectors - * may be either integer indices or ranges. + * +self+ corresponding to the given selector(s). The selectors + * may be either integer indices or ranges. * See also </code>.select<code>. - * + * * a = %w{ a b c d e f } * a.values_at(1, 3, 5) * a.values_at(1, 3, 5, 7) @@ -714,33 +752,28 @@ struct_entry(s, n) */ static VALUE -rb_struct_values_at(argc, argv, s) - int argc; - VALUE *argv; - VALUE s; +rb_struct_values_at(int argc, VALUE *argv, VALUE s) { - return rb_values_at(s, RSTRUCT(s)->len, argc, argv, struct_entry); + return rb_get_values_at(s, RSTRUCT_LEN(s), argc, argv, struct_entry); } /* * call-seq: - * struct.select {|i| block } => array - * + * struct.select {|i| block } -> array + * struct.select -> an_enumerator + * * Invokes the block passing in successive elements from * <i>struct</i>, returning an array containing those elements * for which the block returns a true value (equivalent to * <code>Enumerable#select</code>). - * + * * Lots = Struct.new(:a, :b, :c, :d, :e, :f) * l = Lots.new(11, 22, 33, 44, 55, 66) * l.select {|v| (v % 2).zero? } #=> [22, 44, 66] */ static VALUE -rb_struct_select(argc, argv, s) - int argc; - VALUE *argv; - VALUE s; +rb_struct_select(int argc, VALUE *argv, VALUE s) { VALUE result; long i; @@ -748,25 +781,42 @@ rb_struct_select(argc, argv, s) if (argc > 0) { rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc); } + RETURN_ENUMERATOR(s, 0, 0); result = rb_ary_new(); - for (i = 0; i < RSTRUCT(s)->len; i++) { - if (RTEST(rb_yield(RSTRUCT(s)->ptr[i]))) { - rb_ary_push(result, RSTRUCT(s)->ptr[i]); + for (i = 0; i < RSTRUCT_LEN(s); i++) { + if (RTEST(rb_yield(RSTRUCT_PTR(s)[i]))) { + rb_ary_push(result, RSTRUCT_PTR(s)[i]); } } return result; } +static VALUE +recursive_equal(VALUE s, VALUE s2, int recur) +{ + VALUE *ptr, *ptr2; + long i, len; + + if (recur) return Qtrue; /* Subtle! */ + ptr = RSTRUCT_PTR(s); + ptr2 = RSTRUCT_PTR(s2); + len = RSTRUCT_LEN(s); + for (i=0; i<len; i++) { + if (!rb_equal(ptr[i], ptr2[i])) return Qfalse; + } + return Qtrue; +} + /* * call-seq: - * struct == other_struct => true or false - * + * struct == other_struct -> true or false + * * Equality---Returns <code>true</code> if <i>other_struct</i> is * equal to this one: they must be of the same class as generated by * <code>Struct::new</code>, and the values of all instance variables * must be equal (according to <code>Object#==</code>). - * + * * Customer = Struct.new(:name, :address, :zip) * joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345) * joejr = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345) @@ -776,110 +826,123 @@ rb_struct_select(argc, argv, s) */ static VALUE -rb_struct_equal(s, s2) - VALUE s, s2; +rb_struct_equal(VALUE s, VALUE s2) { - long i; - if (s == s2) return Qtrue; if (TYPE(s2) != T_STRUCT) return Qfalse; if (rb_obj_class(s) != rb_obj_class(s2)) return Qfalse; - if (RSTRUCT(s)->len != RSTRUCT(s2)->len) { + if (RSTRUCT_LEN(s) != RSTRUCT_LEN(s2)) { rb_bug("inconsistent struct"); /* should never happen */ } - for (i=0; i<RSTRUCT(s)->len; i++) { - if (!rb_equal(RSTRUCT(s)->ptr[i], RSTRUCT(s2)->ptr[i])) return Qfalse; + return rb_exec_recursive_paired(recursive_equal, s, s2, s2); +} + +static VALUE +recursive_hash(VALUE s, VALUE dummy, int recur) +{ + long i, len; + st_index_t h; + VALUE n, *ptr; + + h = rb_hash_start(rb_hash(rb_obj_class(s))); + if (!recur) { + ptr = RSTRUCT_PTR(s); + len = RSTRUCT_LEN(s); + for (i = 0; i < len; i++) { + n = rb_hash(ptr[i]); + h = rb_hash_uint(h, NUM2LONG(n)); + } } - return Qtrue; + h = rb_hash_end(h); + return INT2FIX(h); } /* * call-seq: - * struct.hash => fixnum + * struct.hash -> fixnum * * Return a hash value based on this struct's contents. */ static VALUE -rb_struct_hash(s) - VALUE s; +rb_struct_hash(VALUE s) { - long i, h; - VALUE n; + return rb_exec_recursive_outer(recursive_hash, s, 0); +} - h = rb_hash(rb_obj_class(s)); - for (i = 0; i < RSTRUCT(s)->len; i++) { - h = (h << 1) | (h<0 ? 1 : 0); - n = rb_hash(RSTRUCT(s)->ptr[i]); - h ^= NUM2LONG(n); +static VALUE +recursive_eql(VALUE s, VALUE s2, int recur) +{ + VALUE *ptr, *ptr2; + long i, len; + + if (recur) return Qtrue; /* Subtle! */ + ptr = RSTRUCT_PTR(s); + ptr2 = RSTRUCT_PTR(s2); + len = RSTRUCT_LEN(s); + for (i=0; i<len; i++) { + if (!rb_eql(ptr[i], ptr2[i])) return Qfalse; } - return LONG2FIX(h); + return Qtrue; } /* * code-seq: - * struct.eql?(other) => true or false + * struct.eql?(other) -> true or false * * Two structures are equal if they are the same object, or if all their * fields are equal (using <code>eql?</code>). */ static VALUE -rb_struct_eql(s, s2) - VALUE s, s2; +rb_struct_eql(VALUE s, VALUE s2) { - long i; - if (s == s2) return Qtrue; if (TYPE(s2) != T_STRUCT) return Qfalse; if (rb_obj_class(s) != rb_obj_class(s2)) return Qfalse; - if (RSTRUCT(s)->len != RSTRUCT(s2)->len) { + if (RSTRUCT_LEN(s) != RSTRUCT_LEN(s2)) { rb_bug("inconsistent struct"); /* should never happen */ } - for (i=0; i<RSTRUCT(s)->len; i++) { - if (!rb_eql(RSTRUCT(s)->ptr[i], RSTRUCT(s2)->ptr[i])) return Qfalse; - } - return Qtrue; + return rb_exec_recursive_paired(recursive_eql, s, s2, s2); } /* * call-seq: - * struct.length => fixnum - * struct.size => fixnum - * + * struct.length -> fixnum + * struct.size -> fixnum + * * Returns the number of instance variables. - * + * * Customer = Struct.new(:name, :address, :zip) * joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345) * joe.length #=> 3 */ static VALUE -rb_struct_size(s) - VALUE s; +rb_struct_size(VALUE s) { - return LONG2FIX(RSTRUCT(s)->len); + return LONG2FIX(RSTRUCT_LEN(s)); } /* * A <code>Struct</code> is a convenient way to bundle a number of * attributes together, using accessor methods, without having to write * an explicit class. - * + * * The <code>Struct</code> class is a generator of specific classes, * each one of which is defined to hold a set of variables and their * accessors. In these examples, we'll call the generated class * ``<i>Customer</i>Class,'' and we'll show an example instance of that * class as ``<i>Customer</i>Inst.'' - * + * * In the descriptions that follow, the parameter <i>symbol</i> refers * to a symbol, which is either a quoted string or a * <code>Symbol</code> (such as <code>:name</code>). */ void -Init_Struct() +Init_Struct(void) { rb_cStruct = rb_define_class("Struct", rb_cObject); rb_include_module(rb_cStruct, rb_mEnumerable); @@ -887,15 +950,15 @@ Init_Struct() rb_undef_alloc_func(rb_cStruct); rb_define_singleton_method(rb_cStruct, "new", rb_struct_s_def, -1); - rb_define_method(rb_cStruct, "initialize", rb_struct_initialize, -2); + rb_define_method(rb_cStruct, "initialize", rb_struct_initialize_m, -1); rb_define_method(rb_cStruct, "initialize_copy", rb_struct_init_copy, 1); rb_define_method(rb_cStruct, "==", rb_struct_equal, 1); rb_define_method(rb_cStruct, "eql?", rb_struct_eql, 1); rb_define_method(rb_cStruct, "hash", rb_struct_hash, 0); - rb_define_method(rb_cStruct, "to_s", rb_struct_inspect, 0); rb_define_method(rb_cStruct, "inspect", rb_struct_inspect, 0); + rb_define_alias(rb_cStruct, "to_s", "inspect"); rb_define_method(rb_cStruct, "to_a", rb_struct_to_a, 0); rb_define_method(rb_cStruct, "values", rb_struct_to_a, 0); rb_define_method(rb_cStruct, "size", rb_struct_size, 0); @@ -909,4 +972,5 @@ Init_Struct() rb_define_method(rb_cStruct, "values_at", rb_struct_values_at, -1); rb_define_method(rb_cStruct, "members", rb_struct_members_m, 0); + id_members = rb_intern("__members__"); } |