2000-05-01 13:42:38 +04:00
|
|
|
/**********************************************************************
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
struct.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
created at: Tue Mar 22 18:44:30 JST 1995
|
|
|
|
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
Copyright (C) 1993-2007 Yukihiro Matsumoto
|
2000-05-01 13:42:38 +04:00
|
|
|
|
|
|
|
**********************************************************************/
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2007-06-10 07:06:15 +04:00
|
|
|
#include "ruby/ruby.h"
|
2011-05-18 17:41:54 +04:00
|
|
|
#include "internal.h"
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE rb_cStruct;
|
2009-05-19 08:58:36 +04:00
|
|
|
static ID id_members;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
* bignum.c: changed `foo _((boo))' to `foo(boo)`. [ruby-dev:27056]
* defines.h, dir.c, dln.h, enumerator.c, env.h, error.c, eval.c, file.c,
gc.c, hash.c, inits.c, intern.h, io.c, lex.c, marshal.c, missing.h,
node.h, numeric.c, pack.c, process.c, re.h, ruby.c, ruby.h, rubyio.h,
rubysig.h, signal.c, sprintf.c, st.h, string.c, struct.c, time.c,
util.c, util.h, variable.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-14 10:32:32 +04:00
|
|
|
static VALUE struct_alloc(VALUE);
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2009-05-19 08:58:36 +04:00
|
|
|
static inline VALUE
|
|
|
|
struct_ivar_get(VALUE c, ID id)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
|
|
|
for (;;) {
|
2001-08-29 10:28:51 +04:00
|
|
|
if (rb_ivar_defined(c, id))
|
|
|
|
return rb_ivar_get(c, id);
|
2007-09-28 10:21:46 +04:00
|
|
|
c = RCLASS_SUPER(c);
|
2001-08-29 10:28:51 +04:00
|
|
|
if (c == 0 || c == rb_cStruct)
|
1999-08-13 09:45:20 +04:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-05-19 08:58:36 +04:00
|
|
|
VALUE
|
|
|
|
rb_struct_iv_get(VALUE c, const char *name)
|
|
|
|
{
|
|
|
|
return struct_ivar_get(c, rb_intern(name));
|
|
|
|
}
|
|
|
|
|
2004-09-27 08:46:54 +04:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_s_members(VALUE klass)
|
2004-09-24 20:58:51 +04:00
|
|
|
{
|
2009-05-19 08:58:36 +04:00
|
|
|
VALUE members = struct_ivar_get(klass, id_members);
|
2004-09-24 20:58:51 +04:00
|
|
|
|
|
|
|
if (NIL_P(members)) {
|
2007-09-07 21:47:56 +04:00
|
|
|
rb_raise(rb_eTypeError, "uninitialized struct");
|
2004-09-24 20:58:51 +04:00
|
|
|
}
|
2011-09-29 15:07:45 +04:00
|
|
|
if (!RB_TYPE_P(members, T_ARRAY)) {
|
2007-09-08 05:08:23 +04:00
|
|
|
rb_raise(rb_eTypeError, "corrupted struct");
|
|
|
|
}
|
2004-09-24 20:58:51 +04:00
|
|
|
return members;
|
|
|
|
}
|
|
|
|
|
2004-09-27 08:46:54 +04:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_members(VALUE s)
|
2004-09-24 09:53:43 +04:00
|
|
|
{
|
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
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
if (RSTRUCT_LEN(s) != RARRAY_LEN(members)) {
|
2005-09-24 04:17:43 +04:00
|
|
|
rb_raise(rb_eTypeError, "struct size differs (%ld required %ld given)",
|
2006-09-02 18:42:08 +04:00
|
|
|
RARRAY_LEN(members), RSTRUCT_LEN(s));
|
2004-09-24 09:53:43 +04:00
|
|
|
}
|
|
|
|
return members;
|
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_s_members_m(VALUE klass)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2012-05-21 19:47:03 +04:00
|
|
|
VALUE members = rb_struct_s_members(klass);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2012-05-21 19:47:03 +04:00
|
|
|
return rb_ary_dup(members);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* struct.members -> array
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2012-04-06 11:23:40 +04:00
|
|
|
* Returns an array of symbols representing the names of the instance
|
2003-12-28 23:47:56 +03:00
|
|
|
* variables.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* Customer = Struct.new(:name, :address, :zip)
|
|
|
|
* joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
|
2008-03-09 04:04:46 +03:00
|
|
|
* joe.members #=> [:name, :address, :zip]
|
2003-12-28 23:47:56 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_members_m(VALUE obj)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
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
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_getmember(VALUE obj, ID id)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
VALUE members, slot, *ptr, *ptr_members;
|
|
|
|
long i, len;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
ptr = RSTRUCT_PTR(obj);
|
2004-09-27 08:46:54 +04:00
|
|
|
members = rb_struct_members(obj);
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
ptr_members = RARRAY_PTR(members);
|
2000-05-24 08:34:26 +04:00
|
|
|
slot = ID2SYM(id);
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
len = RARRAY_LEN(members);
|
|
|
|
for (i=0; i<len; i++) {
|
|
|
|
if (ptr_members[i] == slot) {
|
|
|
|
return 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));
|
2012-04-14 04:36:26 +04:00
|
|
|
|
|
|
|
UNREACHABLE;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_ref(VALUE obj)
|
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_struct_getmember(obj, rb_frame_this_func());
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2006-02-05 17:40:01 +03:00
|
|
|
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];}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2009-05-20 14:41:46 +04:00
|
|
|
#define numberof(array) (int)(sizeof(array) / sizeof((array)[0]))
|
|
|
|
#define N_REF_FUNC numberof(ref_func)
|
2005-06-01 19:03:09 +04:00
|
|
|
|
2008-04-26 12:30:22 +04:00
|
|
|
static VALUE (*const ref_func[])(VALUE) = {
|
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
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_modify(VALUE s)
|
2001-08-06 07:08:57 +04:00
|
|
|
{
|
* array.c, gc.c, hash.c, object.c, string.c, struct.c,
transcode.c, variable.c, vm.c, vm_insnhelper.c, vm_method.c:
replace calls to rb_error_frozen() with rb_check_frozen(). a
patch from Run Paint Run Run at [ruby-core:32014]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-10-24 12:14:05 +04:00
|
|
|
rb_check_frozen(s);
|
2011-07-17 11:26:45 +04:00
|
|
|
rb_check_trusted(s);
|
2001-08-06 07:08:57 +04:00
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_set(VALUE obj, VALUE val)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
VALUE members, slot, *ptr, *ptr_members;
|
|
|
|
long i, len;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-09-27 08:46:54 +04:00
|
|
|
members = rb_struct_members(obj);
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
ptr_members = RARRAY_PTR(members);
|
|
|
|
len = RARRAY_LEN(members);
|
2001-08-06 07:08:57 +04:00
|
|
|
rb_struct_modify(obj);
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
ptr = RSTRUCT_PTR(obj);
|
|
|
|
for (i=0; i<len; i++) {
|
|
|
|
slot = ptr_members[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()) {
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
return 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()));
|
2012-04-14 04:36:26 +04:00
|
|
|
|
|
|
|
UNREACHABLE;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
make_struct(VALUE name, VALUE members, VALUE klass)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
VALUE nstr, *ptr_members;
|
1998-01-16 15:13:05 +03:00
|
|
|
ID id;
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
long i, len;
|
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 {
|
2008-05-05 14:52:44 +04:00
|
|
|
/* old style: should we warn? */
|
|
|
|
name = rb_str_to_str(name);
|
|
|
|
id = rb_to_id(name);
|
1999-12-14 09:50:43 +03:00
|
|
|
if (!rb_is_const_id(id)) {
|
2008-03-05 18:31:42 +03:00
|
|
|
rb_name_error(id, "identifier %s needs to be constant", StringValuePtr(name));
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
2004-09-03 13:00:52 +04:00
|
|
|
if (rb_const_defined_at(klass, id)) {
|
2008-03-05 18:31:42 +03:00
|
|
|
rb_warn("redefining constant Struct::%s", StringValuePtr(name));
|
2004-09-03 13:00:52 +04:00
|
|
|
rb_mod_remove_const(klass, ID2SYM(id));
|
|
|
|
}
|
2009-08-12 10:32:21 +04:00
|
|
|
nstr = rb_define_class_id_under(klass, id, klass);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2009-05-19 08:58:36 +04:00
|
|
|
rb_ivar_set(nstr, id_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);
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
ptr_members = RARRAY_PTR(members);
|
|
|
|
len = RARRAY_LEN(members);
|
|
|
|
for (i=0; i< len; i++) {
|
|
|
|
ID id = SYM2ID(ptr_members[i]);
|
2012-12-22 06:52:48 +04:00
|
|
|
if (i < N_REF_FUNC) {
|
|
|
|
rb_define_method_id(nstr, id, ref_func[i], 0);
|
* 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
|
|
|
}
|
2012-12-22 06:52:48 +04:00
|
|
|
else {
|
|
|
|
rb_define_method_id(nstr, id, rb_struct_ref, 0);
|
|
|
|
}
|
|
|
|
rb_define_method_id(nstr, rb_id_attrset(id), rb_struct_set, 1);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
return nstr;
|
|
|
|
}
|
|
|
|
|
2007-11-23 07:35:53 +03:00
|
|
|
VALUE
|
2007-11-23 10:00:50 +03:00
|
|
|
rb_struct_alloc_noinit(VALUE klass)
|
|
|
|
{
|
|
|
|
return struct_alloc(klass);
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
2008-05-31 13:28:20 +04:00
|
|
|
rb_struct_define_without_accessor(const char *class_name, VALUE super, rb_alloc_func_t alloc, ...)
|
2007-11-23 07:35:53 +03:00
|
|
|
{
|
|
|
|
VALUE klass;
|
|
|
|
va_list ar;
|
|
|
|
VALUE members;
|
|
|
|
char *name;
|
|
|
|
|
|
|
|
members = rb_ary_new2(0);
|
2007-11-23 10:15:17 +03:00
|
|
|
va_start(ar, alloc);
|
2007-11-23 07:35:53 +03:00
|
|
|
while ((name = va_arg(ar, char*)) != NULL) {
|
|
|
|
rb_ary_push(members, ID2SYM(rb_intern(name)));
|
|
|
|
}
|
|
|
|
va_end(ar);
|
|
|
|
OBJ_FREEZE(members);
|
|
|
|
|
|
|
|
if (class_name) {
|
|
|
|
klass = rb_define_class(class_name, super);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
klass = rb_class_new(super);
|
|
|
|
rb_make_metaclass(klass, RBASIC(super)->klass);
|
|
|
|
rb_class_inherited(super, klass);
|
|
|
|
}
|
|
|
|
|
2009-05-19 08:58:36 +04:00
|
|
|
rb_ivar_set(klass, id_members, members);
|
2007-11-23 07:35:53 +03:00
|
|
|
|
2007-11-23 10:00:50 +03:00
|
|
|
if (alloc)
|
|
|
|
rb_define_alloc_func(klass, alloc);
|
|
|
|
else
|
|
|
|
rb_define_alloc_func(klass, struct_alloc);
|
2007-11-23 07:35:53 +03:00
|
|
|
|
|
|
|
return klass;
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_struct_define(const char *name, ...)
|
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
|
|
|
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
va_start(ar, name);
|
2007-07-12 12:03:18 +04:00
|
|
|
while ((mem = va_arg(ar, char*)) != 0) {
|
1998-01-16 15:13:05 +03:00
|
|
|
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:
|
2013-01-19 06:37:01 +04:00
|
|
|
* Struct.new( [aString] [, aSym]+> ) -> StructClass
|
|
|
|
* Struct.new( [aString] [, aSym]+> ) {|StructClass| block } -> StructClass
|
|
|
|
* StructClass.new(arg, ...) -> obj
|
|
|
|
* StructClass[arg, ...] -> obj
|
2003-12-28 23:47:56 +03:00
|
|
|
*
|
|
|
|
* 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.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2013-01-19 06:37:01 +04:00
|
|
|
* If a block is given, it will be evaluated in the context of
|
|
|
|
* <i>StructClass</i>, passing <i>StructClass</i> as a parameter.
|
|
|
|
*
|
|
|
|
* Customer = Struct.new(:name, :address) do
|
|
|
|
* def greeting
|
|
|
|
* "Hello #{name}!"
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* Customer.new("Dave", "123 Main").greeting # => "Hello Dave!"
|
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* <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
|
2009-07-02 01:20:44 +04:00
|
|
|
* class; unset parameters default to <code>nil</code>. Passing too many
|
|
|
|
* parameters will raise an <code>ArgumentError</code>.
|
2003-12-28 23:47:56 +03:00
|
|
|
*
|
|
|
|
* The remaining methods listed in this section (class and instance)
|
2009-02-22 17:23:33 +03:00
|
|
|
* are defined for this generated class.
|
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* # Create a structure with a name in Struct
|
|
|
|
* Struct.new("Customer", :name, :address) #=> Struct::Customer
|
2008-03-09 04:04:46 +03:00
|
|
|
* Struct::Customer.new("Dave", "123 Main") #=> #<struct Struct::Customer name="Dave", address="123 Main">
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* # Create a structure named by its constant
|
|
|
|
* Customer = Struct.new(:name, :address) #=> Customer
|
2008-03-09 04:04:46 +03:00
|
|
|
* Customer.new("Dave", "123 Main") #=> #<struct Customer name="Dave", address="123 Main">
|
2003-12-28 23:47:56 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_s_def(int argc, VALUE *argv, 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);
|
2006-09-02 19:20:24 +04:00
|
|
|
if (!NIL_P(name) && SYMBOL_P(name)) {
|
|
|
|
rb_ary_unshift(rest, name);
|
|
|
|
name = Qnil;
|
1999-12-14 09:50:43 +03:00
|
|
|
}
|
2008-05-05 14:52:44 +04:00
|
|
|
for (i=0; i<RARRAY_LEN(rest); i++) {
|
|
|
|
id = rb_to_id(RARRAY_PTR(rest)[i]);
|
|
|
|
RARRAY_PTR(rest)[i] = ID2SYM(id);
|
|
|
|
}
|
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
|
|
|
}
|
|
|
|
|
2009-05-20 14:41:46 +04:00
|
|
|
static long
|
2008-06-27 16:56:45 +04:00
|
|
|
num_members(VALUE klass)
|
|
|
|
{
|
|
|
|
VALUE members;
|
2009-05-19 08:58:36 +04:00
|
|
|
members = struct_ivar_get(klass, id_members);
|
2011-09-29 15:07:45 +04:00
|
|
|
if (!RB_TYPE_P(members, T_ARRAY)) {
|
2008-06-27 16:56:45 +04:00
|
|
|
rb_raise(rb_eTypeError, "broken members");
|
|
|
|
}
|
|
|
|
return RARRAY_LEN(members);
|
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
*/
|
|
|
|
|
2008-11-10 03:51:14 +03:00
|
|
|
static VALUE
|
|
|
|
rb_struct_initialize_m(int argc, VALUE *argv, VALUE self)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-08-20 08:29:58 +04:00
|
|
|
VALUE klass = rb_obj_class(self);
|
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);
|
2008-06-27 16:56:45 +04:00
|
|
|
n = num_members(klass);
|
2008-11-10 03:51:14 +03:00
|
|
|
if (n < argc) {
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_raise(rb_eArgError, "struct size differs");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2008-11-10 03:51:14 +03:00
|
|
|
MEMCPY(RSTRUCT_PTR(self), argv, VALUE, argc);
|
|
|
|
if (n > argc) {
|
|
|
|
rb_mem_clear(RSTRUCT_PTR(self)+argc, n-argc);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
1999-08-13 09:45:20 +04:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2008-11-10 03:51:14 +03:00
|
|
|
VALUE
|
|
|
|
rb_struct_initialize(VALUE self, VALUE values)
|
|
|
|
{
|
2009-05-20 20:43:41 +04:00
|
|
|
return rb_struct_initialize_m(RARRAY_LENINT(values), RARRAY_PTR(values), self);
|
2008-11-10 03:51:14 +03:00
|
|
|
}
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
struct_alloc(VALUE klass)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
|
|
|
long n;
|
2012-10-20 10:57:51 +04:00
|
|
|
NEWOBJ_OF(st, struct RStruct, klass, T_STRUCT);
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2008-06-27 16:56:45 +04:00
|
|
|
n = num_members(klass);
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2006-02-05 17:40:01 +03:00
|
|
|
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;
|
|
|
|
}
|
1999-08-13 09:45:20 +04:00
|
|
|
|
|
|
|
return (VALUE)st;
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_alloc(VALUE klass, VALUE values)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
2009-10-07 11:06:32 +04:00
|
|
|
return rb_class_new_instance(RARRAY_LENINT(values), RARRAY_PTR(values), klass);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_struct_new(VALUE klass, ...)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2009-05-20 14:41:46 +04:00
|
|
|
VALUE tmpargs[N_REF_FUNC], *mem = tmpargs;
|
2009-05-20 20:43:41 +04:00
|
|
|
int size, i;
|
1998-01-16 15:13:05 +03:00
|
|
|
va_list args;
|
|
|
|
|
2009-05-20 20:43:41 +04:00
|
|
|
size = rb_long2int(num_members(klass));
|
2009-05-20 14:41:46 +04:00
|
|
|
if (size > numberof(tmpargs)) {
|
|
|
|
tmpargs[0] = rb_ary_tmp_new(size);
|
|
|
|
mem = RARRAY_PTR(tmpargs[0]);
|
|
|
|
}
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
va_start(args, klass);
|
1999-01-20 07:59:39 +03:00
|
|
|
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
|
|
|
}
|
|
|
|
|
2012-11-06 21:14:02 +04:00
|
|
|
static VALUE
|
|
|
|
rb_struct_size(VALUE s);
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* struct.each {|obj| block } -> struct
|
|
|
|
* struct.each -> an_enumerator
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* Calls <i>block</i> once for each instance variable, passing the
|
|
|
|
* value as a parameter.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2010-05-13 09:49:55 +04:00
|
|
|
* If no block is given, an enumerator is returned instead.
|
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* Customer = Struct.new(:name, :address, :zip)
|
|
|
|
* joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
|
|
|
|
* joe.each {|x| puts(x) }
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* <em>produces:</em>
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* Joe Smith
|
|
|
|
* 123 Maple, Anytown NC
|
|
|
|
* 12345
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_each(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
|
|
|
|
2012-11-06 21:14:02 +04:00
|
|
|
RETURN_SIZED_ENUMERATOR(s, 0, 0, rb_struct_size);
|
2006-02-05 17:40:01 +03:00
|
|
|
for (i=0; i<RSTRUCT_LEN(s); i++) {
|
|
|
|
rb_yield(RSTRUCT_PTR(s)[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:
|
2010-05-18 01:07:33 +04:00
|
|
|
* struct.each_pair {|sym, obj| block } -> struct
|
|
|
|
* struct.each_pair -> an_enumerator
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* Calls <i>block</i> once for each instance variable, passing the name
|
|
|
|
* (as a symbol) and the value as parameters.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2010-05-13 09:49:55 +04:00
|
|
|
* If no block is given, an enumerator is returned instead.
|
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* Customer = Struct.new(:name, :address, :zip)
|
|
|
|
* joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
|
|
|
|
* joe.each_pair {|name, value| puts("#{name} => #{value}") }
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* <em>produces:</em>
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* name => Joe Smith
|
|
|
|
* address => 123 Maple, Anytown NC
|
|
|
|
* zip => 12345
|
|
|
|
*/
|
|
|
|
|
2002-04-10 12:45:26 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_each_pair(VALUE s)
|
2002-04-10 12:45:26 +04:00
|
|
|
{
|
2004-09-24 09:53:43 +04:00
|
|
|
VALUE members;
|
2002-04-10 12:45:26 +04:00
|
|
|
long i;
|
|
|
|
|
2012-11-06 21:14:02 +04:00
|
|
|
RETURN_SIZED_ENUMERATOR(s, 0, 0, rb_struct_size);
|
2004-09-27 08:46:54 +04:00
|
|
|
members = rb_struct_members(s);
|
2006-02-05 17:40:01 +03:00
|
|
|
for (i=0; i<RSTRUCT_LEN(s); i++) {
|
2012-11-19 11:31:05 +04:00
|
|
|
VALUE key = rb_ary_entry(members, i);
|
|
|
|
VALUE value = RSTRUCT_PTR(s)[i];
|
2012-11-19 11:54:53 +04:00
|
|
|
rb_yield(rb_assoc_new(key, value));
|
2002-04-10 12:45:26 +04:00
|
|
|
}
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
inspect_struct(VALUE s, VALUE dummy, int recur)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2009-08-12 10:32:21 +04:00
|
|
|
VALUE cname = rb_class_name(rb_obj_class(s));
|
|
|
|
VALUE members, str = rb_str_new2("#<struct ");
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
VALUE *ptr, *ptr_members;
|
|
|
|
long i, len;
|
2009-08-12 10:32:21 +04:00
|
|
|
char first = RSTRING_PTR(cname)[0];
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2009-08-12 10:32:21 +04:00
|
|
|
if (recur || first != '#') {
|
|
|
|
rb_str_append(str, 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
|
|
|
if (recur) {
|
2009-08-12 10:32:21 +04:00
|
|
|
return rb_str_cat2(str, ":...>");
|
* 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
|
|
|
}
|
|
|
|
|
2004-09-27 08:46:54 +04:00
|
|
|
members = rb_struct_members(s);
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
ptr_members = RARRAY_PTR(members);
|
|
|
|
ptr = RSTRUCT_PTR(s);
|
|
|
|
len = RSTRUCT_LEN(s);
|
|
|
|
for (i=0; i<len; i++) {
|
2005-03-17 11:56:36 +03:00
|
|
|
VALUE slot;
|
|
|
|
ID id;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
if (i > 0) {
|
2000-04-10 09:48:43 +04:00
|
|
|
rb_str_cat2(str, ", ");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2009-08-12 10:32:21 +04:00
|
|
|
else if (first != '#') {
|
|
|
|
rb_str_cat2(str, " ");
|
|
|
|
}
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
slot = ptr_members[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)) {
|
2007-12-24 19:38:44 +03:00
|
|
|
rb_str_append(str, rb_id2str(id));
|
2005-03-17 11:56:36 +03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_str_append(str, rb_inspect(slot));
|
|
|
|
}
|
2000-04-10 09:48:43 +04:00
|
|
|
rb_str_cat2(str, "=");
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
rb_str_append(str, rb_inspect(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:
|
2010-05-18 01:07:33 +04:00
|
|
|
* struct.to_s -> string
|
|
|
|
* struct.inspect -> string
|
2003-12-28 23:47:56 +03:00
|
|
|
*
|
|
|
|
* Describe the contents of this struct in a string.
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_inspect(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:
|
2010-05-18 01:07:33 +04:00
|
|
|
* struct.to_a -> array
|
|
|
|
* struct.values -> array
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* Returns the values for this instance as an array.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* 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
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_to_a(VALUE s)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2006-02-05 17:40:01 +03:00
|
|
|
return rb_ary_new4(RSTRUCT_LEN(s), RSTRUCT_PTR(s));
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2012-04-24 07:46:55 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* struct.to_h -> hash
|
|
|
|
*
|
|
|
|
* Returns the values for this instance as a hash with keys
|
|
|
|
* corresponding to the instance variable name.
|
|
|
|
*
|
|
|
|
* Customer = Struct.new(:name, :address, :zip)
|
|
|
|
* joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
|
|
|
|
* joe.to_h[:address] #=> "123 Maple, Anytown NC"
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_struct_to_h(VALUE s)
|
|
|
|
{
|
|
|
|
VALUE h = rb_hash_new();
|
|
|
|
VALUE members = rb_struct_members(s);
|
|
|
|
long i;
|
|
|
|
|
|
|
|
for (i=0; i<RSTRUCT_LEN(s); i++) {
|
|
|
|
rb_hash_aset(h, rb_ary_entry(members, i), RSTRUCT_PTR(s)[i]);
|
|
|
|
}
|
|
|
|
return h;
|
|
|
|
}
|
|
|
|
|
2004-01-18 17:16:47 +03:00
|
|
|
/* :nodoc: */
|
2008-08-21 01:02:54 +04:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_init_copy(VALUE copy, VALUE s)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2012-06-05 15:13:18 +04:00
|
|
|
if (!OBJ_INIT_COPY(copy, s)) return copy;
|
2007-07-12 12:03:18 +04:00
|
|
|
if (RSTRUCT_LEN(copy) != RSTRUCT_LEN(s)) {
|
|
|
|
rb_raise(rb_eTypeError, "struct size mismatch");
|
2006-02-05 17:40:01 +03:00
|
|
|
}
|
|
|
|
MEMCPY(RSTRUCT_PTR(copy), RSTRUCT_PTR(s), VALUE, RSTRUCT_LEN(copy));
|
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
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_aref_id(VALUE s, ID id)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
VALUE *ptr, members, *ptr_members;
|
1999-08-13 09:45:20 +04:00
|
|
|
long i, len;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
ptr = RSTRUCT_PTR(s);
|
2004-09-27 08:46:54 +04:00
|
|
|
members = rb_struct_members(s);
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
ptr_members = RARRAY_PTR(members);
|
2006-09-02 18:42:08 +04:00
|
|
|
len = RARRAY_LEN(members);
|
1999-01-20 07:59:39 +03:00
|
|
|
for (i=0; i<len; i++) {
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
if (SYM2ID(ptr_members[i]) == id) {
|
|
|
|
return ptr[i];
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
}
|
2001-07-02 12:46:28 +04:00
|
|
|
rb_name_error(id, "no member '%s' in struct", rb_id2name(id));
|
2012-04-14 04:36:26 +04:00
|
|
|
|
|
|
|
UNREACHABLE;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* struct[symbol] -> anObject
|
|
|
|
* struct[fixnum] -> anObject
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* 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.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* Customer = Struct.new(:name, :address, :zip)
|
|
|
|
* joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* joe["name"] #=> "Joe Smith"
|
|
|
|
* joe[:name] #=> "Joe Smith"
|
|
|
|
* joe[0] #=> "Joe Smith"
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_aref(VALUE s, VALUE 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
|
|
|
|
2011-09-29 15:07:45 +04:00
|
|
|
if (RB_TYPE_P(idx, T_STRING) || RB_TYPE_P(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);
|
2006-02-05 17:40:01 +03:00
|
|
|
if (i < 0) i = RSTRUCT_LEN(s) + 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)",
|
2006-02-05 17:40:01 +03:00
|
|
|
i, RSTRUCT_LEN(s));
|
|
|
|
if (RSTRUCT_LEN(s) <= i)
|
2002-10-30 00:35:28 +03:00
|
|
|
rb_raise(rb_eIndexError, "offset %ld too large for struct(size:%ld)",
|
2006-02-05 17:40:01 +03:00
|
|
|
i, RSTRUCT_LEN(s));
|
|
|
|
return RSTRUCT_PTR(s)[i];
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_aset_id(VALUE s, ID id, VALUE val)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
VALUE members, *ptr, *ptr_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);
|
2006-09-02 18:42:08 +04:00
|
|
|
len = RARRAY_LEN(members);
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
rb_struct_modify(s);
|
|
|
|
if (RSTRUCT_LEN(s) != len) {
|
2005-09-24 04:17:43 +04:00
|
|
|
rb_raise(rb_eTypeError, "struct size differs (%ld required %ld given)",
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
len, RSTRUCT_LEN(s));
|
2004-09-24 09:53:43 +04:00
|
|
|
}
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
ptr = RSTRUCT_PTR(s);
|
|
|
|
ptr_members = RARRAY_PTR(members);
|
1999-01-20 07:59:39 +03:00
|
|
|
for (i=0; i<len; i++) {
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
if (SYM2ID(ptr_members[i]) == id) {
|
|
|
|
ptr[i] = val;
|
1999-01-20 07:59:39 +03:00
|
|
|
return val;
|
|
|
|
}
|
|
|
|
}
|
2001-07-02 12:46:28 +04:00
|
|
|
rb_name_error(id, "no member '%s' in struct", rb_id2name(id));
|
2012-04-14 03:45:37 +04:00
|
|
|
|
|
|
|
UNREACHABLE;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* struct[symbol] = obj -> obj
|
|
|
|
* struct[fixnum] = obj -> obj
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* 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.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* Customer = Struct.new(:name, :address, :zip)
|
|
|
|
* joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* joe["name"] = "Luke"
|
|
|
|
* joe[:zip] = "90210"
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* joe.name #=> "Luke"
|
|
|
|
* joe.zip #=> "90210"
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_aset(VALUE s, VALUE idx, VALUE 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
|
|
|
|
2011-09-29 15:07:45 +04:00
|
|
|
if (RB_TYPE_P(idx, T_STRING) || RB_TYPE_P(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);
|
2006-02-05 17:40:01 +03:00
|
|
|
if (i < 0) i = RSTRUCT_LEN(s) + 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)",
|
2006-02-05 17:40:01 +03:00
|
|
|
i, RSTRUCT_LEN(s));
|
2000-06-14 09:30:29 +04:00
|
|
|
}
|
2006-02-05 17:40:01 +03:00
|
|
|
if (RSTRUCT_LEN(s) <= i) {
|
2002-10-30 00:35:28 +03:00
|
|
|
rb_raise(rb_eIndexError, "offset %ld too large for struct(size:%ld)",
|
2006-02-05 17:40:01 +03:00
|
|
|
i, RSTRUCT_LEN(s));
|
2000-06-14 09:30:29 +04:00
|
|
|
}
|
2001-08-06 07:08:57 +04:00
|
|
|
rb_struct_modify(s);
|
2006-02-05 17:40:01 +03:00
|
|
|
return RSTRUCT_PTR(s)[i] = val;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-07-03 15:02:53 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
struct_entry(VALUE s, long n)
|
2003-07-03 15:02:53 +04:00
|
|
|
{
|
|
|
|
return rb_struct_aref(s, LONG2NUM(n));
|
|
|
|
}
|
|
|
|
|
2009-02-22 17:23:33 +03:00
|
|
|
/*
|
2003-12-28 23:47:56 +03:00
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* struct.values_at(selector,... ) -> an_array
|
2003-12-28 23:47:56 +03:00
|
|
|
*
|
|
|
|
* Returns an array containing the elements in
|
2010-05-13 09:49:55 +04:00
|
|
|
* +self+ corresponding to the given selector(s). The selectors
|
2009-02-22 17:23:33 +03:00
|
|
|
* may be either integer indices or ranges.
|
2003-12-28 23:47:56 +03:00
|
|
|
* See also </code>.select<code>.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* 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
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_values_at(int argc, VALUE *argv, VALUE s)
|
2003-05-04 20:03:24 +04:00
|
|
|
{
|
2006-02-05 17:40:01 +03:00
|
|
|
return rb_get_values_at(s, RSTRUCT_LEN(s), 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:
|
2010-05-18 01:07:33 +04:00
|
|
|
* struct.select {|i| block } -> array
|
|
|
|
* struct.select -> an_enumerator
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2006-02-03 12:15:42 +03:00
|
|
|
* Invokes the block passing in successive elements from
|
2003-12-28 23:47:56 +03:00
|
|
|
* <i>struct</i>, returning an array containing those elements
|
|
|
|
* for which the block returns a true value (equivalent to
|
|
|
|
* <code>Enumerable#select</code>).
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* 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]
|
|
|
|
*/
|
|
|
|
|
2001-12-11 06:48:08 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_select(int argc, VALUE *argv, VALUE s)
|
2001-12-11 06:48:08 +03:00
|
|
|
{
|
2003-05-04 20:03:24 +04:00
|
|
|
VALUE result;
|
2001-12-11 06:48:08 +03:00
|
|
|
long i;
|
|
|
|
|
2012-03-15 01:10:34 +04:00
|
|
|
rb_check_arity(argc, 0, 0);
|
2012-11-06 21:14:02 +04:00
|
|
|
RETURN_SIZED_ENUMERATOR(s, 0, 0, rb_struct_size);
|
2003-05-04 20:03:24 +04:00
|
|
|
result = rb_ary_new();
|
2006-02-05 17:40:01 +03:00
|
|
|
for (i = 0; i < RSTRUCT_LEN(s); i++) {
|
|
|
|
if (RTEST(rb_yield(RSTRUCT_PTR(s)[i]))) {
|
|
|
|
rb_ary_push(result, RSTRUCT_PTR(s)[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;
|
|
|
|
}
|
|
|
|
|
2009-09-20 06:14:02 +04:00
|
|
|
static VALUE
|
|
|
|
recursive_equal(VALUE s, VALUE s2, int recur)
|
|
|
|
{
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
VALUE *ptr, *ptr2;
|
|
|
|
long i, len;
|
2009-09-20 06:14:02 +04:00
|
|
|
|
|
|
|
if (recur) return Qtrue; /* Subtle! */
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
ptr = RSTRUCT_PTR(s);
|
|
|
|
ptr2 = RSTRUCT_PTR(s2);
|
|
|
|
len = RSTRUCT_LEN(s);
|
|
|
|
for (i=0; i<len; i++) {
|
|
|
|
if (!rb_equal(ptr[i], ptr2[i])) return Qfalse;
|
2009-09-20 06:14:02 +04:00
|
|
|
}
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* struct == other_struct -> true or false
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* 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>).
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* 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
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_equal(VALUE s, VALUE s2)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-08-29 10:28:51 +04:00
|
|
|
if (s == s2) return Qtrue;
|
2011-09-29 15:07:45 +04:00
|
|
|
if (!RB_TYPE_P(s2, T_STRUCT)) return Qfalse;
|
2001-08-20 08:29:58 +04:00
|
|
|
if (rb_obj_class(s) != rb_obj_class(s2)) return Qfalse;
|
2006-02-05 17:40:01 +03:00
|
|
|
if (RSTRUCT_LEN(s) != RSTRUCT_LEN(s2)) {
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_bug("inconsistent struct"); /* should never happen */
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2009-09-20 06:14:02 +04:00
|
|
|
return rb_exec_recursive_paired(recursive_equal, s, s2, s2);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-04-15 14:12:25 +04:00
|
|
|
static VALUE
|
2009-07-17 13:13:29 +04:00
|
|
|
recursive_hash(VALUE s, VALUE dummy, int recur)
|
2003-04-15 14:12:25 +04:00
|
|
|
{
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
long i, len;
|
2009-09-08 17:10:04 +04:00
|
|
|
st_index_t h;
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
VALUE n, *ptr;
|
2003-04-15 14:12:25 +04:00
|
|
|
|
* string.c (rb_hash_uint32, rb_hash_uint, rb_hash_start, rb_hash_end),
include/ruby/intern.h: add Murmurhash API. [ruby-dev:37784]
* complex.c (nucomp_hash), array.c (rb_ary_hash), time.c (time_hash),
string.c (rb_str_hsah), object.c (rb_obj_hash), range.c
(range_hash), struct.c (rb_struct_hash), hash.c (rb_any_hash),
rational.c (nurat_hash): use Murmurhash. [ruby-dev:37784]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22317 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-02-14 22:55:34 +03:00
|
|
|
h = rb_hash_start(rb_hash(rb_obj_class(s)));
|
2009-09-16 01:30:50 +04:00
|
|
|
if (!recur) {
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
ptr = RSTRUCT_PTR(s);
|
|
|
|
len = RSTRUCT_LEN(s);
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
n = rb_hash(ptr[i]);
|
2009-09-16 01:30:50 +04:00
|
|
|
h = rb_hash_uint(h, NUM2LONG(n));
|
|
|
|
}
|
2003-04-15 14:12:25 +04:00
|
|
|
}
|
* string.c (rb_hash_uint32, rb_hash_uint, rb_hash_start, rb_hash_end),
include/ruby/intern.h: add Murmurhash API. [ruby-dev:37784]
* complex.c (nucomp_hash), array.c (rb_ary_hash), time.c (time_hash),
string.c (rb_str_hsah), object.c (rb_obj_hash), range.c
(range_hash), struct.c (rb_struct_hash), hash.c (rb_any_hash),
rational.c (nurat_hash): use Murmurhash. [ruby-dev:37784]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22317 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-02-14 22:55:34 +03:00
|
|
|
h = rb_hash_end(h);
|
|
|
|
return INT2FIX(h);
|
2003-04-15 14:12:25 +04:00
|
|
|
}
|
|
|
|
|
2009-07-17 13:13:29 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* struct.hash -> fixnum
|
2009-07-17 13:13:29 +04:00
|
|
|
*
|
|
|
|
* Return a hash value based on this struct's contents.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_struct_hash(VALUE s)
|
|
|
|
{
|
2009-09-16 01:30:50 +04:00
|
|
|
return rb_exec_recursive_outer(recursive_hash, s, 0);
|
2009-07-17 13:13:29 +04:00
|
|
|
}
|
|
|
|
|
2009-09-20 06:14:02 +04:00
|
|
|
static VALUE
|
|
|
|
recursive_eql(VALUE s, VALUE s2, int recur)
|
|
|
|
{
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
VALUE *ptr, *ptr2;
|
|
|
|
long i, len;
|
2009-09-20 06:14:02 +04:00
|
|
|
|
|
|
|
if (recur) return Qtrue; /* Subtle! */
|
* array.c (rb_ary_{times, shuffle_bang, sample}): reducing macro
calls inside of the loop by keeping pointers in local
variables. a patch from Masahiro Kanai (CanI) in [ruby-dev:39406].
It was found and fixed at Security and Programming camp 2009.
* string.c (rb_str_{times, split_m}): ditto.
* struct.c (rb_struct_{getmember, set, aref_id, aset_id}, {make,
inspect}_struct, recursive_{equal, hash, eql}): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25237 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-10-05 18:35:39 +04:00
|
|
|
ptr = RSTRUCT_PTR(s);
|
|
|
|
ptr2 = RSTRUCT_PTR(s2);
|
|
|
|
len = RSTRUCT_LEN(s);
|
|
|
|
for (i=0; i<len; i++) {
|
|
|
|
if (!rb_eql(ptr[i], ptr2[i])) return Qfalse;
|
2009-09-20 06:14:02 +04:00
|
|
|
}
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
2012-10-27 15:06:46 +04:00
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* struct.eql?(other) -> true or false
|
2003-12-28 23:47:56 +03:00
|
|
|
*
|
|
|
|
* 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
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_eql(VALUE s, VALUE s2)
|
2003-04-18 22:05:11 +04:00
|
|
|
{
|
|
|
|
if (s == s2) return Qtrue;
|
2011-09-29 15:07:45 +04:00
|
|
|
if (!RB_TYPE_P(s2, T_STRUCT)) return Qfalse;
|
2003-04-18 22:05:11 +04:00
|
|
|
if (rb_obj_class(s) != rb_obj_class(s2)) return Qfalse;
|
2006-02-05 17:40:01 +03:00
|
|
|
if (RSTRUCT_LEN(s) != RSTRUCT_LEN(s2)) {
|
2003-04-18 22:05:11 +04:00
|
|
|
rb_bug("inconsistent struct"); /* should never happen */
|
|
|
|
}
|
|
|
|
|
2009-09-20 06:14:02 +04:00
|
|
|
return rb_exec_recursive_paired(recursive_eql, s, s2, s2);
|
2003-04-18 22:05:11 +04:00
|
|
|
}
|
|
|
|
|
2003-12-28 23:47:56 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:07:33 +04:00
|
|
|
* struct.length -> fixnum
|
|
|
|
* struct.size -> fixnum
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* Returns the number of instance variables.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* 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
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_struct_size(VALUE s)
|
1999-12-07 12:25:55 +03:00
|
|
|
{
|
2006-02-05 17:40:01 +03:00
|
|
|
return LONG2FIX(RSTRUCT_LEN(s));
|
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.
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* 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.''
|
2009-02-22 17:23:33 +03:00
|
|
|
*
|
2003-12-28 23:47:56 +03:00
|
|
|
* 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
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
Init_Struct(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
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
|
|
|
|
2008-11-10 03:51:14 +03:00
|
|
|
rb_define_method(rb_cStruct, "initialize", rb_struct_initialize_m, -1);
|
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
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cStruct, "inspect", rb_struct_inspect, 0);
|
2009-05-29 12:10:10 +04:00
|
|
|
rb_define_alias(rb_cStruct, "to_s", "inspect");
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cStruct, "to_a", rb_struct_to_a, 0);
|
2012-04-24 07:46:55 +04:00
|
|
|
rb_define_method(rb_cStruct, "to_h", rb_struct_to_h, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
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);
|
2009-05-19 08:58:36 +04:00
|
|
|
id_members = rb_intern("__members__");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|