2000-05-01 05:42:38 -04:00
|
|
|
/**********************************************************************
|
1998-01-16 07:13:05 -05: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-24 23:29:39 -04:00
|
|
|
Copyright (C) 1993-2007 Yukihiro Matsumoto
|
2000-05-01 05:42:38 -04:00
|
|
|
|
|
|
|
**********************************************************************/
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2011-05-18 09:41:54 -04:00
|
|
|
#include "internal.h"
|
2014-12-09 10:43:49 -05:00
|
|
|
#include "vm_core.h"
|
2015-06-30 16:45:44 -04:00
|
|
|
#include "id.h"
|
|
|
|
|
|
|
|
/* only for struct[:field] access */
|
2015-07-01 04:16:48 -04:00
|
|
|
enum {
|
2015-07-01 04:17:02 -04:00
|
|
|
AREF_HASH_UNIT = 5,
|
2015-07-01 04:16:48 -04:00
|
|
|
AREF_HASH_THRESHOLD = 10
|
|
|
|
};
|
2014-12-09 10:43:49 -05:00
|
|
|
|
2015-07-21 18:52:59 -04:00
|
|
|
const rb_iseq_t *rb_method_for_self_aref(VALUE name, VALUE arg, rb_insn_func_t func);
|
|
|
|
const rb_iseq_t *rb_method_for_self_aset(VALUE name, VALUE arg, rb_insn_func_t func);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
VALUE rb_cStruct;
|
2015-06-30 16:45:44 -04:00
|
|
|
static ID id_members, id_back_members;
|
1998-01-16 07:13:05 -05: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 02:32:32 -04:00
|
|
|
static VALUE struct_alloc(VALUE);
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2009-05-19 00:58:36 -04:00
|
|
|
static inline VALUE
|
|
|
|
struct_ivar_get(VALUE c, ID id)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
2015-06-22 17:50:31 -04:00
|
|
|
VALUE orig = c;
|
|
|
|
VALUE ivar = rb_attr_get(c, id);
|
|
|
|
|
|
|
|
if (!NIL_P(ivar))
|
|
|
|
return ivar;
|
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
for (;;) {
|
2007-09-28 02:21:46 -04:00
|
|
|
c = RCLASS_SUPER(c);
|
2001-08-29 02:28:51 -04:00
|
|
|
if (c == 0 || c == rb_cStruct)
|
1999-08-13 01:45:20 -04:00
|
|
|
return Qnil;
|
2015-06-22 17:50:31 -04:00
|
|
|
ivar = rb_attr_get(c, id);
|
|
|
|
if (!NIL_P(ivar)) {
|
|
|
|
return rb_ivar_set(orig, id, ivar);
|
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-09-27 00: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 06:44:21 -04:00
|
|
|
rb_struct_s_members(VALUE klass)
|
2004-09-24 12:58:51 -04:00
|
|
|
{
|
2009-05-19 00:58:36 -04:00
|
|
|
VALUE members = struct_ivar_get(klass, id_members);
|
2004-09-24 12:58:51 -04:00
|
|
|
|
|
|
|
if (NIL_P(members)) {
|
2007-09-07 13:47:56 -04:00
|
|
|
rb_raise(rb_eTypeError, "uninitialized struct");
|
2004-09-24 12:58:51 -04:00
|
|
|
}
|
2011-09-29 07:07:45 -04:00
|
|
|
if (!RB_TYPE_P(members, T_ARRAY)) {
|
2007-09-07 21:08:23 -04:00
|
|
|
rb_raise(rb_eTypeError, "corrupted struct");
|
|
|
|
}
|
2004-09-24 12:58:51 -04:00
|
|
|
return members;
|
|
|
|
}
|
|
|
|
|
2004-09-27 00: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 06:44:21 -04:00
|
|
|
rb_struct_members(VALUE s)
|
2004-09-24 01:53:43 -04:00
|
|
|
{
|
2004-09-27 00:46:54 -04:00
|
|
|
VALUE members = rb_struct_s_members(rb_obj_class(s));
|
2004-09-24 01:53:43 -04:00
|
|
|
|
2006-09-02 10:42:08 -04:00
|
|
|
if (RSTRUCT_LEN(s) != RARRAY_LEN(members)) {
|
2005-09-23 20:17:43 -04:00
|
|
|
rb_raise(rb_eTypeError, "struct size differs (%ld required %ld given)",
|
2006-09-02 10:42:08 -04:00
|
|
|
RARRAY_LEN(members), RSTRUCT_LEN(s));
|
2004-09-24 01:53:43 -04:00
|
|
|
}
|
|
|
|
return members;
|
|
|
|
}
|
|
|
|
|
2015-06-30 16:45:44 -04:00
|
|
|
static long
|
|
|
|
struct_member_pos_ideal(VALUE name, long mask)
|
|
|
|
{
|
|
|
|
/* (id & (mask/2)) * 2 */
|
|
|
|
return (SYM2ID(name) >> (ID_SCOPE_SHIFT - 1)) & mask;
|
|
|
|
}
|
|
|
|
|
|
|
|
static long
|
|
|
|
struct_member_pos_probe(long prev, long mask)
|
|
|
|
{
|
2015-07-01 04:17:02 -04:00
|
|
|
/* (((prev/2) * AREF_HASH_UNIT + 1) & (mask/2)) * 2 */
|
|
|
|
return (prev * AREF_HASH_UNIT + 2) & mask;
|
2015-06-30 16:45:44 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2015-06-30 20:30:38 -04:00
|
|
|
struct_set_members(VALUE klass, VALUE /* frozen hidden array */ members)
|
2015-06-30 16:45:44 -04:00
|
|
|
{
|
|
|
|
VALUE back;
|
2015-06-30 20:30:38 -04:00
|
|
|
const long members_length = RARRAY_LEN(members);
|
2015-06-30 16:45:44 -04:00
|
|
|
|
2015-06-30 20:30:38 -04:00
|
|
|
if (members_length <= AREF_HASH_THRESHOLD) {
|
2015-06-30 16:45:44 -04:00
|
|
|
back = members;
|
2015-06-30 20:30:38 -04:00
|
|
|
}
|
|
|
|
else {
|
2015-06-30 16:45:44 -04:00
|
|
|
long i, j, mask = 64;
|
|
|
|
VALUE name;
|
|
|
|
|
2015-07-01 04:17:02 -04:00
|
|
|
while (mask < members_length * AREF_HASH_UNIT) mask *= 2;
|
2015-06-30 16:45:44 -04:00
|
|
|
|
2015-06-30 20:30:38 -04:00
|
|
|
back = rb_ary_tmp_new(mask + 1);
|
|
|
|
rb_ary_store(back, mask, INT2FIX(members_length));
|
2015-06-30 16:45:44 -04:00
|
|
|
mask -= 2; /* mask = (2**k-1)*2 */
|
|
|
|
|
2015-06-30 20:30:38 -04:00
|
|
|
for (i=0; i < members_length; i++) {
|
2015-06-30 16:45:44 -04:00
|
|
|
name = RARRAY_AREF(members, i);
|
|
|
|
|
|
|
|
j = struct_member_pos_ideal(name, mask);
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
if (!RTEST(RARRAY_AREF(back, j))) {
|
|
|
|
rb_ary_store(back, j, name);
|
|
|
|
rb_ary_store(back, j + 1, INT2FIX(i));
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
j = struct_member_pos_probe(j, mask);
|
|
|
|
}
|
|
|
|
}
|
2015-06-30 20:30:38 -04:00
|
|
|
OBJ_FREEZE_RAW(back);
|
2015-06-30 16:45:44 -04:00
|
|
|
}
|
|
|
|
rb_ivar_set(klass, id_members, members);
|
|
|
|
rb_ivar_set(klass, id_back_members, back);
|
|
|
|
|
|
|
|
return members;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline int
|
|
|
|
struct_member_pos(VALUE s, VALUE name)
|
|
|
|
{
|
|
|
|
VALUE back = struct_ivar_get(rb_obj_class(s), id_back_members);
|
|
|
|
VALUE const * p;
|
2015-06-30 20:28:49 -04:00
|
|
|
long j, mask;
|
2015-06-30 16:45:44 -04:00
|
|
|
|
|
|
|
if (UNLIKELY(NIL_P(back))) {
|
|
|
|
rb_raise(rb_eTypeError, "uninitialized struct");
|
|
|
|
}
|
|
|
|
if (UNLIKELY(!RB_TYPE_P(back, T_ARRAY))) {
|
|
|
|
rb_raise(rb_eTypeError, "corrupted struct");
|
|
|
|
}
|
|
|
|
|
|
|
|
p = RARRAY_CONST_PTR(back);
|
2015-06-30 20:28:49 -04:00
|
|
|
mask = RARRAY_LEN(back);
|
2015-06-30 16:45:44 -04:00
|
|
|
|
|
|
|
if (mask <= AREF_HASH_THRESHOLD) {
|
2015-06-30 20:30:38 -04:00
|
|
|
if (UNLIKELY(RSTRUCT_LEN(s) != mask)) {
|
2015-06-30 16:45:44 -04:00
|
|
|
rb_raise(rb_eTypeError,
|
2015-06-30 20:28:49 -04:00
|
|
|
"struct size differs (%ld required %ld given)",
|
2015-06-30 16:45:44 -04:00
|
|
|
mask, RSTRUCT_LEN(s));
|
|
|
|
}
|
|
|
|
for (j = 0; j < mask; j++) {
|
|
|
|
if (p[j] == name)
|
2015-06-30 20:28:49 -04:00
|
|
|
return (int)j;
|
2015-06-30 16:45:44 -04:00
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (UNLIKELY(RSTRUCT_LEN(s) != FIX2INT(RARRAY_AREF(back, mask-1)))) {
|
|
|
|
rb_raise(rb_eTypeError, "struct size differs (%d required %ld given)",
|
|
|
|
FIX2INT(RARRAY_AREF(back, mask-1)), RSTRUCT_LEN(s));
|
|
|
|
}
|
|
|
|
|
|
|
|
mask -= 3;
|
|
|
|
j = struct_member_pos_ideal(name, mask);
|
|
|
|
|
|
|
|
for (;;) {
|
|
|
|
if (p[j] == name)
|
|
|
|
return FIX2INT(p[j + 1]);
|
|
|
|
if (!RTEST(p[j])) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
j = struct_member_pos_probe(j, mask);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
1999-01-19 23:59:39 -05: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 06:44:21 -04:00
|
|
|
rb_struct_s_members_m(VALUE klass)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
2012-05-21 11:47:03 -04:00
|
|
|
VALUE members = rb_struct_s_members(klass);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2012-05-21 11:47:03 -04:00
|
|
|
return rb_ary_dup(members);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-28 15:47:56 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-17 17:07:33 -04:00
|
|
|
* struct.members -> array
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2013-06-11 18:17:02 -04:00
|
|
|
* Returns the struct members as an array of symbols:
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2003-12-28 15:47:56 -05:00
|
|
|
* Customer = Struct.new(:name, :address, :zip)
|
|
|
|
* joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
|
2008-03-08 20:04:46 -05:00
|
|
|
* joe.members #=> [:name, :address, :zip]
|
2003-12-28 15:47:56 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05: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 06:44:21 -04:00
|
|
|
rb_struct_members_m(VALUE obj)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2004-09-27 00:46:54 -04:00
|
|
|
return rb_struct_s_members_m(rb_obj_class(obj));
|
1998-01-16 07:13:05 -05: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 06:44:21 -04:00
|
|
|
rb_struct_getmember(VALUE obj, ID id)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2015-06-30 16:45:44 -04:00
|
|
|
VALUE slot = ID2SYM(id);
|
|
|
|
int i = struct_member_pos(obj, slot);
|
|
|
|
if (i != -1) {
|
|
|
|
return RSTRUCT_GET(obj, i);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2015-10-28 02:24:12 -04:00
|
|
|
rb_name_err_raise("`%1$s' is not a struct member", obj, ID2SYM(id));
|
2012-04-13 20:36:26 -04:00
|
|
|
|
|
|
|
UNREACHABLE;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2013-06-21 07:22:18 -04:00
|
|
|
static VALUE rb_struct_ref0(VALUE obj) {return RSTRUCT_GET(obj, 0);}
|
|
|
|
static VALUE rb_struct_ref1(VALUE obj) {return RSTRUCT_GET(obj, 1);}
|
|
|
|
static VALUE rb_struct_ref2(VALUE obj) {return RSTRUCT_GET(obj, 2);}
|
|
|
|
static VALUE rb_struct_ref3(VALUE obj) {return RSTRUCT_GET(obj, 3);}
|
|
|
|
static VALUE rb_struct_ref4(VALUE obj) {return RSTRUCT_GET(obj, 4);}
|
|
|
|
static VALUE rb_struct_ref5(VALUE obj) {return RSTRUCT_GET(obj, 5);}
|
|
|
|
static VALUE rb_struct_ref6(VALUE obj) {return RSTRUCT_GET(obj, 6);}
|
|
|
|
static VALUE rb_struct_ref7(VALUE obj) {return RSTRUCT_GET(obj, 7);}
|
|
|
|
static VALUE rb_struct_ref8(VALUE obj) {return RSTRUCT_GET(obj, 8);}
|
|
|
|
static VALUE rb_struct_ref9(VALUE obj) {return RSTRUCT_GET(obj, 9);}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2009-05-20 06:41:46 -04:00
|
|
|
#define N_REF_FUNC numberof(ref_func)
|
2005-06-01 11:03:09 -04:00
|
|
|
|
2008-04-26 04:30:22 -04:00
|
|
|
static VALUE (*const ref_func[])(VALUE) = {
|
1999-01-19 23:59:39 -05: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 07:13:05 -05:00
|
|
|
};
|
|
|
|
|
2001-08-05 23: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 06:44:21 -04:00
|
|
|
rb_struct_modify(VALUE s)
|
2001-08-05 23: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 04:14:05 -04:00
|
|
|
rb_check_frozen(s);
|
2011-07-17 03:26:45 -04:00
|
|
|
rb_check_trusted(s);
|
2001-08-05 23:08:57 -04:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
2013-04-12 21:20:34 -04:00
|
|
|
anonymous_struct(VALUE klass)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2013-04-12 21:20:34 -04:00
|
|
|
VALUE nstr;
|
|
|
|
|
|
|
|
nstr = rb_class_new(klass);
|
|
|
|
rb_make_metaclass(nstr, RBASIC(klass)->klass);
|
|
|
|
rb_class_inherited(klass, nstr);
|
|
|
|
return nstr;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
new_struct(VALUE name, VALUE super)
|
|
|
|
{
|
|
|
|
/* old style: should we warn? */
|
1998-01-16 07:13:05 -05:00
|
|
|
ID id;
|
2013-04-12 21:20:34 -04:00
|
|
|
name = rb_str_to_str(name);
|
|
|
|
if (!rb_is_const_name(name)) {
|
2015-10-28 02:24:12 -04:00
|
|
|
rb_name_err_raise("identifier %1$s needs to be constant",
|
|
|
|
super, name);
|
2013-04-12 21:20:34 -04:00
|
|
|
}
|
|
|
|
id = rb_to_id(name);
|
|
|
|
if (rb_const_defined_at(super, id)) {
|
2013-10-27 11:52:39 -04:00
|
|
|
rb_warn("redefining constant %"PRIsVALUE"::%"PRIsVALUE, super, name);
|
2013-04-12 21:20:34 -04:00
|
|
|
rb_mod_remove_const(super, ID2SYM(id));
|
|
|
|
}
|
|
|
|
return rb_define_class_id_under(super, id, super);
|
|
|
|
}
|
|
|
|
|
2014-12-09 10:43:49 -05:00
|
|
|
static void
|
|
|
|
define_aref_method(VALUE nstr, VALUE name, VALUE off)
|
|
|
|
{
|
2014-12-16 01:18:25 -05:00
|
|
|
rb_control_frame_t *FUNC_FASTCALL(rb_vm_opt_struct_aref)(rb_thread_t *, rb_control_frame_t *);
|
2015-07-21 18:52:59 -04:00
|
|
|
const rb_iseq_t *iseq = rb_method_for_self_aref(name, off, rb_vm_opt_struct_aref);
|
2014-12-09 10:43:49 -05:00
|
|
|
|
2015-07-21 18:52:59 -04:00
|
|
|
rb_add_method_iseq(nstr, SYM2ID(name), iseq, NULL, METHOD_VISI_PUBLIC);
|
2014-12-09 10:43:49 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
define_aset_method(VALUE nstr, VALUE name, VALUE off)
|
|
|
|
{
|
2014-12-16 01:18:25 -05:00
|
|
|
rb_control_frame_t *FUNC_FASTCALL(rb_vm_opt_struct_aset)(rb_thread_t *, rb_control_frame_t *);
|
2015-07-21 18:52:59 -04:00
|
|
|
const rb_iseq_t *iseq = rb_method_for_self_aset(name, off, rb_vm_opt_struct_aset);
|
2014-12-09 10:43:49 -05:00
|
|
|
|
2015-07-21 18:52:59 -04:00
|
|
|
rb_add_method_iseq(nstr, SYM2ID(name), iseq, NULL, METHOD_VISI_PUBLIC);
|
2014-12-09 10:43:49 -05:00
|
|
|
}
|
|
|
|
|
2013-04-12 21:20:34 -04:00
|
|
|
static VALUE
|
|
|
|
setup_struct(VALUE nstr, VALUE members)
|
|
|
|
{
|
2013-08-26 01:47:27 -04:00
|
|
|
const VALUE *ptr_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 10:35:39 -04:00
|
|
|
long i, len;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2015-06-30 16:45:44 -04:00
|
|
|
members = struct_set_members(nstr, members);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2002-12-20 03:33:17 -05:00
|
|
|
rb_define_alloc_func(nstr, struct_alloc);
|
2001-10-03 03: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 00:46:54 -04:00
|
|
|
rb_define_singleton_method(nstr, "members", rb_struct_s_members_m, 0);
|
* include/ruby/ruby.h: rename RARRAY_RAWPTR() to RARRAY_CONST_PTR().
RARRAY_RAWPTR(ary) returns (const VALUE *) type pointer and
usecase of this macro is not acquire raw pointer, but acquire
read-only pointer. So we rename to better name.
RSTRUCT_RAWPTR() is also renamed to RSTRUCT_CONST_PTR()
(I expect that nobody use it).
* array.c, compile.c, cont.c, enumerator.c, gc.c, proc.c, random.c,
string.c, struct.c, thread.c, vm_eval.c, vm_insnhelper.c:
catch up this change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-09-25 04:24:34 -04:00
|
|
|
ptr_members = RARRAY_CONST_PTR(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 10:35:39 -04:00
|
|
|
len = RARRAY_LEN(members);
|
|
|
|
for (i=0; i< len; i++) {
|
|
|
|
ID id = SYM2ID(ptr_members[i]);
|
2014-12-09 10:43:49 -05:00
|
|
|
VALUE off = LONG2NUM(i);
|
|
|
|
|
2012-12-21 21:52:48 -05: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 01:47:45 -05:00
|
|
|
}
|
2012-12-21 21:52:48 -05:00
|
|
|
else {
|
2014-12-09 10:43:49 -05:00
|
|
|
define_aref_method(nstr, ptr_members[i], off);
|
2012-12-21 21:52:48 -05:00
|
|
|
}
|
2014-12-09 10:43:49 -05:00
|
|
|
define_aset_method(nstr, ID2SYM(rb_id_attrset(id)), off);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
return nstr;
|
|
|
|
}
|
|
|
|
|
2007-11-22 23:35:53 -05:00
|
|
|
VALUE
|
2007-11-23 02:00:50 -05:00
|
|
|
rb_struct_alloc_noinit(VALUE klass)
|
|
|
|
{
|
|
|
|
return struct_alloc(klass);
|
|
|
|
}
|
|
|
|
|
2016-04-15 20:59:42 -04:00
|
|
|
static VALUE
|
|
|
|
struct_make_members_list(va_list ar)
|
|
|
|
{
|
|
|
|
char *mem;
|
2016-04-15 21:00:13 -04:00
|
|
|
VALUE ary, list = rb_ident_hash_new();
|
|
|
|
st_table *tbl = RHASH_TBL(list);
|
2016-04-15 20:59:42 -04:00
|
|
|
|
2016-04-15 21:00:13 -04:00
|
|
|
RBASIC_CLEAR_CLASS(list);
|
2016-04-15 20:59:42 -04:00
|
|
|
while ((mem = va_arg(ar, char*)) != 0) {
|
|
|
|
VALUE sym = rb_sym_intern_ascii_cstr(mem);
|
2016-04-15 21:00:13 -04:00
|
|
|
if (st_insert(tbl, sym, Qtrue)) {
|
|
|
|
rb_raise(rb_eArgError, "duplicate member: %s", mem);
|
|
|
|
}
|
2016-04-15 20:59:42 -04:00
|
|
|
}
|
2016-04-15 21:00:13 -04:00
|
|
|
ary = rb_hash_keys(list);
|
|
|
|
st_clear(tbl);
|
|
|
|
RBASIC_CLEAR_CLASS(ary);
|
2016-04-15 20:59:42 -04:00
|
|
|
OBJ_FREEZE_RAW(ary);
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2013-08-29 05:12:25 -04:00
|
|
|
static VALUE
|
|
|
|
struct_define_without_accessor(VALUE outer, const char *class_name, VALUE super, rb_alloc_func_t alloc, VALUE members)
|
2007-11-22 23:35:53 -05:00
|
|
|
{
|
|
|
|
VALUE klass;
|
2013-08-29 05:12:25 -04:00
|
|
|
|
|
|
|
if (class_name) {
|
|
|
|
if (outer) {
|
|
|
|
klass = rb_define_class_under(outer, class_name, super);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
klass = rb_define_class(class_name, super);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
klass = anonymous_struct(super);
|
|
|
|
}
|
|
|
|
|
2015-06-30 16:45:44 -04:00
|
|
|
struct_set_members(klass, members);
|
2013-08-29 05:12:25 -04:00
|
|
|
|
|
|
|
if (alloc) {
|
|
|
|
rb_define_alloc_func(klass, alloc);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_define_alloc_func(klass, struct_alloc);
|
|
|
|
}
|
|
|
|
|
|
|
|
return klass;
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_struct_define_without_accessor_under(VALUE outer, const char *class_name, VALUE super, rb_alloc_func_t alloc, ...)
|
|
|
|
{
|
2007-11-22 23:35:53 -05:00
|
|
|
va_list ar;
|
|
|
|
VALUE members;
|
|
|
|
|
2007-11-23 02:15:17 -05:00
|
|
|
va_start(ar, alloc);
|
2016-04-15 20:59:42 -04:00
|
|
|
members = struct_make_members_list(ar);
|
2007-11-22 23:35:53 -05:00
|
|
|
va_end(ar);
|
|
|
|
|
2013-08-29 05:12:25 -04:00
|
|
|
return struct_define_without_accessor(outer, class_name, super, alloc, members);
|
|
|
|
}
|
2007-11-22 23:35:53 -05:00
|
|
|
|
2013-08-29 05:12:25 -04:00
|
|
|
VALUE
|
|
|
|
rb_struct_define_without_accessor(const char *class_name, VALUE super, rb_alloc_func_t alloc, ...)
|
|
|
|
{
|
|
|
|
va_list ar;
|
|
|
|
VALUE members;
|
2007-11-22 23:35:53 -05:00
|
|
|
|
2013-08-29 05:12:25 -04:00
|
|
|
va_start(ar, alloc);
|
2016-04-15 20:59:42 -04:00
|
|
|
members = struct_make_members_list(ar);
|
2013-08-29 05:12:25 -04:00
|
|
|
va_end(ar);
|
2007-11-22 23:35:53 -05:00
|
|
|
|
2013-08-29 05:12:25 -04:00
|
|
|
return struct_define_without_accessor(0, class_name, super, alloc, members);
|
2007-11-22 23:35:53 -05:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
VALUE
|
1999-08-13 01:45:20 -04:00
|
|
|
rb_struct_define(const char *name, ...)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
va_list ar;
|
2013-04-12 21:20:34 -04:00
|
|
|
VALUE st, ary;
|
1998-01-16 07:13:05 -05: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 06:44:21 -04:00
|
|
|
va_start(ar, name);
|
2016-04-15 20:59:42 -04:00
|
|
|
ary = struct_make_members_list(ar);
|
1998-01-16 07:13:05 -05:00
|
|
|
va_end(ar);
|
|
|
|
|
2013-04-12 21:20:34 -04:00
|
|
|
if (!name) st = anonymous_struct(rb_cStruct);
|
|
|
|
else st = new_struct(rb_str_new2(name), rb_cStruct);
|
|
|
|
return setup_struct(st, ary);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2013-08-02 20:31:02 -04:00
|
|
|
VALUE
|
|
|
|
rb_struct_define_under(VALUE outer, const char *name, ...)
|
|
|
|
{
|
|
|
|
va_list ar;
|
|
|
|
VALUE ary;
|
|
|
|
|
|
|
|
va_start(ar, name);
|
2016-04-15 20:59:42 -04:00
|
|
|
ary = struct_make_members_list(ar);
|
2013-08-02 20:31:02 -04:00
|
|
|
va_end(ar);
|
|
|
|
|
|
|
|
return setup_struct(rb_define_class_under(outer, name, rb_cStruct), ary);
|
|
|
|
}
|
|
|
|
|
2003-12-28 15:47:56 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2013-06-11 18:17:02 -04:00
|
|
|
* Struct.new([class_name] [, member_name]+>) -> StructClass
|
|
|
|
* Struct.new([class_name] [, member_name]+>) {|StructClass| block } -> StructClass
|
|
|
|
* StructClass.new(value, ...) -> obj
|
|
|
|
* StructClass[value, ...] -> obj
|
|
|
|
*
|
|
|
|
* The first two forms are used to create a new Struct subclass +class_name+
|
|
|
|
* that can contain a value for each +member_name+. This subclass can be
|
|
|
|
* used to create instances of the structure like any other Class.
|
|
|
|
*
|
|
|
|
* If the +class_name+ is omitted an anonymous structure class will be
|
|
|
|
* created. Otherwise, the name of this struct will appear as a constant in
|
|
|
|
* class Struct, so it must be unique for all Structs in the system and
|
|
|
|
* must start with a capital letter. Assigning a structure class to a
|
|
|
|
* constant also gives the class the name of the constant.
|
|
|
|
*
|
|
|
|
* # Create a structure with a name under Struct
|
|
|
|
* Struct.new("Customer", :name, :address)
|
|
|
|
* #=> Struct::Customer
|
|
|
|
* Struct::Customer.new("Dave", "123 Main")
|
|
|
|
* #=> #<struct Struct::Customer name="Dave", address="123 Main">
|
|
|
|
*
|
|
|
|
* If a block is given it will be evaluated in the context of
|
|
|
|
* +StructClass+, passing the created class as a parameter:
|
2013-01-18 21:37:01 -05:00
|
|
|
*
|
|
|
|
* Customer = Struct.new(:name, :address) do
|
|
|
|
* def greeting
|
|
|
|
* "Hello #{name}!"
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
* Customer.new("Dave", "123 Main").greeting # => "Hello Dave!"
|
|
|
|
*
|
2013-06-11 18:17:02 -04:00
|
|
|
* This is the recommended way to customize a struct. Subclassing an
|
|
|
|
* anonymous struct creates an extra anonymous class that will never be used.
|
2003-12-28 15:47:56 -05:00
|
|
|
*
|
2013-06-11 18:17:02 -04:00
|
|
|
* The last two forms create a new instance of a struct subclass. The number
|
|
|
|
* of +value+ parameters must be less than or equal to the number of
|
|
|
|
* attributes defined for the structure. Unset parameters default to +nil+.
|
2013-09-26 11:41:02 -04:00
|
|
|
* Passing more parameters than number of attributes will raise
|
|
|
|
* an ArgumentError.
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2003-12-28 15:47:56 -05:00
|
|
|
* # Create a structure named by its constant
|
2013-06-11 18:17:02 -04:00
|
|
|
* Customer = Struct.new(:name, :address)
|
|
|
|
* #=> Customer
|
|
|
|
* Customer.new("Dave", "123 Main")
|
|
|
|
* #=> #<struct Customer name="Dave", address="123 Main">
|
2003-12-28 15:47:56 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05: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 06:44:21 -04:00
|
|
|
rb_struct_s_def(int argc, VALUE *argv, VALUE klass)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1999-01-19 23:59:39 -05:00
|
|
|
VALUE name, rest;
|
1999-08-13 01:45:20 -04:00
|
|
|
long i;
|
1999-01-19 23:59:39 -05:00
|
|
|
VALUE st;
|
2016-04-15 21:00:13 -04:00
|
|
|
st_table *tbl;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2013-04-12 21:20:34 -04:00
|
|
|
rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
|
|
|
|
name = argv[0];
|
|
|
|
if (SYMBOL_P(name)) {
|
2006-09-02 11:20:24 -04:00
|
|
|
name = Qnil;
|
1999-12-14 01:50:43 -05:00
|
|
|
}
|
2013-04-12 21:20:34 -04:00
|
|
|
else {
|
|
|
|
--argc;
|
|
|
|
++argv;
|
|
|
|
}
|
2016-04-15 21:00:13 -04:00
|
|
|
rest = rb_ident_hash_new();
|
|
|
|
RBASIC_CLEAR_CLASS(rest);
|
|
|
|
tbl = RHASH_TBL(rest);
|
2013-04-12 21:20:34 -04:00
|
|
|
for (i=0; i<argc; i++) {
|
2016-04-15 21:00:13 -04:00
|
|
|
VALUE mem = rb_to_symbol(argv[i]);
|
|
|
|
if (st_insert(tbl, mem, Qtrue)) {
|
|
|
|
rb_raise(rb_eArgError, "duplicate member: %"PRIsVALUE, mem);
|
|
|
|
}
|
2013-04-12 21:20:34 -04:00
|
|
|
}
|
2016-04-15 21:00:13 -04:00
|
|
|
rest = rb_hash_keys(rest);
|
|
|
|
st_clear(tbl);
|
|
|
|
RBASIC_CLEAR_CLASS(rest);
|
2015-06-30 20:30:38 -04:00
|
|
|
OBJ_FREEZE_RAW(rest);
|
2013-04-12 21:20:34 -04:00
|
|
|
if (NIL_P(name)) {
|
|
|
|
st = anonymous_struct(klass);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
st = new_struct(name, klass);
|
2008-05-05 06:52:44 -04:00
|
|
|
}
|
2013-04-12 21:20:34 -04:00
|
|
|
setup_struct(st, rest);
|
2004-03-10 02:05:19 -05:00
|
|
|
if (rb_block_given_p()) {
|
|
|
|
rb_mod_module_eval(0, 0, st);
|
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
|
|
|
|
return st;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2009-05-20 06:41:46 -04:00
|
|
|
static long
|
2008-06-27 08:56:45 -04:00
|
|
|
num_members(VALUE klass)
|
|
|
|
{
|
|
|
|
VALUE members;
|
2009-05-19 00:58:36 -04:00
|
|
|
members = struct_ivar_get(klass, id_members);
|
2011-09-29 07:07:45 -04:00
|
|
|
if (!RB_TYPE_P(members, T_ARRAY)) {
|
2008-06-27 08:56:45 -04:00
|
|
|
rb_raise(rb_eTypeError, "broken members");
|
|
|
|
}
|
|
|
|
return RARRAY_LEN(members);
|
|
|
|
}
|
|
|
|
|
2003-12-28 15:47:56 -05:00
|
|
|
/*
|
|
|
|
*/
|
|
|
|
|
2008-11-09 19:51:14 -05:00
|
|
|
static VALUE
|
2013-11-07 21:37:47 -05:00
|
|
|
rb_struct_initialize_m(int argc, const VALUE *argv, VALUE self)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2001-08-20 00:29:58 -04:00
|
|
|
VALUE klass = rb_obj_class(self);
|
2013-06-21 07:22:18 -04:00
|
|
|
long i, n;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2001-08-05 23:08:57 -04:00
|
|
|
rb_struct_modify(self);
|
2008-06-27 08:56:45 -04:00
|
|
|
n = num_members(klass);
|
2008-11-09 19:51:14 -05:00
|
|
|
if (n < argc) {
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_raise(rb_eArgError, "struct size differs");
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2013-06-21 07:22:18 -04:00
|
|
|
for (i=0; i<argc; i++) {
|
|
|
|
RSTRUCT_SET(self, i, argv[i]);
|
|
|
|
}
|
2008-11-09 19:51:14 -05:00
|
|
|
if (n > argc) {
|
* include/ruby/ruby.h: rename RARRAY_RAWPTR() to RARRAY_CONST_PTR().
RARRAY_RAWPTR(ary) returns (const VALUE *) type pointer and
usecase of this macro is not acquire raw pointer, but acquire
read-only pointer. So we rename to better name.
RSTRUCT_RAWPTR() is also renamed to RSTRUCT_CONST_PTR()
(I expect that nobody use it).
* array.c, compile.c, cont.c, enumerator.c, gc.c, proc.c, random.c,
string.c, struct.c, thread.c, vm_eval.c, vm_insnhelper.c:
catch up this change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-09-25 04:24:34 -04:00
|
|
|
rb_mem_clear((VALUE *)RSTRUCT_CONST_PTR(self)+argc, n-argc);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2008-11-09 19:51:14 -05:00
|
|
|
VALUE
|
|
|
|
rb_struct_initialize(VALUE self, VALUE values)
|
|
|
|
{
|
2013-11-07 21:37:47 -05:00
|
|
|
return rb_struct_initialize_m(RARRAY_LENINT(values), RARRAY_CONST_PTR(values), self);
|
2008-11-09 19:51:14 -05:00
|
|
|
}
|
|
|
|
|
1999-08-13 01: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 06:44:21 -04:00
|
|
|
struct_alloc(VALUE klass)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
|
|
|
long n;
|
2013-06-21 07:22:18 -04:00
|
|
|
NEWOBJ_OF(st, struct RStruct, klass, T_STRUCT | (RGENGC_WB_PROTECTED_STRUCT ? FL_WB_PROTECTED : 0));
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2008-06-27 08:56:45 -04:00
|
|
|
n = num_members(klass);
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2006-02-05 09:40:01 -05:00
|
|
|
if (0 < n && n <= RSTRUCT_EMBED_LEN_MAX) {
|
|
|
|
RBASIC(st)->flags &= ~RSTRUCT_EMBED_LEN_MASK;
|
|
|
|
RBASIC(st)->flags |= n << RSTRUCT_EMBED_LEN_SHIFT;
|
2013-06-21 07:22:18 -04:00
|
|
|
rb_mem_clear((VALUE *)st->as.ary, n);
|
2006-02-05 09:40:01 -05:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
st->as.heap.ptr = ALLOC_N(VALUE, n);
|
2013-06-21 07:22:18 -04:00
|
|
|
rb_mem_clear((VALUE *)st->as.heap.ptr, n);
|
2006-02-05 09:40:01 -05:00
|
|
|
st->as.heap.len = n;
|
|
|
|
}
|
1999-08-13 01: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 06:44:21 -04:00
|
|
|
rb_struct_alloc(VALUE klass, VALUE values)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
2014-03-20 00:06:27 -04:00
|
|
|
return rb_class_new_instance(RARRAY_LENINT(values), RARRAY_CONST_PTR(values), klass);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_struct_new(VALUE klass, ...)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2009-05-20 06:41:46 -04:00
|
|
|
VALUE tmpargs[N_REF_FUNC], *mem = tmpargs;
|
2009-05-20 12:43:41 -04:00
|
|
|
int size, i;
|
1998-01-16 07:13:05 -05:00
|
|
|
va_list args;
|
|
|
|
|
2009-05-20 12:43:41 -04:00
|
|
|
size = rb_long2int(num_members(klass));
|
2009-05-20 06: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 06:44:21 -04:00
|
|
|
va_start(args, klass);
|
1999-01-19 23:59:39 -05:00
|
|
|
for (i=0; i<size; i++) {
|
1999-08-13 01:45:20 -04:00
|
|
|
mem[i] = va_arg(args, VALUE);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
va_end(args);
|
|
|
|
|
2001-10-03 03:19:19 -04:00
|
|
|
return rb_class_new_instance(size, mem, klass);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2013-06-26 09:43:22 -04:00
|
|
|
static VALUE
|
|
|
|
struct_enum_size(VALUE s, VALUE args, VALUE eobj)
|
|
|
|
{
|
|
|
|
return rb_struct_size(s);
|
|
|
|
}
|
|
|
|
|
2003-12-28 15:47:56 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-17 17:07:33 -04:00
|
|
|
* struct.each {|obj| block } -> struct
|
|
|
|
* struct.each -> an_enumerator
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2013-06-11 18:17:02 -04:00
|
|
|
* Yields the value of each struct member in order. If no block is given an
|
|
|
|
* enumerator is returned.
|
2010-05-13 01:49:55 -04:00
|
|
|
*
|
2003-12-28 15:47:56 -05: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 09:23:33 -05:00
|
|
|
*
|
2013-06-11 18:17:02 -04:00
|
|
|
* Produces:
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2003-12-28 15:47:56 -05:00
|
|
|
* Joe Smith
|
|
|
|
* 123 Maple, Anytown NC
|
|
|
|
* 12345
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05: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 06:44:21 -04:00
|
|
|
rb_struct_each(VALUE s)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1999-08-13 01:45:20 -04:00
|
|
|
long i;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2013-06-26 09:43:22 -04:00
|
|
|
RETURN_SIZED_ENUMERATOR(s, 0, 0, struct_enum_size);
|
2006-02-05 09:40:01 -05:00
|
|
|
for (i=0; i<RSTRUCT_LEN(s); i++) {
|
2013-06-21 07:22:18 -04:00
|
|
|
rb_yield(RSTRUCT_GET(s, i));
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
return s;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-28 15:47:56 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-17 17:07:33 -04:00
|
|
|
* struct.each_pair {|sym, obj| block } -> struct
|
|
|
|
* struct.each_pair -> an_enumerator
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2013-06-11 18:17:02 -04:00
|
|
|
* Yields the name and value of each struct member in order. If no block is
|
|
|
|
* given an enumerator is returned.
|
2010-05-13 01:49:55 -04:00
|
|
|
*
|
2003-12-28 15:47:56 -05: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 09:23:33 -05:00
|
|
|
*
|
2013-06-11 18:17:02 -04:00
|
|
|
* Produces:
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2003-12-28 15:47:56 -05:00
|
|
|
* name => Joe Smith
|
|
|
|
* address => 123 Maple, Anytown NC
|
|
|
|
* zip => 12345
|
|
|
|
*/
|
|
|
|
|
2002-04-10 04: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 06:44:21 -04:00
|
|
|
rb_struct_each_pair(VALUE s)
|
2002-04-10 04:45:26 -04:00
|
|
|
{
|
2004-09-24 01:53:43 -04:00
|
|
|
VALUE members;
|
2002-04-10 04:45:26 -04:00
|
|
|
long i;
|
|
|
|
|
2013-06-26 09:43:22 -04:00
|
|
|
RETURN_SIZED_ENUMERATOR(s, 0, 0, struct_enum_size);
|
2004-09-27 00:46:54 -04:00
|
|
|
members = rb_struct_members(s);
|
2013-07-15 01:20:11 -04:00
|
|
|
if (rb_block_arity() > 1) {
|
|
|
|
for (i=0; i<RSTRUCT_LEN(s); i++) {
|
|
|
|
VALUE key = rb_ary_entry(members, i);
|
|
|
|
VALUE value = RSTRUCT_GET(s, i);
|
|
|
|
rb_yield_values(2, key, value);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
for (i=0; i<RSTRUCT_LEN(s); i++) {
|
|
|
|
VALUE key = rb_ary_entry(members, i);
|
|
|
|
VALUE value = RSTRUCT_GET(s, i);
|
|
|
|
rb_yield(rb_assoc_new(key, value));
|
|
|
|
}
|
2002-04-10 04:45:26 -04:00
|
|
|
}
|
|
|
|
return s;
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05: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 06:44:21 -04:00
|
|
|
inspect_struct(VALUE s, VALUE dummy, int recur)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2014-08-21 00:39:28 -04:00
|
|
|
VALUE cname = rb_class_path(rb_obj_class(s));
|
2009-08-12 02:32:21 -04:00
|
|
|
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 10:35:39 -04:00
|
|
|
long i, len;
|
2009-08-12 02:32:21 -04:00
|
|
|
char first = RSTRING_PTR(cname)[0];
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2009-08-12 02: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 01:47:45 -05:00
|
|
|
if (recur) {
|
2009-08-12 02: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 01:47:45 -05:00
|
|
|
}
|
|
|
|
|
2004-09-27 00: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 10:35:39 -04:00
|
|
|
len = RSTRUCT_LEN(s);
|
2013-06-21 07:22:18 -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 10:35:39 -04:00
|
|
|
for (i=0; i<len; i++) {
|
2005-03-17 03:56:36 -05:00
|
|
|
VALUE slot;
|
|
|
|
ID id;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
if (i > 0) {
|
2000-04-10 01:48:43 -04:00
|
|
|
rb_str_cat2(str, ", ");
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2009-08-12 02:32:21 -04:00
|
|
|
else if (first != '#') {
|
|
|
|
rb_str_cat2(str, " ");
|
|
|
|
}
|
2013-06-21 07:22:18 -04:00
|
|
|
slot = RARRAY_AREF(members, i);
|
2005-03-17 03:56:36 -05:00
|
|
|
id = SYM2ID(slot);
|
2005-04-18 02:38:30 -04:00
|
|
|
if (rb_is_local_id(id) || rb_is_const_id(id)) {
|
2007-12-24 11:38:44 -05:00
|
|
|
rb_str_append(str, rb_id2str(id));
|
2005-03-17 03:56:36 -05:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_str_append(str, rb_inspect(slot));
|
|
|
|
}
|
2000-04-10 01:48:43 -04:00
|
|
|
rb_str_cat2(str, "=");
|
2013-06-21 07:22:18 -04:00
|
|
|
rb_str_append(str, rb_inspect(RSTRUCT_GET(s, i)));
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2000-04-10 01:48:43 -04:00
|
|
|
rb_str_cat2(str, ">");
|
2000-02-23 00:23:12 -05:00
|
|
|
OBJ_INFECT(str, s);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2003-12-28 15:47:56 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-17 17:07:33 -04:00
|
|
|
* struct.to_s -> string
|
|
|
|
* struct.inspect -> string
|
2003-12-28 15:47:56 -05:00
|
|
|
*
|
|
|
|
* Describe the contents of this struct in a string.
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05: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 06:44:21 -04:00
|
|
|
rb_struct_inspect(VALUE s)
|
1998-01-16 07:13:05 -05: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 01:47:45 -05:00
|
|
|
return rb_exec_recursive(inspect_struct, s, 0);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-28 15:47:56 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-17 17:07:33 -04:00
|
|
|
* struct.to_a -> array
|
|
|
|
* struct.values -> array
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2013-06-11 18:17:02 -04:00
|
|
|
* Returns the values for this struct as an Array.
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2003-12-28 15:47:56 -05: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 07:13:05 -05: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 06:44:21 -04:00
|
|
|
rb_struct_to_a(VALUE s)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
* include/ruby/ruby.h: rename RARRAY_RAWPTR() to RARRAY_CONST_PTR().
RARRAY_RAWPTR(ary) returns (const VALUE *) type pointer and
usecase of this macro is not acquire raw pointer, but acquire
read-only pointer. So we rename to better name.
RSTRUCT_RAWPTR() is also renamed to RSTRUCT_CONST_PTR()
(I expect that nobody use it).
* array.c, compile.c, cont.c, enumerator.c, gc.c, proc.c, random.c,
string.c, struct.c, thread.c, vm_eval.c, vm_insnhelper.c:
catch up this change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-09-25 04:24:34 -04:00
|
|
|
return rb_ary_new4(RSTRUCT_LEN(s), RSTRUCT_CONST_PTR(s));
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
2012-04-23 23:46:55 -04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* struct.to_h -> hash
|
|
|
|
*
|
2013-06-11 18:17:02 -04:00
|
|
|
* Returns a Hash containing the names and values for the struct's members.
|
2012-04-23 23:46:55 -04:00
|
|
|
*
|
|
|
|
* 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++) {
|
2013-06-21 07:22:18 -04:00
|
|
|
rb_hash_aset(h, rb_ary_entry(members, i), RSTRUCT_GET(s, i));
|
2012-04-23 23:46:55 -04:00
|
|
|
}
|
|
|
|
return h;
|
|
|
|
}
|
|
|
|
|
2004-01-18 09:16:47 -05:00
|
|
|
/* :nodoc: */
|
2008-08-20 17: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 06:44:21 -04:00
|
|
|
rb_struct_init_copy(VALUE copy, VALUE s)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2013-06-21 07:22:18 -04:00
|
|
|
long i, len;
|
|
|
|
|
2012-06-05 07:13:18 -04:00
|
|
|
if (!OBJ_INIT_COPY(copy, s)) return copy;
|
2007-07-12 04:03:18 -04:00
|
|
|
if (RSTRUCT_LEN(copy) != RSTRUCT_LEN(s)) {
|
|
|
|
rb_raise(rb_eTypeError, "struct size mismatch");
|
2006-02-05 09:40:01 -05:00
|
|
|
}
|
2013-06-21 07:22:18 -04:00
|
|
|
|
|
|
|
for (i=0, len=RSTRUCT_LEN(copy); i<len; i++) {
|
|
|
|
RSTRUCT_SET(copy, i, RSTRUCT_GET(s, i));
|
|
|
|
}
|
2000-01-04 23:41:21 -05:00
|
|
|
|
2002-09-03 01:20:14 -04:00
|
|
|
return copy;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2015-11-16 00:46:50 -05:00
|
|
|
static int
|
|
|
|
rb_struct_pos(VALUE s, VALUE *name)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
2015-11-16 00:46:50 -05:00
|
|
|
long i;
|
|
|
|
VALUE idx = *name;
|
|
|
|
|
|
|
|
if (RB_TYPE_P(idx, T_SYMBOL)) {
|
|
|
|
return struct_member_pos(s, idx);
|
|
|
|
}
|
|
|
|
else if (RB_TYPE_P(idx, T_STRING)) {
|
|
|
|
idx = rb_check_symbol(name);
|
|
|
|
if (NIL_P(idx)) return -1;
|
|
|
|
return struct_member_pos(s, idx);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
long len;
|
|
|
|
i = NUM2LONG(idx);
|
|
|
|
len = RSTRUCT_LEN(s);
|
|
|
|
if (i < 0) {
|
|
|
|
if (i + len < 0) {
|
|
|
|
*name = LONG2FIX(i);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
i += len;
|
|
|
|
}
|
|
|
|
else if (len <= i) {
|
|
|
|
*name = LONG2FIX(i);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return (int)i;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
2015-11-16 00:46:50 -05:00
|
|
|
}
|
2012-04-13 20:36:26 -04:00
|
|
|
|
2015-11-16 00:46:50 -05:00
|
|
|
NORETURN(static void invalid_struct_pos(VALUE s, VALUE idx));
|
|
|
|
static void
|
|
|
|
invalid_struct_pos(VALUE s, VALUE idx)
|
|
|
|
{
|
|
|
|
if (FIXNUM_P(idx)) {
|
|
|
|
long i = FIX2INT(idx), len = RSTRUCT_LEN(s);
|
|
|
|
if (i < 0) {
|
|
|
|
rb_raise(rb_eIndexError, "offset %ld too small for struct(size:%ld)",
|
|
|
|
i, len);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_raise(rb_eIndexError, "offset %ld too large for struct(size:%ld)",
|
|
|
|
i, len);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_name_err_raise("no member '%1$s' in struct", s, idx);
|
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
2003-12-28 15:47:56 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2013-06-11 18:17:02 -04:00
|
|
|
* struct[member] -> anObject
|
|
|
|
* struct[index] -> anObject
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2013-06-11 18:17:02 -04:00
|
|
|
* Attribute Reference---Returns the value of the given struct +member+ or
|
|
|
|
* the member at the given +index+. Raises NameError if the +member+ does
|
|
|
|
* not exist and IndexError if the +index+ is out of range.
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2003-12-28 15:47:56 -05:00
|
|
|
* Customer = Struct.new(:name, :address, :zip)
|
|
|
|
* joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2003-12-28 15:47:56 -05:00
|
|
|
* joe["name"] #=> "Joe Smith"
|
|
|
|
* joe[:name] #=> "Joe Smith"
|
|
|
|
* joe[0] #=> "Joe Smith"
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05: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 06:44:21 -04:00
|
|
|
rb_struct_aref(VALUE s, VALUE idx)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2015-11-16 00:46:50 -05:00
|
|
|
int i = rb_struct_pos(s, &idx);
|
|
|
|
if (i < 0) invalid_struct_pos(s, idx);
|
2013-06-21 07:22:18 -04:00
|
|
|
return RSTRUCT_GET(s, i);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-28 15:47:56 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2015-11-16 01:58:43 -05:00
|
|
|
* struct[member] = obj -> obj
|
|
|
|
* struct[index] = obj -> obj
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2013-06-11 18:17:02 -04:00
|
|
|
* Attribute Assignment---Sets the value of the given struct +member+ or
|
2015-11-16 01:58:43 -05:00
|
|
|
* the member at the given +index+. Raises NameError if the +member+ does not
|
2013-06-11 18:17:02 -04:00
|
|
|
* exist and IndexError if the +index+ is out of range.
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2003-12-28 15:47:56 -05:00
|
|
|
* Customer = Struct.new(:name, :address, :zip)
|
|
|
|
* joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2003-12-28 15:47:56 -05:00
|
|
|
* joe["name"] = "Luke"
|
|
|
|
* joe[:zip] = "90210"
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2003-12-28 15:47:56 -05:00
|
|
|
* joe.name #=> "Luke"
|
|
|
|
* joe.zip #=> "90210"
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05: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 06:44:21 -04:00
|
|
|
rb_struct_aset(VALUE s, VALUE idx, VALUE val)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2015-11-16 00:46:50 -05:00
|
|
|
int i = rb_struct_pos(s, &idx);
|
|
|
|
if (i < 0) invalid_struct_pos(s, idx);
|
2001-08-05 23:08:57 -04:00
|
|
|
rb_struct_modify(s);
|
2013-06-21 07:22:18 -04:00
|
|
|
RSTRUCT_SET(s, i, val);
|
|
|
|
return val;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2015-11-16 04:21:56 -05:00
|
|
|
FUNC_MINIMIZED(VALUE rb_struct_lookup(VALUE s, VALUE idx));
|
|
|
|
NOINLINE(static VALUE rb_struct_lookup_default(VALUE s, VALUE idx, VALUE notfound));
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_struct_lookup(VALUE s, VALUE idx)
|
|
|
|
{
|
|
|
|
return rb_struct_lookup_default(s, idx, Qnil);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_struct_lookup_default(VALUE s, VALUE idx, VALUE notfound)
|
|
|
|
{
|
|
|
|
int i = rb_struct_pos(s, &idx);
|
|
|
|
if (i < 0) return notfound;
|
|
|
|
return RSTRUCT_GET(s, i);
|
|
|
|
}
|
|
|
|
|
2003-07-03 07: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 06:44:21 -04:00
|
|
|
struct_entry(VALUE s, long n)
|
2003-07-03 07:02:53 -04:00
|
|
|
{
|
|
|
|
return rb_struct_aref(s, LONG2NUM(n));
|
|
|
|
}
|
|
|
|
|
2009-02-22 09:23:33 -05:00
|
|
|
/*
|
2013-06-11 18:17:02 -04:00
|
|
|
* call-seq:
|
|
|
|
* struct.values_at(selector, ...) -> an_array
|
|
|
|
*
|
|
|
|
* Returns the struct member values for each +selector+ as an Array. A
|
|
|
|
* +selector+ may be either an Integer offset or a Range of offsets (as in
|
|
|
|
* Array#values_at).
|
|
|
|
*
|
|
|
|
* Customer = Struct.new(:name, :address, :zip)
|
|
|
|
* joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
|
|
|
|
* joe.values_at 0, 2 #=> ["Joe Smith", 12345]
|
|
|
|
*
|
2003-12-28 15:47:56 -05:00
|
|
|
*/
|
|
|
|
|
2003-05-04 12: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 06:44:21 -04:00
|
|
|
rb_struct_values_at(int argc, VALUE *argv, VALUE s)
|
2003-05-04 12:03:24 -04:00
|
|
|
{
|
2006-02-05 09:40:01 -05:00
|
|
|
return rb_get_values_at(s, RSTRUCT_LEN(s), argc, argv, struct_entry);
|
2003-05-04 12:03:24 -04:00
|
|
|
}
|
2001-12-10 22:48:08 -05:00
|
|
|
|
2003-12-28 15:47:56 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-17 17:07:33 -04:00
|
|
|
* struct.select {|i| block } -> array
|
|
|
|
* struct.select -> an_enumerator
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2013-06-11 18:17:02 -04:00
|
|
|
* Yields each member value from the struct to the block and returns an Array
|
|
|
|
* containing the member values from the +struct+ for which the given block
|
|
|
|
* returns a true value (equivalent to Enumerable#select).
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2003-12-28 15:47:56 -05: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-10 22:48:08 -05: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 06:44:21 -04:00
|
|
|
rb_struct_select(int argc, VALUE *argv, VALUE s)
|
2001-12-10 22:48:08 -05:00
|
|
|
{
|
2003-05-04 12:03:24 -04:00
|
|
|
VALUE result;
|
2001-12-10 22:48:08 -05:00
|
|
|
long i;
|
|
|
|
|
2012-03-14 17:10:34 -04:00
|
|
|
rb_check_arity(argc, 0, 0);
|
2013-06-26 09:43:22 -04:00
|
|
|
RETURN_SIZED_ENUMERATOR(s, 0, 0, struct_enum_size);
|
2003-05-04 12:03:24 -04:00
|
|
|
result = rb_ary_new();
|
2006-02-05 09:40:01 -05:00
|
|
|
for (i = 0; i < RSTRUCT_LEN(s); i++) {
|
2013-06-21 07:22:18 -04:00
|
|
|
if (RTEST(rb_yield(RSTRUCT_GET(s, i)))) {
|
|
|
|
rb_ary_push(result, RSTRUCT_GET(s, i));
|
2001-12-10 22:48:08 -05:00
|
|
|
}
|
|
|
|
}
|
2003-05-04 12:03:24 -04:00
|
|
|
|
2001-12-10 22:48:08 -05:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2009-09-19 22:14:02 -04:00
|
|
|
static VALUE
|
|
|
|
recursive_equal(VALUE s, VALUE s2, int recur)
|
|
|
|
{
|
2013-06-21 07:22:18 -04:00
|
|
|
const VALUE *ptr, *ptr2;
|
* 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 10:35:39 -04:00
|
|
|
long i, len;
|
2009-09-19 22:14:02 -04:00
|
|
|
|
|
|
|
if (recur) return Qtrue; /* Subtle! */
|
* include/ruby/ruby.h: rename RARRAY_RAWPTR() to RARRAY_CONST_PTR().
RARRAY_RAWPTR(ary) returns (const VALUE *) type pointer and
usecase of this macro is not acquire raw pointer, but acquire
read-only pointer. So we rename to better name.
RSTRUCT_RAWPTR() is also renamed to RSTRUCT_CONST_PTR()
(I expect that nobody use it).
* array.c, compile.c, cont.c, enumerator.c, gc.c, proc.c, random.c,
string.c, struct.c, thread.c, vm_eval.c, vm_insnhelper.c:
catch up this change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-09-25 04:24:34 -04:00
|
|
|
ptr = RSTRUCT_CONST_PTR(s);
|
|
|
|
ptr2 = RSTRUCT_CONST_PTR(s2);
|
* 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 10:35:39 -04:00
|
|
|
len = RSTRUCT_LEN(s);
|
|
|
|
for (i=0; i<len; i++) {
|
|
|
|
if (!rb_equal(ptr[i], ptr2[i])) return Qfalse;
|
2009-09-19 22:14:02 -04:00
|
|
|
}
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
2003-12-28 15:47:56 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2013-06-11 18:17:02 -04:00
|
|
|
* struct == other -> true or false
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2013-06-11 18:17:02 -04:00
|
|
|
* Equality---Returns +true+ if +other+ has the same struct subclass and has
|
|
|
|
* equal member values (according to Object#==).
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2003-12-28 15:47:56 -05: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 07:13:05 -05: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 06:44:21 -04:00
|
|
|
rb_struct_equal(VALUE s, VALUE s2)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2001-08-29 02:28:51 -04:00
|
|
|
if (s == s2) return Qtrue;
|
2011-09-29 07:07:45 -04:00
|
|
|
if (!RB_TYPE_P(s2, T_STRUCT)) return Qfalse;
|
2001-08-20 00:29:58 -04:00
|
|
|
if (rb_obj_class(s) != rb_obj_class(s2)) return Qfalse;
|
2006-02-05 09:40:01 -05:00
|
|
|
if (RSTRUCT_LEN(s) != RSTRUCT_LEN(s2)) {
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_bug("inconsistent struct"); /* should never happen */
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2009-09-19 22:14:02 -04:00
|
|
|
return rb_exec_recursive_paired(recursive_equal, s, s2, s2);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2013-12-03 08:18:30 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* struct.hash -> fixnum
|
|
|
|
*
|
|
|
|
* Returns a hash value based on this struct's contents (see Object#hash).
|
2014-03-13 21:27:43 -04:00
|
|
|
*
|
|
|
|
* See also Object#hash.
|
2013-12-03 08:18:30 -05:00
|
|
|
*/
|
|
|
|
|
2003-04-15 06:12:25 -04:00
|
|
|
static VALUE
|
2013-12-03 08:18:30 -05:00
|
|
|
rb_struct_hash(VALUE s)
|
2003-04-15 06: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 10:35:39 -04:00
|
|
|
long i, len;
|
2009-09-08 09:10:04 -04:00
|
|
|
st_index_t h;
|
2013-06-21 07:22:18 -04:00
|
|
|
VALUE n;
|
|
|
|
const VALUE *ptr;
|
2003-04-15 06: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 14:55:34 -05:00
|
|
|
h = rb_hash_start(rb_hash(rb_obj_class(s)));
|
2013-12-03 08:18:30 -05:00
|
|
|
ptr = RSTRUCT_CONST_PTR(s);
|
|
|
|
len = RSTRUCT_LEN(s);
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
n = rb_hash(ptr[i]);
|
|
|
|
h = rb_hash_uint(h, NUM2LONG(n));
|
2003-04-15 06: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 14:55:34 -05:00
|
|
|
h = rb_hash_end(h);
|
|
|
|
return INT2FIX(h);
|
2003-04-15 06:12:25 -04:00
|
|
|
}
|
|
|
|
|
2009-09-19 22:14:02 -04:00
|
|
|
static VALUE
|
|
|
|
recursive_eql(VALUE s, VALUE s2, int recur)
|
|
|
|
{
|
2013-06-21 07:22:18 -04:00
|
|
|
const VALUE *ptr, *ptr2;
|
* 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 10:35:39 -04:00
|
|
|
long i, len;
|
2009-09-19 22:14:02 -04:00
|
|
|
|
|
|
|
if (recur) return Qtrue; /* Subtle! */
|
* include/ruby/ruby.h: rename RARRAY_RAWPTR() to RARRAY_CONST_PTR().
RARRAY_RAWPTR(ary) returns (const VALUE *) type pointer and
usecase of this macro is not acquire raw pointer, but acquire
read-only pointer. So we rename to better name.
RSTRUCT_RAWPTR() is also renamed to RSTRUCT_CONST_PTR()
(I expect that nobody use it).
* array.c, compile.c, cont.c, enumerator.c, gc.c, proc.c, random.c,
string.c, struct.c, thread.c, vm_eval.c, vm_insnhelper.c:
catch up this change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43043 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-09-25 04:24:34 -04:00
|
|
|
ptr = RSTRUCT_CONST_PTR(s);
|
|
|
|
ptr2 = RSTRUCT_CONST_PTR(s2);
|
* 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 10:35:39 -04:00
|
|
|
len = RSTRUCT_LEN(s);
|
|
|
|
for (i=0; i<len; i++) {
|
|
|
|
if (!rb_eql(ptr[i], ptr2[i])) return Qfalse;
|
2009-09-19 22:14:02 -04:00
|
|
|
}
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
2003-12-28 15:47:56 -05:00
|
|
|
/*
|
2012-10-27 07:06:46 -04:00
|
|
|
* call-seq:
|
2010-05-17 17:07:33 -04:00
|
|
|
* struct.eql?(other) -> true or false
|
2003-12-28 15:47:56 -05:00
|
|
|
*
|
2013-06-11 18:17:02 -04:00
|
|
|
* Hash equality---+other+ and +struct+ refer to the same hash key if they
|
|
|
|
* have the same struct subclass and have equal member values (according to
|
|
|
|
* Object#eql?).
|
2003-12-28 15:47:56 -05:00
|
|
|
*/
|
|
|
|
|
2003-04-18 14: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 06:44:21 -04:00
|
|
|
rb_struct_eql(VALUE s, VALUE s2)
|
2003-04-18 14:05:11 -04:00
|
|
|
{
|
|
|
|
if (s == s2) return Qtrue;
|
2011-09-29 07:07:45 -04:00
|
|
|
if (!RB_TYPE_P(s2, T_STRUCT)) return Qfalse;
|
2003-04-18 14:05:11 -04:00
|
|
|
if (rb_obj_class(s) != rb_obj_class(s2)) return Qfalse;
|
2006-02-05 09:40:01 -05:00
|
|
|
if (RSTRUCT_LEN(s) != RSTRUCT_LEN(s2)) {
|
2003-04-18 14:05:11 -04:00
|
|
|
rb_bug("inconsistent struct"); /* should never happen */
|
|
|
|
}
|
|
|
|
|
2009-09-19 22:14:02 -04:00
|
|
|
return rb_exec_recursive_paired(recursive_eql, s, s2, s2);
|
2003-04-18 14:05:11 -04:00
|
|
|
}
|
|
|
|
|
2003-12-28 15:47:56 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-17 17:07:33 -04:00
|
|
|
* struct.length -> fixnum
|
|
|
|
* struct.size -> fixnum
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2013-06-11 18:17:02 -04:00
|
|
|
* Returns the number of struct members.
|
2009-02-22 09:23:33 -05:00
|
|
|
*
|
2003-12-28 15:47:56 -05:00
|
|
|
* Customer = Struct.new(:name, :address, :zip)
|
|
|
|
* joe = Customer.new("Joe Smith", "123 Maple, Anytown NC", 12345)
|
|
|
|
* joe.length #=> 3
|
|
|
|
*/
|
|
|
|
|
2016-08-01 03:23:56 -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 06:44:21 -04:00
|
|
|
rb_struct_size(VALUE s)
|
1999-12-07 04:25:55 -05:00
|
|
|
{
|
2006-02-05 09:40:01 -05:00
|
|
|
return LONG2FIX(RSTRUCT_LEN(s));
|
1999-12-07 04:25:55 -05:00
|
|
|
}
|
|
|
|
|
2016-08-01 03:23:56 -04:00
|
|
|
const VALUE*
|
|
|
|
rb_struct_ptr(VALUE s)
|
|
|
|
{
|
|
|
|
return RSTRUCT_CONST_PTR(s);
|
|
|
|
}
|
|
|
|
|
2015-11-16 21:25:28 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* struct.dig(key, ...) -> object
|
|
|
|
*
|
2015-12-08 00:21:11 -05:00
|
|
|
* Extracts the nested value specified by the sequence of <i>idx</i>
|
|
|
|
* objects by calling +dig+ at each step, returning +nil+ if any
|
|
|
|
* intermediate step is +nil+.
|
2015-11-16 21:25:28 -05:00
|
|
|
*
|
|
|
|
* klass = Struct.new(:a)
|
|
|
|
* o = klass.new(klass.new({b: [1, 2, 3]}))
|
|
|
|
*
|
|
|
|
* o.dig(:a, :a, :b, 0) #=> 1
|
|
|
|
* o.dig(:b, 0) #=> nil
|
|
|
|
*/
|
|
|
|
|
2015-11-16 04:21:56 -05:00
|
|
|
static VALUE
|
|
|
|
rb_struct_dig(int argc, VALUE *argv, VALUE self)
|
|
|
|
{
|
|
|
|
rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
|
|
|
|
self = rb_struct_lookup(self, *argv);
|
|
|
|
if (!--argc) return self;
|
|
|
|
++argv;
|
|
|
|
return rb_obj_dig(argc, argv, self, Qnil);
|
|
|
|
}
|
|
|
|
|
2003-12-28 15:47:56 -05:00
|
|
|
/*
|
2013-06-11 18:17:02 -04:00
|
|
|
* A Struct is a convenient way to bundle a number of attributes together,
|
|
|
|
* using accessor methods, without having to write an explicit class.
|
|
|
|
*
|
|
|
|
* The Struct class generates new subclasses that hold a set of members and
|
|
|
|
* their values. For each member a reader and writer method is created
|
|
|
|
* similar to Module#attr_accessor.
|
|
|
|
*
|
|
|
|
* Customer = Struct.new(:name, :address) do
|
|
|
|
* def greeting
|
|
|
|
* "Hello #{name}!"
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* dave = Customer.new("Dave", "123 Main")
|
|
|
|
* dave.name #=> "Dave"
|
|
|
|
* dave.greeting #=> "Hello Dave!"
|
|
|
|
*
|
|
|
|
* See Struct::new for further examples of creating struct subclasses and
|
|
|
|
* instances.
|
|
|
|
*
|
|
|
|
* In the method descriptions that follow a "member" parameter refers to a
|
|
|
|
* struct member which is either a quoted string (<code>"name"</code>) or a
|
|
|
|
* Symbol (<code>:name</code>).
|
2003-12-28 15:47:56 -05:00
|
|
|
*/
|
1998-01-16 07:13:05 -05:00
|
|
|
void
|
2014-07-02 23:38:10 -04:00
|
|
|
InitVM_Struct(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_cStruct = rb_define_class("Struct", rb_cObject);
|
|
|
|
rb_include_module(rb_cStruct, rb_mEnumerable);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2002-12-20 03:33:17 -05:00
|
|
|
rb_undef_alloc_func(rb_cStruct);
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_singleton_method(rb_cStruct, "new", rb_struct_s_def, -1);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2008-11-09 19:51:14 -05:00
|
|
|
rb_define_method(rb_cStruct, "initialize", rb_struct_initialize_m, -1);
|
2003-05-19 01:41:08 -04:00
|
|
|
rb_define_method(rb_cStruct, "initialize_copy", rb_struct_init_copy, 1);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_method(rb_cStruct, "==", rb_struct_equal, 1);
|
2003-04-18 14:05:11 -04:00
|
|
|
rb_define_method(rb_cStruct, "eql?", rb_struct_eql, 1);
|
2003-04-15 06:12:25 -04:00
|
|
|
rb_define_method(rb_cStruct, "hash", rb_struct_hash, 0);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_method(rb_cStruct, "inspect", rb_struct_inspect, 0);
|
2009-05-29 04:10:10 -04:00
|
|
|
rb_define_alias(rb_cStruct, "to_s", "inspect");
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_method(rb_cStruct, "to_a", rb_struct_to_a, 0);
|
2012-04-23 23:46:55 -04:00
|
|
|
rb_define_method(rb_cStruct, "to_h", rb_struct_to_h, 0);
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_method(rb_cStruct, "values", rb_struct_to_a, 0);
|
1999-12-07 04:25:55 -05:00
|
|
|
rb_define_method(rb_cStruct, "size", rb_struct_size, 0);
|
|
|
|
rb_define_method(rb_cStruct, "length", rb_struct_size, 0);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_method(rb_cStruct, "each", rb_struct_each, 0);
|
2002-04-10 04:45:26 -04:00
|
|
|
rb_define_method(rb_cStruct, "each_pair", rb_struct_each_pair, 0);
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_method(rb_cStruct, "[]", rb_struct_aref, 1);
|
|
|
|
rb_define_method(rb_cStruct, "[]=", rb_struct_aset, 2);
|
2001-12-10 22:48:08 -05:00
|
|
|
rb_define_method(rb_cStruct, "select", rb_struct_select, -1);
|
2003-05-04 12:03:24 -04:00
|
|
|
rb_define_method(rb_cStruct, "values_at", rb_struct_values_at, -1);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2004-09-27 00:46:54 -04:00
|
|
|
rb_define_method(rb_cStruct, "members", rb_struct_members_m, 0);
|
2015-11-16 04:21:56 -05:00
|
|
|
rb_define_method(rb_cStruct, "dig", rb_struct_dig, -1);
|
2014-07-02 23:38:10 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
#undef rb_intern
|
|
|
|
void
|
|
|
|
Init_Struct(void)
|
|
|
|
{
|
2009-05-19 00:58:36 -04:00
|
|
|
id_members = rb_intern("__members__");
|
2015-06-30 16:45:44 -04:00
|
|
|
id_back_members = rb_intern("__members_back__");
|
2014-07-02 23:38:10 -04:00
|
|
|
|
|
|
|
InitVM(Struct);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|