2000-05-01 13:42:38 +04:00
|
|
|
/**********************************************************************
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
hash.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
created at: Mon Nov 22 18:51:18 JST 1993
|
|
|
|
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
Copyright (C) 1993-2007 Yukihiro Matsumoto
|
2000-05-01 13:42:38 +04:00
|
|
|
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
|
2000-05-09 08:53:16 +04:00
|
|
|
Copyright (C) 2000 Information-technology Promotion Agency, Japan
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2000-05-01 13:42:38 +04:00
|
|
|
**********************************************************************/
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2018-01-09 09:24:11 +03:00
|
|
|
#include "ruby/encoding.h"
|
2007-06-10 07:06:15 +04:00
|
|
|
#include "ruby/st.h"
|
|
|
|
#include "ruby/util.h"
|
2018-01-09 09:24:11 +03:00
|
|
|
#include "internal.h"
|
2010-01-12 04:00:34 +03:00
|
|
|
#include <errno.h>
|
* probes.d: add DTrace probe declarations. [ruby-core:27448]
* array.c (empty_ary_alloc, ary_new): added array create DTrace probe.
* compile.c (rb_insns_name): allowing DTrace probes to access
instruction sequence name.
* Makefile.in: translate probes.d file to appropriate header file.
* common.mk: declare dependencies on the DTrace header.
* configure.in: add a test for existence of DTrace.
* eval.c (setup_exception): add a probe for when an exception is
raised.
* gc.c: Add DTrace probes for mark begin and end, and sweep begin and
end.
* hash.c (empty_hash_alloc): Add a probe for hash allocation.
* insns.def: Add probes for function entry and return.
* internal.h: function declaration for compile.c change.
* load.c (rb_f_load): add probes for `load` entry and exit, require
entry and exit, and wrapping search_required for load path search.
* object.c (rb_obj_alloc): added a probe for general object creation.
* parse.y (yycompile0): added a probe around parse and compile phase.
* string.c (empty_str_alloc, str_new): DTrace probes for string
allocation.
* test/dtrace/*: tests for DTrace probes.
* vm.c (vm_invoke_proc): add probes for function return on exception
raise, hash create, and instruction sequence execution.
* vm_core.h: add probe declarations for function entry and exit.
* vm_dump.c: add probes header file.
* vm_eval.c (vm_call0_cfunc, vm_call0_cfunc_with_frame): add probe on
function entry and return.
* vm_exec.c: expose instruction number to instruction name function.
* vm_insnshelper.c: add function entry and exit probes for cfunc
methods.
* vm_insnhelper.h: vm usage information is always collected, so
uncomment the functions.
12 19:14:50 2012 Akinori MUSHA <knu@iDaemons.org>
* configure.in (isinf, isnan): isinf() and isnan() are macros on
DragonFly which cannot be found by AC_REPLACE_FUNCS(). This
workaround enforces the fact that they exist on DragonFly.
12 15:59:38 2012 Shugo Maeda <shugo@ruby-lang.org>
* vm_core.h (rb_call_info_t::refinements), compile.c (new_callinfo),
vm_insnhelper.c (vm_search_method): revert r37616 because it's too
slow. [ruby-dev:46477]
* test/ruby/test_refinement.rb (test_inline_method_cache): skip
the test until the bug is fixed efficiently.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-13 01:52:12 +04:00
|
|
|
#include "probes.h"
|
2014-03-23 05:10:12 +04:00
|
|
|
#include "id.h"
|
2015-07-28 01:25:30 +03:00
|
|
|
#include "symbol.h"
|
2018-10-31 01:11:51 +03:00
|
|
|
#include "debug_counter.h"
|
|
|
|
#include "transient_heap.h"
|
|
|
|
#include "ruby_assert.h"
|
2002-10-17 20:13:44 +04:00
|
|
|
#ifdef __APPLE__
|
2012-12-28 18:23:25 +04:00
|
|
|
# ifdef HAVE_CRT_EXTERNS_H
|
|
|
|
# include <crt_externs.h>
|
|
|
|
# else
|
|
|
|
# include "missing/crt_externs.h"
|
|
|
|
# endif
|
2002-10-17 20:13:44 +04:00
|
|
|
#endif
|
|
|
|
|
2018-10-31 01:11:51 +03:00
|
|
|
#ifndef HASH_DEBUG
|
|
|
|
#define HASH_DEBUG 0
|
|
|
|
#endif
|
|
|
|
|
2019-08-07 16:54:38 +03:00
|
|
|
#if HASH_DEBUG
|
|
|
|
#include "gc.h"
|
|
|
|
#endif
|
|
|
|
|
2013-12-23 10:53:17 +04:00
|
|
|
#define HAS_EXTRA_STATES(hash, klass) ( \
|
2013-12-23 11:00:01 +04:00
|
|
|
((klass = has_extra_methods(rb_obj_class(hash))) != 0) || \
|
2019-01-17 19:53:10 +03:00
|
|
|
FL_TEST((hash), FL_EXIVAR|FL_TAINT|RHASH_PROC_DEFAULT) || \
|
2013-12-23 11:00:01 +04:00
|
|
|
!NIL_P(RHASH_IFNONE(hash)))
|
2013-12-16 17:40:04 +04:00
|
|
|
|
2016-03-09 10:17:03 +03:00
|
|
|
#define SET_DEFAULT(hash, ifnone) ( \
|
2019-01-17 19:53:10 +03:00
|
|
|
FL_UNSET_RAW(hash, RHASH_PROC_DEFAULT), \
|
2016-03-09 10:17:03 +03:00
|
|
|
RHASH_SET_IFNONE(hash, ifnone))
|
|
|
|
|
2016-03-09 10:17:03 +03:00
|
|
|
#define SET_PROC_DEFAULT(hash, proc) set_proc_default(hash, proc)
|
|
|
|
|
2016-03-09 10:17:04 +03:00
|
|
|
#define COPY_DEFAULT(hash, hash2) copy_default(RHASH(hash), RHASH(hash2))
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
copy_default(struct RHash *hash, const struct RHash *hash2)
|
|
|
|
{
|
2019-01-17 19:53:10 +03:00
|
|
|
hash->basic.flags &= ~RHASH_PROC_DEFAULT;
|
|
|
|
hash->basic.flags |= hash2->basic.flags & RHASH_PROC_DEFAULT;
|
2016-03-09 10:17:04 +03:00
|
|
|
RHASH_SET_IFNONE(hash, RHASH_IFNONE(hash2));
|
|
|
|
}
|
|
|
|
|
2013-12-23 10:53:51 +04:00
|
|
|
static VALUE
|
|
|
|
has_extra_methods(VALUE klass)
|
|
|
|
{
|
|
|
|
const VALUE base = rb_cHash;
|
|
|
|
VALUE c = klass;
|
|
|
|
while (c != base) {
|
2015-05-31 22:17:18 +03:00
|
|
|
if (rb_class_has_methods(c)) return klass;
|
2013-12-23 13:01:05 +04:00
|
|
|
c = RCLASS_SUPER(c);
|
2013-12-23 10:53:51 +04:00
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-10-25 21:05:09 +04:00
|
|
|
static VALUE rb_hash_s_try_convert(VALUE, VALUE);
|
|
|
|
|
2013-05-26 16:37:11 +04:00
|
|
|
/*
|
|
|
|
* Hash WB strategy:
|
|
|
|
* 1. Check mutate st_* functions
|
|
|
|
* * st_insert()
|
|
|
|
* * st_insert2()
|
|
|
|
* * st_update()
|
|
|
|
* * st_add_direct()
|
|
|
|
* 2. Insert WBs
|
|
|
|
*/
|
|
|
|
|
2000-02-17 10:11:22 +03:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_freeze(VALUE hash)
|
2000-02-17 10:11:22 +03:00
|
|
|
{
|
|
|
|
return rb_obj_freeze(hash);
|
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE rb_cHash;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
static VALUE envtbl;
|
2014-02-20 06:27:30 +04:00
|
|
|
static ID id_hash, id_yield, id_default, id_flatten_bang;
|
2019-08-01 05:20:37 +03:00
|
|
|
static ID id_hash_iter_lev;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2013-05-26 16:37:11 +04:00
|
|
|
VALUE
|
|
|
|
rb_hash_set_ifnone(VALUE hash, VALUE ifnone)
|
|
|
|
{
|
* include/ruby/ruby.h: rename OBJ_WRITE and OBJ_WRITTEN into
RB_OBJ_WRITE and RB_OBJ_WRITTEN.
* array.c, class.c, compile.c, hash.c, internal.h, iseq.c,
proc.c, process.c, re.c, string.c, variable.c, vm.c,
vm_eval.c, vm_insnhelper.c, vm_insnhelper.h,
vm_method.c: catch up this change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-20 12:07:47 +04:00
|
|
|
RB_OBJ_WRITE(hash, (&RHASH(hash)->ifnone), ifnone);
|
2013-05-26 16:37:11 +04:00
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_any_cmp(VALUE a, VALUE b)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2003-03-04 10:04:11 +03:00
|
|
|
if (a == b) return 0;
|
2011-09-29 15:07:45 +04:00
|
|
|
if (RB_TYPE_P(a, T_STRING) && RBASIC(a)->klass == rb_cString &&
|
2012-05-23 11:13:21 +04:00
|
|
|
RB_TYPE_P(b, T_STRING) && RBASIC(b)->klass == rb_cString) {
|
2008-02-12 06:17:43 +03:00
|
|
|
return rb_str_hash_cmp(a, b);
|
2000-12-25 09:29:27 +03:00
|
|
|
}
|
2003-03-04 10:04:11 +03:00
|
|
|
if (a == Qundef || b == Qundef) return -1;
|
2000-12-25 09:29:27 +03:00
|
|
|
if (SYMBOL_P(a) && SYMBOL_P(b)) {
|
|
|
|
return a != b;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
* include/ruby/signal.h: removed.
* common.mk, class.c, eval.c, eval_intern.h, file.c, gc.c, hash.c,
io.c, process.c, signal.c: vm_core.h: ditto.
Some unused external global variables are also removed.
(rb_prohibit_interrupt, rb_trap_immediate, rb_trap_pending,
rb_thread_critical)
* ext/openssl/ossl_ssl.c, ext/openssl/ossl_x509store.c,
ext/readline/readline.c, ext/socket/depend,
ext/socket/socket.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-09-03 12:00:05 +04:00
|
|
|
return !rb_eql(a, b);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2013-11-26 17:43:40 +04:00
|
|
|
static VALUE
|
|
|
|
hash_recursive(VALUE obj, VALUE arg, int recurse)
|
|
|
|
{
|
2013-12-05 09:40:43 +04:00
|
|
|
if (recurse) return INT2FIX(0);
|
2013-11-26 17:43:40 +04:00
|
|
|
return rb_funcallv(obj, id_hash, 0, 0);
|
|
|
|
}
|
|
|
|
|
2003-12-22 12:37:13 +03:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash(VALUE obj)
|
2003-12-22 12:37:13 +03:00
|
|
|
{
|
2013-12-05 09:40:43 +04:00
|
|
|
VALUE hval = rb_exec_recursive_outer(hash_recursive, obj, 0);
|
2009-02-14 21:53:40 +03:00
|
|
|
|
2013-12-16 17:40:02 +04:00
|
|
|
while (!FIXNUM_P(hval)) {
|
|
|
|
if (RB_TYPE_P(hval, T_BIGNUM)) {
|
2013-06-08 20:00:16 +04:00
|
|
|
int sign;
|
|
|
|
unsigned long ul;
|
2013-06-10 14:37:39 +04:00
|
|
|
sign = rb_integer_pack(hval, &ul, 1, sizeof(ul), 0,
|
2013-06-11 18:40:16 +04:00
|
|
|
INTEGER_PACK_NATIVE_BYTE_ORDER);
|
2013-06-08 20:00:16 +04:00
|
|
|
ul &= (1UL << (sizeof(long)*CHAR_BIT-1)) - 1;
|
|
|
|
if (sign < 0)
|
|
|
|
return LONG2FIX(-(long)ul);
|
|
|
|
return LONG2FIX((long)ul);
|
|
|
|
}
|
2009-02-14 21:53:40 +03:00
|
|
|
hval = rb_to_int(hval);
|
|
|
|
}
|
2013-12-16 17:40:02 +04:00
|
|
|
return hval;
|
2003-12-22 12:37:13 +03:00
|
|
|
}
|
|
|
|
|
2014-01-09 15:34:17 +04:00
|
|
|
long rb_objid_hash(st_index_t index);
|
2014-01-08 10:55:24 +04:00
|
|
|
|
2019-01-30 07:54:01 +03:00
|
|
|
static st_index_t
|
|
|
|
dbl_to_index(double d)
|
|
|
|
{
|
|
|
|
union {double d; st_index_t i;} u;
|
|
|
|
u.d = d;
|
|
|
|
return u.i;
|
|
|
|
}
|
|
|
|
|
2016-11-07 03:45:00 +03:00
|
|
|
long
|
|
|
|
rb_dbl_long_hash(double d)
|
|
|
|
{
|
|
|
|
/* normalize -0.0 to 0.0 */
|
|
|
|
if (d == 0.0) d = 0.0;
|
|
|
|
#if SIZEOF_INT == SIZEOF_VOIDP
|
|
|
|
return rb_memhash(&d, sizeof(d));
|
|
|
|
#else
|
2019-01-30 07:54:01 +03:00
|
|
|
return rb_objid_hash(dbl_to_index(d));
|
2016-11-07 03:45:00 +03:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2016-12-07 07:25:50 +03:00
|
|
|
static inline long
|
2016-12-06 07:43:48 +03:00
|
|
|
any_hash(VALUE a, st_index_t (*other_func)(VALUE))
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-02-13 08:09:11 +03:00
|
|
|
VALUE hval;
|
2009-09-08 17:10:04 +04:00
|
|
|
st_index_t hnum;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2012-02-21 15:23:50 +04:00
|
|
|
if (SPECIAL_CONST_P(a)) {
|
2015-01-22 10:48:59 +03:00
|
|
|
if (STATIC_SYM_P(a)) {
|
2019-01-17 19:53:10 +03:00
|
|
|
hnum = a >> (RUBY_SPECIAL_SHIFT + ID_SCOPE_SHIFT);
|
|
|
|
hnum = rb_hash_start(hnum);
|
|
|
|
goto out;
|
|
|
|
}
|
2015-01-22 10:48:59 +03:00
|
|
|
else if (FLONUM_P(a)) {
|
|
|
|
/* prevent pathological behavior: [Bug #10761] */
|
2015-07-29 08:53:35 +03:00
|
|
|
goto flt;
|
2015-01-22 10:48:59 +03:00
|
|
|
}
|
2014-01-09 15:34:17 +04:00
|
|
|
hnum = rb_objid_hash((st_index_t)a);
|
2012-02-21 15:23:50 +04:00
|
|
|
}
|
|
|
|
else if (BUILTIN_TYPE(a) == T_STRING) {
|
2016-12-06 07:43:48 +03:00
|
|
|
hnum = rb_str_hash(a);
|
2012-02-21 15:23:50 +04:00
|
|
|
}
|
2015-04-08 07:01:06 +03:00
|
|
|
else if (BUILTIN_TYPE(a) == T_SYMBOL) {
|
2015-07-29 15:38:43 +03:00
|
|
|
hnum = RSYMBOL(a)->hashval;
|
2015-04-08 07:01:06 +03:00
|
|
|
}
|
2016-03-18 04:22:38 +03:00
|
|
|
else if (BUILTIN_TYPE(a) == T_BIGNUM) {
|
|
|
|
hval = rb_big_hash(a);
|
|
|
|
hnum = FIX2LONG(hval);
|
|
|
|
}
|
2015-03-18 06:01:58 +03:00
|
|
|
else if (BUILTIN_TYPE(a) == T_FLOAT) {
|
2015-07-29 08:53:35 +03:00
|
|
|
flt:
|
2016-11-07 03:45:00 +03:00
|
|
|
hnum = rb_dbl_long_hash(rb_float_value(a));
|
2015-03-18 06:01:58 +03:00
|
|
|
}
|
2012-02-21 15:23:50 +04:00
|
|
|
else {
|
2015-07-29 11:25:49 +03:00
|
|
|
hnum = other_func(a);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2015-08-14 22:52:06 +03:00
|
|
|
out:
|
2017-12-22 11:52:11 +03:00
|
|
|
#if SIZEOF_LONG < SIZEOF_ST_INDEX_T
|
|
|
|
if (hnum > 0)
|
|
|
|
hnum &= (unsigned long)-1 >> 2;
|
|
|
|
else
|
|
|
|
hnum |= ~((unsigned long)-1 >> 2);
|
|
|
|
#else
|
2008-03-03 10:14:27 +03:00
|
|
|
hnum <<= 1;
|
2017-12-22 11:52:11 +03:00
|
|
|
hnum = RSHIFT(hnum, 1);
|
|
|
|
#endif
|
|
|
|
return (long)hnum;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2015-07-29 11:25:49 +03:00
|
|
|
static st_index_t
|
|
|
|
obj_any_hash(VALUE obj)
|
|
|
|
{
|
|
|
|
obj = rb_hash(obj);
|
|
|
|
return FIX2LONG(obj);
|
|
|
|
}
|
|
|
|
|
2015-08-14 22:52:06 +03:00
|
|
|
static st_index_t
|
2016-12-06 06:36:52 +03:00
|
|
|
rb_any_hash(VALUE a)
|
|
|
|
{
|
2016-11-07 03:45:00 +03:00
|
|
|
return any_hash(a, obj_any_hash);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Here is a hash function for 64-bit key. It is about 5 times faster
|
|
|
|
(2 times faster when uint128 type is absent) on Haswell than
|
|
|
|
tailored Spooky or City hash function can be. */
|
|
|
|
|
|
|
|
/* Here we two primes with random bit generation. */
|
2016-12-24 16:21:30 +03:00
|
|
|
static const uint64_t prime1 = ((uint64_t)0x2e0bb864 << 32) | 0xe9ea7df5;
|
2017-12-25 15:41:52 +03:00
|
|
|
static const uint32_t prime2 = 0x830fcab9;
|
2016-11-07 03:45:00 +03:00
|
|
|
|
|
|
|
|
|
|
|
static inline uint64_t
|
2016-12-06 06:36:52 +03:00
|
|
|
mult_and_mix(uint64_t m1, uint64_t m2)
|
2015-08-14 22:52:06 +03:00
|
|
|
{
|
2017-12-25 15:32:09 +03:00
|
|
|
#if defined HAVE_UINT128_T
|
2017-12-25 15:32:10 +03:00
|
|
|
uint128_t r = (uint128_t) m1 * (uint128_t) m2;
|
2016-11-07 03:45:00 +03:00
|
|
|
return (uint64_t) (r >> 64) ^ (uint64_t) r;
|
|
|
|
#else
|
|
|
|
uint64_t hm1 = m1 >> 32, hm2 = m2 >> 32;
|
|
|
|
uint64_t lm1 = m1, lm2 = m2;
|
|
|
|
uint64_t v64_128 = hm1 * hm2;
|
|
|
|
uint64_t v32_96 = hm1 * lm2 + lm1 * hm2;
|
|
|
|
uint64_t v1_32 = lm1 * lm2;
|
|
|
|
|
|
|
|
return (v64_128 + (v32_96 >> 32)) ^ ((v32_96 << 32) + v1_32);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline uint64_t
|
2016-12-06 06:36:52 +03:00
|
|
|
key64_hash(uint64_t key, uint32_t seed)
|
2016-11-07 03:45:00 +03:00
|
|
|
{
|
|
|
|
return mult_and_mix(key + seed, prime1);
|
2015-08-14 22:52:06 +03:00
|
|
|
}
|
|
|
|
|
2019-01-30 08:08:36 +03:00
|
|
|
/* Should cast down the result for each purpose */
|
|
|
|
#define st_index_hash(index) key64_hash(rb_hash_start(index), prime2)
|
|
|
|
|
2014-01-09 15:34:17 +04:00
|
|
|
long
|
2014-01-08 10:55:24 +04:00
|
|
|
rb_objid_hash(st_index_t index)
|
|
|
|
{
|
2019-01-30 08:08:36 +03:00
|
|
|
return (long)st_index_hash(index);
|
2014-01-08 10:55:24 +04:00
|
|
|
}
|
|
|
|
|
2015-07-29 11:25:49 +03:00
|
|
|
static st_index_t
|
|
|
|
objid_hash(VALUE obj)
|
|
|
|
{
|
2019-04-23 22:10:52 +03:00
|
|
|
#if SIZEOF_LONG == SIZEOF_VOIDP
|
|
|
|
return (st_index_t)st_index_hash((st_index_t)NUM2LONG(rb_obj_id(obj)));
|
|
|
|
#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
|
|
|
|
return (st_index_t)st_index_hash((st_index_t)NUM2LL(rb_obj_id(obj)));
|
|
|
|
#endif
|
2015-07-29 11:25:49 +03:00
|
|
|
}
|
|
|
|
|
2019-08-24 19:09:53 +03:00
|
|
|
/**
|
|
|
|
* call-seq:
|
|
|
|
* obj.hash -> integer
|
|
|
|
*
|
|
|
|
* Generates an Integer hash value for this object. This function must have the
|
|
|
|
* property that <code>a.eql?(b)</code> implies <code>a.hash == b.hash</code>.
|
|
|
|
*
|
|
|
|
* The hash value is used along with #eql? by the Hash class to determine if
|
|
|
|
* two objects reference the same hash key. Any hash value that exceeds the
|
|
|
|
* capacity of an Integer will be truncated before being used.
|
|
|
|
*
|
|
|
|
* The hash value for an object may not be identical across invocations or
|
|
|
|
* implementations of Ruby. If you need a stable identifier across Ruby
|
|
|
|
* invocations and implementations you will need to generate one with a custom
|
|
|
|
* method.
|
|
|
|
*--
|
|
|
|
* \private
|
|
|
|
*++
|
|
|
|
*/
|
2015-07-29 11:25:49 +03:00
|
|
|
VALUE
|
|
|
|
rb_obj_hash(VALUE obj)
|
|
|
|
{
|
2016-12-07 07:25:50 +03:00
|
|
|
long hnum = any_hash(obj, objid_hash);
|
2016-10-04 19:25:01 +03:00
|
|
|
return ST2FIX(hnum);
|
2015-07-29 11:25:49 +03:00
|
|
|
}
|
|
|
|
|
2007-07-05 05:06:49 +04:00
|
|
|
static const struct st_hash_type objhash = {
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_any_cmp,
|
|
|
|
rb_any_hash,
|
1998-01-16 15:13:05 +03:00
|
|
|
};
|
|
|
|
|
2015-01-23 05:36:50 +03:00
|
|
|
#define rb_ident_cmp st_numcmp
|
|
|
|
|
|
|
|
static st_index_t
|
|
|
|
rb_ident_hash(st_data_t n)
|
|
|
|
{
|
2015-08-14 22:52:06 +03:00
|
|
|
#ifdef USE_FLONUM /* RUBY */
|
2015-01-23 05:36:50 +03:00
|
|
|
/*
|
|
|
|
* - flonum (on 64-bit) is pathologically bad, mix the actual
|
|
|
|
* float value in, but do not use the float value as-is since
|
|
|
|
* many integers get interpreted as 2.0 or -2.0 [Bug #10761]
|
|
|
|
*/
|
|
|
|
if (FLONUM_P(n)) {
|
2019-01-30 07:54:01 +03:00
|
|
|
n ^= dbl_to_index(rb_float_value(n));
|
2015-01-23 05:36:50 +03:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2019-01-30 08:08:36 +03:00
|
|
|
return (st_index_t)st_index_hash((st_index_t)n);
|
2015-01-23 05:36:50 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static const struct st_hash_type identhash = {
|
|
|
|
rb_ident_cmp,
|
|
|
|
rb_ident_hash,
|
|
|
|
};
|
2008-03-04 13:14:40 +03:00
|
|
|
|
2019-01-04 04:59:49 +03:00
|
|
|
typedef st_index_t st_hash_t;
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2019-01-04 04:59:49 +03:00
|
|
|
/*
|
|
|
|
* RHASH_AR_TABLE_P(h):
|
|
|
|
* * as.ar == NULL or
|
|
|
|
* as.ar points ar_table.
|
|
|
|
* * as.ar is allocated by transient heap or xmalloc.
|
|
|
|
*
|
|
|
|
* !RHASH_AR_TABLE_P(h):
|
|
|
|
* * as.st points st_table.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#define RHASH_AR_TABLE_MAX_BOUND RHASH_AR_TABLE_MAX_SIZE
|
|
|
|
|
2019-01-17 19:53:10 +03:00
|
|
|
#define RHASH_AR_TABLE_REF(hash, n) (&RHASH_AR_TABLE(hash)->pairs[n])
|
|
|
|
#define RHASH_AR_CLEARED_HINT 0xff
|
|
|
|
|
|
|
|
typedef struct ar_table_pair_struct {
|
2019-01-04 04:59:49 +03:00
|
|
|
VALUE key;
|
2019-01-17 19:53:10 +03:00
|
|
|
VALUE val;
|
|
|
|
} ar_table_pair;
|
2019-01-04 04:59:49 +03:00
|
|
|
|
|
|
|
typedef struct ar_table_struct {
|
2019-01-17 19:53:10 +03:00
|
|
|
/* 64bit CPU: 8B * 2 * 8 = 128B */
|
|
|
|
ar_table_pair pairs[RHASH_AR_TABLE_MAX_SIZE];
|
2019-01-04 04:59:49 +03:00
|
|
|
} ar_table;
|
|
|
|
|
|
|
|
size_t
|
|
|
|
rb_hash_ar_table_size(void)
|
|
|
|
{
|
|
|
|
return sizeof(ar_table);
|
|
|
|
}
|
|
|
|
|
2018-10-31 01:11:51 +03:00
|
|
|
static inline st_hash_t
|
2019-01-06 01:23:54 +03:00
|
|
|
ar_do_hash(st_data_t key)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2019-01-17 19:53:10 +03:00
|
|
|
return (st_hash_t)rb_any_hash(key);
|
|
|
|
}
|
|
|
|
|
2019-08-01 10:04:40 +03:00
|
|
|
static inline ar_hint_t
|
2019-01-17 19:53:10 +03:00
|
|
|
ar_do_hash_hint(st_hash_t hash_value)
|
|
|
|
{
|
2019-08-01 10:04:40 +03:00
|
|
|
return (ar_hint_t)hash_value;
|
2019-01-17 19:53:10 +03:00
|
|
|
}
|
|
|
|
|
2019-08-01 10:04:40 +03:00
|
|
|
static inline ar_hint_t
|
2019-01-17 19:53:10 +03:00
|
|
|
ar_hint(VALUE hash, unsigned int index)
|
|
|
|
{
|
|
|
|
return RHASH(hash)->ar_hint.ary[index];
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
2019-08-01 10:04:40 +03:00
|
|
|
ar_hint_set_hint(VALUE hash, unsigned int index, ar_hint_t hint)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2019-01-17 19:53:10 +03:00
|
|
|
RHASH(hash)->ar_hint.ary[index] = hint;
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
2019-01-17 19:53:10 +03:00
|
|
|
ar_hint_set(VALUE hash, unsigned int index, st_hash_t hash_value)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2019-01-17 19:53:10 +03:00
|
|
|
ar_hint_set_hint(hash, index, ar_do_hash_hint(hash_value));
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
ar_clear_entry(VALUE hash, unsigned int index)
|
|
|
|
{
|
|
|
|
ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, index);
|
|
|
|
pair->key = Qundef;
|
|
|
|
ar_hint_set_hint(hash, index, RHASH_AR_CLEARED_HINT);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static inline int
|
2019-01-17 19:53:10 +03:00
|
|
|
ar_cleared_entry(VALUE hash, unsigned int index)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2019-01-17 19:53:10 +03:00
|
|
|
if (ar_hint(hash, index) == RHASH_AR_CLEARED_HINT) {
|
|
|
|
/* RHASH_AR_CLEARED_HINT is only a hint, not mean cleared entry,
|
|
|
|
* so you need to check key == Qundef
|
|
|
|
*/
|
|
|
|
ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, index);
|
|
|
|
return pair->key == Qundef;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
ar_set_entry(VALUE hash, unsigned int index, st_data_t key, st_data_t val, st_hash_t hash_value)
|
|
|
|
{
|
|
|
|
ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, index);
|
|
|
|
pair->key = key;
|
|
|
|
pair->val = val;
|
|
|
|
ar_hint_set(hash, index, hash_value);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
#define RHASH_AR_TABLE_SIZE(h) (HASH_ASSERT(RHASH_AR_TABLE_P(h)), \
|
2019-07-31 23:59:04 +03:00
|
|
|
RHASH_AR_TABLE_SIZE_RAW(h))
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
#define RHASH_AR_TABLE_BOUND_RAW(h) \
|
|
|
|
((unsigned int)((RBASIC(h)->flags >> RHASH_AR_TABLE_BOUND_SHIFT) & \
|
|
|
|
(RHASH_AR_TABLE_BOUND_MASK >> RHASH_AR_TABLE_BOUND_SHIFT)))
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
#define RHASH_AR_TABLE_BOUND(h) (HASH_ASSERT(RHASH_AR_TABLE_P(h)), \
|
2019-07-31 23:59:04 +03:00
|
|
|
RHASH_AR_TABLE_BOUND_RAW(h))
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
#define RHASH_ST_TABLE_SET(h, s) rb_hash_st_table_set(h, s)
|
2018-12-14 04:10:15 +03:00
|
|
|
#define RHASH_TYPE(hash) (RHASH_AR_TABLE_P(hash) ? &objhash : RHASH_ST_TABLE(hash)->type)
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2019-07-31 23:48:22 +03:00
|
|
|
#define HASH_ASSERT(expr) RUBY_ASSERT_MESG_WHEN(HASH_DEBUG, expr, #expr)
|
2019-07-15 05:27:38 +03:00
|
|
|
|
2018-10-31 01:11:51 +03:00
|
|
|
#if HASH_DEBUG
|
|
|
|
#define hash_verify(hash) hash_verify_(hash, __FILE__, __LINE__)
|
|
|
|
|
|
|
|
void
|
|
|
|
rb_hash_dump(VALUE hash)
|
|
|
|
{
|
|
|
|
rb_obj_info_dump(hash);
|
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_P(hash)) {
|
|
|
|
unsigned i, n = 0, bound = RHASH_AR_TABLE_BOUND(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2018-11-03 10:58:56 +03:00
|
|
|
fprintf(stderr, " size:%u bound:%u\n",
|
2018-12-14 04:10:15 +03:00
|
|
|
RHASH_AR_TABLE_SIZE(hash), RHASH_AR_TABLE_BOUND(hash));
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
for (i=0; i<bound; i++) {
|
|
|
|
st_data_t k, v;
|
2018-10-31 01:12:12 +03:00
|
|
|
|
2019-01-17 19:53:10 +03:00
|
|
|
if (!ar_cleared_entry(hash, i)) {
|
2018-10-31 01:11:51 +03:00
|
|
|
char b1[0x100], b2[0x100];
|
2019-01-17 19:53:10 +03:00
|
|
|
ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
|
|
|
|
k = pair->key;
|
|
|
|
v = pair->val;
|
|
|
|
fprintf(stderr, " %d key:%s val:%s hint:%02x\n", i,
|
2018-10-31 01:11:51 +03:00
|
|
|
rb_raw_obj_info(b1, 0x100, k),
|
2019-01-17 19:53:10 +03:00
|
|
|
rb_raw_obj_info(b2, 0x100, v),
|
|
|
|
ar_hint(hash, i));
|
2018-10-31 01:11:51 +03:00
|
|
|
n++;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
fprintf(stderr, " %d empty\n", i);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
hash_verify_(VALUE hash, const char *file, int line)
|
|
|
|
{
|
|
|
|
HASH_ASSERT(RB_TYPE_P(hash, T_HASH));
|
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_P(hash)) {
|
|
|
|
unsigned i, n = 0, bound = RHASH_AR_TABLE_BOUND(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
for (i=0; i<bound; i++) {
|
2019-01-17 19:53:10 +03:00
|
|
|
st_data_t k, v;
|
|
|
|
if (!ar_cleared_entry(hash, i)) {
|
|
|
|
ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
|
|
|
|
k = pair->key;
|
|
|
|
v = pair->val;
|
2018-10-31 01:11:51 +03:00
|
|
|
HASH_ASSERT(k != Qundef);
|
|
|
|
HASH_ASSERT(v != Qundef);
|
|
|
|
n++;
|
|
|
|
}
|
|
|
|
}
|
2018-12-14 04:10:15 +03:00
|
|
|
if (n != RHASH_AR_TABLE_SIZE(hash)) {
|
|
|
|
rb_bug("n:%u, RHASH_AR_TABLE_SIZE:%u", n, RHASH_AR_TABLE_SIZE(hash));
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
HASH_ASSERT(RHASH_ST_TABLE(hash) != NULL);
|
2018-12-14 04:10:15 +03:00
|
|
|
HASH_ASSERT(RHASH_AR_TABLE_SIZE_RAW(hash) == 0);
|
|
|
|
HASH_ASSERT(RHASH_AR_TABLE_BOUND_RAW(hash) == 0);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (RHASH_TRANSIENT_P(hash)) {
|
2018-12-14 04:10:15 +03:00
|
|
|
volatile st_data_t MAYBE_UNUSED(key) = RHASH_AR_TABLE_REF(hash, 0)->key; /* read */
|
|
|
|
HASH_ASSERT(RHASH_AR_TABLE(hash) != NULL);
|
|
|
|
HASH_ASSERT(rb_transient_heap_managed_ptr_p(RHASH_AR_TABLE(hash)));
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
|
|
|
#else
|
|
|
|
#define hash_verify(h) ((void)0)
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static inline int
|
2018-12-14 05:27:23 +03:00
|
|
|
RHASH_TABLE_NULL_P(VALUE hash)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH(hash)->as.ar == NULL) {
|
|
|
|
HASH_ASSERT(RHASH_AR_TABLE_P(hash));
|
2018-10-31 01:11:51 +03:00
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-12-14 05:27:23 +03:00
|
|
|
static inline int
|
|
|
|
RHASH_TABLE_EMPTY_P(VALUE hash)
|
|
|
|
{
|
|
|
|
return RHASH_SIZE(hash) == 0;
|
|
|
|
}
|
|
|
|
|
2018-10-31 01:11:51 +03:00
|
|
|
MJIT_FUNC_EXPORTED int
|
2018-12-14 04:10:15 +03:00
|
|
|
rb_hash_ar_table_p(VALUE hash)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
|
|
|
if (FL_TEST_RAW((hash), RHASH_ST_TABLE_FLAG)) {
|
|
|
|
HASH_ASSERT(RHASH(hash)->as.st != NULL);
|
|
|
|
return FALSE;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_table *
|
|
|
|
rb_hash_ar_table(VALUE hash)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
HASH_ASSERT(RHASH_AR_TABLE_P(hash));
|
|
|
|
return RHASH(hash)->as.ar;
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
MJIT_FUNC_EXPORTED st_table *
|
|
|
|
rb_hash_st_table(VALUE hash)
|
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
HASH_ASSERT(!RHASH_AR_TABLE_P(hash));
|
2018-10-31 01:11:51 +03:00
|
|
|
return RHASH(hash)->as.st;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
|
|
|
rb_hash_st_table_set(VALUE hash, st_table *st)
|
|
|
|
{
|
|
|
|
HASH_ASSERT(st != NULL);
|
|
|
|
FL_SET_RAW((hash), RHASH_ST_TABLE_FLAG);
|
|
|
|
RHASH(hash)->as.st = st;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2018-12-14 04:10:15 +03:00
|
|
|
hash_ar_table_set(VALUE hash, ar_table *ar)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
HASH_ASSERT(RHASH_AR_TABLE_P(hash));
|
|
|
|
HASH_ASSERT((RHASH_TRANSIENT_P(hash) && ar == NULL) ? FALSE : TRUE);
|
|
|
|
RHASH(hash)->as.ar = ar;
|
2018-10-31 01:11:51 +03:00
|
|
|
hash_verify(hash);
|
|
|
|
}
|
|
|
|
|
|
|
|
#define RHASH_SET_ST_FLAG(h) FL_SET_RAW(h, RHASH_ST_TABLE_FLAG)
|
|
|
|
#define RHASH_UNSET_ST_FLAG(h) FL_UNSET_RAW(h, RHASH_ST_TABLE_FLAG)
|
|
|
|
|
2019-07-31 23:59:04 +03:00
|
|
|
static inline void
|
|
|
|
RHASH_AR_TABLE_BOUND_SET(VALUE h, st_index_t n)
|
|
|
|
{
|
|
|
|
HASH_ASSERT(RHASH_AR_TABLE_P(h));
|
|
|
|
HASH_ASSERT(n <= RHASH_AR_TABLE_MAX_BOUND);
|
|
|
|
|
|
|
|
RBASIC(h)->flags &= ~RHASH_AR_TABLE_BOUND_MASK;
|
|
|
|
RBASIC(h)->flags |= n << RHASH_AR_TABLE_BOUND_SHIFT;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
RHASH_AR_TABLE_SIZE_SET(VALUE h, st_index_t n)
|
|
|
|
{
|
|
|
|
HASH_ASSERT(RHASH_AR_TABLE_P(h));
|
|
|
|
HASH_ASSERT(n <= RHASH_AR_TABLE_MAX_SIZE);
|
|
|
|
|
|
|
|
RBASIC(h)->flags &= ~RHASH_AR_TABLE_SIZE_MASK;
|
|
|
|
RBASIC(h)->flags |= n << RHASH_AR_TABLE_SIZE_SHIFT;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
HASH_AR_TABLE_SIZE_ADD(VALUE h, st_index_t n)
|
|
|
|
{
|
|
|
|
HASH_ASSERT(RHASH_AR_TABLE_P(h));
|
|
|
|
|
|
|
|
RHASH_AR_TABLE_SIZE_SET(h, RHASH_AR_TABLE_SIZE(h) + n);
|
|
|
|
|
|
|
|
hash_verify(h);
|
|
|
|
}
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
#define RHASH_AR_TABLE_SIZE_INC(h) HASH_AR_TABLE_SIZE_ADD(h, 1)
|
2019-01-17 10:52:47 +03:00
|
|
|
|
|
|
|
static inline void
|
2019-07-19 00:15:47 +03:00
|
|
|
RHASH_AR_TABLE_SIZE_DEC(VALUE h)
|
|
|
|
{
|
2019-01-17 10:52:47 +03:00
|
|
|
HASH_ASSERT(RHASH_AR_TABLE_P(h));
|
|
|
|
int new_size = RHASH_AR_TABLE_SIZE(h) - 1;
|
|
|
|
|
|
|
|
if (new_size != 0) {
|
|
|
|
RHASH_AR_TABLE_SIZE_SET(h, new_size);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
RHASH_AR_TABLE_SIZE_SET(h, 0);
|
|
|
|
RHASH_AR_TABLE_BOUND_SET(h, 0);
|
|
|
|
}
|
|
|
|
hash_verify(h);
|
|
|
|
}
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2019-07-31 23:59:04 +03:00
|
|
|
static inline void
|
|
|
|
RHASH_AR_TABLE_CLEAR(VALUE h)
|
|
|
|
{
|
|
|
|
RBASIC(h)->flags &= ~RHASH_AR_TABLE_SIZE_MASK;
|
|
|
|
RBASIC(h)->flags &= ~RHASH_AR_TABLE_BOUND_MASK;
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2019-07-31 23:59:04 +03:00
|
|
|
hash_ar_table_set(h, NULL);
|
|
|
|
}
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
static ar_table*
|
|
|
|
ar_alloc_table(VALUE hash)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_table *tab = (ar_table*)rb_transient_heap_alloc(hash, sizeof(ar_table));
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
if (tab != NULL) {
|
2018-10-31 01:12:12 +03:00
|
|
|
RHASH_SET_TRANSIENT_FLAG(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
else {
|
2018-10-31 01:12:12 +03:00
|
|
|
RHASH_UNSET_TRANSIENT_FLAG(hash);
|
2018-12-14 04:10:15 +03:00
|
|
|
tab = (ar_table*)ruby_xmalloc(sizeof(ar_table));
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
RHASH_AR_TABLE_SIZE_SET(hash, 0);
|
|
|
|
RHASH_AR_TABLE_BOUND_SET(hash, 0);
|
2019-07-31 23:50:58 +03:00
|
|
|
hash_ar_table_set(hash, tab);
|
2018-12-14 04:10:15 +03:00
|
|
|
|
2018-10-31 01:11:51 +03:00
|
|
|
return tab;
|
2019-01-06 01:40:32 +03:00
|
|
|
}
|
|
|
|
|
2019-01-17 19:53:10 +03:00
|
|
|
NOINLINE(static int ar_equal(VALUE x, VALUE y));
|
2019-01-06 01:40:32 +03:00
|
|
|
|
2019-01-17 19:53:10 +03:00
|
|
|
static int
|
|
|
|
ar_equal(VALUE x, VALUE y)
|
2019-01-06 01:40:32 +03:00
|
|
|
{
|
2019-01-17 19:53:10 +03:00
|
|
|
return rb_any_cmp(x, y) == 0;
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
|
2018-11-03 10:58:56 +03:00
|
|
|
static unsigned
|
2019-08-01 10:04:40 +03:00
|
|
|
ar_find_entry_hint(VALUE hash, ar_hint_t hint, st_data_t key)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
unsigned i, bound = RHASH_AR_TABLE_BOUND(hash);
|
2019-08-01 10:04:40 +03:00
|
|
|
const ar_hint_t *hints = RHASH(hash)->ar_hint.ary;
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
/* if table is NULL, then bound also should be 0 */
|
|
|
|
|
|
|
|
for (i = 0; i < bound; i++) {
|
2019-01-17 19:53:10 +03:00
|
|
|
if (hints[i] == hint) {
|
|
|
|
ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
|
|
|
|
if (ar_equal(key, pair->key)) {
|
|
|
|
RB_DEBUG_COUNTER_INC(artable_hint_hit);
|
|
|
|
return i;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
#if 0
|
|
|
|
static int pid;
|
|
|
|
static char fname[256];
|
|
|
|
static FILE *fp;
|
|
|
|
|
|
|
|
if (pid != getpid()) {
|
|
|
|
snprintf(fname, sizeof(fname), "/tmp/ruby-armiss.%d", pid = getpid());
|
|
|
|
if ((fp = fopen(fname, "w")) == NULL) rb_bug("fopen");
|
|
|
|
}
|
|
|
|
|
|
|
|
st_hash_t h1 = ar_do_hash(key);
|
|
|
|
st_hash_t h2 = ar_do_hash(pair->key);
|
|
|
|
|
|
|
|
fprintf(fp, "miss: hash_eq:%d hints[%d]:%02x hint:%02x\n"
|
|
|
|
" key :%016lx %s\n"
|
|
|
|
" pair->key:%016lx %s\n",
|
|
|
|
h1 == h2, i, hints[i], hint,
|
|
|
|
h1, rb_obj_info(key), h2, rb_obj_info(pair->key));
|
|
|
|
#endif
|
|
|
|
RB_DEBUG_COUNTER_INC(artable_hint_miss);
|
|
|
|
}
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
}
|
2019-01-17 19:53:10 +03:00
|
|
|
RB_DEBUG_COUNTER_INC(artable_hint_notfound);
|
2018-12-14 04:10:15 +03:00
|
|
|
return RHASH_AR_TABLE_MAX_BOUND;
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
|
2019-01-17 19:53:10 +03:00
|
|
|
static unsigned
|
|
|
|
ar_find_entry(VALUE hash, st_hash_t hash_value, st_data_t key)
|
|
|
|
{
|
2019-08-01 10:04:40 +03:00
|
|
|
ar_hint_t hint = ar_do_hash_hint(hash_value);
|
2019-01-17 19:53:10 +03:00
|
|
|
return ar_find_entry_hint(hash, hint, key);
|
|
|
|
}
|
|
|
|
|
2018-10-31 01:11:51 +03:00
|
|
|
static inline void
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_free_and_clear_table(VALUE hash)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_table *tab = RHASH_AR_TABLE(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
if (tab) {
|
|
|
|
if (RHASH_TRANSIENT_P(hash)) {
|
|
|
|
RHASH_UNSET_TRANSIENT_FLAG(hash);
|
2018-10-31 01:12:12 +03:00
|
|
|
}
|
2018-10-31 01:11:51 +03:00
|
|
|
else {
|
2018-12-14 04:10:15 +03:00
|
|
|
ruby_xfree(RHASH_AR_TABLE(hash));
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
2018-12-14 04:10:15 +03:00
|
|
|
RHASH_AR_TABLE_CLEAR(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
2018-12-14 04:10:15 +03:00
|
|
|
HASH_ASSERT(RHASH_AR_TABLE_SIZE(hash) == 0);
|
|
|
|
HASH_ASSERT(RHASH_AR_TABLE_BOUND(hash) == 0);
|
2018-10-31 01:11:51 +03:00
|
|
|
HASH_ASSERT(RHASH_TRANSIENT_P(hash) == 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_try_convert_table(VALUE hash)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
|
|
|
st_table *new_tab;
|
2018-12-14 04:10:15 +03:00
|
|
|
const unsigned size = RHASH_AR_TABLE_SIZE(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
st_index_t i;
|
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
if (!RHASH_AR_TABLE_P(hash) || size < RHASH_AR_TABLE_MAX_SIZE) {
|
2018-10-31 01:11:51 +03:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
new_tab = st_init_table_with_size(&objhash, size * 2);
|
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
for (i = 0; i < RHASH_AR_TABLE_MAX_BOUND; i++) {
|
2019-01-17 19:53:10 +03:00
|
|
|
ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
|
|
|
|
st_add_direct(new_tab, pair->key, pair->val);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_free_and_clear_table(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
RHASH_ST_TABLE_SET(hash, new_tab);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
static st_table *
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_force_convert_table(VALUE hash, const char *file, int line)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
|
|
|
st_table *new_tab;
|
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_ST_TABLE_P(hash)) {
|
2018-10-31 01:11:51 +03:00
|
|
|
return RHASH_ST_TABLE(hash);
|
|
|
|
}
|
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE(hash)) {
|
|
|
|
unsigned i, bound = RHASH_AR_TABLE_BOUND(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
#if RHASH_CONVERT_TABLE_DEBUG
|
|
|
|
rb_obj_info_dump(hash);
|
|
|
|
fprintf(stderr, "force_convert: %s:%d\n", file, line);
|
|
|
|
RB_DEBUG_COUNTER_INC(obj_hash_force_convert);
|
|
|
|
#endif
|
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
new_tab = st_init_table_with_size(&objhash, RHASH_AR_TABLE_SIZE(hash));
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
for (i = 0; i < bound; i++) {
|
2019-01-17 19:53:10 +03:00
|
|
|
if (ar_cleared_entry(hash, i)) continue;
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2019-01-17 19:53:10 +03:00
|
|
|
ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
|
|
|
|
st_add_direct(new_tab, pair->key, pair->val);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_free_and_clear_table(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
new_tab = st_init_table(&objhash);
|
|
|
|
}
|
|
|
|
RHASH_ST_TABLE_SET(hash, new_tab);
|
|
|
|
|
|
|
|
return new_tab;
|
|
|
|
}
|
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
static ar_table *
|
|
|
|
hash_ar_table(VALUE hash)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2018-12-14 05:27:23 +03:00
|
|
|
if (RHASH_TABLE_NULL_P(hash)) {
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_alloc_table(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
2018-12-14 04:10:15 +03:00
|
|
|
return RHASH_AR_TABLE(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_compact_table(VALUE hash)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
const unsigned bound = RHASH_AR_TABLE_BOUND(hash);
|
|
|
|
const unsigned size = RHASH_AR_TABLE_SIZE(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
if (size == bound) {
|
|
|
|
return size;
|
|
|
|
}
|
|
|
|
else {
|
2018-11-03 10:58:56 +03:00
|
|
|
unsigned i, j=0;
|
2019-01-17 19:53:10 +03:00
|
|
|
ar_table_pair *pairs = RHASH_AR_TABLE(hash)->pairs;
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
for (i=0; i<bound; i++) {
|
2019-01-17 19:53:10 +03:00
|
|
|
if (ar_cleared_entry(hash, i)) {
|
2018-10-31 01:11:51 +03:00
|
|
|
if (j <= i) j = i+1;
|
|
|
|
for (; j<bound; j++) {
|
2019-01-17 19:53:10 +03:00
|
|
|
if (!ar_cleared_entry(hash, j)) {
|
|
|
|
pairs[i] = pairs[j];
|
|
|
|
ar_hint_set_hint(hash, i, (st_hash_t)ar_hint(hash, j));
|
|
|
|
ar_clear_entry(hash, j);
|
2018-10-31 01:11:51 +03:00
|
|
|
j++;
|
|
|
|
goto found;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
/* non-empty is not found */
|
|
|
|
goto done;
|
|
|
|
found:;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
done:
|
|
|
|
HASH_ASSERT(i<=bound);
|
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
RHASH_AR_TABLE_BOUND_SET(hash, size);
|
2018-10-31 01:11:51 +03:00
|
|
|
hash_verify(hash);
|
|
|
|
return size;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_add_direct_with_hash(VALUE hash, st_data_t key, st_data_t val, st_hash_t hash_value)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
unsigned bin = RHASH_AR_TABLE_BOUND(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_SIZE(hash) >= RHASH_AR_TABLE_MAX_SIZE) {
|
2018-10-31 01:12:12 +03:00
|
|
|
return 1;
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
else {
|
2018-12-14 04:10:15 +03:00
|
|
|
if (UNLIKELY(bin >= RHASH_AR_TABLE_MAX_BOUND)) {
|
|
|
|
bin = ar_compact_table(hash);
|
|
|
|
hash_ar_table(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
2018-12-14 04:10:15 +03:00
|
|
|
HASH_ASSERT(bin < RHASH_AR_TABLE_MAX_BOUND);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2019-01-17 19:53:10 +03:00
|
|
|
ar_set_entry(hash, bin, key, val, hash_value);
|
2018-12-14 04:10:15 +03:00
|
|
|
RHASH_AR_TABLE_BOUND_SET(hash, bin+1);
|
|
|
|
RHASH_AR_TABLE_SIZE_INC(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2019-08-27 05:53:39 +03:00
|
|
|
ar_general_foreach(VALUE hash, st_foreach_check_callback_func *func, st_update_callback_func *replace, st_data_t arg)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_SIZE(hash) > 0) {
|
|
|
|
unsigned i, bound = RHASH_AR_TABLE_BOUND(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
for (i = 0; i < bound; i++) {
|
2019-01-17 19:53:10 +03:00
|
|
|
if (ar_cleared_entry(hash, i)) continue;
|
|
|
|
|
|
|
|
ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
|
|
|
|
enum st_retval retval = (*func)(pair->key, pair->val, arg, 0);
|
|
|
|
/* pair may be not valid here because of theap */
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
switch (retval) {
|
|
|
|
case ST_CONTINUE:
|
|
|
|
break;
|
|
|
|
case ST_CHECK:
|
|
|
|
case ST_STOP:
|
|
|
|
return 0;
|
2019-04-20 04:19:47 +03:00
|
|
|
case ST_REPLACE:
|
|
|
|
if (replace) {
|
2019-01-17 19:53:10 +03:00
|
|
|
VALUE key = pair->key;
|
|
|
|
VALUE val = pair->val;
|
|
|
|
retval = (*replace)(&key, &val, arg, TRUE);
|
|
|
|
|
|
|
|
// TODO: pair should be same as pair before.
|
|
|
|
ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
|
|
|
|
pair->key = key;
|
|
|
|
pair->val = val;
|
2019-04-20 04:19:47 +03:00
|
|
|
}
|
|
|
|
break;
|
2018-10-31 01:11:51 +03:00
|
|
|
case ST_DELETE:
|
2019-01-17 19:53:10 +03:00
|
|
|
ar_clear_entry(hash, i);
|
2018-12-14 04:10:15 +03:00
|
|
|
RHASH_AR_TABLE_SIZE_DEC(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2019-04-20 04:19:47 +03:00
|
|
|
static int
|
2019-08-27 05:53:39 +03:00
|
|
|
ar_foreach_with_replace(VALUE hash, st_foreach_check_callback_func *func, st_update_callback_func *replace, st_data_t arg)
|
2019-04-20 04:19:47 +03:00
|
|
|
{
|
|
|
|
return ar_general_foreach(hash, func, replace, arg);
|
|
|
|
}
|
|
|
|
|
2019-08-27 05:53:39 +03:00
|
|
|
struct functor {
|
|
|
|
st_foreach_callback_func *func;
|
|
|
|
st_data_t arg;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int
|
|
|
|
apply_functor(st_data_t k, st_data_t v, st_data_t d, int _)
|
|
|
|
{
|
|
|
|
const struct functor *f = (void *)d;
|
|
|
|
return f->func(k, v, f->arg);
|
|
|
|
}
|
|
|
|
|
2019-04-20 04:19:47 +03:00
|
|
|
static int
|
2019-08-27 05:53:39 +03:00
|
|
|
ar_foreach(VALUE hash, st_foreach_callback_func *func, st_data_t arg)
|
2019-04-20 04:19:47 +03:00
|
|
|
{
|
2019-08-27 05:53:39 +03:00
|
|
|
const struct functor f = { func, arg };
|
|
|
|
return ar_general_foreach(hash, apply_functor, NULL, (st_data_t)&f);
|
2019-04-20 04:19:47 +03:00
|
|
|
}
|
|
|
|
|
2018-10-31 01:11:51 +03:00
|
|
|
static int
|
2019-08-27 05:53:39 +03:00
|
|
|
ar_foreach_check(VALUE hash, st_foreach_check_callback_func *func, st_data_t arg,
|
2018-10-31 01:11:51 +03:00
|
|
|
st_data_t never)
|
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_SIZE(hash) > 0) {
|
|
|
|
unsigned i, ret = 0, bound = RHASH_AR_TABLE_BOUND(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
enum st_retval retval;
|
|
|
|
st_data_t key;
|
2019-01-17 19:53:10 +03:00
|
|
|
ar_table_pair *pair;
|
2019-08-01 10:04:40 +03:00
|
|
|
ar_hint_t hint;
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
for (i = 0; i < bound; i++) {
|
2019-01-17 19:53:10 +03:00
|
|
|
if (ar_cleared_entry(hash, i)) continue;
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2019-01-17 19:53:10 +03:00
|
|
|
pair = RHASH_AR_TABLE_REF(hash, i);
|
|
|
|
key = pair->key;
|
|
|
|
hint = ar_hint(hash, i);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2019-01-17 19:53:10 +03:00
|
|
|
retval = (*func)(key, pair->val, arg, 0);
|
|
|
|
hash_verify(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
switch (retval) {
|
|
|
|
case ST_CHECK: {
|
2019-01-17 19:53:10 +03:00
|
|
|
if (pair->key == never) break;
|
|
|
|
ret = ar_find_entry_hint(hash, hint, key);
|
2018-12-14 04:10:15 +03:00
|
|
|
if (ret == RHASH_AR_TABLE_MAX_BOUND) {
|
2018-10-31 01:11:51 +03:00
|
|
|
retval = (*func)(0, 0, arg, 1);
|
|
|
|
return 2;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
case ST_CONTINUE:
|
|
|
|
break;
|
|
|
|
case ST_STOP:
|
2019-04-20 04:19:47 +03:00
|
|
|
case ST_REPLACE:
|
2018-10-31 01:11:51 +03:00
|
|
|
return 0;
|
|
|
|
case ST_DELETE: {
|
2019-01-17 19:53:10 +03:00
|
|
|
if (!ar_cleared_entry(hash, i)) {
|
|
|
|
ar_clear_entry(hash, i);
|
2018-12-14 04:10:15 +03:00
|
|
|
RHASH_AR_TABLE_SIZE_DEC(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_update(VALUE hash, st_data_t key,
|
2018-10-31 01:12:12 +03:00
|
|
|
st_update_callback_func *func, st_data_t arg)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
|
|
|
int retval, existing;
|
2018-12-14 04:10:15 +03:00
|
|
|
unsigned bin = RHASH_AR_TABLE_MAX_BOUND;
|
2018-10-31 01:11:51 +03:00
|
|
|
st_data_t value = 0, old_key;
|
2019-01-06 01:23:54 +03:00
|
|
|
st_hash_t hash_value = ar_do_hash(key);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_SIZE(hash) > 0) {
|
2019-01-06 01:23:54 +03:00
|
|
|
bin = ar_find_entry(hash, hash_value, key);
|
2018-12-14 04:10:15 +03:00
|
|
|
existing = (bin != RHASH_AR_TABLE_MAX_BOUND) ? TRUE : FALSE;
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
else {
|
2018-12-14 04:10:15 +03:00
|
|
|
hash_ar_table(hash); /* allocate ltbl if needed */
|
2018-10-31 01:11:51 +03:00
|
|
|
existing = FALSE;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (existing) {
|
2019-01-17 19:53:10 +03:00
|
|
|
ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, bin);
|
|
|
|
key = pair->key;
|
|
|
|
value = pair->val;
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
old_key = key;
|
|
|
|
retval = (*func)(&key, &value, arg, existing);
|
2019-01-17 19:53:10 +03:00
|
|
|
/* pair can be invalid here because of theap */
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
switch (retval) {
|
|
|
|
case ST_CONTINUE:
|
|
|
|
if (!existing) {
|
2018-12-14 04:10:15 +03:00
|
|
|
if (ar_add_direct_with_hash(hash, key, value, hash_value)) {
|
2018-10-31 01:11:51 +03:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2019-01-17 19:53:10 +03:00
|
|
|
ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, bin);
|
2018-10-31 01:11:51 +03:00
|
|
|
if (old_key != key) {
|
2019-01-17 19:53:10 +03:00
|
|
|
pair->key = key;
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
2019-01-17 19:53:10 +03:00
|
|
|
pair->val = value;
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
case ST_DELETE:
|
|
|
|
if (existing) {
|
2019-01-17 19:53:10 +03:00
|
|
|
ar_clear_entry(hash, bin);
|
2018-12-14 04:10:15 +03:00
|
|
|
RHASH_AR_TABLE_SIZE_DEC(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
return existing;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_insert(VALUE hash, st_data_t key, st_data_t value)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
unsigned bin = RHASH_AR_TABLE_BOUND(hash);
|
2019-01-06 01:23:54 +03:00
|
|
|
st_hash_t hash_value = ar_do_hash(key);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
hash_ar_table(hash); /* prepare ltbl */
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2019-01-06 01:23:54 +03:00
|
|
|
bin = ar_find_entry(hash, hash_value, key);
|
2018-12-14 04:10:15 +03:00
|
|
|
if (bin == RHASH_AR_TABLE_MAX_BOUND) {
|
|
|
|
if (RHASH_AR_TABLE_SIZE(hash) >= RHASH_AR_TABLE_MAX_SIZE) {
|
2018-10-31 01:11:51 +03:00
|
|
|
return -1;
|
|
|
|
}
|
2018-12-14 04:10:15 +03:00
|
|
|
else if (bin >= RHASH_AR_TABLE_MAX_BOUND) {
|
|
|
|
bin = ar_compact_table(hash);
|
|
|
|
hash_ar_table(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
2018-12-14 04:10:15 +03:00
|
|
|
HASH_ASSERT(bin < RHASH_AR_TABLE_MAX_BOUND);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2019-01-17 19:53:10 +03:00
|
|
|
ar_set_entry(hash, bin, key, value, hash_value);
|
2018-12-14 04:10:15 +03:00
|
|
|
RHASH_AR_TABLE_BOUND_SET(hash, bin+1);
|
|
|
|
RHASH_AR_TABLE_SIZE_INC(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else {
|
2019-01-17 19:53:10 +03:00
|
|
|
RHASH_AR_TABLE_REF(hash, bin)->val = value;
|
2018-10-31 01:11:51 +03:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_lookup(VALUE hash, st_data_t key, st_data_t *value)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2019-01-04 10:49:00 +03:00
|
|
|
if (RHASH_AR_TABLE_SIZE(hash) == 0) {
|
2018-10-31 01:11:51 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else {
|
2019-01-06 01:23:54 +03:00
|
|
|
st_hash_t hash_value = ar_do_hash(key);
|
|
|
|
unsigned bin = ar_find_entry(hash, hash_value, key);
|
2019-01-04 10:49:00 +03:00
|
|
|
|
|
|
|
if (bin == RHASH_AR_TABLE_MAX_BOUND) {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
HASH_ASSERT(bin < RHASH_AR_TABLE_MAX_BOUND);
|
|
|
|
if (value != NULL) {
|
2019-01-17 19:53:10 +03:00
|
|
|
*value = RHASH_AR_TABLE_REF(hash, bin)->val;
|
2019-01-04 10:49:00 +03:00
|
|
|
}
|
|
|
|
return 1;
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_delete(VALUE hash, st_data_t *key, st_data_t *value)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2018-11-03 10:58:56 +03:00
|
|
|
unsigned bin;
|
2019-01-06 01:23:54 +03:00
|
|
|
st_hash_t hash_value = ar_do_hash(*key);
|
2018-10-31 01:12:12 +03:00
|
|
|
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2019-01-06 01:23:54 +03:00
|
|
|
bin = ar_find_entry(hash, hash_value, *key);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
if (bin == RHASH_AR_TABLE_MAX_BOUND) {
|
2018-10-31 01:11:51 +03:00
|
|
|
if (value != 0) *value = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
else {
|
2019-01-17 19:53:10 +03:00
|
|
|
if (value != 0) {
|
|
|
|
ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, bin);
|
|
|
|
*value = pair->val;
|
|
|
|
}
|
|
|
|
ar_clear_entry(hash, bin);
|
2018-12-14 04:10:15 +03:00
|
|
|
RHASH_AR_TABLE_SIZE_DEC(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_shift(VALUE hash, st_data_t *key, st_data_t *value)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_SIZE(hash) > 0) {
|
|
|
|
unsigned i, bound = RHASH_AR_TABLE_BOUND(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
for (i = 0; i < bound; i++) {
|
2019-01-17 19:53:10 +03:00
|
|
|
if (!ar_cleared_entry(hash, i)) {
|
|
|
|
ar_table_pair *pair = RHASH_AR_TABLE_REF(hash, i);
|
|
|
|
if (value != 0) *value = pair->val;
|
|
|
|
*key = pair->key;
|
|
|
|
ar_clear_entry(hash, i);
|
2018-12-14 04:10:15 +03:00
|
|
|
RHASH_AR_TABLE_SIZE_DEC(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2019-01-17 19:53:10 +03:00
|
|
|
if (value != NULL) *value = 0;
|
2018-10-31 01:11:51 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-10-31 01:55:31 +03:00
|
|
|
static long
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_keys(VALUE hash, st_data_t *keys, st_index_t size)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
unsigned i, bound = RHASH_AR_TABLE_BOUND(hash);
|
2018-10-31 01:55:31 +03:00
|
|
|
st_data_t *keys_start = keys, *keys_end = keys + size;
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
for (i = 0; i < bound; i++) {
|
|
|
|
if (keys == keys_end) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else {
|
2019-01-17 19:53:10 +03:00
|
|
|
if (!ar_cleared_entry(hash, i)) {
|
|
|
|
*keys++ = RHASH_AR_TABLE_REF(hash, i)->key;
|
|
|
|
}
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return keys - keys_start;
|
|
|
|
}
|
|
|
|
|
2018-10-31 01:55:31 +03:00
|
|
|
static long
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_values(VALUE hash, st_data_t *values, st_index_t size)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
unsigned i, bound = RHASH_AR_TABLE_BOUND(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
st_data_t *values_start = values, *values_end = values + size;
|
|
|
|
|
|
|
|
for (i = 0; i < bound; i++) {
|
|
|
|
if (values == values_end) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
else {
|
2019-01-17 19:53:10 +03:00
|
|
|
if (!ar_cleared_entry(hash, i)) {
|
|
|
|
*values++ = RHASH_AR_TABLE_REF(hash, i)->val;
|
|
|
|
}
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return values - values_start;
|
|
|
|
}
|
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
static ar_table*
|
|
|
|
ar_copy(VALUE hash1, VALUE hash2)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_table *old_tab = RHASH_AR_TABLE(hash2);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2018-11-29 11:03:55 +03:00
|
|
|
if (old_tab != NULL) {
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_table *new_tab = RHASH_AR_TABLE(hash1);
|
2018-11-29 11:03:55 +03:00
|
|
|
if (new_tab == NULL) {
|
2018-12-14 04:10:15 +03:00
|
|
|
new_tab = (ar_table*) rb_transient_heap_alloc(hash1, sizeof(ar_table));
|
2018-11-29 11:03:55 +03:00
|
|
|
if (new_tab != NULL) {
|
|
|
|
RHASH_SET_TRANSIENT_FLAG(hash1);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
RHASH_UNSET_TRANSIENT_FLAG(hash1);
|
2018-12-14 04:10:15 +03:00
|
|
|
new_tab = (ar_table*)ruby_xmalloc(sizeof(ar_table));
|
2018-11-29 11:03:55 +03:00
|
|
|
}
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
*new_tab = *old_tab;
|
2019-01-17 19:53:10 +03:00
|
|
|
RHASH(hash1)->ar_hint.word = RHASH(hash2)->ar_hint.word;
|
2018-12-14 04:10:15 +03:00
|
|
|
RHASH_AR_TABLE_BOUND_SET(hash1, RHASH_AR_TABLE_BOUND(hash2));
|
|
|
|
RHASH_AR_TABLE_SIZE_SET(hash1, RHASH_AR_TABLE_SIZE(hash2));
|
2019-07-31 23:50:58 +03:00
|
|
|
hash_ar_table_set(hash1, new_tab);
|
2018-11-01 05:50:35 +03:00
|
|
|
|
|
|
|
rb_gc_writebarrier_remember(hash1);
|
2018-10-31 01:11:51 +03:00
|
|
|
return new_tab;
|
|
|
|
}
|
|
|
|
else {
|
2018-12-14 04:10:15 +03:00
|
|
|
RHASH_AR_TABLE_BOUND_SET(hash1, RHASH_AR_TABLE_BOUND(hash2));
|
|
|
|
RHASH_AR_TABLE_SIZE_SET(hash1, RHASH_AR_TABLE_SIZE(hash2));
|
2018-11-29 11:03:55 +03:00
|
|
|
|
|
|
|
if (RHASH_TRANSIENT_P(hash1)) {
|
|
|
|
RHASH_UNSET_TRANSIENT_FLAG(hash1);
|
|
|
|
}
|
2018-12-14 04:10:15 +03:00
|
|
|
else if (RHASH_AR_TABLE(hash1)) {
|
|
|
|
ruby_xfree(RHASH_AR_TABLE(hash1));
|
2018-11-29 11:03:55 +03:00
|
|
|
}
|
|
|
|
|
2019-07-31 23:50:58 +03:00
|
|
|
hash_ar_table_set(hash1, NULL);
|
2018-11-01 05:50:35 +03:00
|
|
|
|
|
|
|
rb_gc_writebarrier_remember(hash1);
|
2018-10-31 01:11:51 +03:00
|
|
|
return old_tab;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_clear(VALUE hash)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE(hash) != NULL) {
|
|
|
|
RHASH_AR_TABLE_SIZE_SET(hash, 0);
|
|
|
|
RHASH_AR_TABLE_BOUND_SET(hash, 0);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
else {
|
2018-12-14 04:10:15 +03:00
|
|
|
HASH_ASSERT(RHASH_AR_TABLE_SIZE(hash) == 0);
|
|
|
|
HASH_ASSERT(RHASH_AR_TABLE_BOUND(hash) == 0);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-11-01 11:53:44 +03:00
|
|
|
#if USE_TRANSIENT_HEAP
|
2018-10-31 01:11:51 +03:00
|
|
|
void
|
|
|
|
rb_hash_transient_heap_evacuate(VALUE hash, int promote)
|
|
|
|
{
|
|
|
|
if (RHASH_TRANSIENT_P(hash)) {
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_table *new_tab;
|
|
|
|
ar_table *old_tab = RHASH_AR_TABLE(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
if (UNLIKELY(old_tab == NULL)) {
|
2018-10-31 01:12:12 +03:00
|
|
|
rb_gc_force_recycle(hash);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
HASH_ASSERT(old_tab != NULL);
|
|
|
|
if (promote) {
|
2018-10-31 01:11:51 +03:00
|
|
|
promote:
|
2018-12-14 04:10:15 +03:00
|
|
|
new_tab = ruby_xmalloc(sizeof(ar_table));
|
2018-10-31 01:12:12 +03:00
|
|
|
RHASH_UNSET_TRANSIENT_FLAG(hash);
|
|
|
|
}
|
|
|
|
else {
|
2018-12-14 04:10:15 +03:00
|
|
|
new_tab = rb_transient_heap_alloc(hash, sizeof(ar_table));
|
2018-10-31 01:11:51 +03:00
|
|
|
if (new_tab == NULL) goto promote;
|
2018-10-31 01:12:12 +03:00
|
|
|
}
|
|
|
|
*new_tab = *old_tab;
|
2019-07-31 23:50:58 +03:00
|
|
|
hash_ar_table_set(hash, new_tab);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
hash_verify(hash);
|
|
|
|
}
|
2018-11-01 11:53:44 +03:00
|
|
|
#endif
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2007-08-21 08:57:06 +04:00
|
|
|
typedef int st_foreach_func(st_data_t, st_data_t, st_data_t);
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
struct foreach_safe_arg {
|
|
|
|
st_table *tbl;
|
2007-08-21 08:57:06 +04:00
|
|
|
st_foreach_func *func;
|
2004-09-29 09:15:33 +04:00
|
|
|
st_data_t arg;
|
|
|
|
};
|
|
|
|
|
|
|
|
static int
|
2013-11-14 06:33:50 +04:00
|
|
|
foreach_safe_i(st_data_t key, st_data_t value, st_data_t args, int error)
|
2004-09-29 09:15:33 +04:00
|
|
|
{
|
|
|
|
int status;
|
2013-11-14 06:33:50 +04:00
|
|
|
struct foreach_safe_arg *arg = (void *)args;
|
2004-09-29 09:15:33 +04:00
|
|
|
|
2013-11-14 06:33:50 +04:00
|
|
|
if (error) return ST_STOP;
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
status = (*arg->func)(key, value, arg->arg);
|
2004-09-29 09:15:33 +04:00
|
|
|
if (status == ST_CONTINUE) {
|
|
|
|
return ST_CHECK;
|
|
|
|
}
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2019-08-27 05:53:39 +03:00
|
|
|
st_foreach_safe(st_table *table, st_foreach_func *func, st_data_t a)
|
2004-09-29 09:15:33 +04:00
|
|
|
{
|
|
|
|
struct foreach_safe_arg arg;
|
|
|
|
|
|
|
|
arg.tbl = table;
|
2007-08-21 08:57:06 +04:00
|
|
|
arg.func = (st_foreach_func *)func;
|
2004-09-29 09:15:33 +04:00
|
|
|
arg.arg = a;
|
2012-03-31 02:47:33 +04:00
|
|
|
if (st_foreach_check(table, foreach_safe_i, (st_data_t)&arg, 0)) {
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
rb_raise(rb_eRuntimeError, "hash modified during iteration");
|
|
|
|
}
|
2004-09-29 09:15:33 +04:00
|
|
|
}
|
|
|
|
|
2007-08-21 08:57:06 +04:00
|
|
|
typedef int rb_foreach_func(VALUE, VALUE, VALUE);
|
|
|
|
|
2004-09-23 04:51:32 +04:00
|
|
|
struct hash_foreach_arg {
|
1998-01-16 15:19:22 +03:00
|
|
|
VALUE hash;
|
2007-08-21 08:57:06 +04:00
|
|
|
rb_foreach_func *func;
|
2002-12-29 17:51:22 +03:00
|
|
|
VALUE arg;
|
1998-01-16 15:13:05 +03:00
|
|
|
};
|
|
|
|
|
2018-10-31 01:11:51 +03:00
|
|
|
static int
|
2018-12-14 04:10:15 +03:00
|
|
|
hash_ar_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int error)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
|
|
|
struct hash_foreach_arg *arg = (struct hash_foreach_arg *)argp;
|
|
|
|
int status;
|
|
|
|
|
|
|
|
if (error) return ST_STOP;
|
|
|
|
status = (*arg->func)((VALUE)key, (VALUE)value, arg->arg);
|
|
|
|
/* TODO: rehash check? rb_raise(rb_eRuntimeError, "rehash occurred during iteration"); */
|
|
|
|
|
|
|
|
switch (status) {
|
|
|
|
case ST_DELETE:
|
2018-10-31 01:12:12 +03:00
|
|
|
return ST_DELETE;
|
2018-10-31 01:11:51 +03:00
|
|
|
case ST_CONTINUE:
|
2018-10-31 01:12:12 +03:00
|
|
|
break;
|
2018-10-31 01:11:51 +03:00
|
|
|
case ST_STOP:
|
2018-10-31 01:12:12 +03:00
|
|
|
return ST_STOP;
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
return ST_CHECK;
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static int
|
2013-11-14 06:33:50 +04:00
|
|
|
hash_foreach_iter(st_data_t key, st_data_t value, st_data_t argp, int error)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2012-02-21 15:22:49 +04:00
|
|
|
struct hash_foreach_arg *arg = (struct hash_foreach_arg *)argp;
|
1998-01-16 15:13:05 +03:00
|
|
|
int status;
|
2004-09-22 08:48:52 +04:00
|
|
|
st_table *tbl;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2013-11-14 06:33:50 +04:00
|
|
|
if (error) return ST_STOP;
|
2018-10-31 01:11:51 +03:00
|
|
|
tbl = RHASH_ST_TABLE(arg->hash);
|
2009-02-26 13:29:13 +03:00
|
|
|
status = (*arg->func)((VALUE)key, (VALUE)value, arg->arg);
|
2018-10-31 01:11:51 +03:00
|
|
|
if (RHASH_ST_TABLE(arg->hash) != tbl) {
|
|
|
|
rb_raise(rb_eRuntimeError, "rehash occurred during iteration");
|
2004-09-22 08:48:52 +04:00
|
|
|
}
|
|
|
|
switch (status) {
|
|
|
|
case ST_DELETE:
|
2012-03-31 02:53:26 +04:00
|
|
|
return ST_DELETE;
|
2004-09-22 08:48:52 +04:00
|
|
|
case ST_CONTINUE:
|
|
|
|
break;
|
|
|
|
case ST_STOP:
|
|
|
|
return ST_STOP;
|
2004-09-21 07:08:33 +04:00
|
|
|
}
|
2004-09-22 08:48:52 +04:00
|
|
|
return ST_CHECK;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2019-01-16 13:48:30 +03:00
|
|
|
static int
|
|
|
|
iter_lev_in_ivar(VALUE hash)
|
|
|
|
{
|
2019-08-01 05:20:37 +03:00
|
|
|
VALUE levval = rb_ivar_get(hash, id_hash_iter_lev);
|
2019-01-16 13:48:30 +03:00
|
|
|
HASH_ASSERT(FIXNUM_P(levval));
|
|
|
|
return FIX2INT(levval);
|
|
|
|
}
|
|
|
|
|
|
|
|
void rb_ivar_set_internal(VALUE obj, ID id, VALUE val);
|
|
|
|
|
|
|
|
static void
|
|
|
|
iter_lev_in_ivar_set(VALUE hash, int lev)
|
|
|
|
{
|
2019-08-01 05:20:37 +03:00
|
|
|
rb_ivar_set_internal(hash, id_hash_iter_lev, INT2FIX(lev));
|
2019-01-16 13:48:30 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
iter_lev_in_flags(VALUE hash)
|
|
|
|
{
|
2019-07-31 05:08:05 +03:00
|
|
|
unsigned int u = (unsigned int)((RBASIC(hash)->flags >> RHASH_LEV_SHIFT) & RHASH_LEV_MAX);
|
2019-01-16 13:48:30 +03:00
|
|
|
return (int)u;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
RHASH_ITER_LEV(VALUE hash)
|
|
|
|
{
|
|
|
|
int lev = iter_lev_in_flags(hash);
|
|
|
|
|
|
|
|
if (lev == RHASH_LEV_MAX) {
|
|
|
|
return iter_lev_in_ivar(hash);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return lev;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-09 22:11:32 +03:00
|
|
|
static void
|
|
|
|
hash_iter_lev_inc(VALUE hash)
|
|
|
|
{
|
2019-01-16 13:48:30 +03:00
|
|
|
int lev = iter_lev_in_flags(hash);
|
|
|
|
if (lev == RHASH_LEV_MAX) {
|
|
|
|
lev = iter_lev_in_ivar(hash);
|
|
|
|
iter_lev_in_ivar_set(hash, lev+1);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
lev += 1;
|
|
|
|
RBASIC(hash)->flags = ((RBASIC(hash)->flags & ~RHASH_LEV_MASK) | (lev << RHASH_LEV_SHIFT));
|
|
|
|
if (lev == RHASH_LEV_MAX) {
|
|
|
|
iter_lev_in_ivar_set(hash, lev);
|
|
|
|
}
|
|
|
|
}
|
2019-01-09 22:11:32 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
hash_iter_lev_dec(VALUE hash)
|
|
|
|
{
|
2019-01-16 13:48:30 +03:00
|
|
|
int lev = iter_lev_in_flags(hash);
|
|
|
|
if (lev == RHASH_LEV_MAX) {
|
|
|
|
lev = iter_lev_in_ivar(hash);
|
|
|
|
HASH_ASSERT(lev > 0);
|
|
|
|
iter_lev_in_ivar_set(hash, lev-1);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
HASH_ASSERT(lev > 0);
|
|
|
|
RBASIC(hash)->flags = ((RBASIC(hash)->flags & ~RHASH_LEV_MASK) | ((lev-1) << RHASH_LEV_SHIFT));
|
|
|
|
}
|
2019-01-09 22:11:32 +03:00
|
|
|
}
|
|
|
|
|
2013-11-15 21:15:31 +04:00
|
|
|
static VALUE
|
|
|
|
hash_foreach_ensure_rollback(VALUE hash)
|
|
|
|
{
|
2019-01-09 22:11:32 +03:00
|
|
|
hash_iter_lev_inc(hash);
|
2013-11-15 21:15:31 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2013-11-15 21:08:52 +04:00
|
|
|
hash_foreach_ensure(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2019-01-09 22:11:32 +03:00
|
|
|
hash_iter_lev_dec(hash);
|
1999-01-20 07:59:39 +03:00
|
|
|
return 0;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2018-10-31 01:11:51 +03:00
|
|
|
int
|
2019-08-27 05:53:39 +03:00
|
|
|
rb_hash_stlike_foreach(VALUE hash, st_foreach_callback_func *func, st_data_t arg)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_P(hash)) {
|
|
|
|
return ar_foreach(hash, func, arg);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
return st_foreach(RHASH_ST_TABLE(hash), func, arg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-20 04:19:47 +03:00
|
|
|
int
|
2019-08-27 05:53:39 +03:00
|
|
|
rb_hash_stlike_foreach_with_replace(VALUE hash, st_foreach_check_callback_func *func, st_update_callback_func *replace, st_data_t arg)
|
2019-04-20 04:19:47 +03:00
|
|
|
{
|
|
|
|
if (RHASH_AR_TABLE_P(hash)) {
|
|
|
|
return ar_foreach_with_replace(hash, func, replace, arg);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return st_foreach_with_replace(RHASH_ST_TABLE(hash), func, replace, arg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-09-23 04:51:32 +04:00
|
|
|
static VALUE
|
2012-03-31 02:40:54 +04:00
|
|
|
hash_foreach_call(VALUE arg)
|
2004-09-23 04:51:32 +04:00
|
|
|
{
|
2012-03-31 02:40:54 +04:00
|
|
|
VALUE hash = ((struct hash_foreach_arg *)arg)->hash;
|
2018-10-31 01:11:51 +03:00
|
|
|
int ret = 0;
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_P(hash)) {
|
|
|
|
ret = ar_foreach_check(hash, hash_ar_foreach_iter,
|
2018-10-31 01:11:51 +03:00
|
|
|
(st_data_t)arg, (st_data_t)Qundef);
|
|
|
|
}
|
2018-12-14 04:10:15 +03:00
|
|
|
else if (RHASH_ST_TABLE_P(hash)) {
|
2018-10-31 01:11:51 +03:00
|
|
|
ret = st_foreach_check(RHASH_ST_TABLE(hash), hash_foreach_iter,
|
|
|
|
(st_data_t)arg, (st_data_t)Qundef);
|
|
|
|
}
|
|
|
|
if (ret) {
|
2018-10-31 01:12:12 +03:00
|
|
|
rb_raise(rb_eRuntimeError, "ret: %d, hash modified during iteration", ret);
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
}
|
2004-09-23 04:51:32 +04:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
void
|
2019-08-27 05:53:39 +03:00
|
|
|
rb_hash_foreach(VALUE hash, rb_foreach_func *func, VALUE farg)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2004-09-23 04:51:32 +04:00
|
|
|
struct hash_foreach_arg arg;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2018-12-14 05:27:23 +03:00
|
|
|
if (RHASH_TABLE_EMPTY_P(hash))
|
2007-08-30 03:12:21 +04:00
|
|
|
return;
|
2019-01-09 22:11:32 +03:00
|
|
|
hash_iter_lev_inc(hash);
|
1998-01-16 15:13:05 +03:00
|
|
|
arg.hash = hash;
|
2007-08-21 08:57:06 +04:00
|
|
|
arg.func = (rb_foreach_func *)func;
|
1998-01-16 15:13:05 +03:00
|
|
|
arg.arg = farg;
|
2013-11-15 21:08:52 +04:00
|
|
|
rb_ensure(hash_foreach_call, (VALUE)&arg, hash_foreach_ensure, hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
hash_verify(hash);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2016-03-09 10:17:01 +03:00
|
|
|
hash_alloc_flags(VALUE klass, VALUE flags, VALUE ifnone)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2016-03-09 10:17:01 +03:00
|
|
|
const VALUE wb = (RGENGC_WB_PROTECTED_HASH ? FL_WB_PROTECTED : 0);
|
|
|
|
NEWOBJ_OF(hash, struct RHash, klass, T_HASH | wb | flags);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2016-03-09 10:17:01 +03:00
|
|
|
RHASH_SET_IFNONE((VALUE)hash, ifnone);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
return (VALUE)hash;
|
|
|
|
}
|
|
|
|
|
2016-03-09 10:17:01 +03:00
|
|
|
static VALUE
|
|
|
|
hash_alloc(VALUE klass)
|
|
|
|
{
|
|
|
|
return hash_alloc_flags(klass, 0, Qnil);
|
|
|
|
}
|
|
|
|
|
* probes.d: add DTrace probe declarations. [ruby-core:27448]
* array.c (empty_ary_alloc, ary_new): added array create DTrace probe.
* compile.c (rb_insns_name): allowing DTrace probes to access
instruction sequence name.
* Makefile.in: translate probes.d file to appropriate header file.
* common.mk: declare dependencies on the DTrace header.
* configure.in: add a test for existence of DTrace.
* eval.c (setup_exception): add a probe for when an exception is
raised.
* gc.c: Add DTrace probes for mark begin and end, and sweep begin and
end.
* hash.c (empty_hash_alloc): Add a probe for hash allocation.
* insns.def: Add probes for function entry and return.
* internal.h: function declaration for compile.c change.
* load.c (rb_f_load): add probes for `load` entry and exit, require
entry and exit, and wrapping search_required for load path search.
* object.c (rb_obj_alloc): added a probe for general object creation.
* parse.y (yycompile0): added a probe around parse and compile phase.
* string.c (empty_str_alloc, str_new): DTrace probes for string
allocation.
* test/dtrace/*: tests for DTrace probes.
* vm.c (vm_invoke_proc): add probes for function return on exception
raise, hash create, and instruction sequence execution.
* vm_core.h: add probe declarations for function entry and exit.
* vm_dump.c: add probes header file.
* vm_eval.c (vm_call0_cfunc, vm_call0_cfunc_with_frame): add probe on
function entry and return.
* vm_exec.c: expose instruction number to instruction name function.
* vm_insnshelper.c: add function entry and exit probes for cfunc
methods.
* vm_insnhelper.h: vm usage information is always collected, so
uncomment the functions.
12 19:14:50 2012 Akinori MUSHA <knu@iDaemons.org>
* configure.in (isinf, isnan): isinf() and isnan() are macros on
DragonFly which cannot be found by AC_REPLACE_FUNCS(). This
workaround enforces the fact that they exist on DragonFly.
12 15:59:38 2012 Shugo Maeda <shugo@ruby-lang.org>
* vm_core.h (rb_call_info_t::refinements), compile.c (new_callinfo),
vm_insnhelper.c (vm_search_method): revert r37616 because it's too
slow. [ruby-dev:46477]
* test/ruby/test_refinement.rb (test_inline_method_cache): skip
the test until the bug is fixed efficiently.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-13 01:52:12 +04:00
|
|
|
static VALUE
|
|
|
|
empty_hash_alloc(VALUE klass)
|
|
|
|
{
|
2015-10-29 08:32:57 +03:00
|
|
|
RUBY_DTRACE_CREATE_HOOK(HASH, 0);
|
* probes.d: add DTrace probe declarations. [ruby-core:27448]
* array.c (empty_ary_alloc, ary_new): added array create DTrace probe.
* compile.c (rb_insns_name): allowing DTrace probes to access
instruction sequence name.
* Makefile.in: translate probes.d file to appropriate header file.
* common.mk: declare dependencies on the DTrace header.
* configure.in: add a test for existence of DTrace.
* eval.c (setup_exception): add a probe for when an exception is
raised.
* gc.c: Add DTrace probes for mark begin and end, and sweep begin and
end.
* hash.c (empty_hash_alloc): Add a probe for hash allocation.
* insns.def: Add probes for function entry and return.
* internal.h: function declaration for compile.c change.
* load.c (rb_f_load): add probes for `load` entry and exit, require
entry and exit, and wrapping search_required for load path search.
* object.c (rb_obj_alloc): added a probe for general object creation.
* parse.y (yycompile0): added a probe around parse and compile phase.
* string.c (empty_str_alloc, str_new): DTrace probes for string
allocation.
* test/dtrace/*: tests for DTrace probes.
* vm.c (vm_invoke_proc): add probes for function return on exception
raise, hash create, and instruction sequence execution.
* vm_core.h: add probe declarations for function entry and exit.
* vm_dump.c: add probes header file.
* vm_eval.c (vm_call0_cfunc, vm_call0_cfunc_with_frame): add probe on
function entry and return.
* vm_exec.c: expose instruction number to instruction name function.
* vm_insnshelper.c: add function entry and exit probes for cfunc
methods.
* vm_insnhelper.h: vm usage information is always collected, so
uncomment the functions.
12 19:14:50 2012 Akinori MUSHA <knu@iDaemons.org>
* configure.in (isinf, isnan): isinf() and isnan() are macros on
DragonFly which cannot be found by AC_REPLACE_FUNCS(). This
workaround enforces the fact that they exist on DragonFly.
12 15:59:38 2012 Shugo Maeda <shugo@ruby-lang.org>
* vm_core.h (rb_call_info_t::refinements), compile.c (new_callinfo),
vm_insnhelper.c (vm_search_method): revert r37616 because it's too
slow. [ruby-dev:46477]
* test/ruby/test_refinement.rb (test_inline_method_cache): skip
the test until the bug is fixed efficiently.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-13 01:52:12 +04:00
|
|
|
|
|
|
|
return hash_alloc(klass);
|
|
|
|
}
|
|
|
|
|
2000-02-29 11:05:32 +03:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_new(void)
|
2000-02-29 11:05:32 +03:00
|
|
|
{
|
2002-12-20 11:33:17 +03:00
|
|
|
return hash_alloc(rb_cHash);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
mjit_compile.c: merge initial JIT compiler
which has been developed by Takashi Kokubun <takashikkbn@gmail> as
YARV-MJIT. Many of its bugs are fixed by wanabe <s.wanabe@gmail.com>.
This JIT compiler is designed to be a safe migration path to introduce
JIT compiler to MRI. So this commit does not include any bytecode
changes or dynamic instruction modifications, which are done in original
MJIT.
This commit even strips off some aggressive optimizations from
YARV-MJIT, and thus it's slower than YARV-MJIT too. But it's still
fairly faster than Ruby 2.5 in some benchmarks (attached below).
Note that this JIT compiler passes `make test`, `make test-all`, `make
test-spec` without JIT, and even with JIT. Not only it's perfectly safe
with JIT disabled because it does not replace VM instructions unlike
MJIT, but also with JIT enabled it stably runs Ruby applications
including Rails applications.
I'm expecting this version as just "initial" JIT compiler. I have many
optimization ideas which are skipped for initial merging, and you may
easily replace this JIT compiler with a faster one by just replacing
mjit_compile.c. `mjit_compile` interface is designed for the purpose.
common.mk: update dependencies for mjit_compile.c.
internal.h: declare `rb_vm_insn_addr2insn` for MJIT.
vm.c: exclude some definitions if `-DMJIT_HEADER` is provided to
compiler. This avoids to include some functions which take a long time
to compile, e.g. vm_exec_core. Some of the purpose is achieved in
transform_mjit_header.rb (see `IGNORED_FUNCTIONS`) but others are
manually resolved for now. Load mjit_helper.h for MJIT header.
mjit_helper.h: New. This is a file used only by JIT-ed code. I'll
refactor `mjit_call_cfunc` later.
vm_eval.c: add some #ifdef switches to skip compiling some functions
like Init_vm_eval.
win32/mkexports.rb: export thread/ec functions, which are used by MJIT.
include/ruby/defines.h: add MJIT_FUNC_EXPORTED macro alis to clarify
that a function is exported only for MJIT.
array.c: export a function used by MJIT.
bignum.c: ditto.
class.c: ditto.
compile.c: ditto.
error.c: ditto.
gc.c: ditto.
hash.c: ditto.
iseq.c: ditto.
numeric.c: ditto.
object.c: ditto.
proc.c: ditto.
re.c: ditto.
st.c: ditto.
string.c: ditto.
thread.c: ditto.
variable.c: ditto.
vm_backtrace.c: ditto.
vm_insnhelper.c: ditto.
vm_method.c: ditto.
I would like to improve maintainability of function exports, but I
believe this way is acceptable as initial merging if we clarify the
new exports are for MJIT (so that we can use them as TODO list to fix)
and add unit tests to detect unresolved symbols.
I'll add unit tests of JIT compilations in succeeding commits.
Author: Takashi Kokubun <takashikkbn@gmail.com>
Contributor: wanabe <s.wanabe@gmail.com>
Part of [Feature #14235]
---
* Known issues
* Code generated by gcc is faster than clang. The benchmark may be worse
in macOS. Following benchmark result is provided by gcc w/ Linux.
* Performance is decreased when Google Chrome is running
* JIT can work on MinGW, but it doesn't improve performance at least
in short running benchmark.
* Currently it doesn't perform well with Rails. We'll try to fix this
before release.
---
* Benchmark reslts
Benchmarked with:
Intel 4.0GHz i7-4790K with 16GB memory under x86-64 Ubuntu 8 Cores
- 2.0.0-p0: Ruby 2.0.0-p0
- r62186: Ruby trunk (early 2.6.0), before MJIT changes
- JIT off: On this commit, but without `--jit` option
- JIT on: On this commit, and with `--jit` option
** Optcarrot fps
Benchmark: https://github.com/mame/optcarrot
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:--------|:--------|:--------|:--------|:--------|
|fps |37.32 |51.46 |51.31 |58.88 |
|vs 2.0.0 |1.00x |1.38x |1.37x |1.58x |
** MJIT benchmarks
Benchmark: https://github.com/benchmark-driver/mjit-benchmarks
(Original: https://github.com/vnmakarov/ruby/tree/rtl_mjit_branch/MJIT-benchmarks)
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:----------|:--------|:--------|:--------|:--------|
|aread |1.00 |1.09 |1.07 |2.19 |
|aref |1.00 |1.13 |1.11 |2.22 |
|aset |1.00 |1.50 |1.45 |2.64 |
|awrite |1.00 |1.17 |1.13 |2.20 |
|call |1.00 |1.29 |1.26 |2.02 |
|const2 |1.00 |1.10 |1.10 |2.19 |
|const |1.00 |1.11 |1.10 |2.19 |
|fannk |1.00 |1.04 |1.02 |1.00 |
|fib |1.00 |1.32 |1.31 |1.84 |
|ivread |1.00 |1.13 |1.12 |2.43 |
|ivwrite |1.00 |1.23 |1.21 |2.40 |
|mandelbrot |1.00 |1.13 |1.16 |1.28 |
|meteor |1.00 |2.97 |2.92 |3.17 |
|nbody |1.00 |1.17 |1.15 |1.49 |
|nest-ntimes|1.00 |1.22 |1.20 |1.39 |
|nest-while |1.00 |1.10 |1.10 |1.37 |
|norm |1.00 |1.18 |1.16 |1.24 |
|nsvb |1.00 |1.16 |1.16 |1.17 |
|red-black |1.00 |1.02 |0.99 |1.12 |
|sieve |1.00 |1.30 |1.28 |1.62 |
|trees |1.00 |1.14 |1.13 |1.19 |
|while |1.00 |1.12 |1.11 |2.41 |
** Discourse's script/bench.rb
Benchmark: https://github.com/discourse/discourse/blob/v1.8.7/script/bench.rb
NOTE: Rails performance was somehow a little degraded with JIT for now.
We should fix this.
(At least I know opt_aref is performing badly in JIT and I have an idea
to fix it. Please wait for the fix.)
*** JIT off
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 17
75: 18
90: 22
99: 29
home_admin:
50: 21
75: 21
90: 27
99: 40
topic_admin:
50: 17
75: 18
90: 22
99: 32
categories:
50: 35
75: 41
90: 43
99: 77
home:
50: 39
75: 46
90: 49
99: 95
topic:
50: 46
75: 52
90: 56
99: 101
*** JIT on
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 19
75: 21
90: 25
99: 33
home_admin:
50: 24
75: 26
90: 30
99: 35
topic_admin:
50: 19
75: 20
90: 25
99: 30
categories:
50: 40
75: 44
90: 48
99: 76
home:
50: 42
75: 48
90: 51
99: 89
topic:
50: 49
75: 55
90: 58
99: 99
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-02-04 14:22:28 +03:00
|
|
|
MJIT_FUNC_EXPORTED VALUE
|
2017-09-05 07:48:19 +03:00
|
|
|
rb_hash_new_with_size(st_index_t size)
|
|
|
|
{
|
|
|
|
VALUE ret = rb_hash_new();
|
2018-12-14 04:10:15 +03:00
|
|
|
if (size == 0) {
|
|
|
|
/* do nothing */
|
|
|
|
}
|
|
|
|
else if (size <= RHASH_AR_TABLE_MAX_SIZE) {
|
|
|
|
ar_alloc_table(ret);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
RHASH_ST_TABLE_SET(ret, st_init_table_with_size(&objhash, size));
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
2017-09-05 07:48:19 +03:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2016-03-09 10:17:01 +03:00
|
|
|
static VALUE
|
|
|
|
hash_dup(VALUE hash, VALUE klass, VALUE flags)
|
2008-04-26 16:52:25 +04:00
|
|
|
{
|
2016-03-09 10:17:01 +03:00
|
|
|
VALUE ret = hash_alloc_flags(klass, flags,
|
|
|
|
RHASH_IFNONE(hash));
|
2018-10-31 01:11:51 +03:00
|
|
|
if (!RHASH_EMPTY_P(hash)) {
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_P(hash))
|
|
|
|
ar_copy(ret, hash);
|
|
|
|
else if (RHASH_ST_TABLE_P(hash))
|
2018-10-31 01:11:51 +03:00
|
|
|
RHASH_ST_TABLE_SET(ret, st_copy(RHASH_ST_TABLE(hash)));
|
|
|
|
}
|
2016-03-09 10:17:01 +03:00
|
|
|
return ret;
|
2008-04-26 16:52:25 +04:00
|
|
|
}
|
|
|
|
|
2013-12-16 17:40:04 +04:00
|
|
|
VALUE
|
|
|
|
rb_hash_dup(VALUE hash)
|
|
|
|
{
|
2016-03-09 10:17:01 +03:00
|
|
|
const VALUE flags = RBASIC(hash)->flags;
|
|
|
|
VALUE ret = hash_dup(hash, rb_obj_class(hash),
|
2019-07-31 04:22:47 +03:00
|
|
|
flags & (FL_EXIVAR|FL_TAINT|RHASH_PROC_DEFAULT));
|
2016-03-09 10:17:01 +03:00
|
|
|
if (flags & FL_EXIVAR)
|
|
|
|
rb_copy_generic_ivar(ret, hash);
|
2013-12-16 17:40:04 +04:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-12-20 10:17:55 +03:00
|
|
|
MJIT_FUNC_EXPORTED VALUE
|
|
|
|
rb_hash_resurrect(VALUE hash)
|
|
|
|
{
|
|
|
|
VALUE ret = hash_dup(hash, rb_cHash, 0);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2004-09-22 08:48:52 +04:00
|
|
|
static void
|
2007-08-30 03:12:21 +04:00
|
|
|
rb_hash_modify_check(VALUE hash)
|
2004-09-22 08:48:52 +04:00
|
|
|
{
|
* array.c, gc.c, hash.c, object.c, string.c, struct.c,
transcode.c, variable.c, vm.c, vm_insnhelper.c, vm_method.c:
replace calls to rb_error_frozen() with rb_check_frozen(). a
patch from Run Paint Run Run at [ruby-core:32014]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29583 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-10-24 12:14:05 +04:00
|
|
|
rb_check_frozen(hash);
|
2004-09-22 08:48:52 +04:00
|
|
|
}
|
|
|
|
|
2018-10-31 01:11:51 +03:00
|
|
|
MJIT_FUNC_EXPORTED struct st_table *
|
|
|
|
#if RHASH_CONVERT_TABLE_DEBUG
|
|
|
|
rb_hash_tbl_raw(VALUE hash, const char *file, int line)
|
2007-08-30 03:12:21 +04:00
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
return ar_force_convert_table(hash, file, line);
|
2007-08-30 03:12:21 +04:00
|
|
|
}
|
2018-10-31 01:11:51 +03:00
|
|
|
#else
|
|
|
|
rb_hash_tbl_raw(VALUE hash)
|
2013-05-26 16:37:11 +04:00
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
return ar_force_convert_table(hash, NULL, 0);
|
2013-05-26 16:37:11 +04:00
|
|
|
}
|
2018-10-31 01:11:51 +03:00
|
|
|
#endif
|
2013-05-26 16:37:11 +04:00
|
|
|
|
2018-10-31 01:11:51 +03:00
|
|
|
struct st_table *
|
|
|
|
rb_hash_tbl(VALUE hash, const char *file, int line)
|
2013-05-26 20:19:04 +04:00
|
|
|
{
|
2018-10-31 01:11:51 +03:00
|
|
|
OBJ_WB_UNPROTECT(hash);
|
|
|
|
return RHASH_TBL_RAW(hash);
|
2013-05-26 20:19:04 +04:00
|
|
|
}
|
|
|
|
|
2007-08-30 03:12:21 +04:00
|
|
|
static void
|
|
|
|
rb_hash_modify(VALUE hash)
|
|
|
|
{
|
|
|
|
rb_hash_modify_check(hash);
|
|
|
|
}
|
|
|
|
|
2012-04-13 15:30:39 +04:00
|
|
|
NORETURN(static void no_new_key(void));
|
2010-02-16 19:20:18 +03:00
|
|
|
static void
|
2012-04-13 15:30:39 +04:00
|
|
|
no_new_key(void)
|
2010-02-16 19:20:18 +03:00
|
|
|
{
|
2012-04-13 15:30:39 +04:00
|
|
|
rb_raise(rb_eRuntimeError, "can't add a new key into hash during iteration");
|
2010-02-16 19:20:18 +03:00
|
|
|
}
|
|
|
|
|
2013-05-26 16:37:11 +04:00
|
|
|
struct update_callback_arg {
|
|
|
|
VALUE hash;
|
|
|
|
st_data_t arg;
|
|
|
|
};
|
2012-04-13 10:26:53 +04:00
|
|
|
|
2013-05-26 16:37:11 +04:00
|
|
|
#define NOINSERT_UPDATE_CALLBACK(func) \
|
2013-11-17 18:34:27 +04:00
|
|
|
static int \
|
2013-05-26 16:37:11 +04:00
|
|
|
func##_noinsert(st_data_t *key, st_data_t *val, st_data_t arg, int existing) \
|
|
|
|
{ \
|
|
|
|
if (!existing) no_new_key(); \
|
2013-06-19 01:29:30 +04:00
|
|
|
return func(key, val, (struct update_arg *)arg, existing); \
|
2013-05-26 16:37:11 +04:00
|
|
|
} \
|
2013-06-19 01:29:30 +04:00
|
|
|
\
|
2013-11-17 18:34:27 +04:00
|
|
|
static int \
|
2013-05-26 16:37:11 +04:00
|
|
|
func##_insert(st_data_t *key, st_data_t *val, st_data_t arg, int existing) \
|
|
|
|
{ \
|
2013-06-19 01:29:30 +04:00
|
|
|
return func(key, val, (struct update_arg *)arg, existing); \
|
|
|
|
}
|
|
|
|
|
|
|
|
struct update_arg {
|
|
|
|
st_data_t arg;
|
|
|
|
VALUE hash;
|
|
|
|
VALUE new_key;
|
|
|
|
VALUE old_key;
|
|
|
|
VALUE new_value;
|
|
|
|
VALUE old_value;
|
|
|
|
};
|
|
|
|
|
2016-03-09 07:45:27 +03:00
|
|
|
typedef int (*tbl_update_func)(st_data_t *, st_data_t *, st_data_t, int);
|
|
|
|
|
2018-10-31 01:11:51 +03:00
|
|
|
int
|
|
|
|
rb_hash_stlike_update(VALUE hash, st_data_t key, st_update_callback_func func, st_data_t arg)
|
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_P(hash)) {
|
|
|
|
int result = ar_update(hash, (st_data_t)key, func, arg);
|
2018-10-31 01:11:51 +03:00
|
|
|
if (result == -1) {
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_try_convert_table(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return st_update(RHASH_ST_TABLE(hash), (st_data_t)key, func, arg);
|
|
|
|
}
|
|
|
|
|
2013-06-19 01:29:30 +04:00
|
|
|
static int
|
2016-03-09 07:45:27 +03:00
|
|
|
tbl_update(VALUE hash, VALUE key, tbl_update_func func, st_data_t optional_arg)
|
2013-06-19 01:29:30 +04:00
|
|
|
{
|
|
|
|
struct update_arg arg;
|
|
|
|
int result;
|
|
|
|
|
|
|
|
arg.arg = optional_arg;
|
|
|
|
arg.hash = hash;
|
|
|
|
arg.new_key = 0;
|
|
|
|
arg.old_key = Qundef;
|
|
|
|
arg.new_value = 0;
|
|
|
|
arg.old_value = Qundef;
|
|
|
|
|
2018-10-31 01:11:51 +03:00
|
|
|
result = rb_hash_stlike_update(hash, key, func, (st_data_t)&arg);
|
2013-06-19 01:29:30 +04:00
|
|
|
|
|
|
|
/* write barrier */
|
* include/ruby/ruby.h: rename OBJ_WRITE and OBJ_WRITTEN into
RB_OBJ_WRITE and RB_OBJ_WRITTEN.
* array.c, class.c, compile.c, hash.c, internal.h, iseq.c,
proc.c, process.c, re.c, string.c, variable.c, vm.c,
vm_eval.c, vm_insnhelper.c, vm_insnhelper.h,
vm_method.c: catch up this change.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44299 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-12-20 12:07:47 +04:00
|
|
|
if (arg.new_key) RB_OBJ_WRITTEN(hash, arg.old_key, arg.new_key);
|
|
|
|
if (arg.new_value) RB_OBJ_WRITTEN(hash, arg.old_value, arg.new_value);
|
2013-06-19 01:29:30 +04:00
|
|
|
|
|
|
|
return result;
|
2013-05-26 16:37:11 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
#define UPDATE_CALLBACK(iter_lev, func) ((iter_lev) > 0 ? func##_noinsert : func##_insert)
|
|
|
|
|
2013-06-19 01:29:30 +04:00
|
|
|
#define RHASH_UPDATE_ITER(h, iter_lev, key, func, a) do { \
|
|
|
|
tbl_update((h), (key), UPDATE_CALLBACK((iter_lev), func), (st_data_t)(a)); \
|
2013-05-26 16:37:11 +04:00
|
|
|
} while (0)
|
2012-04-13 10:26:53 +04:00
|
|
|
|
|
|
|
#define RHASH_UPDATE(hash, key, func, arg) \
|
|
|
|
RHASH_UPDATE_ITER(hash, RHASH_ITER_LEV(hash), key, func, arg)
|
|
|
|
|
2009-10-26 13:30:15 +03:00
|
|
|
static void
|
2016-03-09 10:17:03 +03:00
|
|
|
set_proc_default(VALUE hash, VALUE proc)
|
2009-10-26 13:30:15 +03:00
|
|
|
{
|
2016-03-09 10:17:03 +03:00
|
|
|
if (rb_proc_lambda_p(proc)) {
|
|
|
|
int n = rb_proc_arity(proc);
|
2009-10-26 13:30:15 +03:00
|
|
|
|
2016-03-09 10:17:03 +03:00
|
|
|
if (n != 2 && (n >= 0 || n < -3)) {
|
|
|
|
if (n < 0) n = -n-1;
|
|
|
|
rb_raise(rb_eTypeError, "default_proc takes two arguments (2 for %d)", n);
|
|
|
|
}
|
2009-10-26 13:30:15 +03:00
|
|
|
}
|
2016-03-09 10:17:03 +03:00
|
|
|
|
2019-01-17 19:53:10 +03:00
|
|
|
FL_SET_RAW(hash, RHASH_PROC_DEFAULT);
|
2016-03-09 10:17:03 +03:00
|
|
|
RHASH_SET_IFNONE(hash, proc);
|
2009-10-26 13:30:15 +03:00
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* Hash.new -> new_hash
|
|
|
|
* Hash.new(obj) -> new_hash
|
|
|
|
* Hash.new {|hash, key| block } -> new_hash
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Returns a new, empty hash. If this hash is subsequently accessed by
|
|
|
|
* a key that doesn't correspond to a hash entry, the value returned
|
|
|
|
* depends on the style of <code>new</code> used to create the hash. In
|
|
|
|
* the first form, the access returns <code>nil</code>. If
|
|
|
|
* <i>obj</i> is specified, this single object will be used for
|
|
|
|
* all <em>default values</em>. If a block is specified, it will be
|
|
|
|
* called with the hash object and the key, and should return the
|
|
|
|
* default value. It is the block's responsibility to store the value
|
|
|
|
* in the hash if required.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = Hash.new("Go Fish")
|
|
|
|
* h["a"] = 100
|
|
|
|
* h["b"] = 200
|
|
|
|
* h["a"] #=> 100
|
|
|
|
* h["c"] #=> "Go Fish"
|
|
|
|
* # The following alters the single default object
|
|
|
|
* h["c"].upcase! #=> "GO FISH"
|
|
|
|
* h["d"] #=> "GO FISH"
|
|
|
|
* h.keys #=> ["a", "b"]
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* # While this creates a new default object each time
|
|
|
|
* h = Hash.new { |hash, key| hash[key] = "Go Fish: #{key}" }
|
|
|
|
* h["c"] #=> "Go Fish: c"
|
|
|
|
* h["c"].upcase! #=> "GO FISH: C"
|
|
|
|
* h["d"] #=> "Go Fish: d"
|
|
|
|
* h.keys #=> ["c", "d"]
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
2000-02-29 11:05:32 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_initialize(int argc, VALUE *argv, VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2000-02-29 11:05:32 +03:00
|
|
|
VALUE ifnone;
|
|
|
|
|
|
|
|
rb_hash_modify(hash);
|
2001-12-10 10:18:16 +03:00
|
|
|
if (rb_block_given_p()) {
|
2012-03-15 01:10:34 +04:00
|
|
|
rb_check_arity(argc, 0, 0);
|
2009-10-26 13:30:15 +03:00
|
|
|
ifnone = rb_block_proc();
|
2016-03-09 10:17:03 +03:00
|
|
|
SET_PROC_DEFAULT(hash, ifnone);
|
2001-12-10 10:18:16 +03:00
|
|
|
}
|
|
|
|
else {
|
2014-07-02 12:25:21 +04:00
|
|
|
rb_check_arity(argc, 0, 1);
|
|
|
|
ifnone = argc == 0 ? Qnil : argv[0];
|
2013-05-26 16:37:11 +04:00
|
|
|
RHASH_SET_IFNONE(hash, ifnone);
|
2001-12-10 10:18:16 +03:00
|
|
|
}
|
2000-02-29 11:05:32 +03:00
|
|
|
|
|
|
|
return hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* Hash[ key, value, ... ] -> new_hash
|
|
|
|
* Hash[ [ [key, value], ... ] ] -> new_hash
|
|
|
|
* Hash[ object ] -> new_hash
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2013-05-13 05:31:27 +04:00
|
|
|
* Creates a new hash populated with the given objects.
|
|
|
|
*
|
|
|
|
* Similar to the literal <code>{ _key_ => _value_, ... }</code>. In the first
|
|
|
|
* form, keys and values occur in pairs, so there must be an even number of
|
|
|
|
* arguments.
|
|
|
|
*
|
|
|
|
* The second and third form take a single argument which is either an array
|
|
|
|
* of key-value pairs or an object convertible to a hash.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2009-07-22 11:46:37 +04:00
|
|
|
* Hash["a", 100, "b", 200] #=> {"a"=>100, "b"=>200}
|
|
|
|
* Hash[ [ ["a", 100], ["b", 200] ] ] #=> {"a"=>100, "b"=>200}
|
|
|
|
* Hash["a" => 100, "b" => 200] #=> {"a"=>100, "b"=>200}
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_s_create(int argc, VALUE *argv, VALUE klass)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2017-04-24 04:40:51 +03:00
|
|
|
VALUE hash, tmp;
|
|
|
|
|
|
|
|
if (argc == 1) {
|
2018-10-31 05:06:33 +03:00
|
|
|
tmp = rb_hash_s_try_convert(Qnil, argv[0]);
|
2017-04-24 04:40:51 +03:00
|
|
|
if (!NIL_P(tmp)) {
|
|
|
|
hash = hash_alloc(klass);
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_P(tmp)) {
|
|
|
|
ar_copy(hash, tmp);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
else {
|
2018-10-31 01:12:12 +03:00
|
|
|
RHASH_ST_TABLE_SET(hash, st_copy(RHASH_ST_TABLE(tmp)));
|
|
|
|
}
|
2017-04-24 04:40:51 +03:00
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
|
|
|
tmp = rb_check_array_type(argv[0]);
|
|
|
|
if (!NIL_P(tmp)) {
|
|
|
|
long i;
|
|
|
|
|
|
|
|
hash = hash_alloc(klass);
|
|
|
|
for (i = 0; i < RARRAY_LEN(tmp); ++i) {
|
|
|
|
VALUE e = RARRAY_AREF(tmp, i);
|
|
|
|
VALUE v = rb_check_array_type(e);
|
|
|
|
VALUE key, val = Qnil;
|
|
|
|
|
|
|
|
if (NIL_P(v)) {
|
|
|
|
rb_raise(rb_eArgError, "wrong element type %s at %ld (expected array)",
|
|
|
|
rb_builtin_class_name(e), i);
|
|
|
|
}
|
|
|
|
switch (RARRAY_LEN(v)) {
|
|
|
|
default:
|
|
|
|
rb_raise(rb_eArgError, "invalid number of elements (%ld for 1..2)",
|
|
|
|
RARRAY_LEN(v));
|
|
|
|
case 2:
|
|
|
|
val = RARRAY_AREF(v, 1);
|
|
|
|
case 1:
|
|
|
|
key = RARRAY_AREF(v, 0);
|
|
|
|
rb_hash_aset(hash, key, val);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return hash;
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2017-04-24 04:40:51 +03:00
|
|
|
if (argc % 2 != 0) {
|
|
|
|
rb_raise(rb_eArgError, "odd number of arguments for Hash");
|
|
|
|
}
|
|
|
|
|
|
|
|
hash = hash_alloc(klass);
|
2017-04-27 07:21:04 +03:00
|
|
|
rb_hash_bulk_insert(argc, argv, hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
hash_verify(hash);
|
2017-04-24 04:40:51 +03:00
|
|
|
return hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2017-10-26 10:23:23 +03:00
|
|
|
VALUE
|
|
|
|
rb_to_hash_type(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2017-05-31 15:30:57 +03:00
|
|
|
return rb_convert_type_with_id(hash, T_HASH, "Hash", idTo_hash);
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
2017-10-26 10:23:23 +03:00
|
|
|
#define to_hash rb_to_hash_type
|
1998-01-16 15:19:22 +03:00
|
|
|
|
2010-08-03 16:01:13 +04:00
|
|
|
VALUE
|
|
|
|
rb_check_hash_type(VALUE hash)
|
|
|
|
{
|
2017-05-31 15:30:57 +03:00
|
|
|
return rb_check_convert_type_with_id(hash, T_HASH, "Hash", idTo_hash);
|
2010-08-03 16:01:13 +04:00
|
|
|
}
|
|
|
|
|
2007-08-24 21:47:09 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Hash.try_convert(obj) -> hash or nil
|
|
|
|
*
|
|
|
|
* Try to convert <i>obj</i> into a hash, using to_hash method.
|
|
|
|
* Returns converted hash or nil if <i>obj</i> cannot be converted
|
|
|
|
* for any reason.
|
|
|
|
*
|
|
|
|
* Hash.try_convert({1=>2}) # => {1=>2}
|
|
|
|
* Hash.try_convert("1=>2") # => nil
|
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
rb_hash_s_try_convert(VALUE dummy, VALUE hash)
|
|
|
|
{
|
2010-08-03 16:01:13 +04:00
|
|
|
return rb_check_hash_type(hash);
|
2007-08-24 21:47:09 +04:00
|
|
|
}
|
|
|
|
|
2013-12-01 09:28:54 +04:00
|
|
|
struct rehash_arg {
|
|
|
|
VALUE hash;
|
|
|
|
st_table *tbl;
|
|
|
|
};
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
2009-05-09 07:19:52 +04:00
|
|
|
rb_hash_rehash_i(VALUE key, VALUE value, VALUE arg)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_P(arg)) {
|
|
|
|
ar_insert(arg, (st_data_t)key, (st_data_t)value);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
else {
|
2018-10-31 01:12:12 +03:00
|
|
|
st_insert(RHASH_ST_TABLE(arg), (st_data_t)key, (st_data_t)value);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.rehash -> hsh
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Rebuilds the hash based on the current hash values for each key. If
|
|
|
|
* values of key objects have changed since they were inserted, this
|
2019-03-22 14:04:59 +03:00
|
|
|
* method will reindex <i>hsh</i>. If Hash#rehash is
|
2015-11-04 09:39:37 +03:00
|
|
|
* called while an iterator is traversing the hash, a
|
2019-03-22 14:04:59 +03:00
|
|
|
* RuntimeError will be raised in the iterator.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* a = [ "a", "b" ]
|
|
|
|
* c = [ "c", "d" ]
|
|
|
|
* h = { a => 100, c => 300 }
|
|
|
|
* h[a] #=> 100
|
|
|
|
* a[0] = "z"
|
|
|
|
* h[a] #=> nil
|
|
|
|
* h.rehash #=> {["z", "b"]=>100, ["c", "d"]=>300}
|
|
|
|
* h[a] #=> 100
|
|
|
|
*/
|
|
|
|
|
2015-12-11 05:38:20 +03:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_rehash(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2013-12-02 16:59:31 +04:00
|
|
|
VALUE tmp;
|
|
|
|
st_table *tbl;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2012-04-12 10:10:31 +04:00
|
|
|
if (RHASH_ITER_LEV(hash) > 0) {
|
2004-09-22 08:48:52 +04:00
|
|
|
rb_raise(rb_eRuntimeError, "rehash during iteration");
|
|
|
|
}
|
2007-08-30 03:12:21 +04:00
|
|
|
rb_hash_modify_check(hash);
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_P(hash)) {
|
2018-10-31 01:12:12 +03:00
|
|
|
tmp = hash_alloc(0);
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_alloc_table(tmp);
|
2018-10-31 01:12:12 +03:00
|
|
|
rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tmp);
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_free_and_clear_table(hash);
|
|
|
|
ar_copy(hash, tmp);
|
|
|
|
ar_free_and_clear_table(tmp);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
2018-12-14 04:10:15 +03:00
|
|
|
else if (RHASH_ST_TABLE_P(hash)) {
|
2018-10-31 01:12:12 +03:00
|
|
|
st_table *old_tab = RHASH_ST_TABLE(hash);
|
|
|
|
tmp = hash_alloc(0);
|
|
|
|
tbl = st_init_table_with_size(old_tab->type, old_tab->num_entries);
|
2018-10-31 01:11:51 +03:00
|
|
|
RHASH_ST_TABLE_SET(tmp, tbl);
|
2018-10-31 01:12:12 +03:00
|
|
|
rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tmp);
|
|
|
|
st_free_table(old_tab);
|
|
|
|
RHASH_ST_TABLE_SET(hash, tbl);
|
2018-12-14 04:10:15 +03:00
|
|
|
RHASH_ST_CLEAR(tmp);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
hash_verify(hash);
|
1999-01-20 07:59:39 +03:00
|
|
|
return hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2015-11-11 12:30:31 +03:00
|
|
|
VALUE
|
|
|
|
rb_hash_default_value(VALUE hash, VALUE key)
|
2012-03-31 09:23:01 +04:00
|
|
|
{
|
|
|
|
if (rb_method_basic_definition_p(CLASS_OF(hash), id_default)) {
|
|
|
|
VALUE ifnone = RHASH_IFNONE(hash);
|
2019-07-31 04:22:47 +03:00
|
|
|
if (!FL_TEST(hash, RHASH_PROC_DEFAULT)) return ifnone;
|
2012-03-31 09:23:01 +04:00
|
|
|
if (key == Qundef) return Qnil;
|
|
|
|
return rb_funcall(ifnone, id_yield, 2, hash, key);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return rb_funcall(hash, id_default, 1, key);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-05 02:48:33 +03:00
|
|
|
static inline int
|
|
|
|
hash_stlike_lookup(VALUE hash, st_data_t key, st_data_t *pval)
|
|
|
|
{
|
|
|
|
hash_verify(hash);
|
|
|
|
|
|
|
|
if (RHASH_AR_TABLE_P(hash)) {
|
|
|
|
return ar_lookup(hash, key, pval);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return st_lookup(RHASH_ST_TABLE(hash), key, pval);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
MJIT_FUNC_EXPORTED int
|
|
|
|
rb_hash_stlike_lookup(VALUE hash, st_data_t key, st_data_t *pval)
|
|
|
|
{
|
|
|
|
return hash_stlike_lookup(hash, key, pval);
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* hsh[key] -> value
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Element Reference---Retrieves the <i>value</i> object corresponding
|
2009-09-24 22:36:52 +04:00
|
|
|
* to the <i>key</i> object. If not found, returns the default value (see
|
2019-03-22 14:04:59 +03:00
|
|
|
* Hash::new for details).
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h["a"] #=> 100
|
|
|
|
* h["c"] #=> nil
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_aref(VALUE hash, VALUE key)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
* compile.c (iseq_build_body), error.c (set_syserr, get_syserr),
(syserr_initialize), gc.c (define_final, rb_gc_copy_finalizer),
(run_final), hash.c (rb_hash_aref, rb_hash_lookup2),
(rb_hash_fetch_m, rb_hash_clear, rb_hash_aset, eql_i),
iseq.c (iseq_load, iseq_data_to_ary), marshal.c (r_symlink),
thread.c (rb_thread_local_aref),
variable.c (generic_ivar_remove, ivar_get, rb_const_get_0),
(rb_cvar_get), vm.c (rb_vm_check_redefinition_opt_method),
vm_insnhelper.c (vm_get_ev_const), vm_method.c (remove_method),
ext/iconv/iconv.c (map_charset): use st_data_t.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-10-12 18:47:23 +04:00
|
|
|
st_data_t val;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2019-01-05 02:48:33 +03:00
|
|
|
if (hash_stlike_lookup(hash, key, &val)) {
|
2018-10-31 01:12:12 +03:00
|
|
|
return (VALUE)val;
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
else {
|
2019-01-05 02:48:33 +03:00
|
|
|
return rb_hash_default_value(hash, key);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-07-10 14:39:39 +04:00
|
|
|
VALUE
|
2008-12-19 11:22:45 +03:00
|
|
|
rb_hash_lookup2(VALUE hash, VALUE key, VALUE def)
|
2007-07-10 14:39:39 +04:00
|
|
|
{
|
* compile.c (iseq_build_body), error.c (set_syserr, get_syserr),
(syserr_initialize), gc.c (define_final, rb_gc_copy_finalizer),
(run_final), hash.c (rb_hash_aref, rb_hash_lookup2),
(rb_hash_fetch_m, rb_hash_clear, rb_hash_aset, eql_i),
iseq.c (iseq_load, iseq_data_to_ary), marshal.c (r_symlink),
thread.c (rb_thread_local_aref),
variable.c (generic_ivar_remove, ivar_get, rb_const_get_0),
(rb_cvar_get), vm.c (rb_vm_check_redefinition_opt_method),
vm_insnhelper.c (vm_get_ev_const), vm_method.c (remove_method),
ext/iconv/iconv.c (map_charset): use st_data_t.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-10-12 18:47:23 +04:00
|
|
|
st_data_t val;
|
2007-07-10 14:39:39 +04:00
|
|
|
|
2019-01-17 19:53:10 +03:00
|
|
|
if (hash_stlike_lookup(hash, key, &val)) {
|
2018-10-31 01:11:51 +03:00
|
|
|
return (VALUE)val;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return def; /* without Hash#default */
|
2007-07-10 14:39:39 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-12-19 11:22:45 +03:00
|
|
|
VALUE
|
|
|
|
rb_hash_lookup(VALUE hash, VALUE key)
|
|
|
|
{
|
|
|
|
return rb_hash_lookup2(hash, key, Qnil);
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* hsh.fetch(key [, default] ) -> obj
|
|
|
|
* hsh.fetch(key) {| key | block } -> obj
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Returns a value from the hash for the given key. If the key can't be
|
|
|
|
* found, there are several options: With no other arguments, it will
|
2019-03-22 14:04:59 +03:00
|
|
|
* raise a KeyError exception; if <i>default</i> is given,
|
2017-01-22 06:06:17 +03:00
|
|
|
* then that will be returned; if the optional code block is specified,
|
|
|
|
* then that will be run and its result returned.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.fetch("a") #=> 100
|
|
|
|
* h.fetch("z", "go fish") #=> "go fish"
|
|
|
|
* h.fetch("z") { |el| "go fish, #{el}"} #=> "go fish, z"
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* The following example shows that an exception is raised if the key
|
|
|
|
* is not found and a default value is not supplied.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.fetch("z")
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* <em>produces:</em>
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2004-09-22 08:48:52 +04:00
|
|
|
* prog.rb:2:in `fetch': key not found (KeyError)
|
2003-12-23 19:21:17 +03:00
|
|
|
* from prog.rb:2
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2008-09-30 12:01:11 +04:00
|
|
|
rb_hash_fetch_m(int argc, VALUE *argv, VALUE hash)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2014-07-02 12:25:21 +04:00
|
|
|
VALUE key;
|
* compile.c (iseq_build_body), error.c (set_syserr, get_syserr),
(syserr_initialize), gc.c (define_final, rb_gc_copy_finalizer),
(run_final), hash.c (rb_hash_aref, rb_hash_lookup2),
(rb_hash_fetch_m, rb_hash_clear, rb_hash_aset, eql_i),
iseq.c (iseq_load, iseq_data_to_ary), marshal.c (r_symlink),
thread.c (rb_thread_local_aref),
variable.c (generic_ivar_remove, ivar_get, rb_const_get_0),
(rb_cvar_get), vm.c (rb_vm_check_redefinition_opt_method),
vm_insnhelper.c (vm_get_ev_const), vm_method.c (remove_method),
ext/iconv/iconv.c (map_charset): use st_data_t.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-10-12 18:47:23 +04:00
|
|
|
st_data_t val;
|
2003-11-06 10:22:39 +03:00
|
|
|
long block_given;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2014-07-02 12:25:21 +04:00
|
|
|
rb_check_arity(argc, 1, 2);
|
|
|
|
key = argv[0];
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2003-11-06 10:22:39 +03:00
|
|
|
block_given = rb_block_given_p();
|
|
|
|
if (block_given && argc == 2) {
|
|
|
|
rb_warn("block supersedes default value argument");
|
|
|
|
}
|
2019-01-05 02:48:33 +03:00
|
|
|
|
|
|
|
if (hash_stlike_lookup(hash, key, &val)) {
|
2018-10-31 01:12:12 +03:00
|
|
|
return (VALUE)val;
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
2019-01-05 02:48:33 +03:00
|
|
|
else {
|
2019-01-05 03:31:54 +03:00
|
|
|
if (block_given) {
|
|
|
|
return rb_yield(key);
|
|
|
|
}
|
|
|
|
else if (argc == 1) {
|
2019-01-05 02:48:33 +03:00
|
|
|
VALUE desc = rb_protect(rb_inspect, key, 0);
|
|
|
|
if (NIL_P(desc)) {
|
|
|
|
desc = rb_any_to_s(key);
|
|
|
|
}
|
|
|
|
desc = rb_str_ellipsize(desc, 65);
|
|
|
|
rb_key_err_raise(rb_sprintf("key not found: %"PRIsVALUE, desc), hash, key);
|
|
|
|
}
|
2019-01-05 03:31:54 +03:00
|
|
|
else {
|
|
|
|
return argv[1];
|
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-09-30 12:01:11 +04:00
|
|
|
VALUE
|
|
|
|
rb_hash_fetch(VALUE hash, VALUE key)
|
|
|
|
{
|
|
|
|
return rb_hash_fetch_m(1, &key, hash);
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* hsh.default(key=nil) -> obj
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Returns the default value, the value that would be returned by
|
|
|
|
* <i>hsh</i>[<i>key</i>] if <i>key</i> did not exist in <i>hsh</i>.
|
2019-03-22 14:04:59 +03:00
|
|
|
* See also Hash::new and Hash#default=.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = Hash.new #=> {}
|
|
|
|
* h.default #=> nil
|
|
|
|
* h.default(2) #=> nil
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = Hash.new("cat") #=> {}
|
|
|
|
* h.default #=> "cat"
|
|
|
|
* h.default(2) #=> "cat"
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = Hash.new {|h,k| h[k] = k.to_i*10} #=> {}
|
2008-03-09 04:04:46 +03:00
|
|
|
* h.default #=> nil
|
2003-12-23 19:21:17 +03:00
|
|
|
* h.default(2) #=> 20
|
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_default(int argc, VALUE *argv, VALUE hash)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2015-11-08 11:32:51 +03:00
|
|
|
VALUE args[2], ifnone;
|
2001-12-10 10:18:16 +03:00
|
|
|
|
2014-07-02 12:25:21 +04:00
|
|
|
rb_check_arity(argc, 0, 1);
|
2009-11-08 12:13:17 +03:00
|
|
|
ifnone = RHASH_IFNONE(hash);
|
2019-01-17 19:53:10 +03:00
|
|
|
if (FL_TEST(hash, RHASH_PROC_DEFAULT)) {
|
2006-07-10 05:08:15 +04:00
|
|
|
if (argc == 0) return Qnil;
|
2015-11-08 11:32:51 +03:00
|
|
|
args[0] = hash;
|
|
|
|
args[1] = argv[0];
|
|
|
|
return rb_funcallv(ifnone, id_yield, 2, args);
|
2001-12-10 10:18:16 +03:00
|
|
|
}
|
2009-11-08 12:13:17 +03:00
|
|
|
return ifnone;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* hsh.default = obj -> obj
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Sets the default value, the value returned for a key that does not
|
2009-09-24 22:36:52 +04:00
|
|
|
* exist in the hash. It is not possible to set the default to a
|
2019-03-22 14:04:59 +03:00
|
|
|
* Proc that will be executed on each key lookup.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.default = "Go fish"
|
|
|
|
* h["a"] #=> 100
|
|
|
|
* h["z"] #=> "Go fish"
|
|
|
|
* # This doesn't do what you might hope...
|
|
|
|
* h.default = proc do |hash, key|
|
|
|
|
* hash[key] = key + key
|
|
|
|
* end
|
|
|
|
* h[2] #=> #<Proc:0x401b3948@-:6>
|
|
|
|
* h["cat"] #=> #<Proc:0x401b3948@-:6>
|
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_set_default(VALUE hash, VALUE ifnone)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2012-03-31 09:16:04 +04:00
|
|
|
rb_hash_modify_check(hash);
|
2016-03-09 10:17:03 +03:00
|
|
|
SET_DEFAULT(hash, ifnone);
|
2002-01-11 12:18:54 +03:00
|
|
|
return ifnone;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.default_proc -> anObject
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2019-03-22 14:04:59 +03:00
|
|
|
* If Hash::new was invoked with a block, return that
|
2003-12-23 19:21:17 +03:00
|
|
|
* block, otherwise return <code>nil</code>.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = Hash.new {|h,k| h[k] = k*k } #=> {}
|
|
|
|
* p = h.default_proc #=> #<Proc:0x401b3d08@-:1>
|
|
|
|
* a = [] #=> []
|
|
|
|
* p.call(a, 2)
|
|
|
|
* a #=> [nil, nil, 4]
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
2002-08-13 13:21:18 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_default_proc(VALUE hash)
|
2002-08-13 13:21:18 +04:00
|
|
|
{
|
2019-01-17 19:53:10 +03:00
|
|
|
if (FL_TEST(hash, RHASH_PROC_DEFAULT)) {
|
2009-11-08 12:13:17 +03:00
|
|
|
return RHASH_IFNONE(hash);
|
2002-08-13 13:21:18 +04:00
|
|
|
}
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2008-08-13 12:44:17 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2012-04-09 08:07:53 +04:00
|
|
|
* hsh.default_proc = proc_obj or nil
|
2008-08-13 12:44:17 +04:00
|
|
|
*
|
2012-04-09 08:07:53 +04:00
|
|
|
* Sets the default proc to be executed on each failed key lookup.
|
2008-08-13 12:44:17 +04:00
|
|
|
*
|
|
|
|
* h.default_proc = proc do |hash, key|
|
|
|
|
* hash[key] = key + key
|
|
|
|
* end
|
|
|
|
* h[2] #=> 4
|
|
|
|
* h["cat"] #=> "catcat"
|
|
|
|
*/
|
|
|
|
|
2014-11-14 10:29:33 +03:00
|
|
|
VALUE
|
2008-08-13 12:44:17 +04:00
|
|
|
rb_hash_set_default_proc(VALUE hash, VALUE proc)
|
|
|
|
{
|
|
|
|
VALUE b;
|
|
|
|
|
2012-03-31 09:16:04 +04:00
|
|
|
rb_hash_modify_check(hash);
|
2012-04-09 08:07:53 +04:00
|
|
|
if (NIL_P(proc)) {
|
2016-03-09 10:17:03 +03:00
|
|
|
SET_DEFAULT(hash, proc);
|
2012-04-09 08:07:53 +04:00
|
|
|
return proc;
|
|
|
|
}
|
2017-05-31 15:30:57 +03:00
|
|
|
b = rb_check_convert_type_with_id(proc, T_DATA, "Proc", idTo_proc);
|
2008-08-13 12:44:17 +04:00
|
|
|
if (NIL_P(b) || !rb_obj_is_proc(b)) {
|
|
|
|
rb_raise(rb_eTypeError,
|
|
|
|
"wrong default_proc type %s (expected Proc)",
|
|
|
|
rb_obj_classname(proc));
|
|
|
|
}
|
|
|
|
proc = b;
|
2016-03-09 10:17:03 +03:00
|
|
|
SET_PROC_DEFAULT(hash, proc);
|
2008-08-13 12:44:17 +04:00
|
|
|
return proc;
|
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
2009-05-09 07:19:52 +04:00
|
|
|
key_i(VALUE key, VALUE value, VALUE arg)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
2009-05-09 07:19:52 +04:00
|
|
|
VALUE *args = (VALUE *)arg;
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
if (rb_equal(value, args[0])) {
|
|
|
|
args[1] = key;
|
|
|
|
return ST_STOP;
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* hsh.key(value) -> key
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2011-06-01 02:35:59 +04:00
|
|
|
* Returns the key of an occurrence of a given value. If the value is
|
2011-05-23 03:37:03 +04:00
|
|
|
* not found, returns <code>nil</code>.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2011-05-23 03:37:03 +04:00
|
|
|
* h = { "a" => 100, "b" => 200, "c" => 300, "d" => 300 }
|
2005-04-02 08:23:56 +04:00
|
|
|
* h.key(200) #=> "b"
|
2011-05-23 03:37:03 +04:00
|
|
|
* h.key(300) #=> "c"
|
2005-04-02 08:23:56 +04:00
|
|
|
* h.key(999) #=> nil
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_key(VALUE hash, VALUE value)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
|
|
|
VALUE args[2];
|
|
|
|
|
|
|
|
args[0] = value;
|
2001-07-31 10:24:45 +04:00
|
|
|
args[1] = Qnil;
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2009-05-09 07:19:52 +04:00
|
|
|
rb_hash_foreach(hash, key_i, (VALUE)args);
|
1999-08-13 09:45:20 +04:00
|
|
|
|
|
|
|
return args[1];
|
|
|
|
}
|
|
|
|
|
2004-10-20 05:38:04 +04:00
|
|
|
/* :nodoc: */
|
2004-09-22 08:48:52 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_index(VALUE hash, VALUE value)
|
2004-09-22 08:48:52 +04:00
|
|
|
{
|
|
|
|
rb_warn("Hash#index is deprecated; use Hash#key");
|
|
|
|
return rb_hash_key(hash, value);
|
|
|
|
}
|
|
|
|
|
2018-10-31 01:11:51 +03:00
|
|
|
int
|
|
|
|
rb_hash_stlike_delete(VALUE hash, st_data_t *pkey, st_data_t *pval)
|
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_P(hash)) {
|
|
|
|
return ar_delete(hash, pkey, pval);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
return st_delete(RHASH_ST_TABLE(hash), pkey, pval);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-24 05:53:37 +03:00
|
|
|
/*
|
|
|
|
* delete a specified entry a given key.
|
|
|
|
* if there is the corresponding entry, return a value of the entry.
|
|
|
|
* if there is no corresponding entry, return Qundef.
|
|
|
|
*/
|
2014-10-23 16:42:57 +04:00
|
|
|
VALUE
|
2014-12-24 05:53:37 +03:00
|
|
|
rb_hash_delete_entry(VALUE hash, VALUE key)
|
2007-08-15 08:50:12 +04:00
|
|
|
{
|
|
|
|
st_data_t ktmp = (st_data_t)key, val;
|
|
|
|
|
2018-10-31 01:11:51 +03:00
|
|
|
if (rb_hash_stlike_delete(hash, &ktmp, &val)) {
|
|
|
|
return (VALUE)val;
|
2014-12-24 05:53:37 +03:00
|
|
|
}
|
|
|
|
else {
|
2018-10-31 01:11:51 +03:00
|
|
|
return Qundef;
|
2014-12-24 05:53:37 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* delete a specified entry by a given key.
|
|
|
|
* if there is the corresponding entry, return a value of the entry.
|
|
|
|
* if there is no corresponding entry, return Qnil.
|
|
|
|
*/
|
|
|
|
VALUE
|
|
|
|
rb_hash_delete(VALUE hash, VALUE key)
|
|
|
|
{
|
|
|
|
VALUE deleted_value = rb_hash_delete_entry(hash, key);
|
|
|
|
|
|
|
|
if (deleted_value != Qundef) { /* likely pass */
|
|
|
|
return deleted_value;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return Qnil;
|
|
|
|
}
|
2007-08-15 08:50:12 +04:00
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* hsh.delete(key) -> value
|
|
|
|
* hsh.delete(key) {| key | block } -> value
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2012-11-03 06:45:15 +04:00
|
|
|
* Deletes the key-value pair and returns the value from <i>hsh</i> whose
|
2015-03-05 11:00:14 +03:00
|
|
|
* key is equal to <i>key</i>. If the key is not found, it returns
|
|
|
|
* <em>nil</em>. If the optional code block is given and the
|
2003-12-23 19:21:17 +03:00
|
|
|
* key is not found, pass in the key and return the result of
|
|
|
|
* <i>block</i>.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.delete("a") #=> 100
|
|
|
|
* h.delete("z") #=> nil
|
|
|
|
* h.delete("z") { |el| "#{el} not found" } #=> "z not found"
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
2014-10-23 16:42:57 +04:00
|
|
|
static VALUE
|
|
|
|
rb_hash_delete_m(VALUE hash, VALUE key)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE val;
|
|
|
|
|
2012-03-31 09:16:04 +04:00
|
|
|
rb_hash_modify_check(hash);
|
2014-12-24 05:53:37 +03:00
|
|
|
val = rb_hash_delete_entry(hash, key);
|
|
|
|
|
|
|
|
if (val != Qundef) {
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (rb_block_given_p()) {
|
|
|
|
return rb_yield(key);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return Qnil;
|
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
struct shift_var {
|
|
|
|
VALUE key;
|
|
|
|
VALUE val;
|
|
|
|
};
|
|
|
|
|
2007-08-15 08:50:12 +04:00
|
|
|
static int
|
2009-05-09 07:19:52 +04:00
|
|
|
shift_i_safe(VALUE key, VALUE value, VALUE arg)
|
2007-08-15 08:50:12 +04:00
|
|
|
{
|
2009-05-09 07:19:52 +04:00
|
|
|
struct shift_var *var = (struct shift_var *)arg;
|
|
|
|
|
2007-08-15 08:50:12 +04:00
|
|
|
var->key = key;
|
|
|
|
var->val = value;
|
|
|
|
return ST_STOP;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.shift -> anArray or obj
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Removes a key-value pair from <i>hsh</i> and returns it as the
|
|
|
|
* two-item array <code>[</code> <i>key, value</i> <code>]</code>, or
|
|
|
|
* the hash's default value if the hash is empty.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { 1 => "a", 2 => "b", 3 => "c" }
|
|
|
|
* h.shift #=> [1, "a"]
|
|
|
|
* h #=> {2=>"b", 3=>"c"}
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_shift(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct shift_var var;
|
|
|
|
|
2012-03-31 09:16:04 +04:00
|
|
|
rb_hash_modify_check(hash);
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_P(hash)) {
|
2012-03-31 09:16:04 +04:00
|
|
|
var.key = Qundef;
|
2013-04-25 09:03:30 +04:00
|
|
|
if (RHASH_ITER_LEV(hash) == 0) {
|
2018-12-14 04:10:15 +03:00
|
|
|
if (ar_shift(hash, &var.key, &var.val)) {
|
2018-10-31 01:11:51 +03:00
|
|
|
return rb_assoc_new(var.key, var.val);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_hash_foreach(hash, shift_i_safe, (VALUE)&var);
|
2018-10-31 01:12:12 +03:00
|
|
|
if (var.key != Qundef) {
|
|
|
|
rb_hash_delete_entry(hash, var.key);
|
|
|
|
return rb_assoc_new(var.key, var.val);
|
|
|
|
}
|
|
|
|
}
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_ST_TABLE_P(hash)) {
|
2018-10-31 01:12:12 +03:00
|
|
|
var.key = Qundef;
|
|
|
|
if (RHASH_ITER_LEV(hash) == 0) {
|
|
|
|
if (st_shift(RHASH_ST_TABLE(hash), &var.key, &var.val)) {
|
|
|
|
return rb_assoc_new(var.key, var.val);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2013-04-25 09:03:30 +04:00
|
|
|
rb_hash_foreach(hash, shift_i_safe, (VALUE)&var);
|
|
|
|
if (var.key != Qundef) {
|
2014-12-24 05:53:37 +03:00
|
|
|
rb_hash_delete_entry(hash, var.key);
|
2013-04-25 09:03:30 +04:00
|
|
|
return rb_assoc_new(var.key, var.val);
|
2012-03-31 09:16:04 +04:00
|
|
|
}
|
2007-08-15 08:50:12 +04:00
|
|
|
}
|
2002-08-13 13:21:18 +04:00
|
|
|
}
|
2015-11-11 12:30:31 +03:00
|
|
|
return rb_hash_default_value(hash, Qnil);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
delete_if_i(VALUE key, VALUE value, VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2004-02-26 20:15:00 +03:00
|
|
|
if (RTEST(rb_yield_values(2, key, value))) {
|
2013-07-17 17:59:53 +04:00
|
|
|
return ST_DELETE;
|
2004-02-26 20:15:00 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2013-06-26 17:43:22 +04:00
|
|
|
static VALUE
|
|
|
|
hash_enum_size(VALUE hash, VALUE args, VALUE eobj)
|
|
|
|
{
|
|
|
|
return rb_hash_size(hash);
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.delete_if {| key, value | block } -> hsh
|
2010-05-13 09:49:55 +04:00
|
|
|
* hsh.delete_if -> an_enumerator
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Deletes every key-value pair from <i>hsh</i> for which <i>block</i>
|
|
|
|
* evaluates to <code>true</code>.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2010-05-13 09:49:55 +04:00
|
|
|
* If no block is given, an enumerator is returned instead.
|
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { "a" => 100, "b" => 200, "c" => 300 }
|
|
|
|
* h.delete_if {|key, value| key >= "b" } #=> {"a"=>100}
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
2000-07-04 11:04:42 +04:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_delete_if(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2013-06-26 17:43:22 +04:00
|
|
|
RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
|
2012-03-31 09:16:04 +04:00
|
|
|
rb_hash_modify_check(hash);
|
2018-12-14 05:27:23 +03:00
|
|
|
if (!RHASH_TABLE_EMPTY_P(hash)) {
|
2018-10-31 01:11:51 +03:00
|
|
|
rb_hash_foreach(hash, delete_if_i, hash);
|
|
|
|
}
|
2000-08-07 09:05:04 +04:00
|
|
|
return hash;
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.reject! {| key, value | block } -> hsh or nil
|
2010-05-13 09:49:55 +04:00
|
|
|
* hsh.reject! -> an_enumerator
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2019-03-22 14:04:59 +03:00
|
|
|
* Equivalent to Hash#delete_if, but returns
|
2003-12-23 19:21:17 +03:00
|
|
|
* <code>nil</code> if no changes were made.
|
|
|
|
*/
|
|
|
|
|
2000-08-07 09:05:04 +04:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_reject_bang(VALUE hash)
|
2000-08-07 09:05:04 +04:00
|
|
|
{
|
2009-05-09 07:19:52 +04:00
|
|
|
st_index_t n;
|
2008-04-14 12:31:38 +04:00
|
|
|
|
2013-06-26 17:43:22 +04:00
|
|
|
RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
|
2009-06-08 09:44:17 +04:00
|
|
|
rb_hash_modify(hash);
|
2013-07-12 06:35:16 +04:00
|
|
|
n = RHASH_SIZE(hash);
|
|
|
|
if (!n) return Qnil;
|
2009-06-08 09:44:17 +04:00
|
|
|
rb_hash_foreach(hash, delete_if_i, hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
if (n == RHASH_SIZE(hash)) return Qnil;
|
1999-01-20 07:59:39 +03:00
|
|
|
return hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2013-12-07 06:16:04 +04:00
|
|
|
static int
|
2013-12-11 11:01:29 +04:00
|
|
|
reject_i(VALUE key, VALUE value, VALUE result)
|
2013-12-07 06:16:04 +04:00
|
|
|
{
|
|
|
|
if (!RTEST(rb_yield_values(2, key, value))) {
|
2013-12-11 11:01:29 +04:00
|
|
|
rb_hash_aset(result, key, value);
|
2013-12-07 06:16:04 +04:00
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2013-12-11 11:01:29 +04:00
|
|
|
* hsh.reject {|key, value| block} -> a_hash
|
|
|
|
* hsh.reject -> an_enumerator
|
|
|
|
*
|
|
|
|
* Returns a new hash consisting of entries for which the block returns false.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2013-12-11 11:01:29 +04:00
|
|
|
* If no block is given, an enumerator is returned instead.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2013-12-11 11:01:29 +04:00
|
|
|
* h = { "a" => 100, "b" => 200, "c" => 300 }
|
|
|
|
* h.reject {|k,v| k < "b"} #=> {"b" => 200, "c" => 300}
|
|
|
|
* h.reject {|k,v| v > 100} #=> {"a" => 100}
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
2013-12-11 11:01:29 +04:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_reject(VALUE hash)
|
2000-02-08 11:54:01 +03:00
|
|
|
{
|
2013-12-11 11:01:29 +04:00
|
|
|
VALUE result;
|
2013-12-07 06:16:04 +04:00
|
|
|
|
|
|
|
RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
|
2013-12-17 15:01:37 +04:00
|
|
|
if (RTEST(ruby_verbose)) {
|
|
|
|
VALUE klass;
|
2013-12-23 10:53:17 +04:00
|
|
|
if (HAS_EXTRA_STATES(hash, klass)) {
|
|
|
|
rb_warn("extra states are no longer copied: %+"PRIsVALUE, hash);
|
2013-12-17 15:01:37 +04:00
|
|
|
}
|
2013-12-16 17:40:04 +04:00
|
|
|
}
|
2013-12-11 11:01:29 +04:00
|
|
|
result = rb_hash_new();
|
2013-12-07 06:16:04 +04:00
|
|
|
if (!RHASH_EMPTY_P(hash)) {
|
2013-12-11 11:01:29 +04:00
|
|
|
rb_hash_foreach(hash, reject_i, result);
|
2013-12-07 06:16:04 +04:00
|
|
|
}
|
2013-12-11 11:01:29 +04:00
|
|
|
return result;
|
2000-02-08 11:54:01 +03:00
|
|
|
}
|
|
|
|
|
2017-10-21 09:08:33 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2017-10-22 10:01:57 +03:00
|
|
|
* hsh.slice(*keys) -> a_hash
|
2017-10-21 09:08:33 +03:00
|
|
|
*
|
2017-11-07 23:17:04 +03:00
|
|
|
* Returns a hash containing only the given keys and their values.
|
2017-10-21 09:08:33 +03:00
|
|
|
*
|
2017-11-07 23:17:04 +03:00
|
|
|
* h = { a: 100, b: 200, c: 300 }
|
|
|
|
* h.slice(:a) #=> {:a=>100}
|
|
|
|
* h.slice(:b, :c, :d) #=> {:b=>200, :c=>300}
|
2017-10-21 09:08:33 +03:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_hash_slice(int argc, VALUE *argv, VALUE hash)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
VALUE key, value, result;
|
|
|
|
|
|
|
|
if (argc == 0 || RHASH_EMPTY_P(hash)) {
|
|
|
|
return rb_hash_new();
|
|
|
|
}
|
|
|
|
result = rb_hash_new_with_size(argc);
|
|
|
|
|
|
|
|
for (i = 0; i < argc; i++) {
|
|
|
|
key = argv[i];
|
|
|
|
value = rb_hash_lookup2(hash, key, Qundef);
|
|
|
|
if (value != Qundef)
|
|
|
|
rb_hash_aset(result, key, value);
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* hsh.values_at(key, ...) -> array
|
2003-12-23 19:21:17 +03:00
|
|
|
*
|
|
|
|
* Return an array containing the values associated with the given keys.
|
2019-03-22 14:04:59 +03:00
|
|
|
* Also see Hash.select.
|
2003-12-23 19:21:17 +03:00
|
|
|
*
|
|
|
|
* h = { "cat" => "feline", "dog" => "canine", "cow" => "bovine" }
|
|
|
|
* h.values_at("cow", "cat") #=> ["bovine", "feline"]
|
2008-03-09 04:04:46 +03:00
|
|
|
*/
|
2003-12-23 19:21:17 +03:00
|
|
|
|
2001-12-11 06:48:08 +03:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_values_at(int argc, VALUE *argv, VALUE hash)
|
2001-12-11 06:48:08 +03:00
|
|
|
{
|
2004-06-11 17:33:47 +04:00
|
|
|
VALUE result = rb_ary_new2(argc);
|
2001-12-11 06:48:08 +03:00
|
|
|
long i;
|
|
|
|
|
2003-05-04 20:03:24 +04:00
|
|
|
for (i=0; i<argc; i++) {
|
|
|
|
rb_ary_push(result, rb_hash_aref(hash, argv[i]));
|
2001-12-11 06:48:08 +03:00
|
|
|
}
|
2003-05-04 20:03:24 +04:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2015-06-12 11:34:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.fetch_values(key, ...) -> array
|
|
|
|
* hsh.fetch_values(key, ...) { |key| block } -> array
|
|
|
|
*
|
|
|
|
* Returns an array containing the values associated with the given keys
|
2019-03-22 14:04:59 +03:00
|
|
|
* but also raises KeyError when one of keys can't be found.
|
|
|
|
* Also see Hash#values_at and Hash#fetch.
|
2015-06-12 11:34:17 +03:00
|
|
|
*
|
|
|
|
* h = { "cat" => "feline", "dog" => "canine", "cow" => "bovine" }
|
|
|
|
*
|
|
|
|
* h.fetch_values("cow", "cat") #=> ["bovine", "feline"]
|
|
|
|
* h.fetch_values("cow", "bird") # raises KeyError
|
|
|
|
* h.fetch_values("cow", "bird") { |k| k.upcase } #=> ["bovine", "BIRD"]
|
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_hash_fetch_values(int argc, VALUE *argv, VALUE hash)
|
|
|
|
{
|
|
|
|
VALUE result = rb_ary_new2(argc);
|
|
|
|
long i;
|
|
|
|
|
|
|
|
for (i=0; i<argc; i++) {
|
|
|
|
rb_ary_push(result, rb_hash_fetch(hash, argv[i]));
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2007-06-21 18:50:14 +04:00
|
|
|
static int
|
|
|
|
select_i(VALUE key, VALUE value, VALUE result)
|
|
|
|
{
|
2013-12-11 11:01:29 +04:00
|
|
|
if (RTEST(rb_yield_values(2, key, value))) {
|
2007-06-21 18:50:14 +04:00
|
|
|
rb_hash_aset(result, key, value);
|
2013-12-11 11:01:29 +04:00
|
|
|
}
|
2007-06-21 18:50:14 +04:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* hsh.select {|key, value| block} -> a_hash
|
|
|
|
* hsh.select -> an_enumerator
|
2018-11-04 14:43:09 +03:00
|
|
|
* hsh.filter {|key, value| block} -> a_hash
|
|
|
|
* hsh.filter -> an_enumerator
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2009-09-24 22:36:52 +04:00
|
|
|
* Returns a new hash consisting of entries for which the block returns true.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2010-05-13 09:49:55 +04:00
|
|
|
* If no block is given, an enumerator is returned instead.
|
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { "a" => 100, "b" => 200, "c" => 300 }
|
2007-06-21 18:50:14 +04:00
|
|
|
* h.select {|k,v| k > "a"} #=> {"b" => 200, "c" => 300}
|
|
|
|
* h.select {|k,v| v < 200} #=> {"a" => 100}
|
2018-11-04 14:43:09 +03:00
|
|
|
*
|
|
|
|
* Hash#filter is an alias for Hash#select.
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
2003-05-04 20:03:24 +04:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_select(VALUE hash)
|
2003-05-04 20:03:24 +04:00
|
|
|
{
|
|
|
|
VALUE result;
|
|
|
|
|
2013-06-26 17:43:22 +04:00
|
|
|
RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
|
2007-06-21 18:50:14 +04:00
|
|
|
result = rb_hash_new();
|
2013-12-11 11:01:29 +04:00
|
|
|
if (!RHASH_EMPTY_P(hash)) {
|
|
|
|
rb_hash_foreach(hash, select_i, result);
|
|
|
|
}
|
2001-12-11 06:48:08 +03:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2010-03-03 12:44:44 +03:00
|
|
|
static int
|
|
|
|
keep_if_i(VALUE key, VALUE value, VALUE hash)
|
|
|
|
{
|
|
|
|
if (!RTEST(rb_yield_values(2, key, value))) {
|
|
|
|
return ST_DELETE;
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.select! {| key, value | block } -> hsh or nil
|
2010-05-13 09:49:55 +04:00
|
|
|
* hsh.select! -> an_enumerator
|
2018-11-04 14:43:09 +03:00
|
|
|
* hsh.filter! {| key, value | block } -> hsh or nil
|
|
|
|
* hsh.filter! -> an_enumerator
|
2010-03-03 12:44:44 +03:00
|
|
|
*
|
2018-11-04 14:41:52 +03:00
|
|
|
* Equivalent to Hash#keep_if, but returns
|
|
|
|
* +nil+ if no changes were made.
|
2018-11-04 14:43:09 +03:00
|
|
|
*
|
|
|
|
* Hash#filter! is an alias for Hash#select!.
|
2010-03-03 12:44:44 +03:00
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_hash_select_bang(VALUE hash)
|
|
|
|
{
|
|
|
|
st_index_t n;
|
|
|
|
|
2013-06-26 17:43:22 +04:00
|
|
|
RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
|
2012-03-31 09:16:04 +04:00
|
|
|
rb_hash_modify_check(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
n = RHASH_SIZE(hash);
|
|
|
|
if (!n) return Qnil;
|
2010-03-03 12:44:44 +03:00
|
|
|
rb_hash_foreach(hash, keep_if_i, hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
if (n == RHASH_SIZE(hash)) return Qnil;
|
2010-03-03 12:44:44 +03:00
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.keep_if {| key, value | block } -> hsh
|
2010-05-13 09:49:55 +04:00
|
|
|
* hsh.keep_if -> an_enumerator
|
2010-03-03 12:44:44 +03:00
|
|
|
*
|
|
|
|
* Deletes every key-value pair from <i>hsh</i> for which <i>block</i>
|
2018-11-04 14:41:52 +03:00
|
|
|
* evaluates to +false+.
|
2010-05-13 09:49:55 +04:00
|
|
|
*
|
|
|
|
* If no block is given, an enumerator is returned instead.
|
2010-03-03 12:44:44 +03:00
|
|
|
*
|
2018-11-04 14:41:52 +03:00
|
|
|
* See also Hash#select!.
|
2010-03-03 12:44:44 +03:00
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_hash_keep_if(VALUE hash)
|
|
|
|
{
|
2013-06-26 17:43:22 +04:00
|
|
|
RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
|
2012-03-31 09:16:04 +04:00
|
|
|
rb_hash_modify_check(hash);
|
2018-12-14 05:27:23 +03:00
|
|
|
if (!RHASH_TABLE_EMPTY_P(hash)) {
|
2018-10-31 01:11:51 +03:00
|
|
|
rb_hash_foreach(hash, keep_if_i, hash);
|
|
|
|
}
|
2010-03-03 12:44:44 +03:00
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
clear_i(VALUE key, VALUE value, VALUE dummy)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
return ST_DELETE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.clear -> hsh
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Removes all key-value pairs from <i>hsh</i>.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { "a" => 100, "b" => 200 } #=> {"a"=>100, "b"=>200}
|
|
|
|
* h.clear #=> {}
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
2012-11-05 19:27:01 +04:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_clear(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2007-08-30 03:12:21 +04:00
|
|
|
rb_hash_modify_check(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
if (RHASH_ITER_LEV(hash) > 0) {
|
|
|
|
rb_hash_foreach(hash, clear_i, 0);
|
|
|
|
}
|
2018-12-14 04:10:15 +03:00
|
|
|
else if (RHASH_AR_TABLE_P(hash)) {
|
|
|
|
ar_clear(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
st_clear(RHASH_ST_TABLE(hash));
|
2004-09-22 08:48:52 +04:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
return hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2012-04-13 10:26:53 +04:00
|
|
|
static int
|
2013-06-19 01:29:30 +04:00
|
|
|
hash_aset(st_data_t *key, st_data_t *val, struct update_arg *arg, int existing)
|
2012-04-13 10:26:53 +04:00
|
|
|
{
|
2013-05-29 05:38:52 +04:00
|
|
|
if (existing) {
|
2013-06-19 01:29:30 +04:00
|
|
|
arg->new_value = arg->arg;
|
|
|
|
arg->old_value = *val;
|
2013-05-29 05:38:52 +04:00
|
|
|
}
|
|
|
|
else {
|
2013-06-19 01:29:30 +04:00
|
|
|
arg->new_key = *key;
|
|
|
|
arg->new_value = arg->arg;
|
2013-05-29 05:38:52 +04:00
|
|
|
}
|
2013-06-19 01:29:30 +04:00
|
|
|
*val = arg->arg;
|
2012-04-13 10:26:53 +04:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2017-12-30 03:00:23 +03:00
|
|
|
VALUE
|
|
|
|
rb_hash_key_str(VALUE key)
|
|
|
|
{
|
2018-10-26 09:41:34 +03:00
|
|
|
if (!RB_FL_ANY_RAW(key, FL_TAINT|FL_EXIVAR) && RBASIC_CLASS(key) == rb_cString) {
|
|
|
|
return rb_fstring(key);
|
2018-10-26 08:32:47 +03:00
|
|
|
}
|
2017-12-30 03:00:23 +03:00
|
|
|
else {
|
|
|
|
return rb_str_new_frozen(key);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-04-13 10:26:53 +04:00
|
|
|
static int
|
2013-06-19 01:29:30 +04:00
|
|
|
hash_aset_str(st_data_t *key, st_data_t *val, struct update_arg *arg, int existing)
|
* compile.c (iseq_build_body), error.c (set_syserr, get_syserr),
(syserr_initialize), gc.c (define_final, rb_gc_copy_finalizer),
(run_final), hash.c (rb_hash_aref, rb_hash_lookup2),
(rb_hash_fetch_m, rb_hash_clear, rb_hash_aset, eql_i),
iseq.c (iseq_load, iseq_data_to_ary), marshal.c (r_symlink),
thread.c (rb_thread_local_aref),
variable.c (generic_ivar_remove, ivar_get, rb_const_get_0),
(rb_cvar_get), vm.c (rb_vm_check_redefinition_opt_method),
vm_insnhelper.c (vm_get_ev_const), vm_method.c (remove_method),
ext/iconv/iconv.c (map_charset): use st_data_t.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-10-12 18:47:23 +04:00
|
|
|
{
|
2017-07-10 02:04:43 +03:00
|
|
|
if (!existing && !RB_OBJ_FROZEN(*key)) {
|
2017-12-30 03:00:23 +03:00
|
|
|
*key = rb_hash_key_str(*key);
|
2013-05-29 05:38:52 +04:00
|
|
|
}
|
2013-06-19 01:29:30 +04:00
|
|
|
return hash_aset(key, val, arg, existing);
|
* compile.c (iseq_build_body), error.c (set_syserr, get_syserr),
(syserr_initialize), gc.c (define_final, rb_gc_copy_finalizer),
(run_final), hash.c (rb_hash_aref, rb_hash_lookup2),
(rb_hash_fetch_m, rb_hash_clear, rb_hash_aset, eql_i),
iseq.c (iseq_load, iseq_data_to_ary), marshal.c (r_symlink),
thread.c (rb_thread_local_aref),
variable.c (generic_ivar_remove, ivar_get, rb_const_get_0),
(rb_cvar_get), vm.c (rb_vm_check_redefinition_opt_method),
vm_insnhelper.c (vm_get_ev_const), vm_method.c (remove_method),
ext/iconv/iconv.c (map_charset): use st_data_t.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-10-12 18:47:23 +04:00
|
|
|
}
|
|
|
|
|
2015-12-15 17:20:27 +03:00
|
|
|
NOINSERT_UPDATE_CALLBACK(hash_aset)
|
|
|
|
NOINSERT_UPDATE_CALLBACK(hash_aset_str)
|
2012-04-13 10:26:53 +04:00
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* hsh[key] = value -> value
|
|
|
|
* hsh.store(key, value) -> value
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2013-08-14 21:34:40 +04:00
|
|
|
* == Element Assignment
|
|
|
|
*
|
|
|
|
* Associates the value given by +value+ with the key given by +key+.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h["a"] = 9
|
|
|
|
* h["c"] = 4
|
|
|
|
* h #=> {"a"=>9, "b"=>200, "c"=>4}
|
2014-09-13 17:19:27 +04:00
|
|
|
* h.store("d", 42) #=> 42
|
|
|
|
* h #=> {"a"=>9, "b"=>200, "c"=>4, "d"=>42}
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2013-08-14 21:34:40 +04:00
|
|
|
* +key+ should not have its value changed while it is in use as a key (an
|
|
|
|
* <tt>unfrozen String</tt> passed as a key will be duplicated and frozen).
|
|
|
|
*
|
|
|
|
* a = "a"
|
|
|
|
* b = "b".freeze
|
|
|
|
* h = { a => 100, b => 200 }
|
|
|
|
* h.key(100).equal? a #=> false
|
|
|
|
* h.key(200).equal? b #=> true
|
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_aset(VALUE hash, VALUE key, VALUE val)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2012-04-13 10:26:53 +04:00
|
|
|
int iter_lev = RHASH_ITER_LEV(hash);
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_hash_modify(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2018-12-14 05:27:23 +03:00
|
|
|
if (RHASH_TABLE_NULL_P(hash)) {
|
2012-04-13 15:30:39 +04:00
|
|
|
if (iter_lev > 0) no_new_key();
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_alloc_table(hash);
|
2012-04-13 10:26:53 +04:00
|
|
|
}
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
if (RHASH_TYPE(hash) == &identhash || rb_obj_class(key) != rb_cString) {
|
2012-04-13 10:26:53 +04:00
|
|
|
RHASH_UPDATE_ITER(hash, iter_lev, key, hash_aset, val);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
else {
|
2012-04-13 10:26:53 +04:00
|
|
|
RHASH_UPDATE_ITER(hash, iter_lev, key, hash_aset_str, val);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
replace_i(VALUE key, VALUE val, VALUE hash)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2012-03-31 08:20:45 +04:00
|
|
|
rb_hash_aset(hash, key, val);
|
2001-06-01 13:38:30 +04:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2013-06-02 07:12:04 +04:00
|
|
|
/* :nodoc: */
|
2012-10-17 01:33:59 +04:00
|
|
|
static VALUE
|
|
|
|
rb_hash_initialize_copy(VALUE hash, VALUE hash2)
|
|
|
|
{
|
2012-10-20 01:20:33 +04:00
|
|
|
rb_hash_modify_check(hash);
|
|
|
|
hash2 = to_hash(hash2);
|
|
|
|
|
2012-10-17 01:33:59 +04:00
|
|
|
Check_Type(hash2, T_HASH);
|
|
|
|
|
2014-02-21 15:42:03 +04:00
|
|
|
if (hash == hash2) return hash;
|
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_P(hash2)) {
|
|
|
|
if (RHASH_AR_TABLE_P(hash)) ar_free_and_clear_table(hash);
|
|
|
|
ar_copy(hash, hash2);
|
|
|
|
if (RHASH_AR_TABLE_SIZE(hash))
|
2013-07-29 11:51:23 +04:00
|
|
|
rb_hash_rehash(hash);
|
|
|
|
}
|
2018-12-14 04:10:15 +03:00
|
|
|
else if (RHASH_ST_TABLE_P(hash2)) {
|
|
|
|
if (RHASH_ST_TABLE_P(hash)) st_free_table(RHASH_ST_TABLE(hash));
|
2018-10-31 01:11:51 +03:00
|
|
|
RHASH_ST_TABLE_SET(hash, st_copy(RHASH_ST_TABLE(hash2)));
|
2018-10-31 01:12:12 +03:00
|
|
|
if (RHASH_ST_TABLE(hash)->num_entries)
|
|
|
|
rb_hash_rehash(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
2018-12-14 04:10:15 +03:00
|
|
|
else if (RHASH_AR_TABLE_P(hash)) {
|
|
|
|
ar_clear(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
2018-12-14 04:10:15 +03:00
|
|
|
else if (RHASH_ST_TABLE_P(hash)) {
|
2018-10-31 01:12:12 +03:00
|
|
|
st_clear(RHASH_ST_TABLE(hash));
|
2012-10-18 04:24:00 +04:00
|
|
|
}
|
|
|
|
|
2016-03-09 10:17:04 +03:00
|
|
|
COPY_DEFAULT(hash, hash2);
|
2012-10-17 01:33:59 +04:00
|
|
|
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.replace(other_hash) -> hsh
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Replaces the contents of <i>hsh</i> with the contents of
|
|
|
|
* <i>other_hash</i>.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.replace({ "c" => 300, "d" => 400 }) #=> {"c"=>300, "d"=>400}
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_replace(VALUE hash, VALUE hash2)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2010-02-10 10:31:06 +03:00
|
|
|
rb_hash_modify_check(hash);
|
2002-09-28 08:21:31 +04:00
|
|
|
if (hash == hash2) return hash;
|
2013-07-17 17:17:01 +04:00
|
|
|
hash2 = to_hash(hash2);
|
|
|
|
|
2016-03-09 10:17:04 +03:00
|
|
|
COPY_DEFAULT(hash, hash2);
|
2013-07-17 17:17:01 +04:00
|
|
|
|
2013-12-08 07:03:42 +04:00
|
|
|
rb_hash_clear(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_P(hash)) {
|
|
|
|
if (RHASH_AR_TABLE_P(hash2)) {
|
|
|
|
ar_copy(hash, hash2);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
goto st_to_st;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_P(hash2)) ar_force_convert_table(hash2, __FILE__, __LINE__);
|
2018-10-31 01:11:51 +03:00
|
|
|
st_to_st:
|
|
|
|
RHASH_TBL_RAW(hash)->type = RHASH_ST_TABLE(hash2)->type;
|
|
|
|
rb_hash_foreach(hash2, replace_i, hash);
|
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2016-09-08 07:57:49 +03:00
|
|
|
* hsh.length -> integer
|
|
|
|
* hsh.size -> integer
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Returns the number of key-value pairs in the hash.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { "d" => 100, "a" => 200, "v" => 300, "e" => 400 }
|
2018-07-27 20:28:41 +03:00
|
|
|
* h.size #=> 4
|
2003-12-23 19:21:17 +03:00
|
|
|
* h.delete("a") #=> 200
|
2018-07-27 20:28:41 +03:00
|
|
|
* h.size #=> 3
|
2018-10-12 22:56:53 +03:00
|
|
|
* h.length #=> 3
|
|
|
|
*
|
|
|
|
* Hash#length is an alias for Hash#size.
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
2014-06-23 11:26:03 +04:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_size(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2013-07-11 19:25:31 +04:00
|
|
|
return INT2FIX(RHASH_SIZE(hash));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2018-10-31 01:11:51 +03:00
|
|
|
size_t
|
|
|
|
rb_hash_size_num(VALUE hash)
|
|
|
|
{
|
|
|
|
return (long)RHASH_SIZE(hash);
|
|
|
|
}
|
2003-12-23 19:21:17 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* hsh.empty? -> true or false
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Returns <code>true</code> if <i>hsh</i> contains no key-value pairs.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* {}.empty? #=> true
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_empty_p(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2007-08-30 03:12:21 +04:00
|
|
|
return RHASH_EMPTY_P(hash) ? Qtrue : Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
2019-08-27 05:53:39 +03:00
|
|
|
each_value_i(VALUE key, VALUE value, VALUE _)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
rb_yield(value);
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.each_value {| value | block } -> hsh
|
2010-05-13 09:49:55 +04:00
|
|
|
* hsh.each_value -> an_enumerator
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Calls <i>block</i> once for each key in <i>hsh</i>, passing the
|
|
|
|
* value as a parameter.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2010-05-13 09:49:55 +04:00
|
|
|
* If no block is given, an enumerator is returned instead.
|
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.each_value {|value| puts value }
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* <em>produces:</em>
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* 100
|
|
|
|
* 200
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_each_value(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2013-06-26 17:43:22 +04:00
|
|
|
RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, each_value_i, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
return hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
2019-08-27 05:53:39 +03:00
|
|
|
each_key_i(VALUE key, VALUE value, VALUE _)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
rb_yield(key);
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.each_key {| key | block } -> hsh
|
2010-05-13 09:49:55 +04:00
|
|
|
* hsh.each_key -> an_enumerator
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Calls <i>block</i> once for each key in <i>hsh</i>, passing the key
|
|
|
|
* as a parameter.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2010-05-13 09:49:55 +04:00
|
|
|
* If no block is given, an enumerator is returned instead.
|
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.each_key {|key| puts key }
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* <em>produces:</em>
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* a
|
|
|
|
* b
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_each_key(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2013-06-26 17:43:22 +04:00
|
|
|
RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, each_key_i, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
return hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
2019-08-27 05:53:39 +03:00
|
|
|
each_pair_i(VALUE key, VALUE value, VALUE _)
|
2003-10-24 18:31:14 +04:00
|
|
|
{
|
2017-10-02 10:51:27 +03:00
|
|
|
rb_yield(rb_assoc_new(key, value));
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2019-08-27 05:53:39 +03:00
|
|
|
each_pair_i_fast(VALUE key, VALUE value, VALUE _)
|
2017-10-02 10:51:27 +03:00
|
|
|
{
|
|
|
|
VALUE argv[2];
|
|
|
|
argv[0] = key;
|
|
|
|
argv[1] = value;
|
|
|
|
rb_yield_values2(2, argv);
|
2013-07-15 08:38:50 +04:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-13 09:49:55 +04:00
|
|
|
* hsh.each {| key, value | block } -> hsh
|
2007-11-03 17:07:48 +03:00
|
|
|
* hsh.each_pair {| key, value | block } -> hsh
|
2010-05-13 09:49:55 +04:00
|
|
|
* hsh.each -> an_enumerator
|
|
|
|
* hsh.each_pair -> an_enumerator
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
* Calls <i>block</i> once for each key in <i>hsh</i>, passing the key-value
|
2007-11-03 17:07:48 +03:00
|
|
|
* pair as parameters.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2010-05-13 09:49:55 +04:00
|
|
|
* If no block is given, an enumerator is returned instead.
|
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.each {|key, value| puts "#{key} is #{value}" }
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* <em>produces:</em>
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* a is 100
|
|
|
|
* b is 200
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
2003-10-24 18:31:14 +04:00
|
|
|
static VALUE
|
2007-11-03 17:07:48 +03:00
|
|
|
rb_hash_each_pair(VALUE hash)
|
2003-10-24 18:31:14 +04:00
|
|
|
{
|
2013-06-26 17:43:22 +04:00
|
|
|
RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
|
2017-10-02 10:51:27 +03:00
|
|
|
if (rb_block_arity() > 1)
|
|
|
|
rb_hash_foreach(hash, each_pair_i_fast, 0);
|
|
|
|
else
|
|
|
|
rb_hash_foreach(hash, each_pair_i, 0);
|
2003-10-24 18:31:14 +04:00
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2017-07-14 09:44:00 +03:00
|
|
|
static int
|
|
|
|
transform_keys_i(VALUE key, VALUE value, VALUE result)
|
|
|
|
{
|
|
|
|
VALUE new_key = rb_yield(key);
|
|
|
|
rb_hash_aset(result, new_key, value);
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.transform_keys {|key| block } -> new_hash
|
|
|
|
* hsh.transform_keys -> an_enumerator
|
|
|
|
*
|
|
|
|
* Returns a new hash with the results of running the block once for
|
|
|
|
* every key.
|
|
|
|
* This method does not change the values.
|
|
|
|
*
|
|
|
|
* h = { a: 1, b: 2, c: 3 }
|
|
|
|
* h.transform_keys {|k| k.to_s } #=> { "a" => 1, "b" => 2, "c" => 3 }
|
|
|
|
* h.transform_keys(&:to_s) #=> { "a" => 1, "b" => 2, "c" => 3 }
|
|
|
|
* h.transform_keys.with_index {|k, i| "#{k}.#{i}" }
|
|
|
|
* #=> { "a.0" => 1, "b.1" => 2, "c.2" => 3 }
|
|
|
|
*
|
|
|
|
* If no block is given, an enumerator is returned instead.
|
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
rb_hash_transform_keys(VALUE hash)
|
|
|
|
{
|
|
|
|
VALUE result;
|
|
|
|
|
|
|
|
RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
|
|
|
|
result = rb_hash_new();
|
|
|
|
if (!RHASH_EMPTY_P(hash)) {
|
|
|
|
rb_hash_foreach(hash, transform_keys_i, result);
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2018-01-26 04:33:45 +03:00
|
|
|
static VALUE rb_hash_flatten(int argc, VALUE *argv, VALUE hash);
|
|
|
|
|
2017-07-14 09:44:00 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2017-07-14 12:41:05 +03:00
|
|
|
* hsh.transform_keys! {|key| block } -> hsh
|
|
|
|
* hsh.transform_keys! -> an_enumerator
|
2017-07-14 09:44:00 +03:00
|
|
|
*
|
|
|
|
* Invokes the given block once for each key in <i>hsh</i>, replacing it
|
|
|
|
* with the new key returned by the block, and then returns <i>hsh</i>.
|
|
|
|
* This method does not change the values.
|
|
|
|
*
|
|
|
|
* h = { a: 1, b: 2, c: 3 }
|
|
|
|
* h.transform_keys! {|k| k.to_s } #=> { "a" => 1, "b" => 2, "c" => 3 }
|
|
|
|
* h.transform_keys!(&:to_sym) #=> { a: 1, b: 2, c: 3 }
|
|
|
|
* h.transform_keys!.with_index {|k, i| "#{k}.#{i}" }
|
|
|
|
* #=> { "a.0" => 1, "b.1" => 2, "c.2" => 3 }
|
|
|
|
*
|
|
|
|
* If no block is given, an enumerator is returned instead.
|
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
rb_hash_transform_keys_bang(VALUE hash)
|
|
|
|
{
|
|
|
|
RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
|
|
|
|
rb_hash_modify_check(hash);
|
2018-12-14 05:27:23 +03:00
|
|
|
if (!RHASH_TABLE_EMPTY_P(hash)) {
|
2018-01-26 04:33:45 +03:00
|
|
|
long i;
|
|
|
|
VALUE pairs = rb_hash_flatten(0, NULL, hash);
|
|
|
|
rb_hash_clear(hash);
|
|
|
|
for (i = 0; i < RARRAY_LEN(pairs); i += 2) {
|
|
|
|
VALUE key = RARRAY_AREF(pairs, i), new_key = rb_yield(key),
|
|
|
|
val = RARRAY_AREF(pairs, i+1);
|
|
|
|
rb_hash_aset(hash, new_key, val);
|
|
|
|
}
|
2017-07-14 09:44:00 +03:00
|
|
|
}
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2016-08-09 11:54:15 +03:00
|
|
|
static int
|
2019-09-11 19:02:22 +03:00
|
|
|
transform_values_foreach_func(st_data_t key, st_data_t value, st_data_t argp, int error)
|
2016-08-09 11:54:15 +03:00
|
|
|
{
|
2019-09-11 19:02:22 +03:00
|
|
|
return ST_REPLACE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
transform_values_foreach_replace(st_data_t *key, st_data_t *value, st_data_t argp, int existing)
|
|
|
|
{
|
|
|
|
VALUE new_value = rb_yield((VALUE)*value);
|
|
|
|
*value = new_value;
|
2016-08-09 11:54:15 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2017-05-25 18:14:38 +03:00
|
|
|
* hsh.transform_values {|value| block } -> new_hash
|
2016-09-08 05:33:18 +03:00
|
|
|
* hsh.transform_values -> an_enumerator
|
2016-08-09 11:54:15 +03:00
|
|
|
*
|
2017-05-25 18:14:38 +03:00
|
|
|
* Returns a new hash with the results of running the block once for
|
|
|
|
* every value.
|
2016-08-09 11:54:15 +03:00
|
|
|
* This method does not change the keys.
|
|
|
|
*
|
|
|
|
* h = { a: 1, b: 2, c: 3 }
|
2016-09-08 05:33:18 +03:00
|
|
|
* h.transform_values {|v| v * v + 1 } #=> { a: 2, b: 5, c: 10 }
|
|
|
|
* h.transform_values(&:to_s) #=> { a: "1", b: "2", c: "3" }
|
|
|
|
* h.transform_values.with_index {|v, i| "#{v}.#{i}" }
|
|
|
|
* #=> { a: "1.0", b: "2.1", c: "3.2" }
|
2016-08-09 11:54:15 +03:00
|
|
|
*
|
|
|
|
* If no block is given, an enumerator is returned instead.
|
|
|
|
*/
|
|
|
|
static VALUE
|
2016-09-08 05:33:18 +03:00
|
|
|
rb_hash_transform_values(VALUE hash)
|
2016-08-09 11:54:15 +03:00
|
|
|
{
|
|
|
|
VALUE result;
|
|
|
|
|
|
|
|
RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
|
2019-09-11 19:02:22 +03:00
|
|
|
result = hash_dup(hash, rb_cHash, 0);
|
|
|
|
|
2016-08-09 11:54:15 +03:00
|
|
|
if (!RHASH_EMPTY_P(hash)) {
|
2019-09-11 19:02:22 +03:00
|
|
|
rb_hash_stlike_foreach_with_replace(result, transform_values_foreach_func, transform_values_foreach_replace, 0);
|
2016-08-09 11:54:15 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2016-09-08 05:33:18 +03:00
|
|
|
* hsh.transform_values! {|value| block } -> hsh
|
|
|
|
* hsh.transform_values! -> an_enumerator
|
2016-08-09 11:54:15 +03:00
|
|
|
*
|
2017-05-22 10:13:06 +03:00
|
|
|
* Invokes the given block once for each value in <i>hsh</i>, replacing it
|
|
|
|
* with the new value returned by the block, and then returns <i>hsh</i>.
|
2016-08-09 11:54:15 +03:00
|
|
|
* This method does not change the keys.
|
|
|
|
*
|
|
|
|
* h = { a: 1, b: 2, c: 3 }
|
2016-09-08 05:33:18 +03:00
|
|
|
* h.transform_values! {|v| v * v + 1 } #=> { a: 2, b: 5, c: 10 }
|
2017-05-22 10:13:06 +03:00
|
|
|
* h.transform_values!(&:to_s) #=> { a: "2", b: "5", c: "10" }
|
2016-09-08 05:33:18 +03:00
|
|
|
* h.transform_values!.with_index {|v, i| "#{v}.#{i}" }
|
2017-08-28 14:20:08 +03:00
|
|
|
* #=> { a: "2.0", b: "5.1", c: "10.2" }
|
2016-08-09 11:54:15 +03:00
|
|
|
*
|
|
|
|
* If no block is given, an enumerator is returned instead.
|
|
|
|
*/
|
|
|
|
static VALUE
|
2016-09-08 05:33:18 +03:00
|
|
|
rb_hash_transform_values_bang(VALUE hash)
|
2016-08-09 11:54:15 +03:00
|
|
|
{
|
|
|
|
RETURN_SIZED_ENUMERATOR(hash, 0, 0, hash_enum_size);
|
|
|
|
rb_hash_modify_check(hash);
|
2019-09-11 19:02:22 +03:00
|
|
|
|
|
|
|
if (!RHASH_TABLE_EMPTY_P(hash)) {
|
|
|
|
rb_hash_stlike_foreach_with_replace(hash, transform_values_foreach_func, transform_values_foreach_replace, 0);
|
|
|
|
}
|
|
|
|
|
2016-08-09 11:54:15 +03:00
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
to_a_i(VALUE key, VALUE value, VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_ary_push(ary, rb_assoc_new(key, value));
|
1998-01-16 15:13:05 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.to_a -> array
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Converts <i>hsh</i> to a nested array of <code>[</code> <i>key,
|
|
|
|
* value</i> <code>]</code> arrays.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { "c" => 300, "a" => 100, "d" => 400, "c" => 300 }
|
2008-03-09 04:04:46 +03:00
|
|
|
* h.to_a #=> [["c", 300], ["a", 100], ["d", 400]]
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_to_a(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE ary;
|
|
|
|
|
2013-12-01 09:39:38 +04:00
|
|
|
ary = rb_ary_new_capa(RHASH_SIZE(hash));
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, to_a_i, ary);
|
* object.c (rb_obj_untrusted): new method Object#untrusted?.
(rb_obj_untrust): new method Object#untrust.
(rb_obj_trust): new method Object#trust.
* array.c, debug.c, time.c, include/ruby/ruby.h, re.c, variable.c,
string.c, io.c, dir.c, vm_method.c, struct.c, class.c, hash.c,
ruby.c, marshal.c: fixes for Object#untrusted?.
* test/ruby/test_module.rb, test/ruby/test_array.rb,
test/ruby/test_object.rb, test/ruby/test_string.rb,
test/ruby/test_marshal.rb, test/ruby/test_hash.rb: added tests for
Object#untrusted?.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-08-13 11:25:05 +04:00
|
|
|
OBJ_INFECT(ary, hash);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
2009-05-29 12:08:25 +04:00
|
|
|
inspect_i(VALUE key, VALUE value, VALUE str)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2009-05-29 12:08:25 +04:00
|
|
|
VALUE str2;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2011-02-15 10:08:20 +03:00
|
|
|
str2 = rb_inspect(key);
|
2006-08-31 14:47:44 +04:00
|
|
|
if (RSTRING_LEN(str) > 1) {
|
2012-04-13 12:39:13 +04:00
|
|
|
rb_str_buf_cat_ascii(str, ", ");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2011-02-15 10:08:20 +03:00
|
|
|
else {
|
|
|
|
rb_enc_copy(str, str2);
|
|
|
|
}
|
2001-05-30 13:12:34 +04:00
|
|
|
rb_str_buf_append(str, str2);
|
2000-02-23 08:23:12 +03:00
|
|
|
OBJ_INFECT(str, str2);
|
2012-04-13 12:39:13 +04:00
|
|
|
rb_str_buf_cat_ascii(str, "=>");
|
2009-05-29 12:08:25 +04:00
|
|
|
str2 = rb_inspect(value);
|
2001-05-30 13:12:34 +04:00
|
|
|
rb_str_buf_append(str, str2);
|
2000-02-23 08:23:12 +03:00
|
|
|
OBJ_INFECT(str, str2);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2009-05-29 12:08:25 +04:00
|
|
|
inspect_hash(VALUE hash, VALUE dummy, int recur)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2009-05-29 12:08:25 +04:00
|
|
|
VALUE str;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
* string.c (rb_str_usascii_new{,2}: defined.
(rb_str_new): set US-ASCII and ENC_CODERANGE_7BIT when empty
string.
* encoding.c (rb_usascii_encoding, rb_usascii_encindex): defined.
(rb_enc_inspect, enc_name, rb_locale_charmap, rb_enc_name_list_i):
use rb_str_ascii_new.
* array.c (recursive_join, inspect_ary): ditto.
* object.c (nil_to_s, nil_inspect, true_to_s, false_to_s,
rb_mod_to_s): ditto.
* hash.c (inspect_hash, rb_hash_inspect, rb_f_getenv, env_fetch,
env_clear, env_to_s, env_inspect): ditto.
* numeric.c (flo_to_s, int_chr, rb_fix2str): ditto.
* bignum.c (rb_big2str): ditto.
* file.c (rb_file_ftype, rb_file_s_dirname, rb_file_s_extname,
file_inspect_join, Init_file): ditto.
* test/ruby/test_ruby_m17n.rb: add checks for encoding of string.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-01-25 19:40:02 +03:00
|
|
|
if (recur) return rb_usascii_str_new2("{...}");
|
2001-05-30 13:12:34 +04:00
|
|
|
str = rb_str_buf_new2("{");
|
2009-05-29 12:08:25 +04:00
|
|
|
rb_hash_foreach(hash, inspect_i, str);
|
2001-05-30 13:12:34 +04:00
|
|
|
rb_str_buf_cat2(str, "}");
|
2000-02-23 08:23:12 +03:00
|
|
|
OBJ_INFECT(str, hash);
|
2001-05-30 13:12:34 +04:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* hsh.to_s -> string
|
|
|
|
* hsh.inspect -> string
|
2003-12-23 19:21:17 +03:00
|
|
|
*
|
|
|
|
* Return the contents of this hash as a string.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2006-09-07 20:33:08 +04:00
|
|
|
* h = { "c" => 300, "a" => 100, "d" => 400, "c" => 300 }
|
2008-03-09 04:04:46 +03:00
|
|
|
* h.to_s #=> "{\"c\"=>300, \"a\"=>100, \"d\"=>400}"
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_inspect(VALUE hash)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2007-08-30 03:12:21 +04:00
|
|
|
if (RHASH_EMPTY_P(hash))
|
* string.c (rb_str_usascii_new{,2}: defined.
(rb_str_new): set US-ASCII and ENC_CODERANGE_7BIT when empty
string.
* encoding.c (rb_usascii_encoding, rb_usascii_encindex): defined.
(rb_enc_inspect, enc_name, rb_locale_charmap, rb_enc_name_list_i):
use rb_str_ascii_new.
* array.c (recursive_join, inspect_ary): ditto.
* object.c (nil_to_s, nil_inspect, true_to_s, false_to_s,
rb_mod_to_s): ditto.
* hash.c (inspect_hash, rb_hash_inspect, rb_f_getenv, env_fetch,
env_clear, env_to_s, env_inspect): ditto.
* numeric.c (flo_to_s, int_chr, rb_fix2str): ditto.
* bignum.c (rb_big2str): ditto.
* file.c (rb_file_ftype, rb_file_s_dirname, rb_file_s_extname,
file_inspect_join, Init_file): ditto.
* test/ruby/test_ruby_m17n.rb: add checks for encoding of string.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-01-25 19:40:02 +03:00
|
|
|
return rb_usascii_str_new2("{}");
|
2009-05-29 12:08:25 +04:00
|
|
|
return rb_exec_recursive(inspect_hash, hash, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.to_hash => hsh
|
|
|
|
*
|
2010-05-13 09:49:55 +04:00
|
|
|
* Returns +self+.
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_to_hash(VALUE hash)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
|
|
|
return hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2018-09-20 18:06:56 +03:00
|
|
|
VALUE
|
|
|
|
rb_hash_set_pair(VALUE hash, VALUE arg)
|
|
|
|
{
|
|
|
|
VALUE pair;
|
|
|
|
|
|
|
|
pair = rb_check_array_type(arg);
|
|
|
|
if (NIL_P(pair)) {
|
|
|
|
rb_raise(rb_eTypeError, "wrong element type %s (expected array)",
|
|
|
|
rb_builtin_class_name(arg));
|
|
|
|
}
|
|
|
|
if (RARRAY_LEN(pair) != 2) {
|
|
|
|
rb_raise(rb_eArgError, "element has wrong array length (expected 2, was %ld)",
|
|
|
|
RARRAY_LEN(pair));
|
|
|
|
}
|
|
|
|
rb_hash_aset(hash, RARRAY_AREF(pair, 0), RARRAY_AREF(pair, 1));
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
to_h_i(VALUE key, VALUE value, VALUE hash)
|
|
|
|
{
|
|
|
|
rb_hash_set_pair(hash, rb_yield_values(2, key, value));
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_hash_to_h_block(VALUE hash)
|
|
|
|
{
|
|
|
|
VALUE h = rb_hash_new_with_size(RHASH_SIZE(hash));
|
|
|
|
rb_hash_foreach(hash, to_h_i, h);
|
|
|
|
OBJ_INFECT(h, hash);
|
|
|
|
return h;
|
|
|
|
}
|
|
|
|
|
2012-04-24 07:46:55 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2018-09-20 18:06:56 +03:00
|
|
|
* hsh.to_h -> hsh or new_hash
|
|
|
|
* hsh.to_h {|key, value| block } -> new_hash
|
2012-04-24 07:46:55 +04:00
|
|
|
*
|
|
|
|
* Returns +self+. If called on a subclass of Hash, converts
|
|
|
|
* the receiver to a Hash object.
|
2018-09-20 18:06:56 +03:00
|
|
|
*
|
|
|
|
* If a block is given, the results of the block on each pair of
|
|
|
|
* the receiver will be used as pairs.
|
2012-04-24 07:46:55 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_hash_to_h(VALUE hash)
|
|
|
|
{
|
2018-09-20 18:06:56 +03:00
|
|
|
if (rb_block_given_p()) {
|
|
|
|
return rb_hash_to_h_block(hash);
|
|
|
|
}
|
2012-04-24 07:46:55 +04:00
|
|
|
if (rb_obj_class(hash) != rb_cHash) {
|
2016-03-09 10:17:02 +03:00
|
|
|
const VALUE flags = RBASIC(hash)->flags;
|
2019-07-31 04:22:47 +03:00
|
|
|
hash = hash_dup(hash, rb_cHash, flags & RHASH_PROC_DEFAULT);
|
2012-04-24 07:46:55 +04:00
|
|
|
}
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2013-10-10 20:28:56 +04:00
|
|
|
static int
|
|
|
|
keys_i(VALUE key, VALUE value, VALUE ary)
|
|
|
|
{
|
|
|
|
rb_ary_push(ary, key);
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* hsh.keys -> array
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Returns a new array populated with the keys from this hash. See also
|
2019-03-22 14:04:59 +03:00
|
|
|
* Hash#values.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { "a" => 100, "b" => 200, "c" => 300, "d" => 400 }
|
|
|
|
* h.keys #=> ["a", "b", "c", "d"]
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
mjit_compile.c: merge initial JIT compiler
which has been developed by Takashi Kokubun <takashikkbn@gmail> as
YARV-MJIT. Many of its bugs are fixed by wanabe <s.wanabe@gmail.com>.
This JIT compiler is designed to be a safe migration path to introduce
JIT compiler to MRI. So this commit does not include any bytecode
changes or dynamic instruction modifications, which are done in original
MJIT.
This commit even strips off some aggressive optimizations from
YARV-MJIT, and thus it's slower than YARV-MJIT too. But it's still
fairly faster than Ruby 2.5 in some benchmarks (attached below).
Note that this JIT compiler passes `make test`, `make test-all`, `make
test-spec` without JIT, and even with JIT. Not only it's perfectly safe
with JIT disabled because it does not replace VM instructions unlike
MJIT, but also with JIT enabled it stably runs Ruby applications
including Rails applications.
I'm expecting this version as just "initial" JIT compiler. I have many
optimization ideas which are skipped for initial merging, and you may
easily replace this JIT compiler with a faster one by just replacing
mjit_compile.c. `mjit_compile` interface is designed for the purpose.
common.mk: update dependencies for mjit_compile.c.
internal.h: declare `rb_vm_insn_addr2insn` for MJIT.
vm.c: exclude some definitions if `-DMJIT_HEADER` is provided to
compiler. This avoids to include some functions which take a long time
to compile, e.g. vm_exec_core. Some of the purpose is achieved in
transform_mjit_header.rb (see `IGNORED_FUNCTIONS`) but others are
manually resolved for now. Load mjit_helper.h for MJIT header.
mjit_helper.h: New. This is a file used only by JIT-ed code. I'll
refactor `mjit_call_cfunc` later.
vm_eval.c: add some #ifdef switches to skip compiling some functions
like Init_vm_eval.
win32/mkexports.rb: export thread/ec functions, which are used by MJIT.
include/ruby/defines.h: add MJIT_FUNC_EXPORTED macro alis to clarify
that a function is exported only for MJIT.
array.c: export a function used by MJIT.
bignum.c: ditto.
class.c: ditto.
compile.c: ditto.
error.c: ditto.
gc.c: ditto.
hash.c: ditto.
iseq.c: ditto.
numeric.c: ditto.
object.c: ditto.
proc.c: ditto.
re.c: ditto.
st.c: ditto.
string.c: ditto.
thread.c: ditto.
variable.c: ditto.
vm_backtrace.c: ditto.
vm_insnhelper.c: ditto.
vm_method.c: ditto.
I would like to improve maintainability of function exports, but I
believe this way is acceptable as initial merging if we clarify the
new exports are for MJIT (so that we can use them as TODO list to fix)
and add unit tests to detect unresolved symbols.
I'll add unit tests of JIT compilations in succeeding commits.
Author: Takashi Kokubun <takashikkbn@gmail.com>
Contributor: wanabe <s.wanabe@gmail.com>
Part of [Feature #14235]
---
* Known issues
* Code generated by gcc is faster than clang. The benchmark may be worse
in macOS. Following benchmark result is provided by gcc w/ Linux.
* Performance is decreased when Google Chrome is running
* JIT can work on MinGW, but it doesn't improve performance at least
in short running benchmark.
* Currently it doesn't perform well with Rails. We'll try to fix this
before release.
---
* Benchmark reslts
Benchmarked with:
Intel 4.0GHz i7-4790K with 16GB memory under x86-64 Ubuntu 8 Cores
- 2.0.0-p0: Ruby 2.0.0-p0
- r62186: Ruby trunk (early 2.6.0), before MJIT changes
- JIT off: On this commit, but without `--jit` option
- JIT on: On this commit, and with `--jit` option
** Optcarrot fps
Benchmark: https://github.com/mame/optcarrot
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:--------|:--------|:--------|:--------|:--------|
|fps |37.32 |51.46 |51.31 |58.88 |
|vs 2.0.0 |1.00x |1.38x |1.37x |1.58x |
** MJIT benchmarks
Benchmark: https://github.com/benchmark-driver/mjit-benchmarks
(Original: https://github.com/vnmakarov/ruby/tree/rtl_mjit_branch/MJIT-benchmarks)
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:----------|:--------|:--------|:--------|:--------|
|aread |1.00 |1.09 |1.07 |2.19 |
|aref |1.00 |1.13 |1.11 |2.22 |
|aset |1.00 |1.50 |1.45 |2.64 |
|awrite |1.00 |1.17 |1.13 |2.20 |
|call |1.00 |1.29 |1.26 |2.02 |
|const2 |1.00 |1.10 |1.10 |2.19 |
|const |1.00 |1.11 |1.10 |2.19 |
|fannk |1.00 |1.04 |1.02 |1.00 |
|fib |1.00 |1.32 |1.31 |1.84 |
|ivread |1.00 |1.13 |1.12 |2.43 |
|ivwrite |1.00 |1.23 |1.21 |2.40 |
|mandelbrot |1.00 |1.13 |1.16 |1.28 |
|meteor |1.00 |2.97 |2.92 |3.17 |
|nbody |1.00 |1.17 |1.15 |1.49 |
|nest-ntimes|1.00 |1.22 |1.20 |1.39 |
|nest-while |1.00 |1.10 |1.10 |1.37 |
|norm |1.00 |1.18 |1.16 |1.24 |
|nsvb |1.00 |1.16 |1.16 |1.17 |
|red-black |1.00 |1.02 |0.99 |1.12 |
|sieve |1.00 |1.30 |1.28 |1.62 |
|trees |1.00 |1.14 |1.13 |1.19 |
|while |1.00 |1.12 |1.11 |2.41 |
** Discourse's script/bench.rb
Benchmark: https://github.com/discourse/discourse/blob/v1.8.7/script/bench.rb
NOTE: Rails performance was somehow a little degraded with JIT for now.
We should fix this.
(At least I know opt_aref is performing badly in JIT and I have an idea
to fix it. Please wait for the fix.)
*** JIT off
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 17
75: 18
90: 22
99: 29
home_admin:
50: 21
75: 21
90: 27
99: 40
topic_admin:
50: 17
75: 18
90: 22
99: 32
categories:
50: 35
75: 41
90: 43
99: 77
home:
50: 39
75: 46
90: 49
99: 95
topic:
50: 46
75: 52
90: 56
99: 101
*** JIT on
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 19
75: 21
90: 25
99: 33
home_admin:
50: 24
75: 26
90: 30
99: 35
topic_admin:
50: 19
75: 20
90: 25
99: 30
categories:
50: 40
75: 44
90: 48
99: 76
home:
50: 42
75: 48
90: 51
99: 89
topic:
50: 49
75: 55
90: 58
99: 99
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-02-04 14:22:28 +03:00
|
|
|
MJIT_FUNC_EXPORTED VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_keys(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2013-11-27 20:36:44 +04:00
|
|
|
st_index_t size = RHASH_SIZE(hash);
|
2018-12-03 15:36:39 +03:00
|
|
|
VALUE keys = rb_ary_new_capa(size);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2013-11-27 20:07:10 +04:00
|
|
|
if (size == 0) return keys;
|
2013-10-10 20:28:56 +04:00
|
|
|
|
2013-11-27 20:07:10 +04:00
|
|
|
if (ST_DATA_COMPATIBLE_P(VALUE)) {
|
2018-12-03 15:36:39 +03:00
|
|
|
RARRAY_PTR_USE_TRANSIENT(keys, ptr, {
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_P(hash)) {
|
|
|
|
size = ar_keys(hash, ptr, size);
|
2018-12-03 15:36:39 +03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
st_table *table = RHASH_ST_TABLE(hash);
|
|
|
|
size = st_keys(table, ptr, size);
|
|
|
|
}
|
|
|
|
});
|
|
|
|
rb_gc_writebarrier_remember(keys);
|
2013-11-27 20:07:10 +04:00
|
|
|
rb_ary_set_len(keys, size);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_hash_foreach(hash, keys_i, keys);
|
|
|
|
}
|
|
|
|
|
|
|
|
return keys;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
values_i(VALUE key, VALUE value, VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_ary_push(ary, value);
|
1998-01-16 15:13:05 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* hsh.values -> array
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Returns a new array populated with the values from <i>hsh</i>. See
|
2019-03-22 14:04:59 +03:00
|
|
|
* also Hash#keys.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { "a" => 100, "b" => 200, "c" => 300 }
|
|
|
|
* h.values #=> [100, 200, 300]
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
2013-10-08 11:11:15 +04:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_values(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2013-11-28 12:39:16 +04:00
|
|
|
VALUE values;
|
|
|
|
st_index_t size = RHASH_SIZE(hash);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2013-11-28 12:39:16 +04:00
|
|
|
values = rb_ary_new_capa(size);
|
|
|
|
if (size == 0) return values;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2013-11-28 12:39:16 +04:00
|
|
|
if (ST_DATA_COMPATIBLE_P(VALUE)) {
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_P(hash)) {
|
2018-10-31 01:12:12 +03:00
|
|
|
rb_gc_writebarrier_remember(values);
|
2018-12-03 15:36:39 +03:00
|
|
|
RARRAY_PTR_USE_TRANSIENT(values, ptr, {
|
2018-12-14 04:10:15 +03:00
|
|
|
size = ar_values(hash, ptr, size);
|
2018-10-31 01:12:12 +03:00
|
|
|
});
|
|
|
|
}
|
2018-12-14 04:10:15 +03:00
|
|
|
else if (RHASH_ST_TABLE_P(hash)) {
|
2018-10-31 01:12:12 +03:00
|
|
|
st_table *table = RHASH_ST_TABLE(hash);
|
|
|
|
rb_gc_writebarrier_remember(values);
|
2018-12-03 15:36:39 +03:00
|
|
|
RARRAY_PTR_USE_TRANSIENT(values, ptr, {
|
2018-10-31 01:12:12 +03:00
|
|
|
size = st_values(table, ptr, size);
|
|
|
|
});
|
|
|
|
}
|
2013-11-28 12:39:16 +04:00
|
|
|
rb_ary_set_len(values, size);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_hash_foreach(hash, values_i, values);
|
|
|
|
}
|
|
|
|
|
|
|
|
return values;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* hsh.has_key?(key) -> true or false
|
|
|
|
* hsh.include?(key) -> true or false
|
|
|
|
* hsh.key?(key) -> true or false
|
|
|
|
* hsh.member?(key) -> true or false
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Returns <code>true</code> if the given key is present in <i>hsh</i>.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.has_key?("a") #=> true
|
|
|
|
* h.has_key?("z") #=> false
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2019-03-22 14:04:59 +03:00
|
|
|
* Note that #include? and #member? do not test member
|
2015-02-17 04:47:28 +03:00
|
|
|
* equality using <code>==</code> as do other Enumerables.
|
|
|
|
*
|
|
|
|
* See also Enumerable#include?
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
mjit_compile.c: merge initial JIT compiler
which has been developed by Takashi Kokubun <takashikkbn@gmail> as
YARV-MJIT. Many of its bugs are fixed by wanabe <s.wanabe@gmail.com>.
This JIT compiler is designed to be a safe migration path to introduce
JIT compiler to MRI. So this commit does not include any bytecode
changes or dynamic instruction modifications, which are done in original
MJIT.
This commit even strips off some aggressive optimizations from
YARV-MJIT, and thus it's slower than YARV-MJIT too. But it's still
fairly faster than Ruby 2.5 in some benchmarks (attached below).
Note that this JIT compiler passes `make test`, `make test-all`, `make
test-spec` without JIT, and even with JIT. Not only it's perfectly safe
with JIT disabled because it does not replace VM instructions unlike
MJIT, but also with JIT enabled it stably runs Ruby applications
including Rails applications.
I'm expecting this version as just "initial" JIT compiler. I have many
optimization ideas which are skipped for initial merging, and you may
easily replace this JIT compiler with a faster one by just replacing
mjit_compile.c. `mjit_compile` interface is designed for the purpose.
common.mk: update dependencies for mjit_compile.c.
internal.h: declare `rb_vm_insn_addr2insn` for MJIT.
vm.c: exclude some definitions if `-DMJIT_HEADER` is provided to
compiler. This avoids to include some functions which take a long time
to compile, e.g. vm_exec_core. Some of the purpose is achieved in
transform_mjit_header.rb (see `IGNORED_FUNCTIONS`) but others are
manually resolved for now. Load mjit_helper.h for MJIT header.
mjit_helper.h: New. This is a file used only by JIT-ed code. I'll
refactor `mjit_call_cfunc` later.
vm_eval.c: add some #ifdef switches to skip compiling some functions
like Init_vm_eval.
win32/mkexports.rb: export thread/ec functions, which are used by MJIT.
include/ruby/defines.h: add MJIT_FUNC_EXPORTED macro alis to clarify
that a function is exported only for MJIT.
array.c: export a function used by MJIT.
bignum.c: ditto.
class.c: ditto.
compile.c: ditto.
error.c: ditto.
gc.c: ditto.
hash.c: ditto.
iseq.c: ditto.
numeric.c: ditto.
object.c: ditto.
proc.c: ditto.
re.c: ditto.
st.c: ditto.
string.c: ditto.
thread.c: ditto.
variable.c: ditto.
vm_backtrace.c: ditto.
vm_insnhelper.c: ditto.
vm_method.c: ditto.
I would like to improve maintainability of function exports, but I
believe this way is acceptable as initial merging if we clarify the
new exports are for MJIT (so that we can use them as TODO list to fix)
and add unit tests to detect unresolved symbols.
I'll add unit tests of JIT compilations in succeeding commits.
Author: Takashi Kokubun <takashikkbn@gmail.com>
Contributor: wanabe <s.wanabe@gmail.com>
Part of [Feature #14235]
---
* Known issues
* Code generated by gcc is faster than clang. The benchmark may be worse
in macOS. Following benchmark result is provided by gcc w/ Linux.
* Performance is decreased when Google Chrome is running
* JIT can work on MinGW, but it doesn't improve performance at least
in short running benchmark.
* Currently it doesn't perform well with Rails. We'll try to fix this
before release.
---
* Benchmark reslts
Benchmarked with:
Intel 4.0GHz i7-4790K with 16GB memory under x86-64 Ubuntu 8 Cores
- 2.0.0-p0: Ruby 2.0.0-p0
- r62186: Ruby trunk (early 2.6.0), before MJIT changes
- JIT off: On this commit, but without `--jit` option
- JIT on: On this commit, and with `--jit` option
** Optcarrot fps
Benchmark: https://github.com/mame/optcarrot
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:--------|:--------|:--------|:--------|:--------|
|fps |37.32 |51.46 |51.31 |58.88 |
|vs 2.0.0 |1.00x |1.38x |1.37x |1.58x |
** MJIT benchmarks
Benchmark: https://github.com/benchmark-driver/mjit-benchmarks
(Original: https://github.com/vnmakarov/ruby/tree/rtl_mjit_branch/MJIT-benchmarks)
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:----------|:--------|:--------|:--------|:--------|
|aread |1.00 |1.09 |1.07 |2.19 |
|aref |1.00 |1.13 |1.11 |2.22 |
|aset |1.00 |1.50 |1.45 |2.64 |
|awrite |1.00 |1.17 |1.13 |2.20 |
|call |1.00 |1.29 |1.26 |2.02 |
|const2 |1.00 |1.10 |1.10 |2.19 |
|const |1.00 |1.11 |1.10 |2.19 |
|fannk |1.00 |1.04 |1.02 |1.00 |
|fib |1.00 |1.32 |1.31 |1.84 |
|ivread |1.00 |1.13 |1.12 |2.43 |
|ivwrite |1.00 |1.23 |1.21 |2.40 |
|mandelbrot |1.00 |1.13 |1.16 |1.28 |
|meteor |1.00 |2.97 |2.92 |3.17 |
|nbody |1.00 |1.17 |1.15 |1.49 |
|nest-ntimes|1.00 |1.22 |1.20 |1.39 |
|nest-while |1.00 |1.10 |1.10 |1.37 |
|norm |1.00 |1.18 |1.16 |1.24 |
|nsvb |1.00 |1.16 |1.16 |1.17 |
|red-black |1.00 |1.02 |0.99 |1.12 |
|sieve |1.00 |1.30 |1.28 |1.62 |
|trees |1.00 |1.14 |1.13 |1.19 |
|while |1.00 |1.12 |1.11 |2.41 |
** Discourse's script/bench.rb
Benchmark: https://github.com/discourse/discourse/blob/v1.8.7/script/bench.rb
NOTE: Rails performance was somehow a little degraded with JIT for now.
We should fix this.
(At least I know opt_aref is performing badly in JIT and I have an idea
to fix it. Please wait for the fix.)
*** JIT off
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 17
75: 18
90: 22
99: 29
home_admin:
50: 21
75: 21
90: 27
99: 40
topic_admin:
50: 17
75: 18
90: 22
99: 32
categories:
50: 35
75: 41
90: 43
99: 77
home:
50: 39
75: 46
90: 49
99: 95
topic:
50: 46
75: 52
90: 56
99: 101
*** JIT on
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 19
75: 21
90: 25
99: 33
home_admin:
50: 24
75: 26
90: 30
99: 35
topic_admin:
50: 19
75: 20
90: 25
99: 30
categories:
50: 40
75: 44
90: 48
99: 76
home:
50: 42
75: 48
90: 51
99: 89
topic:
50: 49
75: 55
90: 58
99: 99
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-02-04 14:22:28 +03:00
|
|
|
MJIT_FUNC_EXPORTED VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_has_key(VALUE hash, VALUE key)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2019-01-05 02:48:33 +03:00
|
|
|
if (hash_stlike_lookup(hash, key, NULL)) {
|
2018-10-31 01:11:51 +03:00
|
|
|
return Qtrue;
|
|
|
|
}
|
2019-01-05 02:48:33 +03:00
|
|
|
else {
|
|
|
|
return Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
2009-05-09 07:19:52 +04:00
|
|
|
rb_hash_search_value(VALUE key, VALUE value, VALUE arg)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2009-05-09 07:19:52 +04:00
|
|
|
VALUE *data = (VALUE *)arg;
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
if (rb_equal(value, data[1])) {
|
1999-01-20 07:59:39 +03:00
|
|
|
data[0] = Qtrue;
|
1998-01-16 15:13:05 +03:00
|
|
|
return ST_STOP;
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* hsh.has_value?(value) -> true or false
|
|
|
|
* hsh.value?(value) -> true or false
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Returns <code>true</code> if the given value is present for some key
|
|
|
|
* in <i>hsh</i>.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
2016-12-10 21:34:07 +03:00
|
|
|
* h.value?(100) #=> true
|
|
|
|
* h.value?(999) #=> false
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_has_value(VALUE hash, VALUE val)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE data[2];
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
data[0] = Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
data[1] = val;
|
2009-05-09 07:19:52 +04:00
|
|
|
rb_hash_foreach(hash, rb_hash_search_value, (VALUE)data);
|
1998-01-16 15:13:05 +03:00
|
|
|
return data[0];
|
|
|
|
}
|
|
|
|
|
|
|
|
struct equal_data {
|
2007-09-24 17:43:58 +04:00
|
|
|
VALUE result;
|
2018-10-31 01:11:51 +03:00
|
|
|
VALUE hash;
|
2007-09-24 17:43:58 +04:00
|
|
|
int eql;
|
1998-01-16 15:13:05 +03:00
|
|
|
};
|
|
|
|
|
2006-09-22 12:36:02 +04:00
|
|
|
static int
|
2009-05-09 07:19:52 +04:00
|
|
|
eql_i(VALUE key, VALUE val1, VALUE arg)
|
2006-09-22 12:36:02 +04:00
|
|
|
{
|
2009-05-09 07:19:52 +04:00
|
|
|
struct equal_data *data = (struct equal_data *)arg;
|
* compile.c (iseq_build_body), error.c (set_syserr, get_syserr),
(syserr_initialize), gc.c (define_final, rb_gc_copy_finalizer),
(run_final), hash.c (rb_hash_aref, rb_hash_lookup2),
(rb_hash_fetch_m, rb_hash_clear, rb_hash_aset, eql_i),
iseq.c (iseq_load, iseq_data_to_ary), marshal.c (r_symlink),
thread.c (rb_thread_local_aref),
variable.c (generic_ivar_remove, ivar_get, rb_const_get_0),
(rb_cvar_get), vm.c (rb_vm_check_redefinition_opt_method),
vm_insnhelper.c (vm_get_ev_const), vm_method.c (remove_method),
ext/iconv/iconv.c (map_charset): use st_data_t.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2010-10-12 18:47:23 +04:00
|
|
|
st_data_t val2;
|
2006-09-22 12:36:02 +04:00
|
|
|
|
2019-01-05 02:48:33 +03:00
|
|
|
if (!hash_stlike_lookup(data->hash, key, &val2)) {
|
2018-10-31 01:12:12 +03:00
|
|
|
data->result = Qfalse;
|
|
|
|
return ST_STOP;
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
2019-01-05 02:48:33 +03:00
|
|
|
else {
|
|
|
|
if (!(data->eql ? rb_eql(val1, (VALUE)val2) : (int)rb_equal(val1, (VALUE)val2))) {
|
|
|
|
data->result = Qfalse;
|
|
|
|
return ST_STOP;
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
2006-09-22 12:36:02 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-09-24 17:43:58 +04:00
|
|
|
static VALUE
|
|
|
|
recursive_eql(VALUE hash, VALUE dt, int recur)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2007-09-24 17:43:58 +04:00
|
|
|
struct equal_data *data;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2009-05-24 17:48:23 +04:00
|
|
|
if (recur) return Qtrue; /* Subtle! */
|
2007-09-24 17:43:58 +04:00
|
|
|
data = (struct equal_data*)dt;
|
|
|
|
data->result = Qtrue;
|
2009-05-09 07:19:52 +04:00
|
|
|
rb_hash_foreach(hash, eql_i, dt);
|
2007-09-24 17:43:58 +04:00
|
|
|
|
|
|
|
return data->result;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-05-07 12:44:24 +04:00
|
|
|
static VALUE
|
2006-09-22 12:36:02 +04:00
|
|
|
hash_equal(VALUE hash1, VALUE hash2, int eql)
|
2004-05-07 12:44:24 +04:00
|
|
|
{
|
|
|
|
struct equal_data data;
|
|
|
|
|
|
|
|
if (hash1 == hash2) return Qtrue;
|
2011-09-29 15:07:45 +04:00
|
|
|
if (!RB_TYPE_P(hash2, T_HASH)) {
|
2014-05-20 12:28:31 +04:00
|
|
|
if (!rb_respond_to(hash2, idTo_hash)) {
|
2004-05-07 12:44:24 +04:00
|
|
|
return Qfalse;
|
|
|
|
}
|
2014-12-19 09:36:05 +03:00
|
|
|
if (eql) {
|
|
|
|
if (rb_eql(hash2, hash1)) {
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2007-09-20 21:03:41 +04:00
|
|
|
return rb_equal(hash2, hash1);
|
2014-12-19 09:36:05 +03:00
|
|
|
}
|
2004-05-07 12:44:24 +04:00
|
|
|
}
|
2007-08-30 03:12:21 +04:00
|
|
|
if (RHASH_SIZE(hash1) != RHASH_SIZE(hash2))
|
2004-05-07 12:44:24 +04:00
|
|
|
return Qfalse;
|
2018-12-14 05:27:23 +03:00
|
|
|
if (!RHASH_TABLE_EMPTY_P(hash1) && !RHASH_TABLE_EMPTY_P(hash2)) {
|
|
|
|
if (RHASH_TYPE(hash1) != RHASH_TYPE(hash2)) {
|
2018-10-31 01:12:12 +03:00
|
|
|
return Qfalse;
|
2018-12-14 05:27:23 +03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
data.hash = hash2;
|
|
|
|
data.eql = eql;
|
|
|
|
return rb_exec_recursive_paired(recursive_eql, hash1, hash2, (VALUE)&data);
|
|
|
|
}
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
2018-10-31 01:12:12 +03:00
|
|
|
|
2006-09-22 12:36:02 +04:00
|
|
|
#if 0
|
2009-11-08 12:13:17 +03:00
|
|
|
if (!(rb_equal(RHASH_IFNONE(hash1), RHASH_IFNONE(hash2)) &&
|
2019-07-31 04:22:47 +03:00
|
|
|
FL_TEST(hash1, RHASH_PROC_DEFAULT) == FL_TEST(hash2, RHASH_PROC_DEFAULT)))
|
2006-09-22 12:36:02 +04:00
|
|
|
return Qfalse;
|
|
|
|
#endif
|
2018-10-31 01:11:51 +03:00
|
|
|
return Qtrue;
|
2004-05-07 12:44:24 +04:00
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* hsh == other_hash -> true or false
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Equality---Two hashes are equal if they each contain the same number
|
|
|
|
* of keys and if each key-value pair is equal to (according to
|
2019-03-22 14:04:59 +03:00
|
|
|
* Object#==) the corresponding elements in the other hash.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h1 = { "a" => 1, "c" => 2 }
|
|
|
|
* h2 = { 7 => 35, "c" => 2, "a" => 1 }
|
|
|
|
* h3 = { "a" => 1, "c" => 2, 7 => 35 }
|
|
|
|
* h4 = { "a" => 1, "d" => 2, "f" => 35 }
|
|
|
|
* h1 == h2 #=> false
|
|
|
|
* h2 == h3 #=> true
|
|
|
|
* h3 == h4 #=> false
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2015-09-05 02:29:01 +03:00
|
|
|
* The orders of each hashes are not compared.
|
|
|
|
*
|
|
|
|
* h1 = { "a" => 1, "c" => 2 }
|
|
|
|
* h2 = { "c" => 2, "a" => 1 }
|
|
|
|
* h1 == h2 #=> true
|
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_equal(VALUE hash1, VALUE hash2)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2009-07-18 12:05:32 +04:00
|
|
|
return hash_equal(hash1, hash2, FALSE);
|
2004-05-07 12:44:24 +04:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2006-09-22 12:36:02 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hash.eql?(other) -> true or false
|
|
|
|
*
|
|
|
|
* Returns <code>true</code> if <i>hash</i> and <i>other</i> are
|
|
|
|
* both hashes with the same content.
|
2015-09-05 02:29:01 +03:00
|
|
|
* The orders of each hashes are not compared.
|
2006-09-22 12:36:02 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_hash_eql(VALUE hash1, VALUE hash2)
|
|
|
|
{
|
2009-07-18 12:05:32 +04:00
|
|
|
return hash_equal(hash1, hash2, TRUE);
|
2006-09-22 12:36:02 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2009-05-09 07:19:52 +04:00
|
|
|
hash_i(VALUE key, VALUE val, VALUE arg)
|
2006-09-22 12:36:02 +04:00
|
|
|
{
|
2009-09-08 17:10:04 +04:00
|
|
|
st_index_t *hval = (st_index_t *)arg;
|
2011-01-12 02:37:15 +03:00
|
|
|
st_index_t hdata[2];
|
2009-05-09 07:19:52 +04:00
|
|
|
|
2011-01-12 02:37:15 +03:00
|
|
|
hdata[0] = rb_hash(key);
|
|
|
|
hdata[1] = rb_hash(val);
|
|
|
|
*hval ^= st_hash(hdata, sizeof(hdata), 0);
|
2006-09-22 12:36:02 +04:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2016-09-08 07:57:49 +03:00
|
|
|
* hsh.hash -> integer
|
2006-09-22 12:36:02 +04:00
|
|
|
*
|
2009-07-02 01:20:44 +04:00
|
|
|
* Compute a hash-code for this hash. Two hashes with the same content
|
2006-09-22 12:36:02 +04:00
|
|
|
* will have the same hash code (and will compare using <code>eql?</code>).
|
2014-03-14 05:27:43 +04:00
|
|
|
*
|
|
|
|
* See also Object#hash.
|
2006-09-22 12:36:02 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_hash_hash(VALUE hash)
|
|
|
|
{
|
2013-12-10 18:44:51 +04:00
|
|
|
st_index_t size = RHASH_SIZE(hash);
|
|
|
|
st_index_t hval = rb_hash_start(size);
|
|
|
|
hval = rb_hash_uint(hval, (st_index_t)rb_hash_hash);
|
|
|
|
if (size) {
|
|
|
|
rb_hash_foreach(hash, hash_i, (VALUE)&hval);
|
|
|
|
}
|
2013-12-03 17:18:30 +04:00
|
|
|
hval = rb_hash_end(hval);
|
2016-10-04 19:25:01 +03:00
|
|
|
return ST2FIX(hval);
|
2006-09-22 12:36:02 +04:00
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_invert_i(VALUE key, VALUE value, VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_hash_aset(hash, value, key);
|
1998-01-16 15:13:05 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* hsh.invert -> new_hash
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Returns a new hash created by using <i>hsh</i>'s values as keys, and
|
|
|
|
* the keys as values.
|
2015-01-03 18:00:31 +03:00
|
|
|
* If a key with the same value already exists in the <i>hsh</i>, then
|
|
|
|
* the last one defined will be used, the earlier value(s) will be discarded.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h = { "n" => 100, "m" => 100, "y" => 300, "d" => 200, "a" => 0 }
|
2008-03-09 04:04:46 +03:00
|
|
|
* h.invert #=> {0=>"a", 100=>"m", 200=>"d", 300=>"y"}
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2016-02-13 15:45:59 +03:00
|
|
|
* If there is no key with the same value, Hash#invert is involutive.
|
|
|
|
*
|
|
|
|
* h = { a: 1, b: 3, c: 4 }
|
|
|
|
* h.invert.invert == h #=> true
|
|
|
|
*
|
|
|
|
* The condition, no key with the same value, can be tested by comparing
|
|
|
|
* the size of inverted hash.
|
|
|
|
*
|
|
|
|
* # no key with the same value
|
|
|
|
* h = { a: 1, b: 3, c: 4 }
|
|
|
|
* h.size == h.invert.size #=> true
|
|
|
|
*
|
|
|
|
* # two (or more) keys has the same value
|
|
|
|
* h = { a: 1, b: 3, c: 1 }
|
|
|
|
* h.size == h.invert.size #=> false
|
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_invert(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2017-10-01 07:26:25 +03:00
|
|
|
VALUE h = rb_hash_new_with_size(RHASH_SIZE(hash));
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, rb_hash_invert_i, h);
|
1998-01-16 15:13:05 +03:00
|
|
|
return h;
|
|
|
|
}
|
|
|
|
|
2012-04-13 10:26:53 +04:00
|
|
|
static int
|
2013-06-19 01:29:30 +04:00
|
|
|
rb_hash_update_callback(st_data_t *key, st_data_t *value, struct update_arg *arg, int existing)
|
2012-04-13 10:26:53 +04:00
|
|
|
{
|
2013-05-29 05:38:52 +04:00
|
|
|
if (existing) {
|
2013-06-19 01:29:30 +04:00
|
|
|
arg->old_value = *value;
|
|
|
|
arg->new_value = arg->arg;
|
2013-05-29 05:38:52 +04:00
|
|
|
}
|
|
|
|
else {
|
2013-06-19 01:29:30 +04:00
|
|
|
arg->new_key = *key;
|
|
|
|
arg->new_value = arg->arg;
|
2013-05-29 05:38:52 +04:00
|
|
|
}
|
2013-06-19 01:29:30 +04:00
|
|
|
*value = arg->arg;
|
2012-04-13 10:26:53 +04:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2015-12-15 17:20:27 +03:00
|
|
|
NOINSERT_UPDATE_CALLBACK(rb_hash_update_callback)
|
2012-04-13 10:26:53 +04:00
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_update_i(VALUE key, VALUE value, VALUE hash)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
2012-04-13 10:26:53 +04:00
|
|
|
RHASH_UPDATE(hash, key, rb_hash_update_callback, value);
|
1998-01-16 15:19:22 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
2013-06-19 01:29:30 +04:00
|
|
|
rb_hash_update_block_callback(st_data_t *key, st_data_t *value, struct update_arg *arg, int existing)
|
2002-01-25 11:22:11 +03:00
|
|
|
{
|
2013-06-19 01:29:30 +04:00
|
|
|
VALUE newvalue = (VALUE)arg->arg;
|
2013-05-29 05:38:52 +04:00
|
|
|
|
2012-04-13 10:26:53 +04:00
|
|
|
if (existing) {
|
|
|
|
newvalue = rb_yield_values(3, (VALUE)*key, (VALUE)*value, newvalue);
|
2013-06-19 01:29:30 +04:00
|
|
|
arg->old_value = *value;
|
2002-01-25 11:22:11 +03:00
|
|
|
}
|
2013-05-29 05:38:52 +04:00
|
|
|
else {
|
2013-06-19 01:29:30 +04:00
|
|
|
arg->new_key = *key;
|
2013-05-29 05:38:52 +04:00
|
|
|
}
|
2016-04-28 11:03:19 +03:00
|
|
|
arg->new_value = newvalue;
|
2013-05-29 05:38:52 +04:00
|
|
|
*value = newvalue;
|
2012-04-13 10:26:53 +04:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2015-12-15 17:20:27 +03:00
|
|
|
NOINSERT_UPDATE_CALLBACK(rb_hash_update_block_callback)
|
2012-04-13 10:26:53 +04:00
|
|
|
|
|
|
|
static int
|
|
|
|
rb_hash_update_block_i(VALUE key, VALUE value, VALUE hash)
|
|
|
|
{
|
|
|
|
RHASH_UPDATE(hash, key, rb_hash_update_block_callback, value);
|
2002-01-25 11:22:11 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2018-09-19 04:59:26 +03:00
|
|
|
* hsh.merge!(other_hash1, other_hash2, ...) -> hsh
|
|
|
|
* hsh.update(other_hash1, other_hash2, ...) -> hsh
|
2018-10-13 23:36:03 +03:00
|
|
|
* hsh.merge!(other_hash1, other_hash2, ...) {|key, oldval, newval| block}
|
2018-09-19 04:59:26 +03:00
|
|
|
* -> hsh
|
2018-10-13 23:36:03 +03:00
|
|
|
* hsh.update(other_hash1, other_hash2, ...) {|key, oldval, newval| block}
|
2018-09-19 04:59:26 +03:00
|
|
|
* -> hsh
|
|
|
|
*
|
2018-10-13 23:36:03 +03:00
|
|
|
* Adds the contents of the given hashes to the receiver.
|
|
|
|
*
|
|
|
|
* If no block is given, entries with duplicate keys are overwritten
|
|
|
|
* with the values from each +other_hash+ successively,
|
|
|
|
* otherwise the value for each duplicate key is determined by
|
|
|
|
* calling the block with the key, its value in the receiver and
|
|
|
|
* its value in each +other_hash+.
|
2018-09-19 04:59:26 +03:00
|
|
|
*
|
|
|
|
* h1 = { "a" => 100, "b" => 200 }
|
2018-10-13 23:36:03 +03:00
|
|
|
* h1.merge! #=> {"a"=>100, "b"=>200}
|
|
|
|
* h1 #=> {"a"=>100, "b"=>200}
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h1 = { "a" => 100, "b" => 200 }
|
2018-10-13 23:36:03 +03:00
|
|
|
* h2 = { "b" => 246, "c" => 300 }
|
|
|
|
* h1.merge!(h2) #=> {"a"=>100, "b"=>246, "c"=>300}
|
|
|
|
* h1 #=> {"a"=>100, "b"=>246, "c"=>300}
|
2008-03-09 04:04:46 +03:00
|
|
|
*
|
|
|
|
* h1 = { "a" => 100, "b" => 200 }
|
2018-10-13 23:36:03 +03:00
|
|
|
* h2 = { "b" => 246, "c" => 300 }
|
|
|
|
* h3 = { "b" => 357, "d" => 400 }
|
2018-09-19 04:59:26 +03:00
|
|
|
* h1.merge!(h2, h3)
|
2018-10-13 23:36:03 +03:00
|
|
|
* #=> {"a"=>100, "b"=>357, "c"=>300, "d"=>400}
|
|
|
|
* h1 #=> {"a"=>100, "b"=>357, "c"=>300, "d"=>400}
|
2018-09-19 04:59:26 +03:00
|
|
|
*
|
|
|
|
* h1 = { "a" => 100, "b" => 200 }
|
2018-10-13 23:36:03 +03:00
|
|
|
* h2 = { "b" => 246, "c" => 300 }
|
|
|
|
* h3 = { "b" => 357, "d" => 400 }
|
|
|
|
* h1.merge!(h2, h3) {|key, v1, v2| v1 }
|
|
|
|
* #=> {"a"=>100, "b"=>200, "c"=>300, "d"=>400}
|
|
|
|
* h1 #=> {"a"=>100, "b"=>200, "c"=>300, "d"=>400}
|
|
|
|
*
|
|
|
|
* Hash#update is an alias for Hash#merge!.
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
static VALUE
|
2018-09-19 04:59:26 +03:00
|
|
|
rb_hash_update(int argc, VALUE *argv, VALUE self)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
2018-09-19 04:59:26 +03:00
|
|
|
int i;
|
|
|
|
bool block_given = rb_block_given_p();
|
|
|
|
|
|
|
|
rb_hash_modify(self);
|
|
|
|
for (i = 0; i < argc; i++){
|
|
|
|
VALUE hash = to_hash(argv[i]);
|
|
|
|
if (block_given) {
|
2018-09-19 05:10:58 +03:00
|
|
|
rb_hash_foreach(hash, rb_hash_update_block_i, self);
|
2018-09-19 04:59:26 +03:00
|
|
|
}
|
|
|
|
else {
|
2018-09-19 05:10:58 +03:00
|
|
|
rb_hash_foreach(hash, rb_hash_update_i, self);
|
2018-09-19 04:59:26 +03:00
|
|
|
}
|
2010-12-04 05:21:53 +03:00
|
|
|
}
|
2018-09-19 04:59:26 +03:00
|
|
|
return self;
|
2010-12-04 05:21:53 +03:00
|
|
|
}
|
|
|
|
|
2013-06-19 01:29:30 +04:00
|
|
|
struct update_func_arg {
|
2010-12-04 05:21:53 +03:00
|
|
|
VALUE hash;
|
2012-04-13 10:26:53 +04:00
|
|
|
VALUE value;
|
2010-12-04 05:21:53 +03:00
|
|
|
rb_hash_update_func *func;
|
|
|
|
};
|
|
|
|
|
2012-04-13 10:26:53 +04:00
|
|
|
static int
|
2013-06-19 01:29:30 +04:00
|
|
|
rb_hash_update_func_callback(st_data_t *key, st_data_t *value, struct update_arg *arg, int existing)
|
2012-04-13 10:26:53 +04:00
|
|
|
{
|
2013-06-19 01:29:30 +04:00
|
|
|
struct update_func_arg *uf_arg = (struct update_func_arg *)arg->arg;
|
|
|
|
VALUE newvalue = uf_arg->value;
|
|
|
|
|
2012-04-13 10:26:53 +04:00
|
|
|
if (existing) {
|
2013-06-19 01:29:30 +04:00
|
|
|
newvalue = (*uf_arg->func)((VALUE)*key, (VALUE)*value, newvalue);
|
|
|
|
arg->old_value = *value;
|
2013-05-29 05:38:52 +04:00
|
|
|
}
|
|
|
|
else {
|
2013-06-19 01:29:30 +04:00
|
|
|
arg->new_key = *key;
|
2012-04-13 10:26:53 +04:00
|
|
|
}
|
2016-04-28 11:03:19 +03:00
|
|
|
arg->new_value = newvalue;
|
2013-05-29 05:38:52 +04:00
|
|
|
*value = newvalue;
|
2012-04-13 10:26:53 +04:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2015-12-15 17:20:27 +03:00
|
|
|
NOINSERT_UPDATE_CALLBACK(rb_hash_update_func_callback)
|
2012-04-13 10:26:53 +04:00
|
|
|
|
2010-12-04 05:21:53 +03:00
|
|
|
static int
|
|
|
|
rb_hash_update_func_i(VALUE key, VALUE value, VALUE arg0)
|
|
|
|
{
|
2013-06-19 01:29:30 +04:00
|
|
|
struct update_func_arg *arg = (struct update_func_arg *)arg0;
|
2010-12-04 05:21:53 +03:00
|
|
|
VALUE hash = arg->hash;
|
|
|
|
|
2012-04-13 10:26:53 +04:00
|
|
|
arg->value = value;
|
2013-05-26 16:37:11 +04:00
|
|
|
RHASH_UPDATE(hash, key, rb_hash_update_func_callback, (VALUE)arg);
|
2010-12-04 05:21:53 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_hash_update_by(VALUE hash1, VALUE hash2, rb_hash_update_func *func)
|
|
|
|
{
|
|
|
|
rb_hash_modify(hash1);
|
|
|
|
hash2 = to_hash(hash2);
|
|
|
|
if (func) {
|
2013-06-19 01:29:30 +04:00
|
|
|
struct update_func_arg arg;
|
2010-12-04 05:21:53 +03:00
|
|
|
arg.hash = hash1;
|
|
|
|
arg.func = func;
|
|
|
|
rb_hash_foreach(hash2, rb_hash_update_func_i, (VALUE)&arg);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_hash_foreach(hash2, rb_hash_update_i, hash1);
|
2002-01-25 11:22:11 +03:00
|
|
|
}
|
1998-01-16 15:19:22 +03:00
|
|
|
return hash1;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2018-09-19 04:59:26 +03:00
|
|
|
* hsh.merge(other_hash1, other_hash2, ...) -> new_hash
|
2018-10-13 23:36:03 +03:00
|
|
|
* hsh.merge(other_hash1, other_hash2, ...) {|key, oldval, newval| block}
|
2018-09-19 04:59:26 +03:00
|
|
|
* -> new_hash
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2018-10-13 23:36:03 +03:00
|
|
|
* Returns a new hash that combines the contents of the receiver and
|
|
|
|
* the contents of the given hashes.
|
|
|
|
*
|
|
|
|
* If no block is given, entries with duplicate keys are overwritten
|
|
|
|
* with the values from each +other_hash+ successively,
|
|
|
|
* otherwise the value for each duplicate key is determined by
|
|
|
|
* calling the block with the key, its value in the receiver and
|
|
|
|
* its value in each +other_hash+.
|
|
|
|
*
|
|
|
|
* When called without any argument, returns a copy of the receiver.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* h1 = { "a" => 100, "b" => 200 }
|
2018-10-13 23:36:03 +03:00
|
|
|
* h2 = { "b" => 246, "c" => 300 }
|
|
|
|
* h3 = { "b" => 357, "d" => 400 }
|
|
|
|
* h1.merge #=> {"a"=>100, "b"=>200}
|
|
|
|
* h1.merge(h2) #=> {"a"=>100, "b"=>246, "c"=>300}
|
|
|
|
* h1.merge(h2, h3) #=> {"a"=>100, "b"=>357, "c"=>300, "d"=>400}
|
|
|
|
* h1.merge(h2) {|key, oldval, newval| newval - oldval}
|
|
|
|
* #=> {"a"=>100, "b"=>46, "c"=>300}
|
|
|
|
* h1.merge(h2, h3) {|key, oldval, newval| newval - oldval}
|
|
|
|
* #=> {"a"=>100, "b"=>311, "c"=>300, "d"=>400}
|
|
|
|
* h1 #=> {"a"=>100, "b"=>200}
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
2003-02-03 08:34:16 +03:00
|
|
|
static VALUE
|
2018-09-19 04:59:26 +03:00
|
|
|
rb_hash_merge(int argc, VALUE *argv, VALUE self)
|
2003-02-03 08:34:16 +03:00
|
|
|
{
|
2018-09-19 04:59:26 +03:00
|
|
|
return rb_hash_update(argc, argv, rb_hash_dup(self));
|
2003-02-03 08:34:16 +03:00
|
|
|
}
|
|
|
|
|
2013-07-29 16:39:21 +04:00
|
|
|
static int
|
|
|
|
assoc_cmp(VALUE a, VALUE b)
|
|
|
|
{
|
|
|
|
return !RTEST(rb_equal(a, b));
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
lookup2_call(VALUE arg)
|
|
|
|
{
|
|
|
|
VALUE *args = (VALUE *)arg;
|
|
|
|
return rb_hash_lookup2(args[0], args[1], Qundef);
|
|
|
|
}
|
|
|
|
|
|
|
|
struct reset_hash_type_arg {
|
|
|
|
VALUE hash;
|
|
|
|
const struct st_hash_type *orighash;
|
|
|
|
};
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
reset_hash_type(VALUE arg)
|
|
|
|
{
|
|
|
|
struct reset_hash_type_arg *p = (struct reset_hash_type_arg *)arg;
|
2018-12-14 04:10:15 +03:00
|
|
|
HASH_ASSERT(RHASH_ST_TABLE_P(p->hash));
|
2018-10-31 01:11:51 +03:00
|
|
|
RHASH_ST_TABLE(p->hash)->type = p->orighash;
|
2013-07-29 16:39:21 +04:00
|
|
|
return Qundef;
|
|
|
|
}
|
|
|
|
|
2007-06-22 20:26:07 +04:00
|
|
|
static int
|
2013-07-29 15:24:08 +04:00
|
|
|
assoc_i(VALUE key, VALUE val, VALUE arg)
|
2007-06-22 20:26:07 +04:00
|
|
|
{
|
2013-07-29 15:24:08 +04:00
|
|
|
VALUE *args = (VALUE *)arg;
|
2013-07-29 09:58:36 +04:00
|
|
|
|
2013-07-29 15:24:08 +04:00
|
|
|
if (RTEST(rb_equal(args[0], key))) {
|
|
|
|
args[1] = rb_assoc_new(key, val);
|
|
|
|
return ST_STOP;
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
2007-06-22 20:26:07 +04:00
|
|
|
}
|
|
|
|
|
2007-06-29 09:15:46 +04:00
|
|
|
/*
|
2007-06-22 20:26:07 +04:00
|
|
|
* call-seq:
|
|
|
|
* hash.assoc(obj) -> an_array or nil
|
|
|
|
*
|
|
|
|
* Searches through the hash comparing _obj_ with the key using <code>==</code>.
|
|
|
|
* Returns the key-value pair (two elements array) or +nil+
|
2019-03-22 14:04:59 +03:00
|
|
|
* if no match is found. See Array#assoc.
|
2007-06-22 20:26:07 +04:00
|
|
|
*
|
|
|
|
* h = {"colors" => ["red", "blue", "green"],
|
|
|
|
* "letters" => ["a", "b", "c" ]}
|
|
|
|
* h.assoc("letters") #=> ["letters", ["a", "b", "c"]]
|
|
|
|
* h.assoc("foo") #=> nil
|
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
2013-07-29 16:39:21 +04:00
|
|
|
rb_hash_assoc(VALUE hash, VALUE key)
|
2007-06-22 20:26:07 +04:00
|
|
|
{
|
2013-07-29 16:39:21 +04:00
|
|
|
st_table *table;
|
|
|
|
const struct st_hash_type *orighash;
|
2013-07-29 15:24:08 +04:00
|
|
|
VALUE args[2];
|
|
|
|
|
2013-07-29 16:39:21 +04:00
|
|
|
if (RHASH_EMPTY_P(hash)) return Qnil;
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_force_convert_table(hash, __FILE__, __LINE__);
|
|
|
|
HASH_ASSERT(RHASH_ST_TABLE_P(hash));
|
2018-10-31 01:11:51 +03:00
|
|
|
table = RHASH_ST_TABLE(hash);
|
2013-07-29 16:39:21 +04:00
|
|
|
orighash = table->type;
|
|
|
|
|
|
|
|
if (orighash != &identhash) {
|
|
|
|
VALUE value;
|
|
|
|
struct reset_hash_type_arg ensure_arg;
|
|
|
|
struct st_hash_type assochash;
|
|
|
|
|
|
|
|
assochash.compare = assoc_cmp;
|
|
|
|
assochash.hash = orighash->hash;
|
2018-10-31 01:11:51 +03:00
|
|
|
table->type = &assochash;
|
2013-07-29 16:39:21 +04:00
|
|
|
args[0] = hash;
|
|
|
|
args[1] = key;
|
|
|
|
ensure_arg.hash = hash;
|
|
|
|
ensure_arg.orighash = orighash;
|
|
|
|
value = rb_ensure(lookup2_call, (VALUE)&args, reset_hash_type, (VALUE)&ensure_arg);
|
|
|
|
if (value != Qundef) return rb_assoc_new(key, value);
|
|
|
|
}
|
|
|
|
|
|
|
|
args[0] = key;
|
2013-07-29 15:24:08 +04:00
|
|
|
args[1] = Qnil;
|
|
|
|
rb_hash_foreach(hash, assoc_i, (VALUE)args);
|
|
|
|
return args[1];
|
2007-06-22 20:26:07 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2009-05-09 07:19:52 +04:00
|
|
|
rassoc_i(VALUE key, VALUE val, VALUE arg)
|
2007-06-22 20:26:07 +04:00
|
|
|
{
|
2009-05-09 07:19:52 +04:00
|
|
|
VALUE *args = (VALUE *)arg;
|
|
|
|
|
2007-06-22 20:26:07 +04:00
|
|
|
if (RTEST(rb_equal(args[0], val))) {
|
|
|
|
args[1] = rb_assoc_new(key, val);
|
|
|
|
return ST_STOP;
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2011-06-30 04:20:15 +04:00
|
|
|
* hash.rassoc(obj) -> an_array or nil
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2007-06-22 20:26:07 +04:00
|
|
|
* Searches through the hash comparing _obj_ with the value using <code>==</code>.
|
2009-09-24 22:36:52 +04:00
|
|
|
* Returns the first key-value pair (two-element array) that matches. See
|
2019-03-22 14:04:59 +03:00
|
|
|
* also Array#rassoc.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2007-06-22 20:26:07 +04:00
|
|
|
* a = {1=> "one", 2 => "two", 3 => "three", "ii" => "two"}
|
|
|
|
* a.rassoc("two") #=> [2, "two"]
|
|
|
|
* a.rassoc("four") #=> nil
|
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_hash_rassoc(VALUE hash, VALUE obj)
|
|
|
|
{
|
|
|
|
VALUE args[2];
|
|
|
|
|
|
|
|
args[0] = obj;
|
|
|
|
args[1] = Qnil;
|
2009-05-09 07:19:52 +04:00
|
|
|
rb_hash_foreach(hash, rassoc_i, (VALUE)args);
|
2007-06-22 20:26:07 +04:00
|
|
|
return args[1];
|
|
|
|
}
|
|
|
|
|
2013-07-18 12:48:12 +04:00
|
|
|
static int
|
|
|
|
flatten_i(VALUE key, VALUE val, VALUE ary)
|
|
|
|
{
|
|
|
|
VALUE pair[2];
|
|
|
|
|
|
|
|
pair[0] = key;
|
|
|
|
pair[1] = val;
|
|
|
|
rb_ary_cat(ary, pair, 2);
|
|
|
|
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2007-06-22 20:26:07 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hash.flatten -> an_array
|
|
|
|
* hash.flatten(level) -> an_array
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2007-06-22 20:26:07 +04:00
|
|
|
* Returns a new array that is a one-dimensional flattening of this
|
|
|
|
* hash. That is, for every key or value that is an array, extract
|
|
|
|
* its elements into the new array. Unlike Array#flatten, this
|
2009-09-24 22:36:52 +04:00
|
|
|
* method does not flatten recursively by default. The optional
|
2007-12-31 09:43:32 +03:00
|
|
|
* <i>level</i> argument determines the level of recursion to flatten.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2007-06-22 20:26:07 +04:00
|
|
|
* a = {1=> "one", 2 => [2,"two"], 3 => "three"}
|
|
|
|
* a.flatten # => [1, "one", 2, [2, "two"], 3, "three"]
|
|
|
|
* a.flatten(2) # => [1, "one", 2, 2, "two", 3, "three"]
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_hash_flatten(int argc, VALUE *argv, VALUE hash)
|
|
|
|
{
|
2013-07-18 12:48:12 +04:00
|
|
|
VALUE ary;
|
2007-06-22 20:26:07 +04:00
|
|
|
|
2017-10-22 03:38:05 +03:00
|
|
|
rb_check_arity(argc, 0, 1);
|
|
|
|
|
2013-07-18 12:48:12 +04:00
|
|
|
if (argc) {
|
2017-10-22 03:38:05 +03:00
|
|
|
int level = NUM2INT(argv[0]);
|
|
|
|
|
2014-02-20 07:09:13 +04:00
|
|
|
if (level == 0) return rb_hash_to_a(hash);
|
|
|
|
|
|
|
|
ary = rb_ary_new_capa(RHASH_SIZE(hash) * 2);
|
|
|
|
rb_hash_foreach(hash, flatten_i, ary);
|
2017-10-22 03:38:05 +03:00
|
|
|
level--;
|
|
|
|
|
|
|
|
if (level > 0) {
|
|
|
|
VALUE ary_flatten_level = INT2FIX(level);
|
|
|
|
rb_funcallv(ary, id_flatten_bang, 1, &ary_flatten_level);
|
2014-02-20 06:27:30 +04:00
|
|
|
}
|
2014-02-20 07:09:13 +04:00
|
|
|
else if (level < 0) {
|
2017-10-22 03:38:05 +03:00
|
|
|
/* flatten recursively */
|
2016-07-29 14:57:14 +03:00
|
|
|
rb_funcallv(ary, id_flatten_bang, 0, 0);
|
2013-07-18 12:48:12 +04:00
|
|
|
}
|
2008-02-05 19:51:30 +03:00
|
|
|
}
|
2014-02-20 07:09:13 +04:00
|
|
|
else {
|
|
|
|
ary = rb_ary_new_capa(RHASH_SIZE(hash) * 2);
|
|
|
|
rb_hash_foreach(hash, flatten_i, ary);
|
|
|
|
}
|
|
|
|
|
2007-06-22 20:26:07 +04:00
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2016-10-13 11:06:00 +03:00
|
|
|
static int
|
|
|
|
delete_if_nil(VALUE key, VALUE value, VALUE hash)
|
|
|
|
{
|
|
|
|
if (NIL_P(value)) {
|
|
|
|
return ST_DELETE;
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
set_if_not_nil(VALUE key, VALUE value, VALUE hash)
|
|
|
|
{
|
|
|
|
if (!NIL_P(value)) {
|
|
|
|
rb_hash_aset(hash, key, value);
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.compact -> new_hash
|
|
|
|
*
|
|
|
|
* Returns a new hash with the nil values/key pairs removed
|
|
|
|
*
|
|
|
|
* h = { a: 1, b: false, c: nil }
|
|
|
|
* h.compact #=> { a: 1, b: false }
|
|
|
|
* h #=> { a: 1, b: false, c: nil }
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_hash_compact(VALUE hash)
|
|
|
|
{
|
|
|
|
VALUE result = rb_hash_new();
|
|
|
|
if (!RHASH_EMPTY_P(hash)) {
|
|
|
|
rb_hash_foreach(hash, set_if_not_nil, result);
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2017-09-02 04:08:27 +03:00
|
|
|
* hsh.compact! -> hsh or nil
|
2016-10-13 11:06:00 +03:00
|
|
|
*
|
|
|
|
* Removes all nil values from the hash.
|
2017-09-02 04:08:27 +03:00
|
|
|
* Returns nil if no changes were made, otherwise returns the hash.
|
2016-10-13 11:06:00 +03:00
|
|
|
*
|
|
|
|
* h = { a: 1, b: false, c: nil }
|
|
|
|
* h.compact! #=> { a: 1, b: false }
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_hash_compact_bang(VALUE hash)
|
|
|
|
{
|
2018-10-31 01:11:51 +03:00
|
|
|
st_index_t n;
|
2016-10-13 11:06:00 +03:00
|
|
|
rb_hash_modify_check(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
n = RHASH_SIZE(hash);
|
|
|
|
if (n) {
|
2016-10-13 11:06:00 +03:00
|
|
|
rb_hash_foreach(hash, delete_if_nil, hash);
|
2018-10-31 01:12:12 +03:00
|
|
|
if (n != RHASH_SIZE(hash))
|
2016-10-22 12:52:35 +03:00
|
|
|
return hash;
|
2016-10-13 11:06:00 +03:00
|
|
|
}
|
2016-10-22 12:52:35 +03:00
|
|
|
return Qnil;
|
2016-10-13 11:06:00 +03:00
|
|
|
}
|
|
|
|
|
2006-09-11 12:09:19 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* hsh.compare_by_identity -> hsh
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2009-09-24 22:36:52 +04:00
|
|
|
* Makes <i>hsh</i> compare its keys by their identity, i.e. it
|
2006-09-11 12:09:19 +04:00
|
|
|
* will consider exact same objects as same keys.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2006-09-11 12:09:19 +04:00
|
|
|
* h1 = { "a" => 100, "b" => 200, :c => "c" }
|
2006-10-12 20:07:21 +04:00
|
|
|
* h1["a"] #=> 100
|
2006-10-12 18:05:17 +04:00
|
|
|
* h1.compare_by_identity
|
|
|
|
* h1.compare_by_identity? #=> true
|
2014-01-10 08:54:08 +04:00
|
|
|
* h1["a".dup] #=> nil # different objects.
|
2006-09-13 12:10:28 +04:00
|
|
|
* h1[:c] #=> "c" # same symbols are all same.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2006-09-11 12:09:19 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2006-10-12 18:05:17 +04:00
|
|
|
rb_hash_compare_by_id(VALUE hash)
|
2006-09-11 12:09:19 +04:00
|
|
|
{
|
2018-10-31 01:11:51 +03:00
|
|
|
VALUE tmp;
|
2017-10-22 03:57:46 +03:00
|
|
|
st_table *identtable;
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2013-07-29 16:57:40 +04:00
|
|
|
if (rb_hash_compare_by_id_p(hash)) return hash;
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2017-10-22 03:57:46 +03:00
|
|
|
rb_hash_modify_check(hash);
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_force_convert_table(hash, __FILE__, __LINE__);
|
|
|
|
HASH_ASSERT(RHASH_ST_TABLE_P(hash));
|
2017-10-22 03:57:46 +03:00
|
|
|
|
2018-10-31 01:11:51 +03:00
|
|
|
tmp = hash_alloc(0);
|
2017-10-22 03:57:46 +03:00
|
|
|
identtable = rb_init_identtable_with_size(RHASH_SIZE(hash));
|
2018-10-31 01:11:51 +03:00
|
|
|
RHASH_ST_TABLE_SET(tmp, identtable);
|
|
|
|
rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tmp);
|
|
|
|
st_free_table(RHASH_ST_TABLE(hash));
|
|
|
|
RHASH_ST_TABLE_SET(hash, identtable);
|
2018-12-14 04:10:15 +03:00
|
|
|
RHASH_ST_CLEAR(tmp);
|
2018-10-31 01:11:51 +03:00
|
|
|
rb_gc_force_recycle(tmp);
|
2017-10-22 03:57:46 +03:00
|
|
|
|
2006-09-11 12:09:19 +04:00
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2010-05-18 01:31:22 +04:00
|
|
|
* hsh.compare_by_identity? -> true or false
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2006-09-11 12:09:19 +04:00
|
|
|
* Returns <code>true</code> if <i>hsh</i> will compare its keys by
|
2019-03-22 14:04:59 +03:00
|
|
|
* their identity. Also see Hash#compare_by_identity.
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2006-09-11 12:09:19 +04:00
|
|
|
*/
|
|
|
|
|
mjit_compile.c: merge initial JIT compiler
which has been developed by Takashi Kokubun <takashikkbn@gmail> as
YARV-MJIT. Many of its bugs are fixed by wanabe <s.wanabe@gmail.com>.
This JIT compiler is designed to be a safe migration path to introduce
JIT compiler to MRI. So this commit does not include any bytecode
changes or dynamic instruction modifications, which are done in original
MJIT.
This commit even strips off some aggressive optimizations from
YARV-MJIT, and thus it's slower than YARV-MJIT too. But it's still
fairly faster than Ruby 2.5 in some benchmarks (attached below).
Note that this JIT compiler passes `make test`, `make test-all`, `make
test-spec` without JIT, and even with JIT. Not only it's perfectly safe
with JIT disabled because it does not replace VM instructions unlike
MJIT, but also with JIT enabled it stably runs Ruby applications
including Rails applications.
I'm expecting this version as just "initial" JIT compiler. I have many
optimization ideas which are skipped for initial merging, and you may
easily replace this JIT compiler with a faster one by just replacing
mjit_compile.c. `mjit_compile` interface is designed for the purpose.
common.mk: update dependencies for mjit_compile.c.
internal.h: declare `rb_vm_insn_addr2insn` for MJIT.
vm.c: exclude some definitions if `-DMJIT_HEADER` is provided to
compiler. This avoids to include some functions which take a long time
to compile, e.g. vm_exec_core. Some of the purpose is achieved in
transform_mjit_header.rb (see `IGNORED_FUNCTIONS`) but others are
manually resolved for now. Load mjit_helper.h for MJIT header.
mjit_helper.h: New. This is a file used only by JIT-ed code. I'll
refactor `mjit_call_cfunc` later.
vm_eval.c: add some #ifdef switches to skip compiling some functions
like Init_vm_eval.
win32/mkexports.rb: export thread/ec functions, which are used by MJIT.
include/ruby/defines.h: add MJIT_FUNC_EXPORTED macro alis to clarify
that a function is exported only for MJIT.
array.c: export a function used by MJIT.
bignum.c: ditto.
class.c: ditto.
compile.c: ditto.
error.c: ditto.
gc.c: ditto.
hash.c: ditto.
iseq.c: ditto.
numeric.c: ditto.
object.c: ditto.
proc.c: ditto.
re.c: ditto.
st.c: ditto.
string.c: ditto.
thread.c: ditto.
variable.c: ditto.
vm_backtrace.c: ditto.
vm_insnhelper.c: ditto.
vm_method.c: ditto.
I would like to improve maintainability of function exports, but I
believe this way is acceptable as initial merging if we clarify the
new exports are for MJIT (so that we can use them as TODO list to fix)
and add unit tests to detect unresolved symbols.
I'll add unit tests of JIT compilations in succeeding commits.
Author: Takashi Kokubun <takashikkbn@gmail.com>
Contributor: wanabe <s.wanabe@gmail.com>
Part of [Feature #14235]
---
* Known issues
* Code generated by gcc is faster than clang. The benchmark may be worse
in macOS. Following benchmark result is provided by gcc w/ Linux.
* Performance is decreased when Google Chrome is running
* JIT can work on MinGW, but it doesn't improve performance at least
in short running benchmark.
* Currently it doesn't perform well with Rails. We'll try to fix this
before release.
---
* Benchmark reslts
Benchmarked with:
Intel 4.0GHz i7-4790K with 16GB memory under x86-64 Ubuntu 8 Cores
- 2.0.0-p0: Ruby 2.0.0-p0
- r62186: Ruby trunk (early 2.6.0), before MJIT changes
- JIT off: On this commit, but without `--jit` option
- JIT on: On this commit, and with `--jit` option
** Optcarrot fps
Benchmark: https://github.com/mame/optcarrot
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:--------|:--------|:--------|:--------|:--------|
|fps |37.32 |51.46 |51.31 |58.88 |
|vs 2.0.0 |1.00x |1.38x |1.37x |1.58x |
** MJIT benchmarks
Benchmark: https://github.com/benchmark-driver/mjit-benchmarks
(Original: https://github.com/vnmakarov/ruby/tree/rtl_mjit_branch/MJIT-benchmarks)
| |2.0.0-p0 |r62186 |JIT off |JIT on |
|:----------|:--------|:--------|:--------|:--------|
|aread |1.00 |1.09 |1.07 |2.19 |
|aref |1.00 |1.13 |1.11 |2.22 |
|aset |1.00 |1.50 |1.45 |2.64 |
|awrite |1.00 |1.17 |1.13 |2.20 |
|call |1.00 |1.29 |1.26 |2.02 |
|const2 |1.00 |1.10 |1.10 |2.19 |
|const |1.00 |1.11 |1.10 |2.19 |
|fannk |1.00 |1.04 |1.02 |1.00 |
|fib |1.00 |1.32 |1.31 |1.84 |
|ivread |1.00 |1.13 |1.12 |2.43 |
|ivwrite |1.00 |1.23 |1.21 |2.40 |
|mandelbrot |1.00 |1.13 |1.16 |1.28 |
|meteor |1.00 |2.97 |2.92 |3.17 |
|nbody |1.00 |1.17 |1.15 |1.49 |
|nest-ntimes|1.00 |1.22 |1.20 |1.39 |
|nest-while |1.00 |1.10 |1.10 |1.37 |
|norm |1.00 |1.18 |1.16 |1.24 |
|nsvb |1.00 |1.16 |1.16 |1.17 |
|red-black |1.00 |1.02 |0.99 |1.12 |
|sieve |1.00 |1.30 |1.28 |1.62 |
|trees |1.00 |1.14 |1.13 |1.19 |
|while |1.00 |1.12 |1.11 |2.41 |
** Discourse's script/bench.rb
Benchmark: https://github.com/discourse/discourse/blob/v1.8.7/script/bench.rb
NOTE: Rails performance was somehow a little degraded with JIT for now.
We should fix this.
(At least I know opt_aref is performing badly in JIT and I have an idea
to fix it. Please wait for the fix.)
*** JIT off
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 17
75: 18
90: 22
99: 29
home_admin:
50: 21
75: 21
90: 27
99: 40
topic_admin:
50: 17
75: 18
90: 22
99: 32
categories:
50: 35
75: 41
90: 43
99: 77
home:
50: 39
75: 46
90: 49
99: 95
topic:
50: 46
75: 52
90: 56
99: 101
*** JIT on
Your Results: (note for timings- percentile is first, duration is second in millisecs)
categories_admin:
50: 19
75: 21
90: 25
99: 33
home_admin:
50: 24
75: 26
90: 30
99: 35
topic_admin:
50: 19
75: 20
90: 25
99: 30
categories:
50: 40
75: 44
90: 48
99: 76
home:
50: 42
75: 48
90: 51
99: 89
topic:
50: 49
75: 55
90: 58
99: 99
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62197 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2018-02-04 14:22:28 +03:00
|
|
|
MJIT_FUNC_EXPORTED VALUE
|
2006-10-12 18:05:17 +04:00
|
|
|
rb_hash_compare_by_id_p(VALUE hash)
|
2006-09-11 12:09:19 +04:00
|
|
|
{
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_ST_TABLE_P(hash) && RHASH_ST_TABLE(hash)->type == &identhash) {
|
2006-09-11 12:09:19 +04:00
|
|
|
return Qtrue;
|
|
|
|
}
|
2018-10-31 01:11:51 +03:00
|
|
|
else {
|
|
|
|
return Qfalse;
|
|
|
|
}
|
2006-09-11 12:09:19 +04:00
|
|
|
}
|
|
|
|
|
2015-01-23 05:36:50 +03:00
|
|
|
VALUE
|
|
|
|
rb_ident_hash_new(void)
|
|
|
|
{
|
|
|
|
VALUE hash = rb_hash_new();
|
2018-10-31 01:11:51 +03:00
|
|
|
RHASH_ST_TABLE_SET(hash, st_init_table(&identhash));
|
2015-01-23 05:36:50 +03:00
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2015-01-23 14:01:02 +03:00
|
|
|
st_table *
|
|
|
|
rb_init_identtable(void)
|
|
|
|
{
|
|
|
|
return st_init_table(&identhash);
|
|
|
|
}
|
|
|
|
|
|
|
|
st_table *
|
|
|
|
rb_init_identtable_with_size(st_index_t size)
|
|
|
|
{
|
|
|
|
return st_init_table_with_size(&identhash, size);
|
|
|
|
}
|
|
|
|
|
2014-07-18 17:16:48 +04:00
|
|
|
static int
|
|
|
|
any_p_i(VALUE key, VALUE value, VALUE arg)
|
|
|
|
{
|
2017-10-02 10:51:27 +03:00
|
|
|
VALUE ret = rb_yield(rb_assoc_new(key, value));
|
|
|
|
if (RTEST(ret)) {
|
|
|
|
*(VALUE *)arg = Qtrue;
|
|
|
|
return ST_STOP;
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
any_p_i_fast(VALUE key, VALUE value, VALUE arg)
|
|
|
|
{
|
|
|
|
VALUE ret = rb_yield_values(2, key, value);
|
2014-07-18 17:16:48 +04:00
|
|
|
if (RTEST(ret)) {
|
|
|
|
*(VALUE *)arg = Qtrue;
|
|
|
|
return ST_STOP;
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2017-12-11 01:36:28 +03:00
|
|
|
static int
|
|
|
|
any_p_i_pattern(VALUE key, VALUE value, VALUE arg)
|
|
|
|
{
|
|
|
|
VALUE ret = rb_funcall(((VALUE *)arg)[1], idEqq, 1, rb_assoc_new(key, value));
|
|
|
|
if (RTEST(ret)) {
|
|
|
|
*(VALUE *)arg = Qtrue;
|
|
|
|
return ST_STOP;
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2014-07-18 17:16:48 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.any? [{ |(key, value)| block }] -> true or false
|
2018-06-23 07:57:49 +03:00
|
|
|
* hsh.any?(pattern) -> true or false
|
2014-07-18 17:16:48 +04:00
|
|
|
*
|
|
|
|
* See also Enumerable#any?
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2017-12-11 01:36:28 +03:00
|
|
|
rb_hash_any_p(int argc, VALUE *argv, VALUE hash)
|
2014-07-18 17:16:48 +04:00
|
|
|
{
|
2017-12-11 01:36:28 +03:00
|
|
|
VALUE args[2];
|
|
|
|
args[0] = Qfalse;
|
2014-07-18 17:16:48 +04:00
|
|
|
|
2017-12-11 01:36:28 +03:00
|
|
|
rb_check_arity(argc, 0, 1);
|
2014-07-18 17:16:48 +04:00
|
|
|
if (RHASH_EMPTY_P(hash)) return Qfalse;
|
2017-12-11 01:36:28 +03:00
|
|
|
if (argc) {
|
2018-09-13 14:10:24 +03:00
|
|
|
if (rb_block_given_p()) {
|
|
|
|
rb_warn("given block not used");
|
|
|
|
}
|
2017-12-11 01:36:28 +03:00
|
|
|
args[1] = argv[0];
|
|
|
|
|
|
|
|
rb_hash_foreach(hash, any_p_i_pattern, (VALUE)args);
|
2014-07-18 17:16:48 +04:00
|
|
|
}
|
2017-12-11 01:36:28 +03:00
|
|
|
else {
|
|
|
|
if (!rb_block_given_p()) {
|
|
|
|
/* yields pairs, never false */
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
if (rb_block_arity() > 1)
|
|
|
|
rb_hash_foreach(hash, any_p_i_fast, (VALUE)args);
|
|
|
|
else
|
|
|
|
rb_hash_foreach(hash, any_p_i, (VALUE)args);
|
|
|
|
}
|
|
|
|
return args[0];
|
2014-07-18 17:16:48 +04:00
|
|
|
}
|
|
|
|
|
2015-11-09 15:27:26 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.dig(key, ...) -> object
|
|
|
|
*
|
2017-02-27 21:07:11 +03:00
|
|
|
* Extracts the nested value specified by the sequence of <i>key</i>
|
2015-12-08 08:21:11 +03:00
|
|
|
* objects by calling +dig+ at each step, returning +nil+ if any
|
|
|
|
* intermediate step is +nil+.
|
2015-11-09 15:27:26 +03:00
|
|
|
*
|
|
|
|
* h = { foo: {bar: {baz: 1}}}
|
|
|
|
*
|
2017-02-27 21:07:11 +03:00
|
|
|
* h.dig(:foo, :bar, :baz) #=> 1
|
|
|
|
* h.dig(:foo, :zot, :xyz) #=> nil
|
2015-12-08 08:21:11 +03:00
|
|
|
*
|
|
|
|
* g = { foo: [10, 11, 12] }
|
2017-02-27 21:07:11 +03:00
|
|
|
* g.dig(:foo, 1) #=> 11
|
|
|
|
* g.dig(:foo, 1, 0) #=> TypeError: Integer does not have #dig method
|
|
|
|
* g.dig(:foo, :bar) #=> TypeError: no implicit conversion of Symbol into Integer
|
2015-11-09 15:27:26 +03:00
|
|
|
*/
|
|
|
|
|
2018-05-08 12:09:12 +03:00
|
|
|
static VALUE
|
2015-11-09 15:27:26 +03:00
|
|
|
rb_hash_dig(int argc, VALUE *argv, VALUE self)
|
|
|
|
{
|
|
|
|
rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS);
|
|
|
|
self = rb_hash_aref(self, *argv);
|
|
|
|
if (!--argc) return self;
|
|
|
|
++argv;
|
|
|
|
return rb_obj_dig(argc, argv, self, Qnil);
|
|
|
|
}
|
|
|
|
|
2015-11-10 08:02:02 +03:00
|
|
|
static int
|
|
|
|
hash_le_i(VALUE key, VALUE value, VALUE arg)
|
|
|
|
{
|
|
|
|
VALUE *args = (VALUE *)arg;
|
|
|
|
VALUE v = rb_hash_lookup2(args[0], key, Qundef);
|
|
|
|
if (v != Qundef && rb_equal(value, v)) return ST_CONTINUE;
|
|
|
|
args[1] = Qfalse;
|
|
|
|
return ST_STOP;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
hash_le(VALUE hash1, VALUE hash2)
|
|
|
|
{
|
|
|
|
VALUE args[2];
|
|
|
|
args[0] = hash2;
|
|
|
|
args[1] = Qtrue;
|
|
|
|
rb_hash_foreach(hash1, hash_le_i, (VALUE)args);
|
|
|
|
return args[1];
|
|
|
|
}
|
|
|
|
|
2015-11-14 11:13:11 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hash <= other -> true or false
|
|
|
|
*
|
|
|
|
* Returns <code>true</code> if <i>hash</i> is subset of
|
|
|
|
* <i>other</i> or equals to <i>other</i>.
|
|
|
|
*
|
|
|
|
* h1 = {a:1, b:2}
|
|
|
|
* h2 = {a:1, b:2, c:3}
|
|
|
|
* h1 <= h2 #=> true
|
|
|
|
* h2 <= h1 #=> false
|
|
|
|
* h1 <= h1 #=> true
|
|
|
|
*/
|
2015-11-10 08:02:02 +03:00
|
|
|
static VALUE
|
|
|
|
rb_hash_le(VALUE hash, VALUE other)
|
|
|
|
{
|
|
|
|
other = to_hash(other);
|
|
|
|
if (RHASH_SIZE(hash) > RHASH_SIZE(other)) return Qfalse;
|
|
|
|
return hash_le(hash, other);
|
|
|
|
}
|
|
|
|
|
2015-11-14 11:13:11 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hash < other -> true or false
|
|
|
|
*
|
|
|
|
* Returns <code>true</code> if <i>hash</i> is subset of
|
|
|
|
* <i>other</i>.
|
|
|
|
*
|
|
|
|
* h1 = {a:1, b:2}
|
|
|
|
* h2 = {a:1, b:2, c:3}
|
|
|
|
* h1 < h2 #=> true
|
|
|
|
* h2 < h1 #=> false
|
|
|
|
* h1 < h1 #=> false
|
|
|
|
*/
|
2015-11-10 08:02:02 +03:00
|
|
|
static VALUE
|
|
|
|
rb_hash_lt(VALUE hash, VALUE other)
|
|
|
|
{
|
|
|
|
other = to_hash(other);
|
|
|
|
if (RHASH_SIZE(hash) >= RHASH_SIZE(other)) return Qfalse;
|
|
|
|
return hash_le(hash, other);
|
|
|
|
}
|
|
|
|
|
2015-11-14 11:13:11 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hash >= other -> true or false
|
|
|
|
*
|
|
|
|
* Returns <code>true</code> if <i>other</i> is subset of
|
|
|
|
* <i>hash</i> or equals to <i>hash</i>.
|
|
|
|
*
|
|
|
|
* h1 = {a:1, b:2}
|
|
|
|
* h2 = {a:1, b:2, c:3}
|
|
|
|
* h1 >= h2 #=> false
|
|
|
|
* h2 >= h1 #=> true
|
|
|
|
* h1 >= h1 #=> true
|
|
|
|
*/
|
2015-11-10 08:02:02 +03:00
|
|
|
static VALUE
|
|
|
|
rb_hash_ge(VALUE hash, VALUE other)
|
|
|
|
{
|
|
|
|
other = to_hash(other);
|
|
|
|
if (RHASH_SIZE(hash) < RHASH_SIZE(other)) return Qfalse;
|
|
|
|
return hash_le(other, hash);
|
|
|
|
}
|
|
|
|
|
2015-11-14 11:13:11 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hash > other -> true or false
|
|
|
|
*
|
|
|
|
* Returns <code>true</code> if <i>other</i> is subset of
|
|
|
|
* <i>hash</i>.
|
|
|
|
*
|
|
|
|
* h1 = {a:1, b:2}
|
|
|
|
* h2 = {a:1, b:2, c:3}
|
|
|
|
* h1 > h2 #=> false
|
|
|
|
* h2 > h1 #=> true
|
|
|
|
* h1 > h1 #=> false
|
|
|
|
*/
|
2015-11-10 08:02:02 +03:00
|
|
|
static VALUE
|
|
|
|
rb_hash_gt(VALUE hash, VALUE other)
|
|
|
|
{
|
|
|
|
other = to_hash(other);
|
|
|
|
if (RHASH_SIZE(hash) <= RHASH_SIZE(other)) return Qfalse;
|
|
|
|
return hash_le(other, hash);
|
|
|
|
}
|
|
|
|
|
2015-11-10 10:57:17 +03:00
|
|
|
static VALUE
|
2019-09-27 03:25:54 +03:00
|
|
|
hash_proc_call(RB_BLOCK_CALL_FUNC_ARGLIST(key, hash))
|
2015-11-10 10:57:17 +03:00
|
|
|
{
|
2015-11-10 12:25:58 +03:00
|
|
|
rb_check_arity(argc, 1, 1);
|
|
|
|
return rb_hash_aref(hash, *argv);
|
2015-11-10 10:57:17 +03:00
|
|
|
}
|
|
|
|
|
2018-02-23 05:18:52 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hash.to_proc -> proc
|
|
|
|
*
|
|
|
|
* Returns a Proc which maps keys to values.
|
|
|
|
*
|
|
|
|
* h = {a:1, b:2}
|
|
|
|
* hp = h.to_proc
|
|
|
|
* hp.call(:a) #=> 1
|
|
|
|
* hp.call(:b) #=> 2
|
|
|
|
* hp.call(:c) #=> nil
|
|
|
|
* [:a, :b, :c].map(&h) #=> [1, 2, nil]
|
|
|
|
*/
|
2015-11-10 10:57:17 +03:00
|
|
|
static VALUE
|
|
|
|
rb_hash_to_proc(VALUE hash)
|
|
|
|
{
|
2015-11-10 12:25:58 +03:00
|
|
|
return rb_func_proc_new(hash_proc_call, hash);
|
2015-11-10 10:57:17 +03:00
|
|
|
}
|
|
|
|
|
2019-04-17 09:48:03 +03:00
|
|
|
static VALUE
|
|
|
|
rb_hash_deconstruct_keys(VALUE hash, VALUE keys)
|
|
|
|
{
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2016-07-20 11:35:25 +03:00
|
|
|
static int
|
|
|
|
add_new_i(st_data_t *key, st_data_t *val, st_data_t arg, int existing)
|
|
|
|
{
|
|
|
|
VALUE *args = (VALUE *)arg;
|
|
|
|
if (existing) return ST_STOP;
|
|
|
|
RB_OBJ_WRITTEN(args[0], Qundef, (VALUE)*key);
|
|
|
|
RB_OBJ_WRITE(args[0], (VALUE *)val, args[1]);
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* add +key+ to +val+ pair if +hash+ does not contain +key+.
|
|
|
|
* returns non-zero if +key+ was contained.
|
|
|
|
*/
|
|
|
|
int
|
2018-10-31 05:06:33 +03:00
|
|
|
rb_hash_add_new_element(VALUE hash, VALUE key, VALUE val)
|
2016-07-20 11:35:25 +03:00
|
|
|
{
|
2018-10-31 01:11:51 +03:00
|
|
|
st_table *tbl;
|
|
|
|
int ret = 0;
|
2016-07-20 11:35:25 +03:00
|
|
|
VALUE args[2];
|
|
|
|
args[0] = hash;
|
|
|
|
args[1] = val;
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
if (RHASH_AR_TABLE_P(hash)) {
|
|
|
|
hash_ar_table(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2018-12-14 04:10:15 +03:00
|
|
|
ret = ar_update(hash, (st_data_t)key, add_new_i, (st_data_t)args);
|
2018-10-31 01:11:51 +03:00
|
|
|
if (ret != -1) {
|
2018-10-31 01:12:12 +03:00
|
|
|
return ret;
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_try_convert_table(hash);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
tbl = RHASH_TBL_RAW(hash);
|
2016-07-20 11:35:25 +03:00
|
|
|
return st_update(tbl, (st_data_t)key, add_new_i, (st_data_t)args);
|
2018-10-31 01:11:51 +03:00
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
static st_data_t
|
|
|
|
key_stringify(VALUE key)
|
|
|
|
{
|
|
|
|
return (rb_obj_class(key) == rb_cString && !RB_OBJ_FROZEN(key)) ?
|
|
|
|
rb_hash_key_str(key) : key;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_bulk_insert(VALUE hash, long argc, const VALUE *argv)
|
2018-10-31 01:11:51 +03:00
|
|
|
{
|
|
|
|
long i;
|
|
|
|
for (i = 0; i < argc; ) {
|
2018-10-31 01:12:12 +03:00
|
|
|
st_data_t k = key_stringify(argv[i++]);
|
|
|
|
st_data_t v = argv[i++];
|
2018-12-14 04:10:15 +03:00
|
|
|
ar_insert(hash, k, v);
|
2018-10-31 01:12:12 +03:00
|
|
|
RB_OBJ_WRITTEN(hash, Qundef, k);
|
|
|
|
RB_OBJ_WRITTEN(hash, Qundef, v);
|
2018-10-31 01:11:51 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-04-21 11:34:37 +03:00
|
|
|
void
|
2018-10-31 01:11:51 +03:00
|
|
|
rb_hash_bulk_insert(long argc, const VALUE *argv, VALUE hash)
|
|
|
|
{
|
|
|
|
HASH_ASSERT(argc % 2 == 0);
|
2018-12-14 05:27:23 +03:00
|
|
|
if (argc > 0) {
|
|
|
|
st_index_t size = argc / 2;
|
2018-10-31 01:11:51 +03:00
|
|
|
|
2018-12-14 05:27:23 +03:00
|
|
|
if (RHASH_TABLE_NULL_P(hash)) {
|
|
|
|
if (size <= RHASH_AR_TABLE_MAX_SIZE) {
|
|
|
|
hash_ar_table(hash);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
RHASH_TBL_RAW(hash);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (RHASH_AR_TABLE_P(hash) &&
|
|
|
|
(RHASH_AR_TABLE_SIZE(hash) + size <= RHASH_AR_TABLE_MAX_SIZE)) {
|
|
|
|
ar_bulk_insert(hash, argc, argv);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_hash_bulk_insert_into_st_table(argc, argv, hash);
|
|
|
|
}
|
|
|
|
}
|
2016-07-20 11:35:25 +03:00
|
|
|
}
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
static int path_tainted = -1;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-11-13 06:59:20 +03:00
|
|
|
static char **origenviron;
|
* configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
eval.c, file.c, hash.c, io.c, main.c, missing.c,
process.c, ruby.c, rubysig.h, signal.c, st.c, util.c, util.h,
bcc/Makefile.sub, win32/Makefile.sub, win32/win32.h,
ext/Win32API/Win32API.c, ext/socket/getaddrinfo.c,
ext/socket/getnameinfo.c, ext/socket/socket.c,
ext/tcltklib/stubs.c
: replace "NT" with "_WIN32", add DOSISH_DRIVE_LETTER
* wince/exe.mak : delete \r at the end of lines.
* wince/mswince-ruby17.def : delete rb_obj_become
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2002-12-15 06:18:08 +03:00
|
|
|
#ifdef _WIN32
|
2010-12-15 01:18:39 +03:00
|
|
|
#define GET_ENVIRON(e) ((e) = rb_w32_get_environ())
|
2002-05-29 14:22:19 +04:00
|
|
|
#define FREE_ENVIRON(e) rb_w32_free_environ(e)
|
2001-11-13 06:59:20 +03:00
|
|
|
static char **my_environ;
|
|
|
|
#undef environ
|
|
|
|
#define environ my_environ
|
2012-03-15 07:57:02 +04:00
|
|
|
#undef getenv
|
2016-08-05 11:04:04 +03:00
|
|
|
static char *(*w32_getenv)(const char*);
|
|
|
|
static char *
|
|
|
|
w32_getenv_unknown(const char *name)
|
2013-12-01 19:55:56 +04:00
|
|
|
{
|
2016-08-05 11:04:04 +03:00
|
|
|
char *(*func)(const char*);
|
|
|
|
if (rb_locale_encindex() == rb_ascii8bit_encindex()) {
|
|
|
|
func = rb_w32_getenv;
|
2013-12-01 19:55:56 +04:00
|
|
|
}
|
2016-08-05 11:04:04 +03:00
|
|
|
else {
|
|
|
|
func = rb_w32_ugetenv;
|
|
|
|
}
|
|
|
|
/* atomic assignment in flat memory model */
|
|
|
|
return (w32_getenv = func)(name);
|
2013-12-01 19:55:56 +04:00
|
|
|
}
|
2016-08-05 11:04:04 +03:00
|
|
|
static char *(*w32_getenv)(const char*) = w32_getenv_unknown;
|
2013-12-02 17:31:14 +04:00
|
|
|
#define getenv(n) w32_getenv(n)
|
2002-10-17 20:13:44 +04:00
|
|
|
#elif defined(__APPLE__)
|
|
|
|
#undef environ
|
|
|
|
#define environ (*_NSGetEnviron())
|
|
|
|
#define GET_ENVIRON(e) (e)
|
|
|
|
#define FREE_ENVIRON(e)
|
2001-11-13 06:59:20 +03:00
|
|
|
#else
|
1998-01-16 15:13:05 +03:00
|
|
|
extern char **environ;
|
2001-11-13 06:59:20 +03:00
|
|
|
#define GET_ENVIRON(e) (e)
|
|
|
|
#define FREE_ENVIRON(e)
|
1998-01-16 15:13:05 +03:00
|
|
|
#endif
|
2008-09-23 11:59:48 +04:00
|
|
|
#ifdef ENV_IGNORECASE
|
2010-12-15 01:18:39 +03:00
|
|
|
#define ENVMATCH(s1, s2) (STRCASECMP((s1), (s2)) == 0)
|
|
|
|
#define ENVNMATCH(s1, s2, n) (STRNCASECMP((s1), (s2), (n)) == 0)
|
2008-09-23 11:59:48 +04:00
|
|
|
#else
|
2010-12-15 01:18:39 +03:00
|
|
|
#define ENVMATCH(n1, n2) (strcmp((n1), (n2)) == 0)
|
|
|
|
#define ENVNMATCH(s1, s2, n) (memcmp((s1), (s2), (n)) == 0)
|
2008-09-23 11:59:48 +04:00
|
|
|
#endif
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2003-06-06 13:24:59 +04:00
|
|
|
static VALUE
|
2016-08-05 18:39:46 +03:00
|
|
|
env_enc_str_new(const char *ptr, long len, rb_encoding *enc)
|
2003-06-06 13:24:59 +04:00
|
|
|
{
|
2012-03-15 07:57:02 +04:00
|
|
|
#ifdef _WIN32
|
2017-07-30 05:56:30 +03:00
|
|
|
rb_encoding *internal = rb_default_internal_encoding();
|
|
|
|
const int ecflags = ECONV_INVALID_REPLACE | ECONV_UNDEF_REPLACE;
|
|
|
|
rb_encoding *utf8 = rb_utf8_encoding();
|
|
|
|
VALUE str = rb_enc_str_new(NULL, 0, (internal ? internal : enc));
|
|
|
|
if (NIL_P(rb_str_cat_conv_enc_opts(str, 0, ptr, len, utf8, ecflags, Qnil))) {
|
2018-09-26 20:24:00 +03:00
|
|
|
rb_str_initialize(str, ptr, len, NULL);
|
2017-07-30 05:56:30 +03:00
|
|
|
}
|
2012-03-15 07:57:02 +04:00
|
|
|
#else
|
2016-08-05 18:39:46 +03:00
|
|
|
VALUE str = rb_external_str_new_with_enc(ptr, len, enc);
|
2012-03-15 07:57:02 +04:00
|
|
|
#endif
|
2003-06-06 13:24:59 +04:00
|
|
|
|
2016-08-05 18:39:46 +03:00
|
|
|
OBJ_TAINT(str);
|
2003-06-06 13:24:59 +04:00
|
|
|
rb_obj_freeze(str);
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2014-06-24 05:50:09 +04:00
|
|
|
static VALUE
|
2016-08-05 18:39:46 +03:00
|
|
|
env_enc_str_new_cstr(const char *ptr, rb_encoding *enc)
|
2014-06-24 05:50:09 +04:00
|
|
|
{
|
2016-08-05 18:39:46 +03:00
|
|
|
return env_enc_str_new(ptr, strlen(ptr), enc);
|
|
|
|
}
|
2014-06-24 05:50:09 +04:00
|
|
|
|
2016-08-05 18:39:46 +03:00
|
|
|
static VALUE
|
|
|
|
env_str_new(const char *ptr, long len)
|
|
|
|
{
|
|
|
|
return env_enc_str_new(ptr, len, rb_locale_encoding());
|
2014-06-24 05:50:09 +04:00
|
|
|
}
|
|
|
|
|
2003-06-06 13:24:59 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_str_new2(const char *ptr)
|
2003-06-06 13:24:59 +04:00
|
|
|
{
|
2003-06-23 10:52:39 +04:00
|
|
|
if (!ptr) return Qnil;
|
2003-06-06 13:24:59 +04:00
|
|
|
return env_str_new(ptr, strlen(ptr));
|
|
|
|
}
|
|
|
|
|
2016-08-05 18:39:46 +03:00
|
|
|
static int env_path_tainted(const char *);
|
|
|
|
|
2018-07-18 13:30:41 +03:00
|
|
|
static const char TZ_ENV[] = "TZ";
|
2018-07-19 14:22:03 +03:00
|
|
|
extern bool ruby_tz_uptodate_p;
|
2018-07-18 13:30:41 +03:00
|
|
|
|
2016-08-05 18:39:46 +03:00
|
|
|
static rb_encoding *
|
|
|
|
env_encoding_for(const char *name, const char *ptr)
|
|
|
|
{
|
|
|
|
if (ENVMATCH(name, PATH_ENV) && !env_path_tainted(ptr)) {
|
|
|
|
return rb_filesystem_encoding();
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
return rb_locale_encoding();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
env_name_new(const char *name, const char *ptr)
|
|
|
|
{
|
|
|
|
return env_enc_str_new_cstr(ptr, env_encoding_for(name, ptr));
|
|
|
|
}
|
|
|
|
|
2015-04-19 04:42:57 +03:00
|
|
|
static void *
|
2015-12-05 11:26:26 +03:00
|
|
|
get_env_cstr(
|
|
|
|
#ifdef _WIN32
|
|
|
|
volatile VALUE *pstr,
|
|
|
|
#else
|
|
|
|
VALUE str,
|
|
|
|
#endif
|
|
|
|
const char *name)
|
2015-04-19 04:42:57 +03:00
|
|
|
{
|
2015-12-05 11:26:26 +03:00
|
|
|
#ifdef _WIN32
|
|
|
|
VALUE str = *pstr;
|
|
|
|
#endif
|
2015-04-19 04:42:57 +03:00
|
|
|
char *var;
|
|
|
|
rb_encoding *enc = rb_enc_get(str);
|
|
|
|
if (!rb_enc_asciicompat(enc)) {
|
|
|
|
rb_raise(rb_eArgError, "bad environment variable %s: ASCII incompatible encoding: %s",
|
|
|
|
name, rb_enc_name(enc));
|
|
|
|
}
|
2015-12-05 11:26:26 +03:00
|
|
|
#ifdef _WIN32
|
|
|
|
if (!rb_enc_str_asciionly_p(str)) {
|
|
|
|
*pstr = str = rb_str_conv_enc(str, NULL, rb_utf8_encoding());
|
|
|
|
}
|
|
|
|
#endif
|
2015-04-19 04:42:57 +03:00
|
|
|
var = RSTRING_PTR(str);
|
|
|
|
if (memchr(var, '\0', RSTRING_LEN(str))) {
|
|
|
|
rb_raise(rb_eArgError, "bad environment variable %s: contains null byte", name);
|
|
|
|
}
|
2016-06-10 08:48:38 +03:00
|
|
|
return rb_str_fill_terminator(str, 1); /* ASCII compatible */
|
2015-04-19 04:42:57 +03:00
|
|
|
}
|
|
|
|
|
2015-12-05 11:26:26 +03:00
|
|
|
#ifdef _WIN32
|
|
|
|
#define get_env_ptr(var, val) \
|
|
|
|
(var = get_env_cstr(&(val), #var))
|
|
|
|
#else
|
2014-06-25 16:18:53 +04:00
|
|
|
#define get_env_ptr(var, val) \
|
2015-04-19 04:42:57 +03:00
|
|
|
(var = get_env_cstr(val, #var))
|
2015-12-05 11:26:26 +03:00
|
|
|
#endif
|
2014-06-25 16:18:53 +04:00
|
|
|
|
|
|
|
static inline const char *
|
2014-06-26 02:43:23 +04:00
|
|
|
env_name(volatile VALUE *s)
|
2014-06-25 16:18:53 +04:00
|
|
|
{
|
|
|
|
const char *name;
|
2014-06-26 02:43:23 +04:00
|
|
|
SafeStringValue(*s);
|
|
|
|
get_env_ptr(name, *s);
|
2014-06-25 16:18:53 +04:00
|
|
|
return name;
|
|
|
|
}
|
|
|
|
|
2014-06-26 02:43:23 +04:00
|
|
|
#define env_name(s) env_name(&(s))
|
|
|
|
|
2019-02-27 06:26:05 +03:00
|
|
|
static VALUE env_aset(VALUE nm, VALUE val);
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2019-02-27 06:26:05 +03:00
|
|
|
env_delete(VALUE name)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2014-06-25 16:18:53 +04:00
|
|
|
const char *nam, *val;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2014-06-25 16:18:53 +04:00
|
|
|
nam = env_name(name);
|
1999-08-13 09:45:20 +04:00
|
|
|
val = getenv(nam);
|
1998-01-16 15:13:05 +03:00
|
|
|
if (val) {
|
2003-06-06 13:24:59 +04:00
|
|
|
VALUE value = env_str_new2(val);
|
2000-01-05 07:41:21 +03:00
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
ruby_setenv(nam, 0);
|
2008-09-23 11:59:48 +04:00
|
|
|
if (ENVMATCH(nam, PATH_ENV)) {
|
2015-09-25 10:08:45 +03:00
|
|
|
RB_GC_GUARD(name);
|
1999-08-13 09:45:20 +04:00
|
|
|
path_tainted = 0;
|
|
|
|
}
|
2018-07-18 13:30:41 +03:00
|
|
|
else if (ENVMATCH(nam, TZ_ENV)) {
|
2018-07-19 14:22:03 +03:00
|
|
|
ruby_tz_uptodate_p = FALSE;
|
2018-07-18 13:30:41 +03:00
|
|
|
}
|
2000-01-05 07:41:21 +03:00
|
|
|
return value;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2018-11-04 14:45:11 +03:00
|
|
|
* ENV.delete(name) -> value
|
|
|
|
* ENV.delete(name) { |name| block } -> value
|
2011-06-30 04:20:15 +04:00
|
|
|
*
|
2019-10-13 03:48:20 +03:00
|
|
|
* Deletes the environment variable with +name+ if it exists and returns its value:
|
|
|
|
* ENV['foo'] = '0'
|
|
|
|
* ENV.delete('foo') # => '0'
|
|
|
|
* Returns +nil+ if the named environment variable does not exist:
|
|
|
|
* ENV.delete('foo') # => nil
|
|
|
|
* If a block given and the environment variable does not exist,
|
|
|
|
* yields +name+ to the block and returns +nil+:
|
|
|
|
* ENV.delete('foo') { |name| puts name } # => nil
|
|
|
|
* foo
|
|
|
|
* If a block given and the environment variable exists,
|
|
|
|
* deletes the environment variable and returns its value (ignoring the block):
|
|
|
|
* ENV['foo'] = '0'
|
|
|
|
* ENV.delete('foo') { |name| fail 'ignored' } # => "0"
|
|
|
|
* Raises TypeError if +name+ is not a String and cannot be coerced with \#to_str:
|
|
|
|
* ENV.delete(Object.new) # => TypeError raised
|
2011-06-30 04:20:15 +04:00
|
|
|
*/
|
1998-01-16 15:19:22 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_delete_m(VALUE obj, VALUE name)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
2003-03-31 06:06:23 +04:00
|
|
|
VALUE val;
|
|
|
|
|
2019-02-27 06:26:05 +03:00
|
|
|
val = env_delete(name);
|
2003-03-31 06:06:23 +04:00
|
|
|
if (NIL_P(val) && rb_block_given_p()) rb_yield(name);
|
1998-01-16 15:19:22 +03:00
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV[name] -> value
|
|
|
|
*
|
|
|
|
* Retrieves the +value+ for environment variable +name+ as a String. Returns
|
|
|
|
* +nil+ if the named variable does not exist.
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_f_getenv(VALUE obj, VALUE name)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2014-06-25 16:18:53 +04:00
|
|
|
const char *nam, *env;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2014-06-25 16:18:53 +04:00
|
|
|
nam = env_name(name);
|
1999-01-20 07:59:39 +03:00
|
|
|
env = getenv(nam);
|
1998-01-16 15:13:05 +03:00
|
|
|
if (env) {
|
2016-08-05 18:39:46 +03:00
|
|
|
return env_name_new(nam, env);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* :yield: missing_name
|
|
|
|
* call-seq:
|
2018-11-04 14:45:11 +03:00
|
|
|
* ENV.fetch(name) -> value
|
|
|
|
* ENV.fetch(name, default) -> value
|
|
|
|
* ENV.fetch(name) { |missing_name| block } -> value
|
2011-06-30 04:20:15 +04:00
|
|
|
*
|
|
|
|
* Retrieves the environment variable +name+.
|
|
|
|
*
|
2019-08-07 04:21:32 +03:00
|
|
|
* If the given name does not exist and neither +default+ nor a block is
|
|
|
|
* provided, a KeyError is raised. If a block is given it is called with
|
2011-06-30 04:20:15 +04:00
|
|
|
* the missing name to provide a value. If a default value is given it will
|
|
|
|
* be returned when no block is given.
|
|
|
|
*/
|
2000-04-12 09:06:23 +04:00
|
|
|
static VALUE
|
2019-08-29 05:47:20 +03:00
|
|
|
env_fetch(int argc, VALUE *argv, VALUE _)
|
2000-04-12 09:06:23 +04:00
|
|
|
{
|
2015-12-06 15:13:25 +03:00
|
|
|
VALUE key;
|
2003-11-06 10:22:39 +03:00
|
|
|
long block_given;
|
2014-06-25 16:18:53 +04:00
|
|
|
const char *nam, *env;
|
2000-04-12 09:06:23 +04:00
|
|
|
|
2014-07-02 12:25:21 +04:00
|
|
|
rb_check_arity(argc, 1, 2);
|
|
|
|
key = argv[0];
|
2003-11-06 10:22:39 +03:00
|
|
|
block_given = rb_block_given_p();
|
|
|
|
if (block_given && argc == 2) {
|
|
|
|
rb_warn("block supersedes default value argument");
|
|
|
|
}
|
2015-12-06 15:13:25 +03:00
|
|
|
nam = env_name(key);
|
2000-04-12 09:06:23 +04:00
|
|
|
env = getenv(nam);
|
|
|
|
if (!env) {
|
2003-11-06 10:22:39 +03:00
|
|
|
if (block_given) return rb_yield(key);
|
2000-04-12 09:06:23 +04:00
|
|
|
if (argc == 1) {
|
2017-09-18 11:05:53 +03:00
|
|
|
rb_key_err_raise(rb_sprintf("key not found: \"%"PRIsVALUE"\"", key), envtbl, key);
|
2000-04-12 09:06:23 +04:00
|
|
|
}
|
2014-07-02 12:25:21 +04:00
|
|
|
return argv[1];
|
2000-04-12 09:06:23 +04:00
|
|
|
}
|
2016-08-05 18:39:46 +03:00
|
|
|
return env_name_new(nam, env);
|
2000-04-12 09:06:23 +04:00
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static void
|
2009-09-28 19:07:08 +04:00
|
|
|
path_tainted_p(const char *path)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
|
|
|
path_tainted = rb_path_check(path)?0:1;
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
|
2009-09-28 19:07:08 +04:00
|
|
|
static int
|
|
|
|
env_path_tainted(const char *path)
|
|
|
|
{
|
|
|
|
if (path_tainted < 0) {
|
|
|
|
path_tainted_p(path);
|
|
|
|
}
|
|
|
|
return path_tainted;
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_env_path_tainted(void)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
|
|
|
if (path_tainted < 0) {
|
2003-06-20 10:22:50 +04:00
|
|
|
path_tainted_p(getenv(PATH_ENV));
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
return path_tainted;
|
|
|
|
}
|
|
|
|
|
2009-11-14 10:43:26 +03:00
|
|
|
#if defined(_WIN32) || (defined(HAVE_SETENV) && defined(HAVE_UNSETENV))
|
2011-10-24 18:57:08 +04:00
|
|
|
#elif defined __sun
|
2009-11-14 10:43:26 +03:00
|
|
|
static int
|
|
|
|
in_origenv(const char *str)
|
|
|
|
{
|
|
|
|
char **env;
|
|
|
|
for (env = origenviron; *env; ++env) {
|
|
|
|
if (*env == str) return 1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
#else
|
1999-01-20 07:59:39 +03:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
envix(const char *nam)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
|
|
|
register int i, len = strlen(nam);
|
2001-11-13 06:59:20 +03:00
|
|
|
char **env;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
|
|
|
for (i = 0; env[i]; i++) {
|
2008-09-23 11:59:48 +04:00
|
|
|
if (ENVNMATCH(env[i],nam,len) && env[i][len] == '=')
|
1999-01-20 07:59:39 +03:00
|
|
|
break; /* memcmp must come first to avoid */
|
|
|
|
} /* potential SEGV's */
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
1999-01-20 07:59:39 +03:00
|
|
|
return i;
|
|
|
|
}
|
2006-08-29 14:11:27 +04:00
|
|
|
#endif
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2011-03-19 12:28:49 +03:00
|
|
|
#if defined(_WIN32)
|
2011-03-19 19:33:59 +03:00
|
|
|
static size_t
|
2015-12-05 11:26:26 +03:00
|
|
|
getenvsize(const WCHAR* p)
|
2011-03-19 12:28:49 +03:00
|
|
|
{
|
2015-12-05 11:26:26 +03:00
|
|
|
const WCHAR* porg = p;
|
|
|
|
while (*p++) p += lstrlenW(p) + 1;
|
2011-03-19 13:00:51 +03:00
|
|
|
return p - porg + 1;
|
2011-03-19 12:28:49 +03:00
|
|
|
}
|
2018-08-11 16:18:55 +03:00
|
|
|
|
2011-03-19 19:33:59 +03:00
|
|
|
static size_t
|
2014-09-30 09:25:32 +04:00
|
|
|
getenvblocksize(void)
|
2011-03-19 19:33:59 +03:00
|
|
|
{
|
2018-08-11 16:18:55 +03:00
|
|
|
#ifdef _MAX_ENV
|
|
|
|
return _MAX_ENV;
|
|
|
|
#else
|
2016-05-01 14:42:41 +03:00
|
|
|
return 32767;
|
2018-08-11 16:18:55 +03:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
check_envsize(size_t n)
|
|
|
|
{
|
|
|
|
if (_WIN32_WINNT < 0x0600 && rb_w32_osver() < 6) {
|
|
|
|
/* https://msdn.microsoft.com/en-us/library/windows/desktop/ms682653(v=vs.85).aspx */
|
|
|
|
/* Windows Server 2003 and Windows XP: The maximum size of the
|
|
|
|
* environment block for the process is 32,767 characters. */
|
|
|
|
WCHAR* p = GetEnvironmentStringsW();
|
|
|
|
if (!p) return -1; /* never happen */
|
|
|
|
n += getenvsize(p);
|
|
|
|
FreeEnvironmentStringsW(p);
|
|
|
|
if (n >= getenvblocksize()) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
2011-03-19 19:33:59 +03:00
|
|
|
}
|
2014-07-10 19:22:07 +04:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(_WIN32) || \
|
|
|
|
(defined(__sun) && !(defined(HAVE_SETENV) && defined(HAVE_UNSETENV)))
|
2011-03-19 12:28:49 +03:00
|
|
|
|
2013-09-13 11:28:25 +04:00
|
|
|
NORETURN(static void invalid_envname(const char *name));
|
|
|
|
|
|
|
|
static void
|
|
|
|
invalid_envname(const char *name)
|
|
|
|
{
|
|
|
|
rb_syserr_fail_str(EINVAL, rb_sprintf("ruby_setenv(%s)", name));
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *
|
|
|
|
check_envname(const char *name)
|
|
|
|
{
|
|
|
|
if (strchr(name, '=')) {
|
|
|
|
invalid_envname(name);
|
|
|
|
}
|
|
|
|
return name;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
ruby_setenv(const char *name, const char *value)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2003-06-20 10:22:50 +04:00
|
|
|
#if defined(_WIN32)
|
2015-12-05 11:26:26 +03:00
|
|
|
# if defined(MINGW_HAS_SECURE_API) || RUBY_MSVCRT_VERSION >= 80
|
|
|
|
# define HAVE__WPUTENV_S 1
|
|
|
|
# endif
|
2010-09-11 11:47:44 +04:00
|
|
|
VALUE buf;
|
2015-12-05 11:26:26 +03:00
|
|
|
WCHAR *wname;
|
|
|
|
WCHAR *wvalue = 0;
|
2010-09-11 11:47:44 +04:00
|
|
|
int failed = 0;
|
2015-12-05 11:26:26 +03:00
|
|
|
int len;
|
2013-09-13 11:28:25 +04:00
|
|
|
check_envname(name);
|
2015-12-05 11:26:26 +03:00
|
|
|
len = MultiByteToWideChar(CP_UTF8, 0, name, -1, NULL, 0);
|
2009-11-11 06:20:21 +03:00
|
|
|
if (value) {
|
2015-12-05 11:26:26 +03:00
|
|
|
int len2;
|
2018-08-11 16:18:55 +03:00
|
|
|
len2 = MultiByteToWideChar(CP_UTF8, 0, value, -1, NULL, 0);
|
|
|
|
if (check_envsize((size_t)len + len2)) { /* len and len2 include '\0' */
|
2011-03-19 19:33:59 +03:00
|
|
|
goto fail; /* 2 for '=' & '\0' */
|
2011-03-19 11:10:08 +03:00
|
|
|
}
|
2015-12-05 11:26:26 +03:00
|
|
|
wname = ALLOCV_N(WCHAR, buf, len + len2);
|
|
|
|
wvalue = wname + len;
|
|
|
|
MultiByteToWideChar(CP_UTF8, 0, name, -1, wname, len);
|
|
|
|
MultiByteToWideChar(CP_UTF8, 0, value, -1, wvalue, len2);
|
|
|
|
#ifndef HAVE__WPUTENV_S
|
|
|
|
wname[len-1] = L'=';
|
|
|
|
#endif
|
2009-11-11 06:20:21 +03:00
|
|
|
}
|
|
|
|
else {
|
2015-12-05 11:26:26 +03:00
|
|
|
wname = ALLOCV_N(WCHAR, buf, len + 1);
|
|
|
|
MultiByteToWideChar(CP_UTF8, 0, name, -1, wname, len);
|
|
|
|
wvalue = wname + len;
|
|
|
|
*wvalue = L'\0';
|
|
|
|
#ifndef HAVE__WPUTENV_S
|
|
|
|
wname[len-1] = L'=';
|
|
|
|
#endif
|
2010-09-11 11:47:44 +04:00
|
|
|
}
|
2015-12-05 11:26:26 +03:00
|
|
|
#ifndef HAVE__WPUTENV_S
|
|
|
|
failed = _wputenv(wname);
|
|
|
|
#else
|
|
|
|
failed = _wputenv_s(wname, wvalue);
|
|
|
|
#endif
|
|
|
|
ALLOCV_END(buf);
|
2010-09-11 11:47:44 +04:00
|
|
|
/* even if putenv() failed, clean up and try to delete the
|
|
|
|
* variable from the system area. */
|
|
|
|
if (!value || !*value) {
|
|
|
|
/* putenv() doesn't handle empty value */
|
2010-09-30 05:57:17 +04:00
|
|
|
if (!SetEnvironmentVariable(name, value) &&
|
|
|
|
GetLastError() != ERROR_ENVVAR_NOT_FOUND) goto fail;
|
2009-11-11 06:20:21 +03:00
|
|
|
}
|
2013-09-13 11:28:25 +04:00
|
|
|
if (failed) {
|
|
|
|
fail:
|
|
|
|
invalid_envname(name);
|
|
|
|
}
|
2006-02-01 16:27:47 +03:00
|
|
|
#elif defined(HAVE_SETENV) && defined(HAVE_UNSETENV)
|
2010-01-11 06:58:39 +03:00
|
|
|
if (value) {
|
|
|
|
if (setenv(name, value, 1))
|
2013-06-21 09:31:41 +04:00
|
|
|
rb_sys_fail_str(rb_sprintf("setenv(%s)", name));
|
2013-09-13 11:28:25 +04:00
|
|
|
}
|
|
|
|
else {
|
2010-01-26 15:41:43 +03:00
|
|
|
#ifdef VOID_UNSETENV
|
|
|
|
unsetenv(name);
|
|
|
|
#else
|
2010-01-11 06:58:39 +03:00
|
|
|
if (unsetenv(name))
|
2013-06-21 09:31:41 +04:00
|
|
|
rb_sys_fail_str(rb_sprintf("unsetenv(%s)", name));
|
2010-01-26 15:41:43 +03:00
|
|
|
#endif
|
2010-01-11 06:58:39 +03:00
|
|
|
}
|
2011-10-24 18:57:08 +04:00
|
|
|
#elif defined __sun
|
2014-07-10 19:22:07 +04:00
|
|
|
/* Solaris 9 (or earlier) does not have setenv(3C) and unsetenv(3C). */
|
|
|
|
/* The below code was tested on Solaris 10 by:
|
|
|
|
% ./configure ac_cv_func_setenv=no ac_cv_func_unsetenv=no
|
|
|
|
*/
|
|
|
|
size_t len, mem_size;
|
|
|
|
char **env_ptr, *str, *mem_ptr;
|
2013-09-13 11:28:25 +04:00
|
|
|
|
2014-07-10 19:22:07 +04:00
|
|
|
check_envname(name);
|
2010-01-11 16:58:59 +03:00
|
|
|
len = strlen(name);
|
2014-07-10 19:22:07 +04:00
|
|
|
if (value) {
|
|
|
|
mem_size = len + strlen(value) + 2;
|
|
|
|
mem_ptr = malloc(mem_size);
|
|
|
|
if (mem_ptr == NULL)
|
|
|
|
rb_sys_fail_str(rb_sprintf("malloc("PRIuSIZE")", mem_size));
|
|
|
|
snprintf(mem_ptr, mem_size, "%s=%s", name, value);
|
|
|
|
}
|
2009-11-14 10:43:26 +03:00
|
|
|
for (env_ptr = GET_ENVIRON(environ); (str = *env_ptr) != 0; ++env_ptr) {
|
|
|
|
if (!strncmp(str, name, len) && str[len] == '=') {
|
|
|
|
if (!in_origenv(str)) free(str);
|
|
|
|
while ((env_ptr[0] = env_ptr[1]) != 0) env_ptr++;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (value) {
|
2014-07-10 19:22:07 +04:00
|
|
|
if (putenv(mem_ptr)) {
|
|
|
|
free(mem_ptr);
|
2013-06-21 09:31:41 +04:00
|
|
|
rb_sys_fail_str(rb_sprintf("putenv(%s)", name));
|
2014-07-10 19:22:07 +04:00
|
|
|
}
|
2009-11-14 10:43:26 +03:00
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
#else /* WIN32 */
|
2005-07-19 12:31:04 +04:00
|
|
|
size_t len;
|
2010-01-11 16:58:59 +03:00
|
|
|
int i;
|
2013-09-13 11:28:25 +04:00
|
|
|
|
2010-01-11 16:58:59 +03:00
|
|
|
i=envix(name); /* where does it go? */
|
1999-01-20 07:59:39 +03:00
|
|
|
|
|
|
|
if (environ == origenviron) { /* need we copy environment? */
|
|
|
|
int j;
|
|
|
|
int max;
|
|
|
|
char **tmpenv;
|
|
|
|
|
|
|
|
for (max = i; environ[max]; max++) ;
|
|
|
|
tmpenv = ALLOC_N(char*, max+2);
|
|
|
|
for (j=0; j<max; j++) /* copy environment */
|
2009-11-11 06:54:04 +03:00
|
|
|
tmpenv[j] = ruby_strdup(environ[j]);
|
1999-01-20 07:59:39 +03:00
|
|
|
tmpenv[max] = 0;
|
|
|
|
environ = tmpenv; /* tell exec where it is now */
|
|
|
|
}
|
2005-06-13 08:04:33 +04:00
|
|
|
if (environ[i]) {
|
2005-06-12 20:56:06 +04:00
|
|
|
char **envp = origenviron;
|
|
|
|
while (*envp && *envp != environ[i]) envp++;
|
|
|
|
if (!*envp)
|
* array.c, bignum.c, cont.c, dir.c, dln.c, encoding.c, enumerator.c,
enumerator.c (enumerator_allocate), eval_jump.c, file.c, hash.c,
io.c, load.c, pack.c, proc.c, random.c, re.c, ruby.c, st.c,
string.c, thread.c, thread_pthread.c, time.c, util.c, variable.c,
vm.c, gc.c:
allocated memory objects by xmalloc (ruby_xmalloc) should be
freed by xfree (ruby_xfree).
* ext/curses/curses.c, ext/dbm/dbm.c, ext/digest/digest.c,
ext/gdbm/gdbm.c, ext/json/ext/parser/parser.c,
ext/json/ext/parser/unicode.c, ext/openssl/ossl_cipher.c,
ext/openssl/ossl_hmac.c, ext/openssl/ossl_pkey_ec.c,
ext/sdbm/init.c, ext/strscan/strscan.c, ext/zlib/zlib.c:
ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@17017 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-06-08 14:01:40 +04:00
|
|
|
xfree(environ[i]);
|
2005-06-13 08:04:33 +04:00
|
|
|
if (!value) {
|
2005-06-12 20:56:06 +04:00
|
|
|
while (environ[i]) {
|
|
|
|
environ[i] = environ[i+1];
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
return;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
2005-06-13 08:04:33 +04:00
|
|
|
}
|
|
|
|
else { /* does not exist yet */
|
|
|
|
if (!value) return;
|
1999-01-20 07:59:39 +03:00
|
|
|
REALLOC_N(environ, char*, i+2); /* just expand it a bit */
|
|
|
|
environ[i+1] = 0; /* make sure it's null terminated */
|
|
|
|
}
|
2005-07-19 12:31:04 +04:00
|
|
|
len = strlen(name) + strlen(value) + 2;
|
|
|
|
environ[i] = ALLOC_N(char, len);
|
|
|
|
snprintf(environ[i],len,"%s=%s",name,value); /* all that work just for this */
|
1999-01-20 07:59:39 +03:00
|
|
|
#endif /* WIN32 */
|
|
|
|
}
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
ruby_unsetenv(const char *name)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
|
|
|
ruby_setenv(name, 0);
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV[name] = value
|
|
|
|
* ENV.store(name, value) -> value
|
|
|
|
*
|
|
|
|
* Sets the environment variable +name+ to +value+. If the value given is
|
|
|
|
* +nil+ the environment variable is deleted.
|
2015-02-18 05:42:58 +03:00
|
|
|
* +name+ must be a string.
|
2011-06-30 04:20:15 +04:00
|
|
|
*
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2019-02-27 06:26:05 +03:00
|
|
|
env_aset_m(VALUE obj, VALUE nm, VALUE val)
|
|
|
|
{
|
|
|
|
return env_aset(nm, val);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
env_aset(VALUE nm, VALUE val)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
char *name, *value;
|
|
|
|
|
2006-06-17 18:50:04 +04:00
|
|
|
if (NIL_P(val)) {
|
2019-02-27 06:26:09 +03:00
|
|
|
env_delete(nm);
|
2008-09-23 03:27:33 +04:00
|
|
|
return Qnil;
|
2006-06-17 18:50:04 +04:00
|
|
|
}
|
2014-06-25 05:20:01 +04:00
|
|
|
SafeStringValue(nm);
|
|
|
|
SafeStringValue(val);
|
2014-06-25 16:18:53 +04:00
|
|
|
/* nm can be modified in `val.to_str`, don't get `name` before
|
|
|
|
* check for `val` */
|
|
|
|
get_env_ptr(name, nm);
|
|
|
|
get_env_ptr(value, val);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
ruby_setenv(name, value);
|
2008-09-23 11:59:48 +04:00
|
|
|
if (ENVMATCH(name, PATH_ENV)) {
|
2015-09-25 10:08:45 +03:00
|
|
|
RB_GC_GUARD(nm);
|
1999-01-20 07:59:39 +03:00
|
|
|
if (OBJ_TAINTED(val)) {
|
1998-01-16 15:19:22 +03:00
|
|
|
/* already tainted, no check */
|
|
|
|
path_tainted = 1;
|
2001-10-29 08:07:26 +03:00
|
|
|
return val;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
path_tainted_p(value);
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
}
|
2018-07-18 13:30:41 +03:00
|
|
|
else if (ENVMATCH(name, TZ_ENV)) {
|
2018-07-19 14:22:03 +03:00
|
|
|
ruby_tz_uptodate_p = FALSE;
|
2018-07-18 13:30:41 +03:00
|
|
|
}
|
2001-10-29 08:07:26 +03:00
|
|
|
return val;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_keys(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
char **env;
|
2004-11-18 11:11:12 +03:00
|
|
|
VALUE ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
ary = rb_ary_new();
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
1998-01-16 15:13:05 +03:00
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
1999-01-20 07:59:39 +03:00
|
|
|
if (s) {
|
2003-06-06 13:24:59 +04:00
|
|
|
rb_ary_push(ary, env_str_new(*env, s-*env));
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
env++;
|
|
|
|
}
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
1998-01-16 15:13:05 +03:00
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2019-08-29 05:47:20 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.keys -> Array
|
|
|
|
*
|
|
|
|
* Returns every environment variable name in an Array
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
env_f_keys(VALUE _)
|
|
|
|
{
|
|
|
|
return env_keys();
|
|
|
|
}
|
|
|
|
|
2012-11-06 21:13:48 +04:00
|
|
|
static VALUE
|
2013-06-26 17:43:22 +04:00
|
|
|
rb_env_size(VALUE ehash, VALUE args, VALUE eobj)
|
2012-11-06 21:13:48 +04:00
|
|
|
{
|
|
|
|
char **env;
|
|
|
|
long cnt = 0;
|
|
|
|
|
|
|
|
env = GET_ENVIRON(environ);
|
|
|
|
for (; *env ; ++env) {
|
|
|
|
if (strchr(*env, '=')) {
|
|
|
|
cnt++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
FREE_ENVIRON(environ);
|
|
|
|
return LONG2FIX(cnt);
|
|
|
|
}
|
|
|
|
|
2013-01-26 07:58:33 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2018-11-04 14:45:11 +03:00
|
|
|
* ENV.each_key { |name| block } -> Hash
|
|
|
|
* ENV.each_key -> Enumerator
|
2013-01-26 07:58:33 +04:00
|
|
|
*
|
|
|
|
* Yields each environment variable name.
|
|
|
|
*
|
|
|
|
* An Enumerator is returned if no block is given.
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_each_key(VALUE ehash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2004-11-18 11:11:12 +03:00
|
|
|
VALUE keys;
|
2003-08-02 00:16:53 +04:00
|
|
|
long i;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2012-11-06 21:13:48 +04:00
|
|
|
RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
|
* safe.c (rb_set_safe_level, safe_setter): raise an ArgumentError
when $SAFE is set to 4. $SAFE=4 is now obsolete.
[ruby-core:55222] [Feature #8468]
* object.c (rb_obj_untrusted, rb_obj_untrust, rb_obj_trust):
Kernel#untrusted?, untrust, and trust are now deprecated.
Their behavior is same as tainted?, taint, and untaint,
respectively.
* include/ruby/ruby.h (OBJ_UNTRUSTED, OBJ_UNTRUST): OBJ_UNTRUSTED()
and OBJ_UNTRUST() are aliases of OBJ_TAINTED() and OBJ_TAINT(),
respectively.
* array.c, class.c, debug.c, dir.c, encoding.c, error.c, eval.c,
ext/curses/curses.c, ext/dbm/dbm.c, ext/dl/cfunc.c,
ext/dl/cptr.c, ext/dl/dl.c, ext/etc/etc.c, ext/fiddle/fiddle.c,
ext/fiddle/pointer.c, ext/gdbm/gdbm.c, ext/readline/readline.c,
ext/sdbm/init.c, ext/socket/ancdata.c, ext/socket/basicsocket.c,
ext/socket/socket.c, ext/socket/udpsocket.c,
ext/stringio/stringio.c, ext/syslog/syslog.c, ext/tk/tcltklib.c,
ext/win32ole/win32ole.c, file.c, gc.c, hash.c, io.c, iseq.c,
load.c, marshal.c, object.c, proc.c, process.c, random.c, re.c,
safe.c, string.c, thread.c, transcode.c, variable.c,
vm_insnhelper.c, vm_method.c, vm_trace.c: remove code for
$SAFE=4.
* test/dl/test_dl2.rb, test/erb/test_erb.rb,
test/readline/test_readline.rb,
test/readline/test_readline_history.rb, test/ruby/test_alias.rb,
test/ruby/test_array.rb, test/ruby/test_dir.rb,
test/ruby/test_encoding.rb, test/ruby/test_env.rb,
test/ruby/test_eval.rb, test/ruby/test_exception.rb,
test/ruby/test_file_exhaustive.rb, test/ruby/test_hash.rb,
test/ruby/test_io.rb, test/ruby/test_method.rb,
test/ruby/test_module.rb, test/ruby/test_object.rb,
test/ruby/test_pack.rb, test/ruby/test_rand.rb,
test/ruby/test_regexp.rb, test/ruby/test_settracefunc.rb,
test/ruby/test_struct.rb, test/ruby/test_thread.rb,
test/ruby/test_time.rb: remove tests for $SAFE=4.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-12 18:20:51 +04:00
|
|
|
keys = env_keys();
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i=0; i<RARRAY_LEN(keys); i++) {
|
2013-05-13 13:56:22 +04:00
|
|
|
rb_yield(RARRAY_AREF(keys, i));
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
2003-08-02 00:16:53 +04:00
|
|
|
return ehash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_values(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2004-11-18 11:11:12 +03:00
|
|
|
VALUE ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
char **env;
|
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
ary = rb_ary_new();
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
1998-01-16 15:13:05 +03:00
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
1999-01-20 07:59:39 +03:00
|
|
|
if (s) {
|
2003-06-06 13:24:59 +04:00
|
|
|
rb_ary_push(ary, env_str_new2(s+1));
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
env++;
|
|
|
|
}
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
1998-01-16 15:13:05 +03:00
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2019-08-29 05:47:20 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.values -> Array
|
|
|
|
*
|
|
|
|
* Returns every environment variable value as an Array
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
env_f_values(VALUE _)
|
|
|
|
{
|
|
|
|
return env_values();
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2018-11-04 14:45:11 +03:00
|
|
|
* ENV.each_value { |value| block } -> Hash
|
|
|
|
* ENV.each_value -> Enumerator
|
2011-06-30 04:20:15 +04:00
|
|
|
*
|
|
|
|
* Yields each environment variable +value+.
|
|
|
|
*
|
|
|
|
* An Enumerator is returned if no block was given.
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_each_value(VALUE ehash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-05-25 19:42:14 +04:00
|
|
|
VALUE values;
|
2003-08-02 00:16:53 +04:00
|
|
|
long i;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2012-11-06 21:13:48 +04:00
|
|
|
RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
|
* safe.c (rb_set_safe_level, safe_setter): raise an ArgumentError
when $SAFE is set to 4. $SAFE=4 is now obsolete.
[ruby-core:55222] [Feature #8468]
* object.c (rb_obj_untrusted, rb_obj_untrust, rb_obj_trust):
Kernel#untrusted?, untrust, and trust are now deprecated.
Their behavior is same as tainted?, taint, and untaint,
respectively.
* include/ruby/ruby.h (OBJ_UNTRUSTED, OBJ_UNTRUST): OBJ_UNTRUSTED()
and OBJ_UNTRUST() are aliases of OBJ_TAINTED() and OBJ_TAINT(),
respectively.
* array.c, class.c, debug.c, dir.c, encoding.c, error.c, eval.c,
ext/curses/curses.c, ext/dbm/dbm.c, ext/dl/cfunc.c,
ext/dl/cptr.c, ext/dl/dl.c, ext/etc/etc.c, ext/fiddle/fiddle.c,
ext/fiddle/pointer.c, ext/gdbm/gdbm.c, ext/readline/readline.c,
ext/sdbm/init.c, ext/socket/ancdata.c, ext/socket/basicsocket.c,
ext/socket/socket.c, ext/socket/udpsocket.c,
ext/stringio/stringio.c, ext/syslog/syslog.c, ext/tk/tcltklib.c,
ext/win32ole/win32ole.c, file.c, gc.c, hash.c, io.c, iseq.c,
load.c, marshal.c, object.c, proc.c, process.c, random.c, re.c,
safe.c, string.c, thread.c, transcode.c, variable.c,
vm_insnhelper.c, vm_method.c, vm_trace.c: remove code for
$SAFE=4.
* test/dl/test_dl2.rb, test/erb/test_erb.rb,
test/readline/test_readline.rb,
test/readline/test_readline_history.rb, test/ruby/test_alias.rb,
test/ruby/test_array.rb, test/ruby/test_dir.rb,
test/ruby/test_encoding.rb, test/ruby/test_env.rb,
test/ruby/test_eval.rb, test/ruby/test_exception.rb,
test/ruby/test_file_exhaustive.rb, test/ruby/test_hash.rb,
test/ruby/test_io.rb, test/ruby/test_method.rb,
test/ruby/test_module.rb, test/ruby/test_object.rb,
test/ruby/test_pack.rb, test/ruby/test_rand.rb,
test/ruby/test_regexp.rb, test/ruby/test_settracefunc.rb,
test/ruby/test_struct.rb, test/ruby/test_thread.rb,
test/ruby/test_time.rb: remove tests for $SAFE=4.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-12 18:20:51 +04:00
|
|
|
values = env_values();
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i=0; i<RARRAY_LEN(values); i++) {
|
2013-05-13 13:56:22 +04:00
|
|
|
rb_yield(RARRAY_AREF(values, i));
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
2003-08-02 00:16:53 +04:00
|
|
|
return ehash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2019-09-20 22:18:07 +03:00
|
|
|
* ENV.each { |name, value| block } -> ENV
|
2018-11-04 14:45:11 +03:00
|
|
|
* ENV.each -> Enumerator
|
2019-09-20 22:18:07 +03:00
|
|
|
* ENV.each_pair { |name, value| block } -> ENV
|
2018-11-04 14:45:11 +03:00
|
|
|
* ENV.each_pair -> Enumerator
|
2011-06-30 04:20:15 +04:00
|
|
|
*
|
|
|
|
* Yields each environment variable +name+ and +value+.
|
|
|
|
*
|
|
|
|
* If no block is given an Enumerator is returned.
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2007-11-03 17:07:48 +03:00
|
|
|
env_each_pair(VALUE ehash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
char **env;
|
2004-11-18 11:11:12 +03:00
|
|
|
VALUE ary;
|
2003-08-02 00:16:53 +04:00
|
|
|
long i;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2012-11-06 21:13:48 +04:00
|
|
|
RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
|
2007-11-03 17:07:48 +03:00
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
ary = rb_ary_new();
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
1999-01-20 07:59:39 +03:00
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
if (s) {
|
2003-08-02 00:16:53 +04:00
|
|
|
rb_ary_push(ary, env_str_new(*env, s-*env));
|
|
|
|
rb_ary_push(ary, env_str_new2(s+1));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
env++;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
2003-08-02 00:16:53 +04:00
|
|
|
|
2017-10-02 10:51:27 +03:00
|
|
|
if (rb_block_arity() > 1) {
|
|
|
|
for (i=0; i<RARRAY_LEN(ary); i+=2) {
|
|
|
|
rb_yield_values(2, RARRAY_AREF(ary, i), RARRAY_AREF(ary, i+1));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
for (i=0; i<RARRAY_LEN(ary); i+=2) {
|
|
|
|
rb_yield(rb_assoc_new(RARRAY_AREF(ary, i), RARRAY_AREF(ary, i+1)));
|
|
|
|
}
|
2003-08-02 00:16:53 +04:00
|
|
|
}
|
|
|
|
return ehash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2018-11-04 14:45:11 +03:00
|
|
|
* ENV.reject! { |name, value| block } -> ENV or nil
|
|
|
|
* ENV.reject! -> Enumerator
|
2011-06-30 04:20:15 +04:00
|
|
|
*
|
2018-11-04 14:45:59 +03:00
|
|
|
* Equivalent to ENV.delete_if but returns +nil+ if no changes were made.
|
2011-06-30 04:20:15 +04:00
|
|
|
*
|
|
|
|
* Returns an Enumerator if no block was given.
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2008-04-14 12:31:38 +04:00
|
|
|
env_reject_bang(VALUE ehash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2015-06-26 02:06:48 +03:00
|
|
|
VALUE keys;
|
2003-08-01 06:52:21 +04:00
|
|
|
long i;
|
2002-08-21 19:47:54 +04:00
|
|
|
int del = 0;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2012-11-06 21:13:48 +04:00
|
|
|
RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
|
* safe.c (rb_set_safe_level, safe_setter): raise an ArgumentError
when $SAFE is set to 4. $SAFE=4 is now obsolete.
[ruby-core:55222] [Feature #8468]
* object.c (rb_obj_untrusted, rb_obj_untrust, rb_obj_trust):
Kernel#untrusted?, untrust, and trust are now deprecated.
Their behavior is same as tainted?, taint, and untaint,
respectively.
* include/ruby/ruby.h (OBJ_UNTRUSTED, OBJ_UNTRUST): OBJ_UNTRUSTED()
and OBJ_UNTRUST() are aliases of OBJ_TAINTED() and OBJ_TAINT(),
respectively.
* array.c, class.c, debug.c, dir.c, encoding.c, error.c, eval.c,
ext/curses/curses.c, ext/dbm/dbm.c, ext/dl/cfunc.c,
ext/dl/cptr.c, ext/dl/dl.c, ext/etc/etc.c, ext/fiddle/fiddle.c,
ext/fiddle/pointer.c, ext/gdbm/gdbm.c, ext/readline/readline.c,
ext/sdbm/init.c, ext/socket/ancdata.c, ext/socket/basicsocket.c,
ext/socket/socket.c, ext/socket/udpsocket.c,
ext/stringio/stringio.c, ext/syslog/syslog.c, ext/tk/tcltklib.c,
ext/win32ole/win32ole.c, file.c, gc.c, hash.c, io.c, iseq.c,
load.c, marshal.c, object.c, proc.c, process.c, random.c, re.c,
safe.c, string.c, thread.c, transcode.c, variable.c,
vm_insnhelper.c, vm_method.c, vm_trace.c: remove code for
$SAFE=4.
* test/dl/test_dl2.rb, test/erb/test_erb.rb,
test/readline/test_readline.rb,
test/readline/test_readline_history.rb, test/ruby/test_alias.rb,
test/ruby/test_array.rb, test/ruby/test_dir.rb,
test/ruby/test_encoding.rb, test/ruby/test_env.rb,
test/ruby/test_eval.rb, test/ruby/test_exception.rb,
test/ruby/test_file_exhaustive.rb, test/ruby/test_hash.rb,
test/ruby/test_io.rb, test/ruby/test_method.rb,
test/ruby/test_module.rb, test/ruby/test_object.rb,
test/ruby/test_pack.rb, test/ruby/test_rand.rb,
test/ruby/test_regexp.rb, test/ruby/test_settracefunc.rb,
test/ruby/test_struct.rb, test/ruby/test_thread.rb,
test/ruby/test_time.rb: remove tests for $SAFE=4.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-12 18:20:51 +04:00
|
|
|
keys = env_keys();
|
* include/ruby/ruby.h: constify RBasic::klass and add
RBASIC_CLASS(obj) macro which returns a class of `obj'.
This change is a part of RGENGC branch [ruby-trunk - Feature #8339].
* object.c: add new function rb_obj_reveal().
This function reveal interal (hidden) object by rb_obj_hide().
Note that do not change class before and after hiding.
Only permitted example is:
klass = RBASIC_CLASS(obj);
rb_obj_hide(obj);
....
rb_obj_reveal(obj, klass);
TODO: API design. rb_obj_reveal() should be replaced with others.
TODO: modify constified variables using cast may be harmful for
compiler's analysis and optimizaton.
Any idea to prohibt inserting RBasic::klass directly?
If rename RBasic::klass and force to use RBASIC_CLASS(obj),
then all codes such as `RBASIC(obj)->klass' will be
compilation error. Is it acceptable? (We have similar
experience at Ruby 1.9,
for example "RARRAY(ary)->ptr" to "RARRAY_PTR(ary)".
* internal.h: add some macros.
* RBASIC_CLEAR_CLASS(obj) clear RBasic::klass to make it internal
object.
* RBASIC_SET_CLASS(obj, cls) set RBasic::klass.
* RBASIC_SET_CLASS_RAW(obj, cls) same as RBASIC_SET_CLASS
without write barrier (planned).
* RCLASS_SET_SUPER(a, b) set super class of a.
* array.c, class.c, compile.c, encoding.c, enum.c, error.c, eval.c,
file.c, gc.c, hash.c, io.c, iseq.c, marshal.c, object.c,
parse.y, proc.c, process.c, random.c, ruby.c, sprintf.c,
string.c, thread.c, transcode.c, vm.c, vm_eval.c, win32/file.c:
Use above macros and functions to access RBasic::klass.
* ext/coverage/coverage.c, ext/readline/readline.c,
ext/socket/ancdata.c, ext/socket/init.c,
* ext/zlib/zlib.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40691 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-05-13 14:49:11 +04:00
|
|
|
RBASIC_CLEAR_CLASS(keys);
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i=0; i<RARRAY_LEN(keys); i++) {
|
2013-05-13 13:56:22 +04:00
|
|
|
VALUE val = rb_f_getenv(Qnil, RARRAY_AREF(keys, i));
|
1998-01-16 15:13:05 +03:00
|
|
|
if (!NIL_P(val)) {
|
2013-05-13 13:56:22 +04:00
|
|
|
if (RTEST(rb_yield_values(2, RARRAY_AREF(keys, i), val))) {
|
|
|
|
FL_UNSET(RARRAY_AREF(keys, i), FL_TAINT);
|
2019-02-27 06:26:09 +03:00
|
|
|
env_delete(RARRAY_AREF(keys, i));
|
2000-08-07 09:05:04 +04:00
|
|
|
del++;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-06-26 02:06:48 +03:00
|
|
|
RB_GC_GUARD(keys);
|
2000-08-07 09:05:04 +04:00
|
|
|
if (del == 0) return Qnil;
|
|
|
|
return envtbl;
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2018-11-04 14:45:11 +03:00
|
|
|
* ENV.delete_if { |name, value| block } -> Hash
|
|
|
|
* ENV.delete_if -> Enumerator
|
2011-06-30 04:20:15 +04:00
|
|
|
*
|
|
|
|
* Deletes every environment variable for which the block evaluates to +true+.
|
|
|
|
*
|
|
|
|
* If no block is given an enumerator is returned instead.
|
|
|
|
*/
|
2000-08-07 09:05:04 +04:00
|
|
|
static VALUE
|
2008-04-14 12:31:38 +04:00
|
|
|
env_delete_if(VALUE ehash)
|
2000-08-07 09:05:04 +04:00
|
|
|
{
|
2012-11-06 21:13:48 +04:00
|
|
|
RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
|
2008-04-14 12:31:38 +04:00
|
|
|
env_reject_bang(ehash);
|
1998-01-16 15:13:05 +03:00
|
|
|
return envtbl;
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.values_at(name, ...) -> Array
|
|
|
|
*
|
|
|
|
* Returns an array containing the environment variable values associated with
|
|
|
|
* the given names. See also ENV.select.
|
|
|
|
*/
|
2001-12-11 06:48:08 +03:00
|
|
|
static VALUE
|
2019-08-29 05:47:20 +03:00
|
|
|
env_values_at(int argc, VALUE *argv, VALUE _)
|
2001-12-11 06:48:08 +03:00
|
|
|
{
|
2004-11-18 11:11:12 +03:00
|
|
|
VALUE result;
|
2001-12-11 06:48:08 +03:00
|
|
|
long i;
|
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
result = rb_ary_new();
|
2003-05-04 20:03:24 +04:00
|
|
|
for (i=0; i<argc; i++) {
|
|
|
|
rb_ary_push(result, rb_f_getenv(Qnil, argv[i]));
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
2001-12-11 06:48:08 +03:00
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2018-11-04 14:45:11 +03:00
|
|
|
* ENV.select { |name, value| block } -> Hash
|
|
|
|
* ENV.select -> Enumerator
|
2018-11-04 14:46:49 +03:00
|
|
|
* ENV.filter { |name, value| block } -> Hash
|
|
|
|
* ENV.filter -> Enumerator
|
2011-06-30 04:20:15 +04:00
|
|
|
*
|
|
|
|
* Returns a copy of the environment for entries where the block returns true.
|
|
|
|
*
|
|
|
|
* Returns an Enumerator if no block was given.
|
2018-11-04 14:46:49 +03:00
|
|
|
*
|
|
|
|
* ENV.filter is an alias for ENV.select.
|
2011-06-30 04:20:15 +04:00
|
|
|
*/
|
2003-05-04 20:03:24 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_select(VALUE ehash)
|
2003-05-04 20:03:24 +04:00
|
|
|
{
|
|
|
|
VALUE result;
|
2014-06-26 03:28:04 +04:00
|
|
|
VALUE keys;
|
|
|
|
long i;
|
2003-05-04 20:03:24 +04:00
|
|
|
|
2012-11-06 21:13:48 +04:00
|
|
|
RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
|
2007-06-21 18:50:14 +04:00
|
|
|
result = rb_hash_new();
|
2014-06-26 03:28:04 +04:00
|
|
|
keys = env_keys();
|
|
|
|
for (i = 0; i < RARRAY_LEN(keys); ++i) {
|
|
|
|
VALUE key = RARRAY_AREF(keys, i);
|
|
|
|
VALUE val = rb_f_getenv(Qnil, key);
|
|
|
|
if (!NIL_P(val)) {
|
|
|
|
if (RTEST(rb_yield_values(2, key, val))) {
|
|
|
|
rb_hash_aset(result, key, val);
|
2003-05-04 20:03:24 +04:00
|
|
|
}
|
2001-12-11 06:48:08 +03:00
|
|
|
}
|
|
|
|
}
|
2015-06-26 02:06:48 +03:00
|
|
|
RB_GC_GUARD(keys);
|
2003-05-04 20:03:24 +04:00
|
|
|
|
2001-12-11 06:48:08 +03:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2018-11-04 14:45:11 +03:00
|
|
|
* ENV.select! { |name, value| block } -> ENV or nil
|
|
|
|
* ENV.select! -> Enumerator
|
2018-11-04 14:46:49 +03:00
|
|
|
* ENV.filter! { |name, value| block } -> ENV or nil
|
|
|
|
* ENV.filter! -> Enumerator
|
2011-06-30 04:20:15 +04:00
|
|
|
*
|
2018-11-04 14:45:59 +03:00
|
|
|
* Equivalent to ENV.keep_if but returns +nil+ if no changes were made.
|
2018-11-04 14:46:49 +03:00
|
|
|
*
|
|
|
|
* ENV.filter! is an alias for ENV.select!.
|
2011-06-30 04:20:15 +04:00
|
|
|
*/
|
2010-03-03 12:44:44 +03:00
|
|
|
static VALUE
|
|
|
|
env_select_bang(VALUE ehash)
|
|
|
|
{
|
2015-06-26 02:06:48 +03:00
|
|
|
VALUE keys;
|
2010-03-03 12:44:44 +03:00
|
|
|
long i;
|
|
|
|
int del = 0;
|
|
|
|
|
2012-11-06 21:13:48 +04:00
|
|
|
RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
|
* safe.c (rb_set_safe_level, safe_setter): raise an ArgumentError
when $SAFE is set to 4. $SAFE=4 is now obsolete.
[ruby-core:55222] [Feature #8468]
* object.c (rb_obj_untrusted, rb_obj_untrust, rb_obj_trust):
Kernel#untrusted?, untrust, and trust are now deprecated.
Their behavior is same as tainted?, taint, and untaint,
respectively.
* include/ruby/ruby.h (OBJ_UNTRUSTED, OBJ_UNTRUST): OBJ_UNTRUSTED()
and OBJ_UNTRUST() are aliases of OBJ_TAINTED() and OBJ_TAINT(),
respectively.
* array.c, class.c, debug.c, dir.c, encoding.c, error.c, eval.c,
ext/curses/curses.c, ext/dbm/dbm.c, ext/dl/cfunc.c,
ext/dl/cptr.c, ext/dl/dl.c, ext/etc/etc.c, ext/fiddle/fiddle.c,
ext/fiddle/pointer.c, ext/gdbm/gdbm.c, ext/readline/readline.c,
ext/sdbm/init.c, ext/socket/ancdata.c, ext/socket/basicsocket.c,
ext/socket/socket.c, ext/socket/udpsocket.c,
ext/stringio/stringio.c, ext/syslog/syslog.c, ext/tk/tcltklib.c,
ext/win32ole/win32ole.c, file.c, gc.c, hash.c, io.c, iseq.c,
load.c, marshal.c, object.c, proc.c, process.c, random.c, re.c,
safe.c, string.c, thread.c, transcode.c, variable.c,
vm_insnhelper.c, vm_method.c, vm_trace.c: remove code for
$SAFE=4.
* test/dl/test_dl2.rb, test/erb/test_erb.rb,
test/readline/test_readline.rb,
test/readline/test_readline_history.rb, test/ruby/test_alias.rb,
test/ruby/test_array.rb, test/ruby/test_dir.rb,
test/ruby/test_encoding.rb, test/ruby/test_env.rb,
test/ruby/test_eval.rb, test/ruby/test_exception.rb,
test/ruby/test_file_exhaustive.rb, test/ruby/test_hash.rb,
test/ruby/test_io.rb, test/ruby/test_method.rb,
test/ruby/test_module.rb, test/ruby/test_object.rb,
test/ruby/test_pack.rb, test/ruby/test_rand.rb,
test/ruby/test_regexp.rb, test/ruby/test_settracefunc.rb,
test/ruby/test_struct.rb, test/ruby/test_thread.rb,
test/ruby/test_time.rb: remove tests for $SAFE=4.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-12 18:20:51 +04:00
|
|
|
keys = env_keys();
|
* include/ruby/ruby.h: constify RBasic::klass and add
RBASIC_CLASS(obj) macro which returns a class of `obj'.
This change is a part of RGENGC branch [ruby-trunk - Feature #8339].
* object.c: add new function rb_obj_reveal().
This function reveal interal (hidden) object by rb_obj_hide().
Note that do not change class before and after hiding.
Only permitted example is:
klass = RBASIC_CLASS(obj);
rb_obj_hide(obj);
....
rb_obj_reveal(obj, klass);
TODO: API design. rb_obj_reveal() should be replaced with others.
TODO: modify constified variables using cast may be harmful for
compiler's analysis and optimizaton.
Any idea to prohibt inserting RBasic::klass directly?
If rename RBasic::klass and force to use RBASIC_CLASS(obj),
then all codes such as `RBASIC(obj)->klass' will be
compilation error. Is it acceptable? (We have similar
experience at Ruby 1.9,
for example "RARRAY(ary)->ptr" to "RARRAY_PTR(ary)".
* internal.h: add some macros.
* RBASIC_CLEAR_CLASS(obj) clear RBasic::klass to make it internal
object.
* RBASIC_SET_CLASS(obj, cls) set RBasic::klass.
* RBASIC_SET_CLASS_RAW(obj, cls) same as RBASIC_SET_CLASS
without write barrier (planned).
* RCLASS_SET_SUPER(a, b) set super class of a.
* array.c, class.c, compile.c, encoding.c, enum.c, error.c, eval.c,
file.c, gc.c, hash.c, io.c, iseq.c, marshal.c, object.c,
parse.y, proc.c, process.c, random.c, ruby.c, sprintf.c,
string.c, thread.c, transcode.c, vm.c, vm_eval.c, win32/file.c:
Use above macros and functions to access RBasic::klass.
* ext/coverage/coverage.c, ext/readline/readline.c,
ext/socket/ancdata.c, ext/socket/init.c,
* ext/zlib/zlib.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40691 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-05-13 14:49:11 +04:00
|
|
|
RBASIC_CLEAR_CLASS(keys);
|
2010-03-03 12:44:44 +03:00
|
|
|
for (i=0; i<RARRAY_LEN(keys); i++) {
|
2013-05-13 13:56:22 +04:00
|
|
|
VALUE val = rb_f_getenv(Qnil, RARRAY_AREF(keys, i));
|
2010-03-03 12:44:44 +03:00
|
|
|
if (!NIL_P(val)) {
|
2013-05-13 13:56:22 +04:00
|
|
|
if (!RTEST(rb_yield_values(2, RARRAY_AREF(keys, i), val))) {
|
|
|
|
FL_UNSET(RARRAY_AREF(keys, i), FL_TAINT);
|
2019-02-27 06:26:09 +03:00
|
|
|
env_delete(RARRAY_AREF(keys, i));
|
2010-03-03 12:44:44 +03:00
|
|
|
del++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2015-06-26 02:06:48 +03:00
|
|
|
RB_GC_GUARD(keys);
|
2010-03-03 12:44:44 +03:00
|
|
|
if (del == 0) return Qnil;
|
|
|
|
return envtbl;
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2018-11-04 14:45:11 +03:00
|
|
|
* ENV.keep_if { |name, value| block } -> Hash
|
|
|
|
* ENV.keep_if -> Enumerator
|
2011-06-30 04:20:15 +04:00
|
|
|
*
|
|
|
|
* Deletes every environment variable where the block evaluates to +false+.
|
|
|
|
*
|
|
|
|
* Returns an enumerator if no block was given.
|
|
|
|
*/
|
2010-03-03 12:44:44 +03:00
|
|
|
static VALUE
|
|
|
|
env_keep_if(VALUE ehash)
|
|
|
|
{
|
2012-11-06 21:13:48 +04:00
|
|
|
RETURN_SIZED_ENUMERATOR(ehash, 0, 0, rb_env_size);
|
2010-03-03 12:44:44 +03:00
|
|
|
env_select_bang(ehash);
|
|
|
|
return envtbl;
|
|
|
|
}
|
|
|
|
|
2018-04-19 08:55:42 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.slice(*keys) -> a_hash
|
|
|
|
*
|
|
|
|
* Returns a hash containing only the given keys from ENV and their values.
|
|
|
|
*
|
|
|
|
* ENV.slice("TERM","HOME") #=> {"TERM"=>"xterm-256color", "HOME"=>"/Users/rhc"}
|
|
|
|
*/
|
|
|
|
static VALUE
|
2019-08-29 05:47:20 +03:00
|
|
|
env_slice(int argc, VALUE *argv, VALUE _)
|
2018-04-19 08:55:42 +03:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
VALUE key, value, result;
|
|
|
|
|
|
|
|
if (argc == 0) {
|
|
|
|
return rb_hash_new();
|
|
|
|
}
|
|
|
|
result = rb_hash_new_with_size(argc);
|
|
|
|
|
|
|
|
for (i = 0; i < argc; i++) {
|
|
|
|
key = argv[i];
|
|
|
|
value = rb_f_getenv(Qnil, key);
|
|
|
|
if (value != Qnil)
|
|
|
|
rb_hash_aset(result, key, value);
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2008-04-24 18:46:39 +04:00
|
|
|
VALUE
|
|
|
|
rb_env_clear(void)
|
2003-01-07 10:36:40 +03:00
|
|
|
{
|
2015-06-26 02:06:48 +03:00
|
|
|
VALUE keys;
|
2003-08-01 06:52:21 +04:00
|
|
|
long i;
|
2007-06-29 09:15:46 +04:00
|
|
|
|
* safe.c (rb_set_safe_level, safe_setter): raise an ArgumentError
when $SAFE is set to 4. $SAFE=4 is now obsolete.
[ruby-core:55222] [Feature #8468]
* object.c (rb_obj_untrusted, rb_obj_untrust, rb_obj_trust):
Kernel#untrusted?, untrust, and trust are now deprecated.
Their behavior is same as tainted?, taint, and untaint,
respectively.
* include/ruby/ruby.h (OBJ_UNTRUSTED, OBJ_UNTRUST): OBJ_UNTRUSTED()
and OBJ_UNTRUST() are aliases of OBJ_TAINTED() and OBJ_TAINT(),
respectively.
* array.c, class.c, debug.c, dir.c, encoding.c, error.c, eval.c,
ext/curses/curses.c, ext/dbm/dbm.c, ext/dl/cfunc.c,
ext/dl/cptr.c, ext/dl/dl.c, ext/etc/etc.c, ext/fiddle/fiddle.c,
ext/fiddle/pointer.c, ext/gdbm/gdbm.c, ext/readline/readline.c,
ext/sdbm/init.c, ext/socket/ancdata.c, ext/socket/basicsocket.c,
ext/socket/socket.c, ext/socket/udpsocket.c,
ext/stringio/stringio.c, ext/syslog/syslog.c, ext/tk/tcltklib.c,
ext/win32ole/win32ole.c, file.c, gc.c, hash.c, io.c, iseq.c,
load.c, marshal.c, object.c, proc.c, process.c, random.c, re.c,
safe.c, string.c, thread.c, transcode.c, variable.c,
vm_insnhelper.c, vm_method.c, vm_trace.c: remove code for
$SAFE=4.
* test/dl/test_dl2.rb, test/erb/test_erb.rb,
test/readline/test_readline.rb,
test/readline/test_readline_history.rb, test/ruby/test_alias.rb,
test/ruby/test_array.rb, test/ruby/test_dir.rb,
test/ruby/test_encoding.rb, test/ruby/test_env.rb,
test/ruby/test_eval.rb, test/ruby/test_exception.rb,
test/ruby/test_file_exhaustive.rb, test/ruby/test_hash.rb,
test/ruby/test_io.rb, test/ruby/test_method.rb,
test/ruby/test_module.rb, test/ruby/test_object.rb,
test/ruby/test_pack.rb, test/ruby/test_rand.rb,
test/ruby/test_regexp.rb, test/ruby/test_settracefunc.rb,
test/ruby/test_struct.rb, test/ruby/test_thread.rb,
test/ruby/test_time.rb: remove tests for $SAFE=4.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-12 18:20:51 +04:00
|
|
|
keys = env_keys();
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i=0; i<RARRAY_LEN(keys); i++) {
|
2013-05-13 13:56:22 +04:00
|
|
|
VALUE val = rb_f_getenv(Qnil, RARRAY_AREF(keys, i));
|
2003-01-07 10:36:40 +03:00
|
|
|
if (!NIL_P(val)) {
|
2019-02-27 06:26:09 +03:00
|
|
|
env_delete(RARRAY_AREF(keys, i));
|
2003-01-07 10:36:40 +03:00
|
|
|
}
|
|
|
|
}
|
2015-06-26 02:06:48 +03:00
|
|
|
RB_GC_GUARD(keys);
|
2003-01-07 10:36:40 +03:00
|
|
|
return envtbl;
|
|
|
|
}
|
|
|
|
|
2019-08-29 05:47:20 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.clear
|
|
|
|
*
|
|
|
|
* Removes every environment variable.
|
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
env_clear(VALUE _)
|
|
|
|
{
|
|
|
|
return rb_env_clear();
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.to_s -> "ENV"
|
|
|
|
*
|
|
|
|
* Returns "ENV"
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2019-08-29 05:47:20 +03:00
|
|
|
env_to_s(VALUE _)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
* string.c (rb_str_usascii_new{,2}: defined.
(rb_str_new): set US-ASCII and ENC_CODERANGE_7BIT when empty
string.
* encoding.c (rb_usascii_encoding, rb_usascii_encindex): defined.
(rb_enc_inspect, enc_name, rb_locale_charmap, rb_enc_name_list_i):
use rb_str_ascii_new.
* array.c (recursive_join, inspect_ary): ditto.
* object.c (nil_to_s, nil_inspect, true_to_s, false_to_s,
rb_mod_to_s): ditto.
* hash.c (inspect_hash, rb_hash_inspect, rb_f_getenv, env_fetch,
env_clear, env_to_s, env_inspect): ditto.
* numeric.c (flo_to_s, int_chr, rb_fix2str): ditto.
* bignum.c (rb_big2str): ditto.
* file.c (rb_file_ftype, rb_file_s_dirname, rb_file_s_extname,
file_inspect_join, Init_file): ditto.
* test/ruby/test_ruby_m17n.rb: add checks for encoding of string.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-01-25 19:40:02 +03:00
|
|
|
return rb_usascii_str_new2("ENV");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.inspect -> string
|
|
|
|
*
|
|
|
|
* Returns the contents of the environment as a String.
|
|
|
|
*/
|
2000-12-05 12:36:54 +03:00
|
|
|
static VALUE
|
2019-08-29 05:47:20 +03:00
|
|
|
env_inspect(VALUE _)
|
2000-12-05 12:36:54 +03:00
|
|
|
{
|
|
|
|
char **env;
|
2004-11-18 11:11:12 +03:00
|
|
|
VALUE str, i;
|
2000-12-05 12:36:54 +03:00
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
str = rb_str_buf_new2("{");
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
2000-12-05 12:36:54 +03:00
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
|
|
|
|
if (env != environ) {
|
2001-05-30 13:12:34 +04:00
|
|
|
rb_str_buf_cat2(str, ", ");
|
2000-12-05 12:36:54 +03:00
|
|
|
}
|
|
|
|
if (s) {
|
2001-05-30 13:12:34 +04:00
|
|
|
rb_str_buf_cat2(str, "\"");
|
|
|
|
rb_str_buf_cat(str, *env, s-*env);
|
|
|
|
rb_str_buf_cat2(str, "\"=>");
|
2008-02-28 21:13:45 +03:00
|
|
|
i = rb_inspect(rb_str_new2(s+1));
|
2001-05-30 13:12:34 +04:00
|
|
|
rb_str_buf_append(str, i);
|
2000-12-05 12:36:54 +03:00
|
|
|
}
|
|
|
|
env++;
|
|
|
|
}
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
2001-05-30 13:12:34 +04:00
|
|
|
rb_str_buf_cat2(str, "}");
|
2000-12-05 12:36:54 +03:00
|
|
|
OBJ_TAINT(str);
|
|
|
|
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.to_a -> Array
|
|
|
|
*
|
|
|
|
* Converts the environment variables into an array of names and value arrays.
|
|
|
|
*
|
2013-04-16 10:28:35 +04:00
|
|
|
* ENV.to_a # => [["TERM", "xterm-color"], ["SHELL", "/bin/bash"], ...]
|
2011-06-30 04:20:15 +04:00
|
|
|
*
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2019-08-29 05:47:20 +03:00
|
|
|
env_to_a(VALUE _)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
char **env;
|
2004-11-18 11:11:12 +03:00
|
|
|
VALUE ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
ary = rb_ary_new();
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
1998-01-16 15:13:05 +03:00
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
1999-01-20 07:59:39 +03:00
|
|
|
if (s) {
|
2003-06-06 13:24:59 +04:00
|
|
|
rb_ary_push(ary, rb_assoc_new(env_str_new(*env, s-*env),
|
|
|
|
env_str_new2(s+1)));
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
env++;
|
|
|
|
}
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
1998-01-16 15:13:05 +03:00
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.rehash
|
|
|
|
*
|
|
|
|
* Re-hashing the environment variables does nothing. It is provided for
|
|
|
|
* compatibility with Hash.
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2019-08-29 05:47:20 +03:00
|
|
|
env_none(VALUE _)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.length
|
|
|
|
* ENV.size
|
|
|
|
*
|
|
|
|
* Returns the number of environment variables.
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2019-08-29 05:47:20 +03:00
|
|
|
env_size(VALUE _)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
int i;
|
2001-11-13 06:59:20 +03:00
|
|
|
char **env;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
2012-12-29 16:22:04 +04:00
|
|
|
for (i=0; env[i]; i++)
|
1998-01-16 15:13:05 +03:00
|
|
|
;
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
1998-01-16 15:13:05 +03:00
|
|
|
return INT2FIX(i);
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.empty? -> true or false
|
|
|
|
*
|
|
|
|
* Returns true when there are no environment variables
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2019-08-29 05:47:20 +03:00
|
|
|
env_empty_p(VALUE _)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-11-13 06:59:20 +03:00
|
|
|
char **env;
|
|
|
|
|
|
|
|
env = GET_ENVIRON(environ);
|
|
|
|
if (env[0] == 0) {
|
|
|
|
FREE_ENVIRON(environ);
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
FREE_ENVIRON(environ);
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.key?(name) -> true or false
|
|
|
|
* ENV.include?(name) -> true or false
|
|
|
|
* ENV.has_key?(name) -> true or false
|
|
|
|
* ENV.member?(name) -> true or false
|
|
|
|
*
|
|
|
|
* Returns +true+ if there is an environment variable with the given +name+.
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_has_key(VALUE env, VALUE key)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2014-06-25 16:18:53 +04:00
|
|
|
const char *s;
|
2001-05-02 08:22:21 +04:00
|
|
|
|
2014-06-25 16:18:53 +04:00
|
|
|
s = env_name(key);
|
2001-05-02 08:22:21 +04:00
|
|
|
if (getenv(s)) return Qtrue;
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.assoc(name) -> Array or nil
|
|
|
|
*
|
|
|
|
* Returns an Array of the name and value of the environment variable with
|
|
|
|
* +name+ or +nil+ if the name cannot be found.
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2007-06-22 20:26:07 +04:00
|
|
|
env_assoc(VALUE env, VALUE key)
|
|
|
|
{
|
2014-06-25 16:18:53 +04:00
|
|
|
const char *s, *e;
|
2007-06-22 20:26:07 +04:00
|
|
|
|
2015-12-06 15:13:25 +03:00
|
|
|
s = env_name(key);
|
2007-06-22 20:26:07 +04:00
|
|
|
e = getenv(s);
|
2016-08-04 05:54:32 +03:00
|
|
|
if (e) return rb_assoc_new(key, env_str_new2(e));
|
2007-06-22 20:26:07 +04:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.value?(value) -> true or false
|
|
|
|
* ENV.has_value?(value) -> true or false
|
|
|
|
*
|
|
|
|
* Returns +true+ if there is an environment variable with the given +value+.
|
|
|
|
*/
|
2007-06-22 20:26:07 +04:00
|
|
|
static VALUE
|
|
|
|
env_has_value(VALUE dmy, VALUE obj)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
char **env;
|
|
|
|
|
2007-06-22 20:26:07 +04:00
|
|
|
obj = rb_check_string_type(obj);
|
|
|
|
if (NIL_P(obj)) return Qnil;
|
2014-06-25 05:20:01 +04:00
|
|
|
rb_check_safe_obj(obj);
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
1998-01-16 15:13:05 +03:00
|
|
|
while (*env) {
|
2003-06-23 12:41:07 +04:00
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
if (s++) {
|
2003-11-28 13:28:21 +03:00
|
|
|
long len = strlen(s);
|
2007-06-22 20:26:07 +04:00
|
|
|
if (RSTRING_LEN(obj) == len && strncmp(s, RSTRING_PTR(obj), len) == 0) {
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qtrue;
|
2001-11-13 06:59:20 +03:00
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
env++;
|
|
|
|
}
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.rassoc(value)
|
|
|
|
*
|
|
|
|
* Returns an Array of the name and value of the environment variable with
|
|
|
|
* +value+ or +nil+ if the value cannot be found.
|
|
|
|
*/
|
2007-06-22 20:26:07 +04:00
|
|
|
static VALUE
|
|
|
|
env_rassoc(VALUE dmy, VALUE obj)
|
|
|
|
{
|
|
|
|
char **env;
|
|
|
|
|
|
|
|
obj = rb_check_string_type(obj);
|
|
|
|
if (NIL_P(obj)) return Qnil;
|
2014-06-25 05:20:01 +04:00
|
|
|
rb_check_safe_obj(obj);
|
2007-06-22 20:26:07 +04:00
|
|
|
env = GET_ENVIRON(environ);
|
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
if (s++) {
|
|
|
|
long len = strlen(s);
|
|
|
|
if (RSTRING_LEN(obj) == len && strncmp(s, RSTRING_PTR(obj), len) == 0) {
|
2008-02-05 18:25:35 +03:00
|
|
|
VALUE result = rb_assoc_new(rb_tainted_str_new(*env, s-*env-1), obj);
|
2007-06-22 20:26:07 +04:00
|
|
|
FREE_ENVIRON(environ);
|
2008-02-05 18:25:35 +03:00
|
|
|
return result;
|
2007-06-22 20:26:07 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
env++;
|
|
|
|
}
|
|
|
|
FREE_ENVIRON(environ);
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.key(value) -> name
|
|
|
|
*
|
|
|
|
* Returns the name of the environment variable with +value+. If the value is
|
|
|
|
* not found +nil+ is returned.
|
|
|
|
*/
|
1999-08-13 09:45:20 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_key(VALUE dmy, VALUE value)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
|
|
|
char **env;
|
2001-11-13 06:59:20 +03:00
|
|
|
VALUE str;
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2014-06-25 05:20:01 +04:00
|
|
|
SafeStringValue(value);
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
1999-08-13 09:45:20 +04:00
|
|
|
while (*env) {
|
2003-06-23 12:41:07 +04:00
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
if (s++) {
|
2003-11-28 13:28:21 +03:00
|
|
|
long len = strlen(s);
|
2006-08-31 14:47:44 +04:00
|
|
|
if (RSTRING_LEN(value) == len && strncmp(s, RSTRING_PTR(value), len) == 0) {
|
2003-06-06 13:24:59 +04:00
|
|
|
str = env_str_new(*env, s-*env-1);
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
|
|
|
return str;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
env++;
|
|
|
|
}
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
1999-08-13 09:45:20 +04:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.index(value) -> key
|
|
|
|
*
|
|
|
|
* Deprecated method that is equivalent to ENV.key
|
|
|
|
*/
|
2005-04-02 08:23:56 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_index(VALUE dmy, VALUE value)
|
2005-04-02 08:23:56 +04:00
|
|
|
{
|
|
|
|
rb_warn("ENV.index is deprecated; use ENV.key");
|
|
|
|
return env_key(dmy, value);
|
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_to_hash(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
char **env;
|
2004-11-18 11:11:12 +03:00
|
|
|
VALUE hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
hash = rb_hash_new();
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
1999-01-20 07:59:39 +03:00
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
if (s) {
|
2003-06-06 13:24:59 +04:00
|
|
|
rb_hash_aset(hash, env_str_new(*env, s-*env),
|
|
|
|
env_str_new2(s+1));
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
env++;
|
|
|
|
}
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
1999-01-20 07:59:39 +03:00
|
|
|
return hash;
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2019-08-29 05:47:20 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.to_hash -> hash
|
|
|
|
*
|
|
|
|
* Creates a hash with a copy of the environment variables.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
env_f_to_hash(VALUE _)
|
|
|
|
{
|
|
|
|
return env_to_hash();
|
|
|
|
}
|
|
|
|
|
2018-09-20 18:06:56 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.to_h -> hash
|
|
|
|
* ENV.to_h {|name, value| block } -> hash
|
|
|
|
*
|
|
|
|
* Creates a hash with a copy of the environment variables.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
static VALUE
|
2019-08-29 05:47:20 +03:00
|
|
|
env_to_h(VALUE _)
|
2018-09-20 18:06:56 +03:00
|
|
|
{
|
|
|
|
VALUE hash = env_to_hash();
|
|
|
|
if (rb_block_given_p()) {
|
|
|
|
hash = rb_hash_to_h_block(hash);
|
|
|
|
}
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2018-11-04 14:45:11 +03:00
|
|
|
* ENV.reject { |name, value| block } -> Hash
|
|
|
|
* ENV.reject -> Enumerator
|
2011-06-30 04:20:15 +04:00
|
|
|
*
|
2018-11-04 14:45:59 +03:00
|
|
|
* Same as ENV.delete_if, but works on (and returns) a copy of the
|
2011-06-30 04:20:15 +04:00
|
|
|
* environment.
|
|
|
|
*/
|
2000-02-08 11:54:02 +03:00
|
|
|
static VALUE
|
2019-08-29 05:47:20 +03:00
|
|
|
env_reject(VALUE _)
|
2000-02-08 11:54:02 +03:00
|
|
|
{
|
|
|
|
return rb_hash_delete_if(env_to_hash());
|
|
|
|
}
|
|
|
|
|
2019-06-15 02:53:42 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.freeze -> raises TypeError
|
|
|
|
*
|
|
|
|
* Ruby does not allow ENV to be frozen, so calling ENV.freeze
|
|
|
|
* raises TypeError.
|
|
|
|
*/
|
|
|
|
static VALUE
|
|
|
|
env_freeze(VALUE self)
|
|
|
|
{
|
|
|
|
rb_raise(rb_eTypeError, "cannot freeze ENV");
|
|
|
|
return self; /* Not reached */
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.shift -> Array or nil
|
|
|
|
*
|
|
|
|
* Removes an environment variable name-value pair from ENV and returns it as
|
|
|
|
* an Array. Returns +nil+ if when the environment is empty.
|
|
|
|
*/
|
2003-01-07 10:36:40 +03:00
|
|
|
static VALUE
|
2019-08-29 05:47:20 +03:00
|
|
|
env_shift(VALUE _)
|
2003-01-07 10:36:40 +03:00
|
|
|
{
|
|
|
|
char **env;
|
2014-06-27 00:33:34 +04:00
|
|
|
VALUE result = Qnil;
|
2003-01-07 10:36:40 +03:00
|
|
|
|
|
|
|
env = GET_ENVIRON(environ);
|
|
|
|
if (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
if (s) {
|
2003-06-06 13:24:59 +04:00
|
|
|
VALUE key = env_str_new(*env, s-*env);
|
2006-08-31 14:47:44 +04:00
|
|
|
VALUE val = env_str_new2(getenv(RSTRING_PTR(key)));
|
2019-02-27 06:26:09 +03:00
|
|
|
env_delete(key);
|
2014-06-27 00:33:34 +04:00
|
|
|
result = rb_assoc_new(key, val);
|
2003-01-07 10:36:40 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
FREE_ENVIRON(environ);
|
2014-06-27 00:33:34 +04:00
|
|
|
return result;
|
2003-01-07 10:36:40 +03:00
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.invert -> Hash
|
|
|
|
*
|
|
|
|
* Returns a new hash created by using environment variable names as values
|
|
|
|
* and values as names.
|
|
|
|
*/
|
2003-01-07 10:36:40 +03:00
|
|
|
static VALUE
|
2019-08-29 05:47:20 +03:00
|
|
|
env_invert(VALUE _)
|
2003-01-07 10:36:40 +03:00
|
|
|
{
|
|
|
|
return rb_hash_invert(env_to_hash());
|
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_replace_i(VALUE key, VALUE val, VALUE keys)
|
2003-01-07 10:36:40 +03:00
|
|
|
{
|
2019-02-27 06:26:05 +03:00
|
|
|
env_aset(key, val);
|
2012-03-31 08:20:45 +04:00
|
|
|
if (rb_ary_includes(keys, key)) {
|
|
|
|
rb_ary_delete(keys, key);
|
2003-01-07 10:36:40 +03:00
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ENV.replace(hash) -> env
|
|
|
|
*
|
|
|
|
* Replaces the contents of the environment variables with the contents of
|
|
|
|
* +hash+.
|
|
|
|
*/
|
2003-01-07 10:36:40 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_replace(VALUE env, VALUE hash)
|
2003-01-07 10:36:40 +03:00
|
|
|
{
|
2015-06-26 02:06:48 +03:00
|
|
|
VALUE keys;
|
2003-08-01 06:52:21 +04:00
|
|
|
long i;
|
2003-01-07 10:36:40 +03:00
|
|
|
|
* safe.c (rb_set_safe_level, safe_setter): raise an ArgumentError
when $SAFE is set to 4. $SAFE=4 is now obsolete.
[ruby-core:55222] [Feature #8468]
* object.c (rb_obj_untrusted, rb_obj_untrust, rb_obj_trust):
Kernel#untrusted?, untrust, and trust are now deprecated.
Their behavior is same as tainted?, taint, and untaint,
respectively.
* include/ruby/ruby.h (OBJ_UNTRUSTED, OBJ_UNTRUST): OBJ_UNTRUSTED()
and OBJ_UNTRUST() are aliases of OBJ_TAINTED() and OBJ_TAINT(),
respectively.
* array.c, class.c, debug.c, dir.c, encoding.c, error.c, eval.c,
ext/curses/curses.c, ext/dbm/dbm.c, ext/dl/cfunc.c,
ext/dl/cptr.c, ext/dl/dl.c, ext/etc/etc.c, ext/fiddle/fiddle.c,
ext/fiddle/pointer.c, ext/gdbm/gdbm.c, ext/readline/readline.c,
ext/sdbm/init.c, ext/socket/ancdata.c, ext/socket/basicsocket.c,
ext/socket/socket.c, ext/socket/udpsocket.c,
ext/stringio/stringio.c, ext/syslog/syslog.c, ext/tk/tcltklib.c,
ext/win32ole/win32ole.c, file.c, gc.c, hash.c, io.c, iseq.c,
load.c, marshal.c, object.c, proc.c, process.c, random.c, re.c,
safe.c, string.c, thread.c, transcode.c, variable.c,
vm_insnhelper.c, vm_method.c, vm_trace.c: remove code for
$SAFE=4.
* test/dl/test_dl2.rb, test/erb/test_erb.rb,
test/readline/test_readline.rb,
test/readline/test_readline_history.rb, test/ruby/test_alias.rb,
test/ruby/test_array.rb, test/ruby/test_dir.rb,
test/ruby/test_encoding.rb, test/ruby/test_env.rb,
test/ruby/test_eval.rb, test/ruby/test_exception.rb,
test/ruby/test_file_exhaustive.rb, test/ruby/test_hash.rb,
test/ruby/test_io.rb, test/ruby/test_method.rb,
test/ruby/test_module.rb, test/ruby/test_object.rb,
test/ruby/test_pack.rb, test/ruby/test_rand.rb,
test/ruby/test_regexp.rb, test/ruby/test_settracefunc.rb,
test/ruby/test_struct.rb, test/ruby/test_thread.rb,
test/ruby/test_time.rb: remove tests for $SAFE=4.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41259 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2013-06-12 18:20:51 +04:00
|
|
|
keys = env_keys();
|
2003-01-07 10:36:40 +03:00
|
|
|
if (env == hash) return env;
|
|
|
|
hash = to_hash(hash);
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, env_replace_i, keys);
|
2003-01-07 10:36:40 +03:00
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i=0; i<RARRAY_LEN(keys); i++) {
|
2019-02-27 06:26:09 +03:00
|
|
|
env_delete(RARRAY_AREF(keys, i));
|
2003-01-07 10:36:40 +03:00
|
|
|
}
|
2015-06-26 02:06:48 +03:00
|
|
|
RB_GC_GUARD(keys);
|
2003-01-07 10:36:40 +03:00
|
|
|
return env;
|
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
2019-08-27 05:53:39 +03:00
|
|
|
env_update_i(VALUE key, VALUE val, VALUE _)
|
2003-01-07 10:36:40 +03:00
|
|
|
{
|
2012-03-31 08:20:45 +04:00
|
|
|
if (rb_block_given_p()) {
|
|
|
|
val = rb_yield_values(3, key, rb_f_getenv(Qnil, key), val);
|
2003-01-07 10:36:40 +03:00
|
|
|
}
|
2019-02-27 06:26:05 +03:00
|
|
|
env_aset(key, val);
|
2003-01-07 10:36:40 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2011-06-30 04:20:15 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2018-11-04 14:45:11 +03:00
|
|
|
* ENV.update(hash) -> Hash
|
|
|
|
* ENV.update(hash) { |name, old_value, new_value| block } -> Hash
|
2019-06-21 06:28:28 +03:00
|
|
|
* ENV.merge!(hash) -> Hash
|
|
|
|
* ENV.merge!(hash) { |name, old_value, new_value| block } -> Hash
|
2011-06-30 04:20:15 +04:00
|
|
|
*
|
|
|
|
* Adds the contents of +hash+ to the environment variables. If no block is
|
|
|
|
* specified entries with duplicate keys are overwritten, otherwise the value
|
|
|
|
* of each duplicate name is determined by calling the block with the key, its
|
|
|
|
* value from the environment and its value from the hash.
|
|
|
|
*/
|
2003-01-07 10:36:40 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_update(VALUE env, VALUE hash)
|
2003-01-07 10:36:40 +03:00
|
|
|
{
|
|
|
|
if (env == hash) return env;
|
|
|
|
hash = to_hash(hash);
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, env_update_i, 0);
|
2003-01-07 10:36:40 +03:00
|
|
|
return env;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
2011-10-05 00:57:07 +04:00
|
|
|
* A Hash is a dictionary-like collection of unique keys and their values.
|
|
|
|
* Also called associative arrays, they are similar to Arrays, but where an
|
|
|
|
* Array uses integers as its index, a Hash allows you to use any object
|
2011-11-04 11:19:23 +04:00
|
|
|
* type.
|
2011-10-05 00:57:07 +04:00
|
|
|
*
|
|
|
|
* Hashes enumerate their values in the order that the corresponding keys
|
2011-11-04 11:19:23 +04:00
|
|
|
* were inserted.
|
2011-10-05 00:57:07 +04:00
|
|
|
*
|
|
|
|
* A Hash can be easily created by using its implicit form:
|
|
|
|
*
|
|
|
|
* grades = { "Jane Doe" => 10, "Jim Doe" => 6 }
|
2011-11-04 11:19:23 +04:00
|
|
|
*
|
2015-08-07 21:42:01 +03:00
|
|
|
* Hashes allow an alternate syntax for keys that are symbols.
|
2011-11-04 11:19:23 +04:00
|
|
|
* Instead of
|
2011-10-05 00:57:07 +04:00
|
|
|
*
|
|
|
|
* options = { :font_size => 10, :font_family => "Arial" }
|
2011-11-04 11:19:23 +04:00
|
|
|
*
|
|
|
|
* You could write it as:
|
2011-10-05 00:57:07 +04:00
|
|
|
*
|
|
|
|
* options = { font_size: 10, font_family: "Arial" }
|
2011-11-04 11:19:23 +04:00
|
|
|
*
|
2011-10-05 00:57:07 +04:00
|
|
|
* Each named key is a symbol you can access in hash:
|
|
|
|
*
|
|
|
|
* options[:font_size] # => 10
|
|
|
|
*
|
|
|
|
* A Hash can also be created through its ::new method:
|
|
|
|
*
|
|
|
|
* grades = Hash.new
|
|
|
|
* grades["Dorothy Doe"] = 9
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2003-12-23 19:21:17 +03:00
|
|
|
* Hashes have a <em>default value</em> that is returned when accessing
|
2011-10-05 00:57:07 +04:00
|
|
|
* keys that do not exist in the hash. If no default is set +nil+ is used.
|
2011-11-04 11:19:23 +04:00
|
|
|
* You can set the default value by sending it as an argument to Hash.new:
|
2011-10-05 00:57:07 +04:00
|
|
|
*
|
|
|
|
* grades = Hash.new(0)
|
|
|
|
*
|
|
|
|
* Or by using the #default= method:
|
|
|
|
*
|
|
|
|
* grades = {"Timmy Doe" => 8}
|
|
|
|
* grades.default = 0
|
2011-11-04 11:19:23 +04:00
|
|
|
*
|
2011-10-05 00:57:07 +04:00
|
|
|
* Accessing a value in a Hash requires using its key:
|
|
|
|
*
|
2013-10-03 04:43:01 +04:00
|
|
|
* puts grades["Jane Doe"] # => 0
|
2011-11-04 11:19:23 +04:00
|
|
|
*
|
2011-10-05 00:57:07 +04:00
|
|
|
* === Common Uses
|
|
|
|
*
|
|
|
|
* Hashes are an easy way to represent data structures, such as
|
|
|
|
*
|
|
|
|
* books = {}
|
2017-03-01 22:57:14 +03:00
|
|
|
* books[:matz] = "The Ruby Programming Language"
|
2011-10-05 00:57:07 +04:00
|
|
|
* books[:black] = "The Well-Grounded Rubyist"
|
2011-11-04 11:19:23 +04:00
|
|
|
*
|
2011-10-05 00:57:07 +04:00
|
|
|
* Hashes are also commonly used as a way to have named parameters in
|
|
|
|
* functions. Note that no brackets are used below. If a hash is the last
|
|
|
|
* argument on a method call, no braces are needed, thus creating a really
|
2011-11-04 11:19:23 +04:00
|
|
|
* clean interface:
|
|
|
|
*
|
2011-10-05 00:57:07 +04:00
|
|
|
* Person.create(name: "John Doe", age: 27)
|
|
|
|
*
|
|
|
|
* def self.create(params)
|
|
|
|
* @name = params[:name]
|
|
|
|
* @age = params[:age]
|
|
|
|
* end
|
2007-06-29 09:15:46 +04:00
|
|
|
*
|
2012-02-24 03:03:39 +04:00
|
|
|
* === Hash Keys
|
|
|
|
*
|
|
|
|
* Two objects refer to the same hash key when their <code>hash</code> value
|
|
|
|
* is identical and the two objects are <code>eql?</code> to each other.
|
|
|
|
*
|
|
|
|
* A user-defined class may be used as a hash key if the <code>hash</code>
|
|
|
|
* and <code>eql?</code> methods are overridden to provide meaningful
|
|
|
|
* behavior. By default, separate instances refer to separate hash keys.
|
|
|
|
*
|
2012-03-04 17:59:23 +04:00
|
|
|
* A typical implementation of <code>hash</code> is based on the
|
2012-02-24 03:03:39 +04:00
|
|
|
* object's data while <code>eql?</code> is usually aliased to the overridden
|
|
|
|
* <code>==</code> method:
|
|
|
|
*
|
|
|
|
* class Book
|
|
|
|
* attr_reader :author, :title
|
|
|
|
*
|
|
|
|
* def initialize(author, title)
|
|
|
|
* @author = author
|
|
|
|
* @title = title
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* def ==(other)
|
|
|
|
* self.class === other and
|
2012-03-04 17:59:23 +04:00
|
|
|
* other.author == @author and
|
2012-02-24 03:03:39 +04:00
|
|
|
* other.title == @title
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* alias eql? ==
|
|
|
|
*
|
|
|
|
* def hash
|
|
|
|
* @author.hash ^ @title.hash # XOR
|
|
|
|
* end
|
|
|
|
* end
|
|
|
|
*
|
|
|
|
* book1 = Book.new 'matz', 'Ruby in a Nutshell'
|
|
|
|
* book2 = Book.new 'matz', 'Ruby in a Nutshell'
|
|
|
|
*
|
|
|
|
* reviews = {}
|
|
|
|
*
|
|
|
|
* reviews[book1] = 'Great reference!'
|
|
|
|
* reviews[book2] = 'Nice and compact!'
|
|
|
|
*
|
|
|
|
* reviews.length #=> 1
|
|
|
|
*
|
|
|
|
* See also Object#hash and Object#eql?
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
Init_Hash(void)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2008-06-09 13:25:32 +04:00
|
|
|
#undef rb_intern
|
2008-08-16 04:20:31 +04:00
|
|
|
#define rb_intern(str) rb_intern_const(str)
|
2001-12-10 10:18:16 +03:00
|
|
|
id_hash = rb_intern("hash");
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
id_yield = rb_intern("yield");
|
2001-12-10 10:18:16 +03:00
|
|
|
id_default = rb_intern("default");
|
2014-02-20 06:27:30 +04:00
|
|
|
id_flatten_bang = rb_intern("flatten!");
|
2019-08-01 05:20:37 +03:00
|
|
|
id_hash_iter_lev = rb_make_internal_id();
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_cHash = rb_define_class("Hash", rb_cObject);
|
|
|
|
|
|
|
|
rb_include_module(rb_cHash, rb_mEnumerable);
|
|
|
|
|
* probes.d: add DTrace probe declarations. [ruby-core:27448]
* array.c (empty_ary_alloc, ary_new): added array create DTrace probe.
* compile.c (rb_insns_name): allowing DTrace probes to access
instruction sequence name.
* Makefile.in: translate probes.d file to appropriate header file.
* common.mk: declare dependencies on the DTrace header.
* configure.in: add a test for existence of DTrace.
* eval.c (setup_exception): add a probe for when an exception is
raised.
* gc.c: Add DTrace probes for mark begin and end, and sweep begin and
end.
* hash.c (empty_hash_alloc): Add a probe for hash allocation.
* insns.def: Add probes for function entry and return.
* internal.h: function declaration for compile.c change.
* load.c (rb_f_load): add probes for `load` entry and exit, require
entry and exit, and wrapping search_required for load path search.
* object.c (rb_obj_alloc): added a probe for general object creation.
* parse.y (yycompile0): added a probe around parse and compile phase.
* string.c (empty_str_alloc, str_new): DTrace probes for string
allocation.
* test/dtrace/*: tests for DTrace probes.
* vm.c (vm_invoke_proc): add probes for function return on exception
raise, hash create, and instruction sequence execution.
* vm_core.h: add probe declarations for function entry and exit.
* vm_dump.c: add probes header file.
* vm_eval.c (vm_call0_cfunc, vm_call0_cfunc_with_frame): add probe on
function entry and return.
* vm_exec.c: expose instruction number to instruction name function.
* vm_insnshelper.c: add function entry and exit probes for cfunc
methods.
* vm_insnhelper.h: vm usage information is always collected, so
uncomment the functions.
12 19:14:50 2012 Akinori MUSHA <knu@iDaemons.org>
* configure.in (isinf, isnan): isinf() and isnan() are macros on
DragonFly which cannot be found by AC_REPLACE_FUNCS(). This
workaround enforces the fact that they exist on DragonFly.
12 15:59:38 2012 Shugo Maeda <shugo@ruby-lang.org>
* vm_core.h (rb_call_info_t::refinements), compile.c (new_callinfo),
vm_insnhelper.c (vm_search_method): revert r37616 because it's too
slow. [ruby-dev:46477]
* test/ruby/test_refinement.rb (test_inline_method_cache): skip
the test until the bug is fixed efficiently.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37631 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2012-11-13 01:52:12 +04:00
|
|
|
rb_define_alloc_func(rb_cHash, empty_hash_alloc);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_singleton_method(rb_cHash, "[]", rb_hash_s_create, -1);
|
2007-08-24 21:47:09 +04:00
|
|
|
rb_define_singleton_method(rb_cHash, "try_convert", rb_hash_s_try_convert, 1);
|
2016-12-03 14:18:44 +03:00
|
|
|
rb_define_method(rb_cHash, "initialize", rb_hash_initialize, -1);
|
|
|
|
rb_define_method(rb_cHash, "initialize_copy", rb_hash_initialize_copy, 1);
|
|
|
|
rb_define_method(rb_cHash, "rehash", rb_hash_rehash, 0);
|
|
|
|
|
|
|
|
rb_define_method(rb_cHash, "to_hash", rb_hash_to_hash, 0);
|
|
|
|
rb_define_method(rb_cHash, "to_h", rb_hash_to_h, 0);
|
|
|
|
rb_define_method(rb_cHash, "to_a", rb_hash_to_a, 0);
|
|
|
|
rb_define_method(rb_cHash, "inspect", rb_hash_inspect, 0);
|
2009-05-29 12:08:25 +04:00
|
|
|
rb_define_alias(rb_cHash, "to_s", "inspect");
|
2016-12-03 14:18:44 +03:00
|
|
|
rb_define_method(rb_cHash, "to_proc", rb_hash_to_proc, 0);
|
|
|
|
|
|
|
|
rb_define_method(rb_cHash, "==", rb_hash_equal, 1);
|
|
|
|
rb_define_method(rb_cHash, "[]", rb_hash_aref, 1);
|
|
|
|
rb_define_method(rb_cHash, "hash", rb_hash_hash, 0);
|
|
|
|
rb_define_method(rb_cHash, "eql?", rb_hash_eql, 1);
|
|
|
|
rb_define_method(rb_cHash, "fetch", rb_hash_fetch_m, -1);
|
|
|
|
rb_define_method(rb_cHash, "[]=", rb_hash_aset, 2);
|
|
|
|
rb_define_method(rb_cHash, "store", rb_hash_aset, 2);
|
|
|
|
rb_define_method(rb_cHash, "default", rb_hash_default, -1);
|
|
|
|
rb_define_method(rb_cHash, "default=", rb_hash_set_default, 1);
|
|
|
|
rb_define_method(rb_cHash, "default_proc", rb_hash_default_proc, 0);
|
|
|
|
rb_define_method(rb_cHash, "default_proc=", rb_hash_set_default_proc, 1);
|
|
|
|
rb_define_method(rb_cHash, "key", rb_hash_key, 1);
|
|
|
|
rb_define_method(rb_cHash, "index", rb_hash_index, 1);
|
|
|
|
rb_define_method(rb_cHash, "size", rb_hash_size, 0);
|
|
|
|
rb_define_method(rb_cHash, "length", rb_hash_size, 0);
|
|
|
|
rb_define_method(rb_cHash, "empty?", rb_hash_empty_p, 0);
|
|
|
|
|
|
|
|
rb_define_method(rb_cHash, "each_value", rb_hash_each_value, 0);
|
|
|
|
rb_define_method(rb_cHash, "each_key", rb_hash_each_key, 0);
|
|
|
|
rb_define_method(rb_cHash, "each_pair", rb_hash_each_pair, 0);
|
|
|
|
rb_define_method(rb_cHash, "each", rb_hash_each_pair, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2017-07-14 09:44:00 +03:00
|
|
|
rb_define_method(rb_cHash, "transform_keys", rb_hash_transform_keys, 0);
|
|
|
|
rb_define_method(rb_cHash, "transform_keys!", rb_hash_transform_keys_bang, 0);
|
2016-09-08 05:33:18 +03:00
|
|
|
rb_define_method(rb_cHash, "transform_values", rb_hash_transform_values, 0);
|
|
|
|
rb_define_method(rb_cHash, "transform_values!", rb_hash_transform_values_bang, 0);
|
2016-08-09 11:54:15 +03:00
|
|
|
|
2016-12-03 14:18:44 +03:00
|
|
|
rb_define_method(rb_cHash, "keys", rb_hash_keys, 0);
|
|
|
|
rb_define_method(rb_cHash, "values", rb_hash_values, 0);
|
|
|
|
rb_define_method(rb_cHash, "values_at", rb_hash_values_at, -1);
|
|
|
|
rb_define_method(rb_cHash, "fetch_values", rb_hash_fetch_values, -1);
|
|
|
|
|
|
|
|
rb_define_method(rb_cHash, "shift", rb_hash_shift, 0);
|
|
|
|
rb_define_method(rb_cHash, "delete", rb_hash_delete_m, 1);
|
|
|
|
rb_define_method(rb_cHash, "delete_if", rb_hash_delete_if, 0);
|
|
|
|
rb_define_method(rb_cHash, "keep_if", rb_hash_keep_if, 0);
|
|
|
|
rb_define_method(rb_cHash, "select", rb_hash_select, 0);
|
|
|
|
rb_define_method(rb_cHash, "select!", rb_hash_select_bang, 0);
|
2018-02-25 16:52:07 +03:00
|
|
|
rb_define_method(rb_cHash, "filter", rb_hash_select, 0);
|
|
|
|
rb_define_method(rb_cHash, "filter!", rb_hash_select_bang, 0);
|
2016-12-03 14:18:44 +03:00
|
|
|
rb_define_method(rb_cHash, "reject", rb_hash_reject, 0);
|
|
|
|
rb_define_method(rb_cHash, "reject!", rb_hash_reject_bang, 0);
|
2017-10-21 09:08:33 +03:00
|
|
|
rb_define_method(rb_cHash, "slice", rb_hash_slice, -1);
|
2016-12-03 14:18:44 +03:00
|
|
|
rb_define_method(rb_cHash, "clear", rb_hash_clear, 0);
|
|
|
|
rb_define_method(rb_cHash, "invert", rb_hash_invert, 0);
|
2018-09-19 04:59:26 +03:00
|
|
|
rb_define_method(rb_cHash, "update", rb_hash_update, -1);
|
2016-12-03 14:18:44 +03:00
|
|
|
rb_define_method(rb_cHash, "replace", rb_hash_replace, 1);
|
2018-09-19 04:59:26 +03:00
|
|
|
rb_define_method(rb_cHash, "merge!", rb_hash_update, -1);
|
|
|
|
rb_define_method(rb_cHash, "merge", rb_hash_merge, -1);
|
2007-06-22 20:26:07 +04:00
|
|
|
rb_define_method(rb_cHash, "assoc", rb_hash_assoc, 1);
|
|
|
|
rb_define_method(rb_cHash, "rassoc", rb_hash_rassoc, 1);
|
|
|
|
rb_define_method(rb_cHash, "flatten", rb_hash_flatten, -1);
|
2016-12-03 14:18:44 +03:00
|
|
|
rb_define_method(rb_cHash, "compact", rb_hash_compact, 0);
|
|
|
|
rb_define_method(rb_cHash, "compact!", rb_hash_compact_bang, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2016-12-03 14:18:44 +03:00
|
|
|
rb_define_method(rb_cHash, "include?", rb_hash_has_key, 1);
|
|
|
|
rb_define_method(rb_cHash, "member?", rb_hash_has_key, 1);
|
|
|
|
rb_define_method(rb_cHash, "has_key?", rb_hash_has_key, 1);
|
|
|
|
rb_define_method(rb_cHash, "has_value?", rb_hash_has_value, 1);
|
|
|
|
rb_define_method(rb_cHash, "key?", rb_hash_has_key, 1);
|
|
|
|
rb_define_method(rb_cHash, "value?", rb_hash_has_value, 1);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2016-12-03 14:18:44 +03:00
|
|
|
rb_define_method(rb_cHash, "compare_by_identity", rb_hash_compare_by_id, 0);
|
|
|
|
rb_define_method(rb_cHash, "compare_by_identity?", rb_hash_compare_by_id_p, 0);
|
2006-09-11 12:09:19 +04:00
|
|
|
|
2017-12-11 01:36:28 +03:00
|
|
|
rb_define_method(rb_cHash, "any?", rb_hash_any_p, -1);
|
2015-11-09 15:27:26 +03:00
|
|
|
rb_define_method(rb_cHash, "dig", rb_hash_dig, -1);
|
2014-07-18 17:16:48 +04:00
|
|
|
|
2015-11-10 08:02:02 +03:00
|
|
|
rb_define_method(rb_cHash, "<=", rb_hash_le, 1);
|
|
|
|
rb_define_method(rb_cHash, "<", rb_hash_lt, 1);
|
|
|
|
rb_define_method(rb_cHash, ">=", rb_hash_ge, 1);
|
|
|
|
rb_define_method(rb_cHash, ">", rb_hash_gt, 1);
|
|
|
|
|
2019-04-17 09:48:03 +03:00
|
|
|
rb_define_method(rb_cHash, "deconstruct_keys", rb_hash_deconstruct_keys, 1);
|
|
|
|
|
2011-06-29 07:09:34 +04:00
|
|
|
/* Document-class: ENV
|
|
|
|
*
|
|
|
|
* ENV is a hash-like accessor for environment variables.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Hack to get RDoc to regard ENV as a class:
|
|
|
|
* envtbl = rb_define_class("ENV", rb_cObject);
|
|
|
|
*/
|
1999-01-20 07:59:39 +03:00
|
|
|
origenviron = environ;
|
|
|
|
envtbl = rb_obj_alloc(rb_cObject);
|
|
|
|
rb_extend_object(envtbl, rb_mEnumerable);
|
|
|
|
|
2016-12-03 14:18:44 +03:00
|
|
|
rb_define_singleton_method(envtbl, "[]", rb_f_getenv, 1);
|
|
|
|
rb_define_singleton_method(envtbl, "fetch", env_fetch, -1);
|
2019-02-27 06:26:05 +03:00
|
|
|
rb_define_singleton_method(envtbl, "[]=", env_aset_m, 2);
|
|
|
|
rb_define_singleton_method(envtbl, "store", env_aset_m, 2);
|
2016-12-03 14:18:44 +03:00
|
|
|
rb_define_singleton_method(envtbl, "each", env_each_pair, 0);
|
|
|
|
rb_define_singleton_method(envtbl, "each_pair", env_each_pair, 0);
|
|
|
|
rb_define_singleton_method(envtbl, "each_key", env_each_key, 0);
|
|
|
|
rb_define_singleton_method(envtbl, "each_value", env_each_value, 0);
|
|
|
|
rb_define_singleton_method(envtbl, "delete", env_delete_m, 1);
|
|
|
|
rb_define_singleton_method(envtbl, "delete_if", env_delete_if, 0);
|
|
|
|
rb_define_singleton_method(envtbl, "keep_if", env_keep_if, 0);
|
2018-04-19 08:55:42 +03:00
|
|
|
rb_define_singleton_method(envtbl, "slice", env_slice, -1);
|
2019-08-29 05:47:20 +03:00
|
|
|
rb_define_singleton_method(envtbl, "clear", env_clear, 0);
|
2016-12-03 14:18:44 +03:00
|
|
|
rb_define_singleton_method(envtbl, "reject", env_reject, 0);
|
|
|
|
rb_define_singleton_method(envtbl, "reject!", env_reject_bang, 0);
|
|
|
|
rb_define_singleton_method(envtbl, "select", env_select, 0);
|
|
|
|
rb_define_singleton_method(envtbl, "select!", env_select_bang, 0);
|
2018-02-25 16:52:07 +03:00
|
|
|
rb_define_singleton_method(envtbl, "filter", env_select, 0);
|
|
|
|
rb_define_singleton_method(envtbl, "filter!", env_select_bang, 0);
|
2016-12-03 14:18:44 +03:00
|
|
|
rb_define_singleton_method(envtbl, "shift", env_shift, 0);
|
2019-06-15 02:53:42 +03:00
|
|
|
rb_define_singleton_method(envtbl, "freeze", env_freeze, 0);
|
2016-12-03 14:18:44 +03:00
|
|
|
rb_define_singleton_method(envtbl, "invert", env_invert, 0);
|
|
|
|
rb_define_singleton_method(envtbl, "replace", env_replace, 1);
|
|
|
|
rb_define_singleton_method(envtbl, "update", env_update, 1);
|
2019-06-21 06:28:28 +03:00
|
|
|
rb_define_singleton_method(envtbl, "merge!", env_update, 1);
|
2016-12-03 14:18:44 +03:00
|
|
|
rb_define_singleton_method(envtbl, "inspect", env_inspect, 0);
|
|
|
|
rb_define_singleton_method(envtbl, "rehash", env_none, 0);
|
|
|
|
rb_define_singleton_method(envtbl, "to_a", env_to_a, 0);
|
|
|
|
rb_define_singleton_method(envtbl, "to_s", env_to_s, 0);
|
|
|
|
rb_define_singleton_method(envtbl, "key", env_key, 1);
|
|
|
|
rb_define_singleton_method(envtbl, "index", env_index, 1);
|
|
|
|
rb_define_singleton_method(envtbl, "size", env_size, 0);
|
|
|
|
rb_define_singleton_method(envtbl, "length", env_size, 0);
|
|
|
|
rb_define_singleton_method(envtbl, "empty?", env_empty_p, 0);
|
2019-08-29 05:47:20 +03:00
|
|
|
rb_define_singleton_method(envtbl, "keys", env_f_keys, 0);
|
|
|
|
rb_define_singleton_method(envtbl, "values", env_f_values, 0);
|
2016-12-03 14:18:44 +03:00
|
|
|
rb_define_singleton_method(envtbl, "values_at", env_values_at, -1);
|
|
|
|
rb_define_singleton_method(envtbl, "include?", env_has_key, 1);
|
|
|
|
rb_define_singleton_method(envtbl, "member?", env_has_key, 1);
|
|
|
|
rb_define_singleton_method(envtbl, "has_key?", env_has_key, 1);
|
|
|
|
rb_define_singleton_method(envtbl, "has_value?", env_has_value, 1);
|
|
|
|
rb_define_singleton_method(envtbl, "key?", env_has_key, 1);
|
|
|
|
rb_define_singleton_method(envtbl, "value?", env_has_value, 1);
|
2019-08-29 05:47:20 +03:00
|
|
|
rb_define_singleton_method(envtbl, "to_hash", env_f_to_hash, 0);
|
2018-09-20 18:06:56 +03:00
|
|
|
rb_define_singleton_method(envtbl, "to_h", env_to_h, 0);
|
2016-12-03 14:18:44 +03:00
|
|
|
rb_define_singleton_method(envtbl, "assoc", env_assoc, 1);
|
|
|
|
rb_define_singleton_method(envtbl, "rassoc", env_rassoc, 1);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2011-06-29 07:09:34 +04:00
|
|
|
/*
|
|
|
|
* ENV is a Hash-like accessor for environment variables.
|
|
|
|
*
|
|
|
|
* See ENV (the class) for more details.
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
rb_define_global_const("ENV", envtbl);
|
2013-11-15 21:15:31 +04:00
|
|
|
|
|
|
|
/* for callcc */
|
|
|
|
ruby_register_rollback_func_for_ensure(hash_foreach_ensure, hash_foreach_ensure_rollback);
|
2019-08-01 10:04:40 +03:00
|
|
|
|
|
|
|
HASH_ASSERT(sizeof(ar_hint_t) * RHASH_AR_TABLE_MAX_SIZE == sizeof(VALUE));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|