2000-05-01 13:42:38 +04:00
|
|
|
/**********************************************************************
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
struct.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
$Date$
|
|
|
|
created at: Tue Mar 22 18:44:30 JST 1995
|
|
|
|
|
2003-01-16 10:34:03 +03:00
|
|
|
Copyright (C) 1993-2003 Yukihiro Matsumoto
|
2000-05-01 13:42:38 +04:00
|
|
|
|
|
|
|
**********************************************************************/
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
#include "ruby.h"
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE rb_cStruct;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-10-03 11:19:19 +04:00
|
|
|
static VALUE struct_alloc _((VALUE));
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2001-08-29 10:28:51 +04:00
|
|
|
VALUE
|
|
|
|
rb_struct_iv_get(c, name)
|
|
|
|
VALUE c;
|
1999-08-13 09:45:20 +04:00
|
|
|
char *name;
|
|
|
|
{
|
|
|
|
ID id;
|
|
|
|
|
|
|
|
id = rb_intern(name);
|
|
|
|
for (;;) {
|
2001-08-29 10:28:51 +04:00
|
|
|
if (rb_ivar_defined(c, id))
|
|
|
|
return rb_ivar_get(c, id);
|
|
|
|
c = RCLASS(c)->super;
|
|
|
|
if (c == 0 || c == rb_cStruct)
|
1999-08-13 09:45:20 +04:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-09-27 08:46:54 +04:00
|
|
|
VALUE
|
|
|
|
rb_struct_s_members(klass)
|
2004-09-24 20:58:51 +04:00
|
|
|
VALUE klass;
|
|
|
|
{
|
|
|
|
VALUE members = rb_struct_iv_get(klass, "__members__");
|
|
|
|
|
|
|
|
if (NIL_P(members)) {
|
|
|
|
rb_bug("non-initialized struct");
|
|
|
|
}
|
|
|
|
return members;
|
|
|
|
}
|
|
|
|
|
2004-09-27 08:46:54 +04:00
|
|
|
VALUE
|
|
|
|
rb_struct_members(s)
|
2004-09-24 09:53:43 +04:00
|
|
|
VALUE s;
|
|
|
|
{
|
2004-09-27 08:46:54 +04:00
|
|
|
VALUE members = rb_struct_s_members(rb_obj_class(s));
|
2004-09-24 09:53:43 +04:00
|
|
|
|
|
|
|
if (RSTRUCT(s)->len != RARRAY(members)->len) {
|
|
|
|
rb_raise(rb_eTypeError, "struct size differs (%d required %d given)",
|
|
|
|
RARRAY(members)->len, RSTRUCT(s)->len);
|
|
|
|
}
|
|
|
|
return members;
|
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
2004-09-27 08:46:54 +04:00
|
|
|
rb_struct_s_members_m(klass)
|
2004-09-24 20:58:51 +04:00
|
|
|
VALUE klass;
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2004-09-24 09:53:43 +04:00
|
|
|
VALUE members, ary;
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE *p, *pend;
|
|
|
|
|
2004-09-27 08:46:54 +04:00
|
|
|
members = rb_struct_s_members(klass);
|
2004-09-24 09:53:43 +04:00
|
|
|
ary = rb_ary_new2(RARRAY(members)->len);
|
|
|
|
p = RARRAY(members)->ptr; pend = p + RARRAY(members)->len;
|
1998-01-16 15:13:05 +03:00
|
|
|
while (p < pend) {
|
2000-04-10 09:48:43 +04:00
|
|
|
rb_ary_push(ary, rb_str_new2(rb_id2name(SYM2ID(*p))));
|
1998-01-16 15:13:05 +03:00
|
|
|
p++;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* 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"]
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2004-09-27 08:46:54 +04:00
|
|
|
rb_struct_members_m(obj)
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE obj;
|
|
|
|
{
|
2004-09-27 08:46:54 +04:00
|
|
|
return rb_struct_s_members_m(rb_obj_class(obj));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_struct_getmember(obj, id)
|
1998-01-16 15:19:22 +03:00
|
|
|
VALUE obj;
|
1998-01-16 15:13:05 +03:00
|
|
|
ID id;
|
|
|
|
{
|
2004-09-24 09:53:43 +04:00
|
|
|
VALUE members, slot;
|
1999-08-13 09:45:20 +04:00
|
|
|
long i;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-09-27 08:46:54 +04:00
|
|
|
members = rb_struct_members(obj);
|
2000-05-24 08:34:26 +04:00
|
|
|
slot = ID2SYM(id);
|
2004-09-24 09:53:43 +04:00
|
|
|
for (i=0; i<RARRAY(members)->len; i++) {
|
|
|
|
if (RARRAY(members)->ptr[i] == slot) {
|
1998-01-16 15:19:22 +03:00
|
|
|
return RSTRUCT(obj)->ptr[i];
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
2001-07-02 12:46:28 +04:00
|
|
|
rb_name_error(id, "%s is not struct member", rb_id2name(id));
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qnil; /* not reached */
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_struct_ref(obj)
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE obj;
|
|
|
|
{
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
return rb_struct_getmember(obj, rb_frame_this_func());
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
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];}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2005-06-01 19:03:09 +04:00
|
|
|
#define N_REF_FUNC (sizeof(ref_func) / sizeof(VALUE (*)()))
|
|
|
|
|
|
|
|
static VALUE (*ref_func[])() = {
|
1999-01-20 07:59:39 +03:00
|
|
|
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,
|
1998-01-16 15:13:05 +03:00
|
|
|
};
|
|
|
|
|
2001-08-06 07:08:57 +04:00
|
|
|
static void
|
|
|
|
rb_struct_modify(s)
|
|
|
|
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");
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_struct_set(obj, val)
|
1998-01-16 15:19:22 +03:00
|
|
|
VALUE obj, val;
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2004-09-24 09:53:43 +04:00
|
|
|
VALUE members, slot;
|
1999-08-13 09:45:20 +04:00
|
|
|
long i;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-09-27 08:46:54 +04:00
|
|
|
members = rb_struct_members(obj);
|
2001-08-06 07:08:57 +04:00
|
|
|
rb_struct_modify(obj);
|
2004-09-24 09:53:43 +04:00
|
|
|
for (i=0; i<RARRAY(members)->len; i++) {
|
|
|
|
slot = RARRAY(members)->ptr[i];
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
if (rb_id_attrset(SYM2ID(slot)) == rb_frame_this_func()) {
|
1998-01-16 15:19:22 +03:00
|
|
|
return RSTRUCT(obj)->ptr[i] = val;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
rb_name_error(rb_frame_this_func(), "`%s' is not a struct member",
|
|
|
|
rb_id2name(rb_frame_this_func()));
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qnil; /* not reached */
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2004-09-24 09:53:43 +04:00
|
|
|
make_struct(name, members, klass)
|
|
|
|
VALUE name, members, klass;
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE nstr;
|
|
|
|
ID id;
|
1999-08-13 09:45:20 +04:00
|
|
|
long i;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-09-24 09:53:43 +04:00
|
|
|
OBJ_FREEZE(members);
|
1999-01-20 07:59:39 +03:00
|
|
|
if (NIL_P(name)) {
|
|
|
|
nstr = rb_class_new(klass);
|
2003-01-05 20:40:29 +03:00
|
|
|
rb_make_metaclass(nstr, RBASIC(klass)->klass);
|
2002-01-10 23:18:39 +03:00
|
|
|
rb_class_inherited(klass, nstr);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
else {
|
2001-05-02 08:22:21 +04:00
|
|
|
char *cname = StringValuePtr(name);
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
id = rb_intern(cname);
|
1999-12-14 09:50:43 +03:00
|
|
|
if (!rb_is_const_id(id)) {
|
2001-07-02 12:46:28 +04:00
|
|
|
rb_name_error(id, "identifier %s needs to be constant", cname);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
2004-09-03 13:00:52 +04:00
|
|
|
if (rb_const_defined_at(klass, id)) {
|
|
|
|
rb_warn("redefining constant Struct::%s", cname);
|
|
|
|
rb_mod_remove_const(klass, ID2SYM(id));
|
|
|
|
}
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
nstr = rb_define_class_under(klass, rb_id2name(id), klass);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2004-09-24 09:53:43 +04:00
|
|
|
rb_iv_set(nstr, "__size__", LONG2NUM(RARRAY(members)->len));
|
|
|
|
rb_iv_set(nstr, "__members__", members);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2002-12-20 11:33:17 +03:00
|
|
|
rb_define_alloc_func(nstr, struct_alloc);
|
2001-10-03 11:19:19 +04:00
|
|
|
rb_define_singleton_method(nstr, "new", rb_class_new_instance, -1);
|
|
|
|
rb_define_singleton_method(nstr, "[]", rb_class_new_instance, -1);
|
2004-09-27 08:46:54 +04:00
|
|
|
rb_define_singleton_method(nstr, "members", rb_struct_s_members_m, 0);
|
2004-09-24 09:53:43 +04:00
|
|
|
for (i=0; i< RARRAY(members)->len; i++) {
|
|
|
|
ID id = SYM2ID(RARRAY(members)->ptr[i]);
|
2005-04-18 10:38:30 +04:00
|
|
|
if (rb_is_local_id(id) || rb_is_const_id(id)) {
|
2005-06-01 19:03:09 +04:00
|
|
|
if (i < N_REF_FUNC) {
|
2005-03-17 11:56:36 +03:00
|
|
|
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);
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
return nstr;
|
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
#ifdef HAVE_STDARG_PROTOTYPES
|
|
|
|
#include <stdarg.h>
|
|
|
|
#define va_init_list(a,b) va_start(a,b)
|
|
|
|
#else
|
1998-01-16 15:13:05 +03:00
|
|
|
#include <varargs.h>
|
1999-01-20 07:59:39 +03:00
|
|
|
#define va_init_list(a,b) va_start(a)
|
|
|
|
#endif
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
VALUE
|
1999-01-20 07:59:39 +03:00
|
|
|
#ifdef HAVE_STDARG_PROTOTYPES
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_struct_define(const char *name, ...)
|
1999-01-20 07:59:39 +03:00
|
|
|
#else
|
|
|
|
rb_struct_define(name, va_alist)
|
1999-08-13 09:45:20 +04:00
|
|
|
const char *name;
|
1998-01-16 15:13:05 +03:00
|
|
|
va_dcl
|
1999-01-20 07:59:39 +03:00
|
|
|
#endif
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
va_list ar;
|
|
|
|
VALUE nm, ary;
|
|
|
|
char *mem;
|
|
|
|
|
1999-12-14 09:50:43 +03:00
|
|
|
if (!name) nm = Qnil;
|
|
|
|
else nm = rb_str_new2(name);
|
1999-01-20 07:59:39 +03:00
|
|
|
ary = rb_ary_new();
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
va_init_list(ar, name);
|
1998-01-16 15:13:05 +03:00
|
|
|
while (mem = va_arg(ar, char*)) {
|
|
|
|
ID slot = rb_intern(mem);
|
2000-04-10 09:48:43 +04:00
|
|
|
rb_ary_push(ary, ID2SYM(slot));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
va_end(ar);
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
return make_struct(nm, ary, rb_cStruct);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* 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">
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_struct_s_def(argc, argv, klass)
|
1998-01-16 15:13:05 +03:00
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
1999-12-14 09:50:43 +03:00
|
|
|
VALUE klass;
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE name, rest;
|
1999-08-13 09:45:20 +04:00
|
|
|
long i;
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE st;
|
1999-12-14 09:50:43 +03:00
|
|
|
ID id;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "1*", &name, &rest);
|
1999-01-20 07:59:39 +03:00
|
|
|
for (i=0; i<RARRAY(rest)->len; i++) {
|
1999-12-14 09:50:43 +03:00
|
|
|
id = rb_to_id(RARRAY(rest)->ptr[i]);
|
2000-04-10 09:48:43 +04:00
|
|
|
RARRAY(rest)->ptr[i] = ID2SYM(id);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2004-03-10 10:05:19 +03:00
|
|
|
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;
|
|
|
|
}
|
1999-12-14 09:50:43 +03:00
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
st = make_struct(name, rest, klass);
|
2004-03-10 10:05:19 +03:00
|
|
|
if (rb_block_given_p()) {
|
|
|
|
rb_mod_module_eval(0, 0, st);
|
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
|
|
|
|
return st;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
*/
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
static VALUE
|
|
|
|
rb_struct_initialize(self, values)
|
|
|
|
VALUE self, values;
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-08-20 08:29:58 +04:00
|
|
|
VALUE klass = rb_obj_class(self);
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE size;
|
1999-08-13 09:45:20 +04:00
|
|
|
long n;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-08-06 07:08:57 +04:00
|
|
|
rb_struct_modify(self);
|
2001-08-29 10:28:51 +04:00
|
|
|
size = rb_struct_iv_get(klass, "__size__");
|
2000-04-10 09:48:43 +04:00
|
|
|
n = FIX2LONG(size);
|
1999-08-13 09:45:20 +04:00
|
|
|
if (n < RARRAY(values)->len) {
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_raise(rb_eArgError, "struct size differs");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
1999-08-13 09:45:20 +04:00
|
|
|
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);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
1999-08-13 09:45:20 +04:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2001-10-03 11:19:19 +04:00
|
|
|
struct_alloc(klass)
|
1999-08-13 09:45:20 +04:00
|
|
|
VALUE klass;
|
|
|
|
{
|
|
|
|
VALUE size;
|
|
|
|
long n;
|
|
|
|
NEWOBJ(st, struct RStruct);
|
|
|
|
OBJSETUP(st, klass, T_STRUCT);
|
|
|
|
|
2001-08-29 10:28:51 +04:00
|
|
|
size = rb_struct_iv_get(klass, "__size__");
|
1999-08-13 09:45:20 +04:00
|
|
|
n = FIX2LONG(size);
|
|
|
|
|
|
|
|
st->ptr = ALLOC_N(VALUE, n);
|
|
|
|
rb_mem_clear(st->ptr, n);
|
|
|
|
st->len = n;
|
|
|
|
|
|
|
|
return (VALUE)st;
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_struct_alloc(klass, values)
|
|
|
|
VALUE klass, values;
|
|
|
|
{
|
2001-10-03 11:19:19 +04:00
|
|
|
return rb_class_new_instance(RARRAY(values)->len, RARRAY(values)->ptr, klass);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
1999-01-20 07:59:39 +03:00
|
|
|
#ifdef HAVE_STDARG_PROTOTYPES
|
|
|
|
rb_struct_new(VALUE klass, ...)
|
|
|
|
#else
|
|
|
|
rb_struct_new(klass, va_alist)
|
|
|
|
VALUE klass;
|
1998-01-16 15:13:05 +03:00
|
|
|
va_dcl
|
1999-01-20 07:59:39 +03:00
|
|
|
#endif
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-08-13 09:45:20 +04:00
|
|
|
VALUE sz, *mem;
|
|
|
|
long size, i;
|
1998-01-16 15:13:05 +03:00
|
|
|
va_list args;
|
|
|
|
|
2001-08-29 10:28:51 +04:00
|
|
|
sz = rb_struct_iv_get(klass, "__size__");
|
1999-08-13 09:45:20 +04:00
|
|
|
size = FIX2LONG(sz);
|
|
|
|
mem = ALLOCA_N(VALUE, size);
|
1999-01-20 07:59:39 +03:00
|
|
|
va_init_list(args, klass);
|
|
|
|
for (i=0; i<size; i++) {
|
1999-08-13 09:45:20 +04:00
|
|
|
mem[i] = va_arg(args, VALUE);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
va_end(args);
|
|
|
|
|
2001-10-03 11:19:19 +04:00
|
|
|
return rb_class_new_instance(size, mem, klass);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* 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
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_struct_each(s)
|
1998-01-16 15:19:22 +03:00
|
|
|
VALUE s;
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-08-13 09:45:20 +04:00
|
|
|
long i;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
for (i=0; i<RSTRUCT(s)->len; i++) {
|
|
|
|
rb_yield(RSTRUCT(s)->ptr[i]);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
1999-08-13 09:45:20 +04:00
|
|
|
return s;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* 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
|
|
|
|
*/
|
|
|
|
|
2002-04-10 12:45:26 +04:00
|
|
|
static VALUE
|
|
|
|
rb_struct_each_pair(s)
|
|
|
|
VALUE s;
|
|
|
|
{
|
2004-09-24 09:53:43 +04:00
|
|
|
VALUE members;
|
2002-04-10 12:45:26 +04:00
|
|
|
long i;
|
|
|
|
|
2004-09-27 08:46:54 +04:00
|
|
|
members = rb_struct_members(s);
|
2002-04-10 12:45:26 +04:00
|
|
|
for (i=0; i<RSTRUCT(s)->len; i++) {
|
2004-09-24 09:53:43 +04:00
|
|
|
rb_yield_values(2, rb_ary_entry(members, i), RSTRUCT(s)->ptr[i]);
|
2002-04-10 12:45:26 +04:00
|
|
|
}
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
inspect_struct(s, dummy, recur)
|
|
|
|
VALUE s, dummy;
|
|
|
|
int recur;
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-08-20 08:29:58 +04:00
|
|
|
char *cname = rb_class2name(rb_obj_class(s));
|
2004-09-24 09:53:43 +04:00
|
|
|
VALUE str, members;
|
1999-08-13 09:45:20 +04:00
|
|
|
long i;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
if (recur) {
|
|
|
|
char *cname = rb_class2name(rb_obj_class(s));
|
2005-07-19 12:31:04 +04:00
|
|
|
size_t len = strlen(cname) + 15;
|
|
|
|
VALUE str = rb_str_new(0, len);
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
|
2005-07-19 12:31:04 +04:00
|
|
|
snprintf(RSTRING(str)->ptr, len, "#<struct %s:...>", cname);
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
RSTRING(str)->len = strlen(RSTRING(str)->ptr);
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2004-09-27 08:46:54 +04:00
|
|
|
members = rb_struct_members(s);
|
2003-07-03 15:02:53 +04:00
|
|
|
str = rb_str_buf_new2("#<struct ");
|
2000-04-10 09:48:43 +04:00
|
|
|
rb_str_cat2(str, cname);
|
|
|
|
rb_str_cat2(str, " ");
|
1998-01-16 15:19:22 +03:00
|
|
|
for (i=0; i<RSTRUCT(s)->len; i++) {
|
2005-03-17 11:56:36 +03:00
|
|
|
VALUE slot;
|
|
|
|
ID id;
|
1998-01-16 15:13:05 +03:00
|
|
|
char *p;
|
|
|
|
|
|
|
|
if (i > 0) {
|
2000-04-10 09:48:43 +04:00
|
|
|
rb_str_cat2(str, ", ");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2004-09-24 09:53:43 +04:00
|
|
|
slot = RARRAY(members)->ptr[i];
|
2005-03-17 11:56:36 +03:00
|
|
|
id = SYM2ID(slot);
|
2005-04-18 10:38:30 +04:00
|
|
|
if (rb_is_local_id(id) || rb_is_const_id(id)) {
|
2005-03-17 11:56:36 +03:00
|
|
|
p = rb_id2name(id);
|
|
|
|
rb_str_cat2(str, p);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_str_append(str, rb_inspect(slot));
|
|
|
|
}
|
2000-04-10 09:48:43 +04:00
|
|
|
rb_str_cat2(str, "=");
|
2005-03-17 11:56:36 +03:00
|
|
|
rb_str_append(str, rb_inspect(RSTRUCT(s)->ptr[i]));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2000-04-10 09:48:43 +04:00
|
|
|
rb_str_cat2(str, ">");
|
2000-02-23 08:23:12 +03:00
|
|
|
OBJ_INFECT(str, s);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* struct.to_s => string
|
|
|
|
* struct.inspect => string
|
|
|
|
*
|
|
|
|
* Describe the contents of this struct in a string.
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_struct_inspect(s)
|
1998-01-16 15:19:22 +03:00
|
|
|
VALUE s;
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
return rb_exec_recursive(inspect_struct, s, 0);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* 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"
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_struct_to_a(s)
|
|
|
|
VALUE s;
|
|
|
|
{
|
|
|
|
return rb_ary_new4(RSTRUCT(s)->len, RSTRUCT(s)->ptr);
|
|
|
|
}
|
|
|
|
|
2004-01-18 17:16:47 +03:00
|
|
|
/* :nodoc: */
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
2003-05-19 09:41:08 +04:00
|
|
|
rb_struct_init_copy(copy, s)
|
2002-09-03 09:20:14 +04:00
|
|
|
VALUE copy, s;
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2002-09-03 09:20:14 +04:00
|
|
|
if (copy == s) return copy;
|
|
|
|
rb_check_frozen(copy);
|
|
|
|
if (!rb_obj_is_instance_of(s, rb_obj_class(copy))) {
|
2002-08-29 13:08:18 +04:00
|
|
|
rb_raise(rb_eTypeError, "wrong argument class");
|
2002-08-27 12:31:08 +04:00
|
|
|
}
|
2002-09-03 09:20:14 +04:00
|
|
|
RSTRUCT(copy)->ptr = ALLOC_N(VALUE, RSTRUCT(s)->len);
|
|
|
|
RSTRUCT(copy)->len = RSTRUCT(s)->len;
|
|
|
|
MEMCPY(RSTRUCT(copy)->ptr, RSTRUCT(s)->ptr, VALUE, RSTRUCT(copy)->len);
|
2000-01-05 07:41:21 +03:00
|
|
|
|
2002-09-03 09:20:14 +04:00
|
|
|
return copy;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
|
|
|
rb_struct_aref_id(s, id)
|
|
|
|
VALUE s;
|
|
|
|
ID id;
|
|
|
|
{
|
2004-09-24 09:53:43 +04:00
|
|
|
VALUE members;
|
1999-08-13 09:45:20 +04:00
|
|
|
long i, len;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2004-09-27 08:46:54 +04:00
|
|
|
members = rb_struct_members(s);
|
2004-09-24 09:53:43 +04:00
|
|
|
len = RARRAY(members)->len;
|
1999-01-20 07:59:39 +03:00
|
|
|
for (i=0; i<len; i++) {
|
2004-09-24 09:53:43 +04:00
|
|
|
if (SYM2ID(RARRAY(members)->ptr[i]) == id) {
|
1999-01-20 07:59:39 +03:00
|
|
|
return RSTRUCT(s)->ptr[i];
|
|
|
|
}
|
|
|
|
}
|
2001-07-02 12:46:28 +04:00
|
|
|
rb_name_error(id, "no member '%s' in struct", rb_id2name(id));
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qnil; /* not reached */
|
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* 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"
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_struct_aref(s, idx)
|
1998-01-16 15:19:22 +03:00
|
|
|
VALUE s, idx;
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-08-13 09:45:20 +04:00
|
|
|
long i;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2000-03-13 10:18:45 +03:00
|
|
|
if (TYPE(idx) == T_STRING || TYPE(idx) == T_SYMBOL) {
|
1999-01-20 07:59:39 +03:00
|
|
|
return rb_struct_aref_id(s, rb_to_id(idx));
|
|
|
|
}
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
i = NUM2LONG(idx);
|
1999-01-20 07:59:39 +03:00
|
|
|
if (i < 0) i = RSTRUCT(s)->len + i;
|
1998-01-16 15:13:05 +03:00
|
|
|
if (i < 0)
|
2002-10-30 00:35:28 +03:00
|
|
|
rb_raise(rb_eIndexError, "offset %ld too small for struct(size:%ld)",
|
1999-01-20 07:59:39 +03:00
|
|
|
i, RSTRUCT(s)->len);
|
1998-01-16 15:19:22 +03:00
|
|
|
if (RSTRUCT(s)->len <= i)
|
2002-10-30 00:35:28 +03:00
|
|
|
rb_raise(rb_eIndexError, "offset %ld too large for struct(size:%ld)",
|
1999-01-20 07:59:39 +03:00
|
|
|
i, RSTRUCT(s)->len);
|
1998-01-16 15:19:22 +03:00
|
|
|
return RSTRUCT(s)->ptr[i];
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
|
|
|
rb_struct_aset_id(s, id, val)
|
|
|
|
VALUE s, val;
|
|
|
|
ID id;
|
|
|
|
{
|
2004-09-24 09:53:43 +04:00
|
|
|
VALUE members;
|
1999-08-13 09:45:20 +04:00
|
|
|
long i, len;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2004-09-27 08:46:54 +04:00
|
|
|
members = rb_struct_members(s);
|
2001-08-06 07:08:57 +04:00
|
|
|
rb_struct_modify(s);
|
2004-09-24 09:53:43 +04:00
|
|
|
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);
|
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
for (i=0; i<len; i++) {
|
2004-09-24 09:53:43 +04:00
|
|
|
if (SYM2ID(RARRAY(members)->ptr[i]) == id) {
|
1999-01-20 07:59:39 +03:00
|
|
|
RSTRUCT(s)->ptr[i] = val;
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
}
|
2001-07-02 12:46:28 +04:00
|
|
|
rb_name_error(id, "no member '%s' in struct", rb_id2name(id));
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* 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"
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_struct_aset(s, idx, val)
|
1998-01-16 15:19:22 +03:00
|
|
|
VALUE s, idx, val;
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-08-13 09:45:20 +04:00
|
|
|
long i;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2000-03-13 10:18:45 +03:00
|
|
|
if (TYPE(idx) == T_STRING || TYPE(idx) == T_SYMBOL) {
|
1999-01-20 07:59:39 +03:00
|
|
|
return rb_struct_aset_id(s, rb_to_id(idx), val);
|
|
|
|
}
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
i = NUM2LONG(idx);
|
1999-01-20 07:59:39 +03:00
|
|
|
if (i < 0) i = RSTRUCT(s)->len + i;
|
2000-06-14 09:30:29 +04:00
|
|
|
if (i < 0) {
|
2002-10-30 00:35:28 +03:00
|
|
|
rb_raise(rb_eIndexError, "offset %ld too small for struct(size:%ld)",
|
1999-01-20 07:59:39 +03:00
|
|
|
i, RSTRUCT(s)->len);
|
2000-06-14 09:30:29 +04:00
|
|
|
}
|
|
|
|
if (RSTRUCT(s)->len <= i) {
|
2002-10-30 00:35:28 +03:00
|
|
|
rb_raise(rb_eIndexError, "offset %ld too large for struct(size:%ld)",
|
1999-01-20 07:59:39 +03:00
|
|
|
i, RSTRUCT(s)->len);
|
2000-06-14 09:30:29 +04:00
|
|
|
}
|
2001-08-06 07:08:57 +04:00
|
|
|
rb_struct_modify(s);
|
1998-01-16 15:19:22 +03:00
|
|
|
return RSTRUCT(s)->ptr[i] = val;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-07-12 12:02:26 +04:00
|
|
|
static VALUE struct_entry _((VALUE, long));
|
2003-07-03 15:02:53 +04:00
|
|
|
static VALUE
|
|
|
|
struct_entry(s, n)
|
|
|
|
VALUE s;
|
|
|
|
long n;
|
|
|
|
{
|
|
|
|
return rb_struct_aref(s, LONG2NUM(n));
|
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* 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)
|
|
|
|
*/
|
|
|
|
|
2003-05-04 20:03:24 +04:00
|
|
|
static VALUE
|
|
|
|
rb_struct_values_at(argc, argv, s)
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
VALUE s;
|
|
|
|
{
|
2004-04-07 06:51:05 +04:00
|
|
|
return rb_get_values_at(s, RSTRUCT(s)->len, argc, argv, struct_entry);
|
2003-05-04 20:03:24 +04:00
|
|
|
}
|
2001-12-11 06:48:08 +03:00
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* struct.select(fixnum, ... ) => array
|
|
|
|
* struct.select {|i| block } => array
|
|
|
|
*
|
|
|
|
* The first form returns an array containing the elements in
|
|
|
|
* <i>struct</i> corresponding to the given indices. The second
|
|
|
|
* form 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(1, 3, 5) #=> [22, 44, 66]
|
|
|
|
* l.select(0, 2, 4) #=> [11, 33, 55]
|
|
|
|
* l.select(-1, -3, -5) #=> [66, 44, 22]
|
|
|
|
* l.select {|v| (v % 2).zero? } #=> [22, 44, 66]
|
|
|
|
*/
|
|
|
|
|
2001-12-11 06:48:08 +03:00
|
|
|
static VALUE
|
|
|
|
rb_struct_select(argc, argv, s)
|
|
|
|
int argc;
|
|
|
|
VALUE *argv;
|
|
|
|
VALUE s;
|
|
|
|
{
|
2003-05-04 20:03:24 +04:00
|
|
|
VALUE result;
|
2001-12-11 06:48:08 +03:00
|
|
|
long i;
|
|
|
|
|
2003-05-04 20:03:24 +04:00
|
|
|
if (argc > 0) {
|
2004-03-29 11:54:38 +04:00
|
|
|
rb_raise(rb_eArgError, "wrong number of arguments (%d for 0)", argc);
|
2003-05-04 20:03:24 +04:00
|
|
|
}
|
|
|
|
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]);
|
2001-12-11 06:48:08 +03:00
|
|
|
}
|
|
|
|
}
|
2003-05-04 20:03:24 +04:00
|
|
|
|
2001-12-11 06:48:08 +03:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* 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
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_struct_equal(s, s2)
|
1998-01-16 15:19:22 +03:00
|
|
|
VALUE s, s2;
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-08-13 09:45:20 +04:00
|
|
|
long i;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-08-29 10:28:51 +04:00
|
|
|
if (s == s2) return Qtrue;
|
1999-01-20 07:59:39 +03:00
|
|
|
if (TYPE(s2) != T_STRUCT) return Qfalse;
|
2001-08-20 08:29:58 +04:00
|
|
|
if (rb_obj_class(s) != rb_obj_class(s2)) return Qfalse;
|
1998-01-16 15:19:22 +03:00
|
|
|
if (RSTRUCT(s)->len != RSTRUCT(s2)->len) {
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_bug("inconsistent struct"); /* should never happen */
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
for (i=0; i<RSTRUCT(s)->len; i++) {
|
1999-01-20 07:59:39 +03:00
|
|
|
if (!rb_equal(RSTRUCT(s)->ptr[i], RSTRUCT(s2)->ptr[i])) return Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qtrue;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* struct.hash => fixnum
|
|
|
|
*
|
|
|
|
* Return a hash value based on this struct's contents.
|
|
|
|
*/
|
|
|
|
|
2003-04-15 14:12:25 +04:00
|
|
|
static VALUE
|
|
|
|
rb_struct_hash(s)
|
|
|
|
VALUE s;
|
|
|
|
{
|
|
|
|
long i, h;
|
|
|
|
VALUE n;
|
|
|
|
|
|
|
|
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);
|
|
|
|
}
|
|
|
|
return LONG2FIX(h);
|
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* 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>).
|
|
|
|
*/
|
|
|
|
|
2003-04-18 22:05:11 +04:00
|
|
|
static VALUE
|
|
|
|
rb_struct_eql(s, s2)
|
|
|
|
VALUE s, 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) {
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* 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
|
|
|
|
*/
|
|
|
|
|
1999-12-07 12:25:55 +03:00
|
|
|
static VALUE
|
|
|
|
rb_struct_size(s)
|
|
|
|
VALUE s;
|
|
|
|
{
|
2002-08-21 19:47:54 +04:00
|
|
|
return LONG2FIX(RSTRUCT(s)->len);
|
1999-12-07 12:25:55 +03:00
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* 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>).
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
void
|
|
|
|
Init_Struct()
|
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_cStruct = rb_define_class("Struct", rb_cObject);
|
|
|
|
rb_include_module(rb_cStruct, rb_mEnumerable);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2002-12-20 11:33:17 +03:00
|
|
|
rb_undef_alloc_func(rb_cStruct);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_singleton_method(rb_cStruct, "new", rb_struct_s_def, -1);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_define_method(rb_cStruct, "initialize", rb_struct_initialize, -2);
|
2003-05-19 09:41:08 +04:00
|
|
|
rb_define_method(rb_cStruct, "initialize_copy", rb_struct_init_copy, 1);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cStruct, "==", rb_struct_equal, 1);
|
2003-04-18 22:05:11 +04:00
|
|
|
rb_define_method(rb_cStruct, "eql?", rb_struct_eql, 1);
|
2003-04-15 14:12:25 +04:00
|
|
|
rb_define_method(rb_cStruct, "hash", rb_struct_hash, 0);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2003-07-03 15:02:53 +04:00
|
|
|
rb_define_method(rb_cStruct, "to_s", rb_struct_inspect, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
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);
|
1999-12-07 12:25:55 +03:00
|
|
|
rb_define_method(rb_cStruct, "size", rb_struct_size, 0);
|
|
|
|
rb_define_method(rb_cStruct, "length", rb_struct_size, 0);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cStruct, "each", rb_struct_each, 0);
|
2002-04-10 12:45:26 +04:00
|
|
|
rb_define_method(rb_cStruct, "each_pair", rb_struct_each_pair, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cStruct, "[]", rb_struct_aref, 1);
|
|
|
|
rb_define_method(rb_cStruct, "[]=", rb_struct_aset, 2);
|
2001-12-11 06:48:08 +03:00
|
|
|
rb_define_method(rb_cStruct, "select", rb_struct_select, -1);
|
2003-05-04 20:03:24 +04:00
|
|
|
rb_define_method(rb_cStruct, "values_at", rb_struct_values_at, -1);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-09-27 08:46:54 +04:00
|
|
|
rb_define_method(rb_cStruct, "members", rb_struct_members_m, 0);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|