mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
9b383bd6cf
string (e.g. ?x). * lib/tempfile.rb (Tempfile::make_tmpname): put dot between basename and pid. [ruby-talk:196272] * parse.y (do_block): remove -> style block. * parse.y (parser_yylex): remove tLAMBDA_ARG. * eval.c (rb_call0): binding for the return event hook should have consistent scope. [ruby-core:07928] * eval.c (proc_invoke): return behavior should depend whether it is surrounded by a lambda or a mere block. * eval.c (formal_assign): handles post splat arguments. * eval.c (rb_call0): ditto. * st.c (strhash): use FNV-1a hash. * parse.y (parser_yylex): removed experimental ';;' terminator. * eval.c (rb_node_arity): should be aware of post splat arguments. * eval.c (rb_proc_arity): ditto. * parse.y (f_args): syntax rule enhanced to support arguments after the splat. * parse.y (block_param): ditto for block parameters. * parse.y (f_post_arg): mandatory formal arguments after the splat argument. * parse.y (new_args_gen): generate nodes for mandatory formal arguments after the splat argument. * eval.c (rb_eval): dispatch mandatory formal arguments after the splat argument. * parse.y (args): allow more than one splat in the argument list. * parse.y (method_call): allow aref [] to accept all kind of method argument, including assocs, splat, and block argument. * eval.c (SETUP_ARGS0): prepare block argument as well. * lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931] * eval.c (error_line): print receivers true/false/nil specially. * eval.c (rb_proc_yield): handles parameters in yield semantics. * eval.c (nil_yield): gives LocalJumpError to denote no block error. * io.c (rb_io_getc): now takes one-character string. * string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo hashing algorithm. * string.c (rb_str_aref): str[0] now returns 1 character string, instead of a fixnum. [Ruby2] * parse.y (parser_yylex): ?c now returns 1 character string, instead of a fixnum. [Ruby2] * string.c (rb_str_aset): no longer support fixnum insertion. * eval.c (umethod_bind): should not update original class. [ruby-dev:28636] * eval.c (ev_const_get): should support constant access from within instance_eval(). [ruby-dev:28327] * time.c (time_timeval): should round for usec floating number. [ruby-core:07896] * time.c (time_add): ditto. * dir.c (sys_warning): should not call a vararg function rb_sys_warning() indirectly. [ruby-core:07886] * numeric.c (flo_divmod): the first element of Float#divmod should be an integer. [ruby-dev:28589] * test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder. * re.c (rb_reg_initialize): should not allow modifying literal regexps. frozen check moved from rb_reg_initialize_m as well. * re.c (rb_reg_initialize): should not modify untainted objects in safe levels higher than 3. * re.c (rb_memcmp): type change from char* to const void*. * dir.c (dir_close): should not close untainted dir stream. * dir.c (GetDIR): add tainted/frozen check for each dir operation. * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg): typo fixed. a patch from Florian Gross <florg at florg.net>. * eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from event_hooks. no guarantee for arbitrary hook deletion. [ruby-dev:28632] * util.c (ruby_strtod): differ addition to minimize error. [ruby-dev:28619] * util.c (ruby_strtod): should not raise ERANGE when the input string does not have any digits. [ruby-dev:28629] * eval.c (proc_invoke): should restore old ruby_frame->block. thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833] also fix [ruby-dev:28614] as well. * signal.c (trap): sig should be less then NSIG. Coverity found this bug. a patch from Kevin Tew <tewk at tewk.com>. [ruby-core:07823] * math.c (math_log2): add new method inspired by [ruby-talk:191237]. * math.c (math_log): add optional base argument to Math::log(). [ruby-talk:191308] * ext/syck/emitter.c (syck_scan_scalar): avoid accessing uninitialized array element. a patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07809] * array.c (rb_ary_fill): initialize local variables first. a patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810] * ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free type_tag. a patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07808] * ext/socket/socket.c (make_hostent_internal): accept ai_family check from Sam Roberts <sroberts at uniserve.com>. [ruby-core:07691] * util.c (ruby_strtod): should not cut off 18 digits for no reason. [ruby-core:07796] * array.c (rb_ary_fill): internalize local variable "beg" to pacify Coverity. [ruby-core:07770] * pack.c (pack_unpack): now supports CRLF newlines. a patch from <tommy at tmtm.org>. [ruby-dev:28601] * applied code clean-up patch from Stefan Huehner <stefan at huehner.org>. [ruby-core:07764] * lib/jcode.rb (String::tr_s): should have translated non squeezing character sequence (i.e. a character) as well. thanks to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090] * ext/socket/socket.c: document update patch from Sam Roberts <sroberts at uniserve.com>. [ruby-core:07701] * lib/mathn.rb (Integer): need not to remove gcd2. a patch from NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570] * parse.y (arg): too much NEW_LIST() * eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen. * eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1. [ruby-dev:28585] * parse.y (arg): use NODE_ARGSCAT for placeholder. * lib/getoptlong.rb (GetoptLong::get): RDoc update patch from mathew <meta at pobox.com>. [ruby-core:07738] * variable.c (rb_const_set): raise error when no target klass is supplied. [ruby-dev:28582] * prec.c (prec_prec_f): documentation patch from <gerardo.santana at gmail.com>. [ruby-core:07689] * bignum.c (rb_big_pow): second operand may be too big even if it's a Fixnum. [ruby-talk:187984] * README.EXT: update symbol description. [ruby-talk:188104] * COPYING: explicitly note GPLv2. [ruby-talk:187922] * parse.y: remove some obsolete syntax rules (unparenthesized method calls in argument list). * eval.c (rb_call0): insecure calling should be checked for non NODE_SCOPE method invocations too. * eval.c (rb_alias): should preserve the current safe level as well as method definition. * process.c (rb_f_sleep): remove RDoc description about SIGALRM which is not valid on the current implementation. [ruby-dev:28464] Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp> * eval.c (method_missing): should support argument splat in super. a bug in combination of super, splat and method_missing. [ruby-talk:185438] * configure.in: Solaris SunPro compiler -rapth patch from <kuwa at labs.fujitsu.com>. [ruby-dev:28443] * configure.in: remove enable_rpath=no for Solaris. [ruby-dev:28440] * ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby String object. * ruby.1: a clarification patch from David Lutterkort <dlutter at redhat.com>. [ruby-core:7508] * lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems directories. a patch from Eric Hodel <drbrain at segment7.net>. [ruby-core:07423] * eval.c (rb_clear_cache_by_class): clearing wrong cache. * ext/extmk.rb: use :remove_destination to install extension libraries to avoid SEGV. [ruby-dev:28417] * eval.c (rb_thread_fd_writable): should not re-schedule output from KILLED thread (must be error printing). * array.c (rb_ary_flatten_bang): allow specifying recursion level. [ruby-talk:182170] * array.c (rb_ary_flatten): ditto. * gc.c (add_heap): a heap_slots may overflow. a patch from Stefan Weil <weil at mail.berlios.de>. * eval.c (rb_call): use separate cache for fcall/vcall invocation. * eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local functions. * eval.c (rb_mod_local): a new method to specify newly added visibility "local". * eval.c (search_method): search for local methods which are visible only from the current class. * class.c (rb_class_local_methods): a method to list local methods. * object.c (Init_Object): add BasicObject class as a top level BlankSlate class. * ruby.h (SYM2ID): should not cast to signed long. [ruby-core:07414] * class.c (rb_include_module): allow module duplication. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
861 lines
22 KiB
C
861 lines
22 KiB
C
/**********************************************************************
|
|
|
|
struct.c -
|
|
|
|
$Author$
|
|
$Date$
|
|
created at: Tue Mar 22 18:44:30 JST 1995
|
|
|
|
Copyright (C) 1993-2003 Yukihiro Matsumoto
|
|
|
|
**********************************************************************/
|
|
|
|
#include "ruby.h"
|
|
|
|
VALUE rb_cStruct;
|
|
|
|
static VALUE struct_alloc(VALUE);
|
|
|
|
VALUE
|
|
rb_struct_iv_get(VALUE c, const char *name)
|
|
{
|
|
ID id;
|
|
|
|
id = rb_intern(name);
|
|
for (;;) {
|
|
if (rb_ivar_defined(c, id))
|
|
return rb_ivar_get(c, id);
|
|
c = RCLASS(c)->super;
|
|
if (c == 0 || c == rb_cStruct)
|
|
return Qnil;
|
|
}
|
|
}
|
|
|
|
VALUE
|
|
rb_struct_s_members(VALUE klass)
|
|
{
|
|
VALUE members = rb_struct_iv_get(klass, "__members__");
|
|
|
|
if (NIL_P(members)) {
|
|
rb_bug("non-initialized struct");
|
|
}
|
|
return members;
|
|
}
|
|
|
|
VALUE
|
|
rb_struct_members(VALUE s)
|
|
{
|
|
VALUE members = rb_struct_s_members(rb_obj_class(s));
|
|
|
|
if (RSTRUCT_LEN(s) != RARRAY(members)->len) {
|
|
rb_raise(rb_eTypeError, "struct size differs (%ld required %ld given)",
|
|
RARRAY(members)->len, RSTRUCT_LEN(s));
|
|
}
|
|
return members;
|
|
}
|
|
|
|
static VALUE
|
|
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;
|
|
while (p < pend) {
|
|
rb_ary_push(ary, rb_str_new2(rb_id2name(SYM2ID(*p))));
|
|
p++;
|
|
}
|
|
|
|
return ary;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* 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"]
|
|
*/
|
|
|
|
static VALUE
|
|
rb_struct_members_m(VALUE obj)
|
|
{
|
|
return rb_struct_s_members_m(rb_obj_class(obj));
|
|
}
|
|
|
|
VALUE
|
|
rb_struct_getmember(VALUE obj, ID id)
|
|
{
|
|
VALUE members, slot;
|
|
long i;
|
|
|
|
members = rb_struct_members(obj);
|
|
slot = ID2SYM(id);
|
|
for (i=0; i<RARRAY(members)->len; i++) {
|
|
if (RARRAY(members)->ptr[i] == slot) {
|
|
return RSTRUCT_PTR(obj)[i];
|
|
}
|
|
}
|
|
rb_name_error(id, "%s is not struct member", rb_id2name(id));
|
|
return Qnil; /* not reached */
|
|
}
|
|
|
|
static VALUE
|
|
rb_struct_ref(VALUE obj)
|
|
{
|
|
return rb_struct_getmember(obj, rb_frame_this_func());
|
|
}
|
|
|
|
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 N_REF_FUNC (sizeof(ref_func) / sizeof(ref_func[0]))
|
|
|
|
static VALUE (*ref_func[])(VALUE) = {
|
|
rb_struct_ref0,
|
|
rb_struct_ref1,
|
|
rb_struct_ref2,
|
|
rb_struct_ref3,
|
|
rb_struct_ref4,
|
|
rb_struct_ref5,
|
|
rb_struct_ref6,
|
|
rb_struct_ref7,
|
|
rb_struct_ref8,
|
|
rb_struct_ref9,
|
|
};
|
|
|
|
static void
|
|
rb_struct_modify(VALUE s)
|
|
{
|
|
if (OBJ_FROZEN(s)) rb_error_frozen("Struct");
|
|
if (!OBJ_TAINTED(s) && rb_safe_level() >= 4)
|
|
rb_raise(rb_eSecurityError, "Insecure: can't modify Struct");
|
|
}
|
|
|
|
static VALUE
|
|
rb_struct_set(VALUE obj, VALUE val)
|
|
{
|
|
VALUE members, slot;
|
|
long i;
|
|
|
|
members = rb_struct_members(obj);
|
|
rb_struct_modify(obj);
|
|
for (i=0; i<RARRAY(members)->len; i++) {
|
|
slot = RARRAY(members)->ptr[i];
|
|
if (rb_id_attrset(SYM2ID(slot)) == rb_frame_this_func()) {
|
|
return RSTRUCT_PTR(obj)[i] = val;
|
|
}
|
|
}
|
|
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(VALUE name, VALUE members, VALUE klass)
|
|
{
|
|
VALUE nstr;
|
|
ID id;
|
|
long i;
|
|
|
|
OBJ_FREEZE(members);
|
|
if (NIL_P(name)) {
|
|
nstr = rb_class_new(klass);
|
|
rb_make_metaclass(nstr, RBASIC(klass)->klass);
|
|
rb_class_inherited(klass, nstr);
|
|
}
|
|
else {
|
|
char *cname = StringValuePtr(name);
|
|
|
|
id = rb_intern(cname);
|
|
if (!rb_is_const_id(id)) {
|
|
rb_name_error(id, "identifier %s needs to be constant", cname);
|
|
}
|
|
if (rb_const_defined_at(klass, id)) {
|
|
rb_warn("redefining constant Struct::%s", cname);
|
|
rb_mod_remove_const(klass, ID2SYM(id));
|
|
}
|
|
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_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]);
|
|
if (rb_is_local_id(id) || rb_is_const_id(id)) {
|
|
if (i < N_REF_FUNC) {
|
|
rb_define_method_id(nstr, id, ref_func[i], 0);
|
|
}
|
|
else {
|
|
rb_define_method_id(nstr, id, rb_struct_ref, 0);
|
|
}
|
|
rb_define_method_id(nstr, rb_id_attrset(id), rb_struct_set, 1);
|
|
}
|
|
}
|
|
|
|
return nstr;
|
|
}
|
|
|
|
VALUE
|
|
rb_struct_define(const char *name, ...)
|
|
{
|
|
va_list ar;
|
|
VALUE nm, ary;
|
|
char *mem;
|
|
|
|
if (!name) nm = Qnil;
|
|
else nm = rb_str_new2(name);
|
|
ary = rb_ary_new();
|
|
|
|
va_start(ar, name);
|
|
while (mem = va_arg(ar, char*)) {
|
|
ID slot = rb_intern(mem);
|
|
rb_ary_push(ary, ID2SYM(slot));
|
|
}
|
|
va_end(ar);
|
|
|
|
return make_struct(nm, ary, rb_cStruct);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* 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
|
|
* omitted, an anonymous structure class will be created. Otherwise,
|
|
* the name of this struct will appear as a constant in class
|
|
* <code>Struct</code>, so it must be unique for all
|
|
* <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}.
|
|
*
|
|
* The remaining methods listed in this section (class and instance)
|
|
* 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">
|
|
*
|
|
* # Create a structure named by its constant
|
|
* Customer = Struct.new(:name, :address) #=> Customer
|
|
* Customer.new("Dave", "123 Main") #=> #<Customer name="Dave", address="123 Main">
|
|
*/
|
|
|
|
static VALUE
|
|
rb_struct_s_def(int argc, VALUE *argv, VALUE klass)
|
|
{
|
|
VALUE name, rest;
|
|
long i;
|
|
VALUE st;
|
|
ID id;
|
|
|
|
rb_scan_args(argc, argv, "1*", &name, &rest);
|
|
for (i=0; i<RARRAY(rest)->len; i++) {
|
|
id = rb_to_id(RARRAY(rest)->ptr[i]);
|
|
RARRAY(rest)->ptr[i] = ID2SYM(id);
|
|
}
|
|
if (!NIL_P(name)) {
|
|
VALUE tmp = rb_check_string_type(name);
|
|
|
|
if (NIL_P(tmp)) {
|
|
id = rb_to_id(name);
|
|
rb_ary_unshift(rest, ID2SYM(id));
|
|
name = Qnil;
|
|
}
|
|
}
|
|
st = make_struct(name, rest, klass);
|
|
if (rb_block_given_p()) {
|
|
rb_mod_module_eval(0, 0, st);
|
|
}
|
|
|
|
return st;
|
|
}
|
|
|
|
/*
|
|
*/
|
|
|
|
static VALUE
|
|
rb_struct_initialize(VALUE self, VALUE values)
|
|
{
|
|
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) {
|
|
rb_raise(rb_eArgError, "struct size differs");
|
|
}
|
|
MEMCPY(RSTRUCT_PTR(self), RARRAY(values)->ptr, VALUE, RARRAY(values)->len);
|
|
if (n > RARRAY(values)->len) {
|
|
rb_mem_clear(RSTRUCT_PTR(self)+RARRAY(values)->len,
|
|
n-RARRAY(values)->len);
|
|
}
|
|
return Qnil;
|
|
}
|
|
|
|
static VALUE
|
|
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);
|
|
|
|
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(VALUE klass, VALUE values)
|
|
{
|
|
return rb_class_new_instance(RARRAY(values)->len, RARRAY(values)->ptr, klass);
|
|
}
|
|
|
|
VALUE
|
|
rb_struct_new(VALUE klass, ...)
|
|
{
|
|
VALUE sz, *mem;
|
|
long size, i;
|
|
va_list args;
|
|
|
|
sz = rb_struct_iv_get(klass, "__size__");
|
|
size = FIX2LONG(sz);
|
|
mem = ALLOCA_N(VALUE, size);
|
|
va_start(args, klass);
|
|
for (i=0; i<size; i++) {
|
|
mem[i] = va_arg(args, VALUE);
|
|
}
|
|
va_end(args);
|
|
|
|
return rb_class_new_instance(size, mem, klass);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* struct.each {|obj| block } => struct
|
|
*
|
|
* Calls <i>block</i> once for each instance variable, passing the
|
|
* value as a parameter.
|
|
*
|
|
* 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(VALUE s)
|
|
{
|
|
long 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
|
|
*
|
|
* Calls <i>block</i> once for each instance variable, passing the name
|
|
* (as a symbol) and the value as parameters.
|
|
*
|
|
* 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(VALUE s)
|
|
{
|
|
VALUE members;
|
|
long i;
|
|
|
|
RETURN_ENUMERATOR(s, 0, 0);
|
|
members = rb_struct_members(s);
|
|
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(VALUE s, VALUE dummy, int recur)
|
|
{
|
|
char *cname = rb_class2name(rb_obj_class(s));
|
|
VALUE str, members;
|
|
long i;
|
|
|
|
if (recur) {
|
|
return rb_sprintf("#<struct %s:...>", cname);
|
|
}
|
|
|
|
members = rb_struct_members(s);
|
|
str = rb_sprintf("#<struct %s ", cname);
|
|
for (i=0; i<RSTRUCT_LEN(s); i++) {
|
|
VALUE slot;
|
|
ID id;
|
|
const char *p;
|
|
|
|
if (i > 0) {
|
|
rb_str_cat2(str, ", ");
|
|
}
|
|
slot = RARRAY(members)->ptr[i];
|
|
id = SYM2ID(slot);
|
|
if (rb_is_local_id(id) || rb_is_const_id(id)) {
|
|
p = rb_id2name(id);
|
|
rb_str_cat2(str, p);
|
|
}
|
|
else {
|
|
rb_str_append(str, rb_inspect(slot));
|
|
}
|
|
rb_str_cat2(str, "=");
|
|
rb_str_append(str, rb_inspect(RSTRUCT_PTR(s)[i]));
|
|
}
|
|
rb_str_cat2(str, ">");
|
|
OBJ_INFECT(str, s);
|
|
|
|
return str;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* struct.to_s => string
|
|
* struct.inspect => string
|
|
*
|
|
* Describe the contents of this struct in a string.
|
|
*/
|
|
|
|
static VALUE
|
|
rb_struct_inspect(VALUE s)
|
|
{
|
|
return rb_exec_recursive(inspect_struct, s, 0);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* 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(VALUE s)
|
|
{
|
|
return rb_ary_new4(RSTRUCT_LEN(s), RSTRUCT_PTR(s));
|
|
}
|
|
|
|
/* :nodoc: */
|
|
static 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 (0 < RSTRUCT_LEN(s) && RSTRUCT_LEN(s) <= RSTRUCT_EMBED_LEN_MAX) {
|
|
RBASIC(copy)->flags &= ~RSTRUCT_EMBED_LEN_MASK;
|
|
RBASIC(copy)->flags |= RSTRUCT_LEN(s) << RSTRUCT_EMBED_LEN_SHIFT;
|
|
}
|
|
else {
|
|
RSTRUCT(copy)->as.heap.ptr = ALLOC_N(VALUE, RSTRUCT_LEN(s));
|
|
RSTRUCT(copy)->as.heap.len = RSTRUCT_LEN(s);
|
|
}
|
|
MEMCPY(RSTRUCT_PTR(copy), RSTRUCT_PTR(s), VALUE, RSTRUCT_LEN(copy));
|
|
|
|
return copy;
|
|
}
|
|
|
|
static VALUE
|
|
rb_struct_aref_id(VALUE s, ID id)
|
|
{
|
|
VALUE members;
|
|
long i, len;
|
|
|
|
members = rb_struct_members(s);
|
|
len = RARRAY(members)->len;
|
|
for (i=0; i<len; i++) {
|
|
if (SYM2ID(RARRAY(members)->ptr[i]) == id) {
|
|
return RSTRUCT_PTR(s)[i];
|
|
}
|
|
}
|
|
rb_name_error(id, "no member '%s' in struct", rb_id2name(id));
|
|
return Qnil; /* not reached */
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* 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(VALUE s, VALUE idx)
|
|
{
|
|
long i;
|
|
|
|
if (TYPE(idx) == T_STRING || TYPE(idx) == T_SYMBOL) {
|
|
return rb_struct_aref_id(s, rb_to_id(idx));
|
|
}
|
|
|
|
i = NUM2LONG(idx);
|
|
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_LEN(s));
|
|
if (RSTRUCT_LEN(s) <= i)
|
|
rb_raise(rb_eIndexError, "offset %ld too large for struct(size:%ld)",
|
|
i, RSTRUCT_LEN(s));
|
|
return RSTRUCT_PTR(s)[i];
|
|
}
|
|
|
|
static VALUE
|
|
rb_struct_aset_id(VALUE s, ID id, VALUE val)
|
|
{
|
|
VALUE members;
|
|
long i, len;
|
|
|
|
members = rb_struct_members(s);
|
|
rb_struct_modify(s);
|
|
len = RARRAY(members)->len;
|
|
if (RSTRUCT_LEN(s) != RARRAY(members)->len) {
|
|
rb_raise(rb_eTypeError, "struct size differs (%ld required %ld given)",
|
|
RARRAY(members)->len, RSTRUCT_LEN(s));
|
|
}
|
|
for (i=0; i<len; i++) {
|
|
if (SYM2ID(RARRAY(members)->ptr[i]) == id) {
|
|
RSTRUCT_PTR(s)[i] = val;
|
|
return val;
|
|
}
|
|
}
|
|
rb_name_error(id, "no member '%s' in struct", rb_id2name(id));
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* 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(VALUE s, VALUE idx, VALUE val)
|
|
{
|
|
long i;
|
|
|
|
if (TYPE(idx) == T_STRING || TYPE(idx) == T_SYMBOL) {
|
|
return rb_struct_aset_id(s, rb_to_id(idx), val);
|
|
}
|
|
|
|
i = NUM2LONG(idx);
|
|
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_LEN(s));
|
|
}
|
|
if (RSTRUCT_LEN(s) <= i) {
|
|
rb_raise(rb_eIndexError, "offset %ld too large for struct(size:%ld)",
|
|
i, RSTRUCT_LEN(s));
|
|
}
|
|
rb_struct_modify(s);
|
|
return RSTRUCT_PTR(s)[i] = val;
|
|
}
|
|
|
|
static VALUE
|
|
struct_entry(VALUE s, long n)
|
|
{
|
|
return rb_struct_aref(s, LONG2NUM(n));
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* 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.
|
|
* 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)
|
|
* a.values_at(-1, -3, -5, -7)
|
|
* a.values_at(1..3, 2...5)
|
|
*/
|
|
|
|
static VALUE
|
|
rb_struct_values_at(int argc, VALUE *argv, VALUE s)
|
|
{
|
|
return rb_get_values_at(s, RSTRUCT_LEN(s), argc, argv, struct_entry);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* struct.select {|i| block } => array
|
|
*
|
|
* 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(int argc, VALUE *argv, VALUE s)
|
|
{
|
|
VALUE result;
|
|
long i;
|
|
|
|
if (argc > 0) {
|
|
rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
|
|
}
|
|
result = rb_ary_new();
|
|
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;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* 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)
|
|
* jane = Customer.new("Jane Doe", "456 Elm, Anytown NC", 12345)
|
|
* joe == joejr #=> true
|
|
* joe == jane #=> false
|
|
*/
|
|
|
|
static VALUE
|
|
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_LEN(s) != RSTRUCT_LEN(s2)) {
|
|
rb_bug("inconsistent struct"); /* should never happen */
|
|
}
|
|
|
|
for (i=0; i<RSTRUCT_LEN(s); i++) {
|
|
if (!rb_equal(RSTRUCT_PTR(s)[i], RSTRUCT_PTR(s2)[i])) return Qfalse;
|
|
}
|
|
return Qtrue;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* struct.hash => fixnum
|
|
*
|
|
* Return a hash value based on this struct's contents.
|
|
*/
|
|
|
|
static VALUE
|
|
rb_struct_hash(VALUE s)
|
|
{
|
|
long i, h;
|
|
VALUE n;
|
|
|
|
h = rb_hash(rb_obj_class(s));
|
|
for (i = 0; i < RSTRUCT_LEN(s); i++) {
|
|
h = (h << 1) | (h<0 ? 1 : 0);
|
|
n = rb_hash(RSTRUCT_PTR(s)[i]);
|
|
h ^= NUM2LONG(n);
|
|
}
|
|
return LONG2FIX(h);
|
|
}
|
|
|
|
/*
|
|
* code-seq:
|
|
* 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(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_LEN(s) != RSTRUCT_LEN(s2)) {
|
|
rb_bug("inconsistent struct"); /* should never happen */
|
|
}
|
|
|
|
for (i=0; i<RSTRUCT_LEN(s); i++) {
|
|
if (!rb_eql(RSTRUCT_PTR(s)[i], RSTRUCT_PTR(s2)[i])) return Qfalse;
|
|
}
|
|
return Qtrue;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* 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(VALUE s)
|
|
{
|
|
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(void)
|
|
{
|
|
rb_cStruct = rb_define_class("Struct", rb_cObject);
|
|
rb_include_module(rb_cStruct, rb_mEnumerable);
|
|
|
|
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_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_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);
|
|
rb_define_method(rb_cStruct, "length", rb_struct_size, 0);
|
|
|
|
rb_define_method(rb_cStruct, "each", rb_struct_each, 0);
|
|
rb_define_method(rb_cStruct, "each_pair", rb_struct_each_pair, 0);
|
|
rb_define_method(rb_cStruct, "[]", rb_struct_aref, 1);
|
|
rb_define_method(rb_cStruct, "[]=", rb_struct_aset, 2);
|
|
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_m, 0);
|
|
}
|