2000-05-01 05:42:38 -04:00
|
|
|
/**********************************************************************
|
1998-01-16 07:13:05 -05: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-24 23:29:39 -04:00
|
|
|
Copyright (C) 1993-2007 Yukihiro Matsumoto
|
2000-05-01 05:42:38 -04:00
|
|
|
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
|
2000-05-09 00:53:16 -04:00
|
|
|
Copyright (C) 2000 Information-technology Promotion Agency, Japan
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2000-05-01 05:42:38 -04:00
|
|
|
**********************************************************************/
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2007-06-09 23:06:15 -04:00
|
|
|
#include "ruby/ruby.h"
|
|
|
|
#include "ruby/st.h"
|
|
|
|
#include "ruby/util.h"
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2002-10-17 12:13:44 -04:00
|
|
|
#ifdef __APPLE__
|
|
|
|
#include <crt_externs.h>
|
|
|
|
#endif
|
|
|
|
|
2007-10-25 13:05:09 -04:00
|
|
|
static VALUE rb_hash_s_try_convert(VALUE, VALUE);
|
|
|
|
|
2000-01-31 22:12:21 -05:00
|
|
|
#define HASH_DELETED FL_USER1
|
2001-12-10 02:18:16 -05:00
|
|
|
#define HASH_PROC_DEFAULT FL_USER2
|
1998-01-16 07:19:22 -05:00
|
|
|
|
2000-02-17 02:11:22 -05:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_freeze(VALUE hash)
|
2000-02-17 02:11:22 -05:00
|
|
|
{
|
|
|
|
return rb_obj_freeze(hash);
|
|
|
|
}
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
VALUE rb_cHash;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
static VALUE envtbl;
|
* 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-09 17:20:17 -04:00
|
|
|
static ID id_hash, id_yield, id_default;
|
1998-01-16 07:13:05 -05: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 06:44:21 -04:00
|
|
|
rb_any_cmp(VALUE a, VALUE b)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2003-03-04 02:04:11 -05:00
|
|
|
if (a == b) return 0;
|
2000-12-25 01:29:27 -05:00
|
|
|
if (FIXNUM_P(a) && FIXNUM_P(b)) {
|
|
|
|
return a != b;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2000-12-25 01:29:27 -05:00
|
|
|
if (TYPE(a) == T_STRING && RBASIC(a)->klass == rb_cString &&
|
|
|
|
TYPE(b) == T_STRING && RBASIC(b)->klass == rb_cString) {
|
2008-02-11 22:17:43 -05:00
|
|
|
return rb_str_hash_cmp(a, b);
|
2000-12-25 01:29:27 -05:00
|
|
|
}
|
2003-03-04 02:04:11 -05:00
|
|
|
if (a == Qundef || b == Qundef) return -1;
|
2000-12-25 01:29:27 -05:00
|
|
|
if (SYMBOL_P(a) && SYMBOL_P(b)) {
|
|
|
|
return a != b;
|
1998-01-16 07:13:05 -05: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 04:00:05 -04:00
|
|
|
return !rb_eql(a, b);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-22 04:37:13 -05:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash(VALUE obj)
|
2003-12-22 04:37:13 -05:00
|
|
|
{
|
2009-02-14 13:53:40 -05:00
|
|
|
VALUE hval = rb_funcall(obj, id_hash, 0);
|
|
|
|
retry:
|
|
|
|
switch (TYPE(hval)) {
|
|
|
|
case T_FIXNUM:
|
|
|
|
return hval;
|
|
|
|
|
|
|
|
case T_BIGNUM:
|
|
|
|
return LONG2FIX(((long*)(RBIGNUM_DIGITS(hval)))[0]);
|
|
|
|
|
|
|
|
default:
|
|
|
|
hval = rb_to_int(hval);
|
|
|
|
goto retry;
|
|
|
|
}
|
2003-12-22 04:37:13 -05:00
|
|
|
}
|
|
|
|
|
2009-09-08 09:10:04 -04:00
|
|
|
static st_index_t
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_any_hash(VALUE a)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2001-02-13 00:09:11 -05:00
|
|
|
VALUE hval;
|
2009-09-08 09:10:04 -04:00
|
|
|
st_index_t hnum;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
switch (TYPE(a)) {
|
|
|
|
case T_FIXNUM:
|
2000-12-25 01:29:27 -05:00
|
|
|
case T_SYMBOL:
|
2009-01-26 13:48:47 -05:00
|
|
|
case T_NIL:
|
|
|
|
case T_FALSE:
|
|
|
|
case T_TRUE:
|
* string.c (rb_hash_uint32, rb_hash_uint, rb_hash_start, rb_hash_end),
include/ruby/intern.h: add Murmurhash API. [ruby-dev:37784]
* complex.c (nucomp_hash), array.c (rb_ary_hash), time.c (time_hash),
string.c (rb_str_hsah), object.c (rb_obj_hash), range.c
(range_hash), struct.c (rb_struct_hash), hash.c (rb_any_hash),
rational.c (nurat_hash): use Murmurhash. [ruby-dev:37784]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22317 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2009-02-14 14:55:34 -05:00
|
|
|
hnum = rb_hash_end(rb_hash_start((unsigned int)a));
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
|
|
|
|
case T_STRING:
|
2008-03-03 02:14:27 -05:00
|
|
|
hnum = rb_str_hash(a);
|
1998-01-16 07:13:05 -05:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2009-02-14 13:53:40 -05:00
|
|
|
hval = rb_hash(a);
|
2009-05-08 23:19:52 -04:00
|
|
|
hnum = FIX2LONG(hval);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2008-03-03 02:14:27 -05:00
|
|
|
hnum <<= 1;
|
2009-09-08 09:10:04 -04:00
|
|
|
return (st_index_t)RSHIFT(hnum, 1);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2007-07-04 21:06:49 -04:00
|
|
|
static const struct st_hash_type objhash = {
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_any_cmp,
|
|
|
|
rb_any_hash,
|
1998-01-16 07:13:05 -05:00
|
|
|
};
|
|
|
|
|
2008-03-04 05:14:40 -05:00
|
|
|
static const struct st_hash_type identhash = {
|
|
|
|
st_numcmp,
|
|
|
|
st_numhash,
|
|
|
|
};
|
|
|
|
|
2007-08-21 00:57:06 -04:00
|
|
|
typedef int st_foreach_func(st_data_t, st_data_t, st_data_t);
|
|
|
|
|
2004-09-29 01:15:33 -04:00
|
|
|
struct foreach_safe_arg {
|
|
|
|
st_table *tbl;
|
2007-08-21 00:57:06 -04:00
|
|
|
st_foreach_func *func;
|
2004-09-29 01:15:33 -04:00
|
|
|
st_data_t arg;
|
|
|
|
};
|
|
|
|
|
|
|
|
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 06:44:21 -04:00
|
|
|
foreach_safe_i(st_data_t key, st_data_t value, struct foreach_safe_arg *arg)
|
2004-09-29 01:15:33 -04:00
|
|
|
{
|
|
|
|
int status;
|
|
|
|
|
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
status = (*arg->func)(key, value, arg->arg);
|
2004-09-29 01:15:33 -04:00
|
|
|
if (status == ST_CONTINUE) {
|
|
|
|
return ST_CHECK;
|
|
|
|
}
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2005-10-19 22:56:22 -04:00
|
|
|
st_foreach_safe(st_table *table, int (*func)(ANYARGS), st_data_t a)
|
2004-09-29 01:15:33 -04:00
|
|
|
{
|
|
|
|
struct foreach_safe_arg arg;
|
|
|
|
|
|
|
|
arg.tbl = table;
|
2007-08-21 00:57:06 -04:00
|
|
|
arg.func = (st_foreach_func *)func;
|
2004-09-29 01:15:33 -04:00
|
|
|
arg.arg = a;
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
if (st_foreach(table, foreach_safe_i, (st_data_t)&arg)) {
|
|
|
|
rb_raise(rb_eRuntimeError, "hash modified during iteration");
|
|
|
|
}
|
2004-09-29 01:15:33 -04:00
|
|
|
}
|
|
|
|
|
2007-08-21 00:57:06 -04:00
|
|
|
typedef int rb_foreach_func(VALUE, VALUE, VALUE);
|
|
|
|
|
2004-09-22 20:51:32 -04:00
|
|
|
struct hash_foreach_arg {
|
1998-01-16 07:19:22 -05:00
|
|
|
VALUE hash;
|
2007-08-21 00:57:06 -04:00
|
|
|
rb_foreach_func *func;
|
2002-12-29 09:51:22 -05:00
|
|
|
VALUE arg;
|
1998-01-16 07:13:05 -05:00
|
|
|
};
|
|
|
|
|
|
|
|
static int
|
2009-02-26 05:29:13 -05:00
|
|
|
hash_foreach_iter(st_data_t key, st_data_t value, struct hash_foreach_arg *arg)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
int status;
|
2004-09-22 00:48:52 -04:00
|
|
|
st_table *tbl;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2007-08-29 19:12:21 -04:00
|
|
|
tbl = RHASH(arg->hash)->ntbl;
|
2009-02-26 05:29:13 -05:00
|
|
|
if ((VALUE)key == Qundef) return ST_CONTINUE;
|
|
|
|
status = (*arg->func)((VALUE)key, (VALUE)value, arg->arg);
|
2007-08-29 19:12:21 -04:00
|
|
|
if (RHASH(arg->hash)->ntbl != tbl) {
|
2004-09-22 00:48:52 -04:00
|
|
|
rb_raise(rb_eRuntimeError, "rehash occurred during iteration");
|
|
|
|
}
|
|
|
|
switch (status) {
|
|
|
|
case ST_DELETE:
|
2009-02-26 05:29:13 -05:00
|
|
|
st_delete_safe(tbl, &key, 0, Qundef);
|
2004-09-22 00:48:52 -04:00
|
|
|
FL_SET(arg->hash, HASH_DELETED);
|
|
|
|
case ST_CONTINUE:
|
|
|
|
break;
|
|
|
|
case ST_STOP:
|
|
|
|
return ST_STOP;
|
2004-09-20 23:08:33 -04:00
|
|
|
}
|
2004-09-22 00:48:52 -04:00
|
|
|
return ST_CHECK;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
hash_foreach_ensure(VALUE hash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1998-01-16 07:19:22 -05:00
|
|
|
RHASH(hash)->iter_lev--;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1998-01-16 07:19:22 -05:00
|
|
|
if (RHASH(hash)->iter_lev == 0) {
|
1999-01-19 23:59:39 -05:00
|
|
|
if (FL_TEST(hash, HASH_DELETED)) {
|
2007-08-29 19:12:21 -04:00
|
|
|
st_cleanup_safe(RHASH(hash)->ntbl, Qundef);
|
1999-01-19 23:59:39 -05:00
|
|
|
FL_UNSET(hash, HASH_DELETED);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
return 0;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2004-09-22 20:51:32 -04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
hash_foreach_call(struct hash_foreach_arg *arg)
|
2004-09-22 20:51:32 -04:00
|
|
|
{
|
2007-08-29 19:12:21 -04:00
|
|
|
if (st_foreach(RHASH(arg->hash)->ntbl, hash_foreach_iter, (st_data_t)arg)) {
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
rb_raise(rb_eRuntimeError, "hash modified during iteration");
|
|
|
|
}
|
2004-09-22 20:51:32 -04:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2004-09-29 01:15:33 -04:00
|
|
|
void
|
2005-10-19 22:56:22 -04:00
|
|
|
rb_hash_foreach(VALUE hash, int (*func)(ANYARGS), VALUE farg)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2004-09-22 20:51:32 -04:00
|
|
|
struct hash_foreach_arg arg;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2007-08-29 19:12:21 -04:00
|
|
|
if (!RHASH(hash)->ntbl)
|
|
|
|
return;
|
1998-01-16 07:19:22 -05:00
|
|
|
RHASH(hash)->iter_lev++;
|
1998-01-16 07:13:05 -05:00
|
|
|
arg.hash = hash;
|
2007-08-21 00:57:06 -04:00
|
|
|
arg.func = (rb_foreach_func *)func;
|
1998-01-16 07:13:05 -05:00
|
|
|
arg.arg = farg;
|
2004-09-29 01:15:33 -04:00
|
|
|
rb_ensure(hash_foreach_call, (VALUE)&arg, hash_foreach_ensure, hash);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2007-08-29 20:41:24 -04:00
|
|
|
hash_alloc(VALUE klass)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
NEWOBJ(hash, struct RHash);
|
1999-01-19 23:59:39 -05:00
|
|
|
OBJSETUP(hash, klass, T_HASH);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
hash->ifnone = Qnil;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
return (VALUE)hash;
|
|
|
|
}
|
|
|
|
|
2000-02-29 03:05:32 -05:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_new(void)
|
2000-02-29 03:05:32 -05:00
|
|
|
{
|
2002-12-20 03:33:17 -05:00
|
|
|
return hash_alloc(rb_cHash);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2008-04-26 08:52:25 -04:00
|
|
|
VALUE
|
|
|
|
rb_hash_dup(VALUE hash)
|
|
|
|
{
|
2008-06-07 12:19:47 -04:00
|
|
|
NEWOBJ(ret, struct RHash);
|
|
|
|
DUPSETUP(ret, hash);
|
|
|
|
|
2008-04-26 08:52:25 -04:00
|
|
|
if (!RHASH_EMPTY_P(hash))
|
2008-06-07 12:19:47 -04:00
|
|
|
ret->ntbl = st_copy(RHASH(hash)->ntbl);
|
2008-04-26 08:52:25 -04:00
|
|
|
if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
|
|
|
|
FL_SET(ret, HASH_PROC_DEFAULT);
|
|
|
|
}
|
2008-06-07 12:19:47 -04:00
|
|
|
ret->ifnone = RHASH(hash)->ifnone;
|
|
|
|
return (VALUE)ret;
|
2008-04-26 08:52:25 -04:00
|
|
|
}
|
|
|
|
|
2004-09-22 00:48:52 -04:00
|
|
|
static void
|
2007-08-29 19:12:21 -04:00
|
|
|
rb_hash_modify_check(VALUE hash)
|
2004-09-22 00:48:52 -04:00
|
|
|
{
|
|
|
|
if (OBJ_FROZEN(hash)) rb_error_frozen("hash");
|
* 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 03:25:05 -04:00
|
|
|
if (!OBJ_UNTRUSTED(hash) && rb_safe_level() >= 4)
|
2004-09-22 00:48:52 -04:00
|
|
|
rb_raise(rb_eSecurityError, "Insecure: can't modify hash");
|
|
|
|
}
|
|
|
|
|
2007-08-29 19:12:21 -04:00
|
|
|
struct st_table *
|
|
|
|
rb_hash_tbl(VALUE hash)
|
|
|
|
{
|
|
|
|
if (!RHASH(hash)->ntbl) {
|
|
|
|
RHASH(hash)->ntbl = st_init_table(&objhash);
|
|
|
|
}
|
|
|
|
return RHASH(hash)->ntbl;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
rb_hash_modify(VALUE hash)
|
|
|
|
{
|
|
|
|
rb_hash_modify_check(hash);
|
|
|
|
rb_hash_tbl(hash);
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Hash.new => hash
|
|
|
|
* Hash.new(obj) => aHash
|
|
|
|
* Hash.new {|hash, key| block } => aHash
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05: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 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05: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 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05: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 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
2000-02-29 03:05:32 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_initialize(int argc, VALUE *argv, VALUE hash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2000-02-29 03:05:32 -05:00
|
|
|
VALUE ifnone;
|
|
|
|
|
|
|
|
rb_hash_modify(hash);
|
2001-12-10 02:18:16 -05:00
|
|
|
if (rb_block_given_p()) {
|
2002-01-28 03:44:45 -05:00
|
|
|
if (argc > 0) {
|
|
|
|
rb_raise(rb_eArgError, "wrong number of arguments");
|
2001-12-10 02:18:16 -05:00
|
|
|
}
|
2003-06-16 03:14:50 -04:00
|
|
|
RHASH(hash)->ifnone = rb_block_proc();
|
2001-12-10 02:18:16 -05:00
|
|
|
FL_SET(hash, HASH_PROC_DEFAULT);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_scan_args(argc, argv, "01", &ifnone);
|
|
|
|
RHASH(hash)->ifnone = ifnone;
|
|
|
|
}
|
2000-02-29 03:05:32 -05:00
|
|
|
|
|
|
|
return hash;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2009-07-22 03:46:37 -04:00
|
|
|
* Hash[ key, value, ... ] => hash
|
|
|
|
* Hash[ [ [key, value], ... ] ] => hash
|
|
|
|
* Hash[ object ] => hash
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Creates a new hash populated with the given objects. Equivalent to
|
2009-07-22 03:46:37 -04:00
|
|
|
* the literal <code>{ <i>key</i> => <i>value</i>, ... }</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 01:15:46 -04:00
|
|
|
*
|
2009-07-22 03: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 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_s_create(int argc, VALUE *argv, VALUE klass)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2007-10-25 13:05:09 -04:00
|
|
|
VALUE hash, tmp;
|
1998-01-16 07:13:05 -05:00
|
|
|
int i;
|
|
|
|
|
2007-10-25 13:05:09 -04:00
|
|
|
if (argc == 1) {
|
|
|
|
tmp = rb_hash_s_try_convert(Qnil, argv[0]);
|
|
|
|
if (!NIL_P(tmp)) {
|
|
|
|
hash = hash_alloc(klass);
|
2008-05-01 10:04:38 -04:00
|
|
|
if (RHASH(tmp)->ntbl) {
|
|
|
|
RHASH(hash)->ntbl = st_copy(RHASH(tmp)->ntbl);
|
2007-10-25 13:05:09 -04:00
|
|
|
}
|
|
|
|
return hash;
|
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2007-10-25 13:05:09 -04:00
|
|
|
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 v = rb_check_array_type(RARRAY_PTR(tmp)[i]);
|
2009-01-10 19:47:32 -05:00
|
|
|
VALUE key, val = Qnil;
|
|
|
|
|
2007-10-25 13:05:09 -04:00
|
|
|
if (NIL_P(v)) continue;
|
2009-01-10 19:47:32 -05:00
|
|
|
switch (RARRAY_LEN(v)) {
|
|
|
|
case 2:
|
|
|
|
val = RARRAY_PTR(v)[1];
|
|
|
|
case 1:
|
|
|
|
key = RARRAY_PTR(v)[0];
|
|
|
|
rb_hash_aset(hash, key, val);
|
|
|
|
}
|
2007-10-25 13:05:09 -04:00
|
|
|
}
|
|
|
|
return hash;
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
if (argc % 2 != 0) {
|
2004-03-29 02:54:38 -05:00
|
|
|
rb_raise(rb_eArgError, "odd number of arguments for Hash");
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2002-12-20 03:33:17 -05:00
|
|
|
hash = hash_alloc(klass);
|
1998-01-16 07:13:05 -05:00
|
|
|
for (i=0; i<argc; i+=2) {
|
2002-06-12 23:55:44 -04:00
|
|
|
rb_hash_aset(hash, argv[i], argv[i + 1]);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
1998-01-16 07:19:22 -05:00
|
|
|
return hash;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
to_hash(VALUE hash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2002-08-27 04:31:08 -04:00
|
|
|
return rb_convert_type(hash, T_HASH, "Hash", "to_hash");
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
|
|
|
|
2007-08-24 13: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)
|
|
|
|
{
|
|
|
|
return rb_check_convert_type(hash, T_HASH, "Hash", "to_hash");
|
|
|
|
}
|
|
|
|
|
2004-09-29 01:15:33 -04:00
|
|
|
static int
|
2009-05-08 23:19:52 -04:00
|
|
|
rb_hash_rehash_i(VALUE key, VALUE value, VALUE arg)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2009-05-08 23:19:52 -04:00
|
|
|
st_table *tbl = (st_table *)arg;
|
|
|
|
|
2000-01-04 23:41:21 -05:00
|
|
|
if (key != Qundef) st_insert(tbl, key, value);
|
1998-01-16 07:13:05 -05:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.rehash -> hsh
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05: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
|
|
|
|
* method will reindex <i>hsh</i>. If <code>Hash#rehash</code> is
|
|
|
|
* called while an iterator is traversing the hash, an
|
2004-09-22 00:48:52 -04:00
|
|
|
* <code>RuntimeError</code> will be raised in the iterator.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05: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
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_rehash(VALUE hash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1998-01-16 07:19:22 -05:00
|
|
|
st_table *tbl;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2004-09-22 00:48:52 -04:00
|
|
|
if (RHASH(hash)->iter_lev > 0) {
|
|
|
|
rb_raise(rb_eRuntimeError, "rehash during iteration");
|
|
|
|
}
|
2007-08-29 19:12:21 -04:00
|
|
|
rb_hash_modify_check(hash);
|
|
|
|
if (!RHASH(hash)->ntbl)
|
|
|
|
return hash;
|
|
|
|
tbl = st_init_table_with_size(RHASH(hash)->ntbl->type, RHASH(hash)->ntbl->num_entries);
|
2009-05-08 23:19:52 -04:00
|
|
|
rb_hash_foreach(hash, rb_hash_rehash_i, (VALUE)tbl);
|
2007-08-29 19:12:21 -04:00
|
|
|
st_free_table(RHASH(hash)->ntbl);
|
|
|
|
RHASH(hash)->ntbl = tbl;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
return hash;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh[key] => value
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Element Reference---Retrieves the <i>value</i> object corresponding
|
|
|
|
* to the <i>key</i> object. If not found, returns the a default value (see
|
|
|
|
* <code>Hash::new</code> for details).
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h["a"] #=> 100
|
|
|
|
* h["c"] #=> nil
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_aref(VALUE hash, VALUE key)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
VALUE val;
|
|
|
|
|
2007-08-29 19:12:21 -04:00
|
|
|
if (!RHASH(hash)->ntbl || !st_lookup(RHASH(hash)->ntbl, key, &val)) {
|
2001-12-10 02:18:16 -05:00
|
|
|
return rb_funcall(hash, id_default, 1, key);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2007-07-10 06:39:39 -04:00
|
|
|
VALUE
|
2008-12-19 03:22:45 -05:00
|
|
|
rb_hash_lookup2(VALUE hash, VALUE key, VALUE def)
|
2007-07-10 06:39:39 -04:00
|
|
|
{
|
|
|
|
VALUE val;
|
|
|
|
|
2007-08-29 19:12:21 -04:00
|
|
|
if (!RHASH(hash)->ntbl || !st_lookup(RHASH(hash)->ntbl, key, &val)) {
|
2008-12-19 03:22:45 -05:00
|
|
|
return def; /* without Hash#default */
|
2007-07-10 06:39:39 -04:00
|
|
|
}
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2008-12-19 03:22:45 -05:00
|
|
|
VALUE
|
|
|
|
rb_hash_lookup(VALUE hash, VALUE key)
|
|
|
|
{
|
|
|
|
return rb_hash_lookup2(hash, key, Qnil);
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.fetch(key [, default] ) => obj
|
|
|
|
* hsh.fetch(key) {| key | block } => obj
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05: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
|
2004-09-22 00:48:52 -04:00
|
|
|
* raise an <code>KeyError</code> exception; if <i>default</i> is
|
2003-12-23 11:21:17 -05:00
|
|
|
* given, then that will be returned; if the optional code block is
|
|
|
|
* specified, then that will be run and its result returned.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05: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 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05: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 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.fetch("z")
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* <em>produces:</em>
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2004-09-22 00:48:52 -04:00
|
|
|
* prog.rb:2:in `fetch': key not found (KeyError)
|
2003-12-23 11:21:17 -05:00
|
|
|
* from prog.rb:2
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
2008-09-30 04:01:11 -04:00
|
|
|
rb_hash_fetch_m(int argc, VALUE *argv, VALUE hash)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
|
|
|
VALUE key, if_none;
|
|
|
|
VALUE val;
|
2003-11-06 02:22:39 -05:00
|
|
|
long block_given;
|
1999-01-19 23:59:39 -05:00
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "11", &key, &if_none);
|
|
|
|
|
2003-11-06 02:22:39 -05:00
|
|
|
block_given = rb_block_given_p();
|
|
|
|
if (block_given && argc == 2) {
|
|
|
|
rb_warn("block supersedes default value argument");
|
|
|
|
}
|
2007-08-29 19:12:21 -04:00
|
|
|
if (!RHASH(hash)->ntbl || !st_lookup(RHASH(hash)->ntbl, key, &val)) {
|
2003-11-06 02:22:39 -05:00
|
|
|
if (block_given) return rb_yield(key);
|
1999-10-13 02:44:42 -04:00
|
|
|
if (argc == 1) {
|
2004-09-22 00:48:52 -04:00
|
|
|
rb_raise(rb_eKeyError, "key not found");
|
1999-10-13 02:44:42 -04:00
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
return if_none;
|
|
|
|
}
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2008-09-30 04:01:11 -04:00
|
|
|
VALUE
|
|
|
|
rb_hash_fetch(VALUE hash, VALUE key)
|
|
|
|
{
|
|
|
|
return rb_hash_fetch_m(1, &key, hash);
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.default(key=nil) => obj
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05: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>.
|
|
|
|
* See also <code>Hash::new</code> and <code>Hash#default=</code>.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = Hash.new #=> {}
|
|
|
|
* h.default #=> nil
|
|
|
|
* h.default(2) #=> nil
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = Hash.new("cat") #=> {}
|
|
|
|
* h.default #=> "cat"
|
|
|
|
* h.default(2) #=> "cat"
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = Hash.new {|h,k| h[k] = k.to_i*10} #=> {}
|
2008-03-08 20:04:46 -05:00
|
|
|
* h.default #=> nil
|
2003-12-23 11:21:17 -05:00
|
|
|
* h.default(2) #=> 20
|
|
|
|
*/
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_default(int argc, VALUE *argv, VALUE hash)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
2001-12-10 02:18:16 -05:00
|
|
|
VALUE key;
|
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "01", &key);
|
|
|
|
if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
|
2006-07-09 21:08:15 -04:00
|
|
|
if (argc == 0) return Qnil;
|
* 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-09 17:20:17 -04:00
|
|
|
return rb_funcall(RHASH(hash)->ifnone, id_yield, 2, hash, key);
|
2001-12-10 02:18:16 -05:00
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
return RHASH(hash)->ifnone;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2008-08-14 04:19:56 -04:00
|
|
|
* hsh.default = obj => obj
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Sets the default value, the value returned for a key that does not
|
|
|
|
* exist in the hash. It is not possible to set the a default to a
|
|
|
|
* <code>Proc</code> that will be executed on each key lookup.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05: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-19 23:59:39 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_set_default(VALUE hash, VALUE ifnone)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
2000-12-18 04:46:21 -05:00
|
|
|
rb_hash_modify(hash);
|
1999-01-19 23:59:39 -05:00
|
|
|
RHASH(hash)->ifnone = ifnone;
|
2001-12-10 02:18:16 -05:00
|
|
|
FL_UNSET(hash, HASH_PROC_DEFAULT);
|
2002-01-11 04:18:54 -05:00
|
|
|
return ifnone;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.default_proc -> anObject
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* If <code>Hash::new</code> was invoked with a block, return that
|
|
|
|
* block, otherwise return <code>nil</code>.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05: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 05: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 06:44:21 -04:00
|
|
|
rb_hash_default_proc(VALUE hash)
|
2002-08-13 05:21:18 -04:00
|
|
|
{
|
|
|
|
if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
|
|
|
|
return RHASH(hash)->ifnone;
|
|
|
|
}
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2008-09-23 05:25:27 -04:00
|
|
|
VALUE rb_obj_is_proc(VALUE proc);
|
|
|
|
|
2008-08-13 04:44:17 -04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.default_proc = proc_obj => proc_obj
|
|
|
|
*
|
|
|
|
* Sets the default proc to be executed on each key lookup.
|
|
|
|
*
|
|
|
|
* h.default_proc = proc do |hash, key|
|
|
|
|
* hash[key] = key + key
|
|
|
|
* end
|
|
|
|
* h[2] #=> 4
|
|
|
|
* h["cat"] #=> "catcat"
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_hash_set_default_proc(VALUE hash, VALUE proc)
|
|
|
|
{
|
|
|
|
VALUE b;
|
|
|
|
|
|
|
|
rb_hash_modify(hash);
|
|
|
|
b = rb_check_convert_type(proc, T_DATA, "Proc", "to_proc");
|
|
|
|
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;
|
|
|
|
RHASH(hash)->ifnone = proc;
|
|
|
|
FL_SET(hash, HASH_PROC_DEFAULT);
|
|
|
|
return proc;
|
|
|
|
}
|
|
|
|
|
2004-09-29 01:15:33 -04:00
|
|
|
static int
|
2009-05-08 23:19:52 -04:00
|
|
|
key_i(VALUE key, VALUE value, VALUE arg)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
2009-05-08 23:19:52 -04:00
|
|
|
VALUE *args = (VALUE *)arg;
|
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
if (rb_equal(value, args[0])) {
|
|
|
|
args[1] = key;
|
|
|
|
return ST_STOP;
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-09-22 00:48:52 -04:00
|
|
|
* hsh.key(value) => key
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Returns the key for a given value. If not found, returns <code>nil</code>.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
2005-04-01 23:23:56 -05:00
|
|
|
* h.key(200) #=> "b"
|
|
|
|
* h.key(999) #=> nil
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_key(VALUE hash, VALUE value)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
|
|
|
VALUE args[2];
|
|
|
|
|
|
|
|
args[0] = value;
|
2001-07-31 02:24:45 -04:00
|
|
|
args[1] = Qnil;
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2009-05-08 23:19:52 -04:00
|
|
|
rb_hash_foreach(hash, key_i, (VALUE)args);
|
1999-08-13 01:45:20 -04:00
|
|
|
|
|
|
|
return args[1];
|
|
|
|
}
|
|
|
|
|
2004-10-19 21:38:04 -04:00
|
|
|
/* :nodoc: */
|
2004-09-22 00: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 06:44:21 -04:00
|
|
|
rb_hash_index(VALUE hash, VALUE value)
|
2004-09-22 00:48:52 -04:00
|
|
|
{
|
|
|
|
rb_warn("Hash#index is deprecated; use Hash#key");
|
|
|
|
return rb_hash_key(hash, value);
|
|
|
|
}
|
|
|
|
|
2007-08-15 00:50:12 -04:00
|
|
|
static VALUE
|
|
|
|
rb_hash_delete_key(VALUE hash, VALUE key)
|
|
|
|
{
|
|
|
|
st_data_t ktmp = (st_data_t)key, val;
|
|
|
|
|
2007-08-29 19:12:21 -04:00
|
|
|
if (!RHASH(hash)->ntbl)
|
|
|
|
return Qundef;
|
2007-08-15 00:50:12 -04:00
|
|
|
if (RHASH(hash)->iter_lev > 0) {
|
2007-08-29 19:12:21 -04:00
|
|
|
if (st_delete_safe(RHASH(hash)->ntbl, &ktmp, &val, Qundef)) {
|
2007-08-15 00:50:12 -04:00
|
|
|
FL_SET(hash, HASH_DELETED);
|
|
|
|
return (VALUE)val;
|
|
|
|
}
|
|
|
|
}
|
2007-08-29 19:12:21 -04:00
|
|
|
else if (st_delete(RHASH(hash)->ntbl, &ktmp, &val))
|
2007-08-15 00:50:12 -04:00
|
|
|
return (VALUE)val;
|
|
|
|
return Qundef;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.delete(key) => value
|
|
|
|
* hsh.delete(key) {| key | block } => value
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Deletes and returns a key-value pair from <i>hsh</i> whose key is
|
|
|
|
* equal to <i>key</i>. If the key is not found, returns the
|
|
|
|
* <em>default value</em>. If the optional code block is given and the
|
|
|
|
* key is not found, pass in the key and return the result of
|
|
|
|
* <i>block</i>.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05: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 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
2001-07-24 05:07:33 -04:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_delete(VALUE hash, VALUE key)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
VALUE val;
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_hash_modify(hash);
|
2007-08-15 00:50:12 -04:00
|
|
|
val = rb_hash_delete_key(hash, key);
|
|
|
|
if (val != Qundef) return val;
|
2000-05-24 00:34:26 -04:00
|
|
|
if (rb_block_given_p()) {
|
1999-01-19 23:59:39 -05:00
|
|
|
return rb_yield(key);
|
|
|
|
}
|
2001-12-10 02:18:16 -05:00
|
|
|
return Qnil;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
struct shift_var {
|
|
|
|
VALUE key;
|
|
|
|
VALUE val;
|
|
|
|
};
|
|
|
|
|
2004-09-29 01:15:33 -04:00
|
|
|
static int
|
2009-05-08 23:19:52 -04:00
|
|
|
shift_i(VALUE key, VALUE value, VALUE arg)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2009-05-08 23:19:52 -04:00
|
|
|
struct shift_var *var = (struct shift_var *)arg;
|
|
|
|
|
2000-01-04 23:41:21 -05:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
2007-08-15 00:50:12 -04:00
|
|
|
if (var->key != Qundef) return ST_STOP;
|
1998-01-16 07:13:05 -05:00
|
|
|
var->key = key;
|
|
|
|
var->val = value;
|
|
|
|
return ST_DELETE;
|
|
|
|
}
|
|
|
|
|
2007-08-15 00:50:12 -04:00
|
|
|
static int
|
2009-05-08 23:19:52 -04:00
|
|
|
shift_i_safe(VALUE key, VALUE value, VALUE arg)
|
2007-08-15 00:50:12 -04:00
|
|
|
{
|
2009-05-08 23:19:52 -04:00
|
|
|
struct shift_var *var = (struct shift_var *)arg;
|
|
|
|
|
2007-08-15 00:50:12 -04:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
|
|
|
var->key = key;
|
|
|
|
var->val = value;
|
|
|
|
return ST_STOP;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.shift -> anArray or obj
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05: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 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = { 1 => "a", 2 => "b", 3 => "c" }
|
|
|
|
* h.shift #=> [1, "a"]
|
|
|
|
* h #=> {2=>"b", 3=>"c"}
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_shift(VALUE hash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
struct shift_var var;
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_hash_modify(hash);
|
2007-08-15 00:50:12 -04:00
|
|
|
var.key = Qundef;
|
|
|
|
rb_hash_foreach(hash, RHASH(hash)->iter_lev > 0 ? shift_i_safe : shift_i,
|
2009-05-08 23:19:52 -04:00
|
|
|
(VALUE)&var);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2007-08-15 00:50:12 -04:00
|
|
|
if (var.key != Qundef) {
|
|
|
|
if (RHASH(hash)->iter_lev > 0) {
|
|
|
|
rb_hash_delete_key(hash, var.key);
|
|
|
|
}
|
2002-08-13 05:21:18 -04:00
|
|
|
return rb_assoc_new(var.key, var.val);
|
|
|
|
}
|
|
|
|
else if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
|
* 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-09 17:20:17 -04:00
|
|
|
return rb_funcall(RHASH(hash)->ifnone, id_yield, 2, hash, Qnil);
|
2002-08-13 05:21:18 -04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
return RHASH(hash)->ifnone;
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2004-09-29 01: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 06:44:21 -04:00
|
|
|
delete_if_i(VALUE key, VALUE value, VALUE hash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2003-12-20 11:59:09 -05:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
2004-02-26 12:15:00 -05:00
|
|
|
if (RTEST(rb_yield_values(2, key, value))) {
|
2007-08-15 00:50:12 -04:00
|
|
|
rb_hash_delete_key(hash, key);
|
2004-02-26 12:15:00 -05:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.delete_if {| key, value | block } -> hsh
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Deletes every key-value pair from <i>hsh</i> for which <i>block</i>
|
|
|
|
* evaluates to <code>true</code>.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = { "a" => 100, "b" => 200, "c" => 300 }
|
|
|
|
* h.delete_if {|key, value| key >= "b" } #=> {"a"=>100}
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
2000-07-04 03: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 06:44:21 -04:00
|
|
|
rb_hash_delete_if(VALUE hash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2008-04-14 04:31:38 -04:00
|
|
|
RETURN_ENUMERATOR(hash, 0, 0);
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_hash_modify(hash);
|
2004-09-29 01:15:33 -04:00
|
|
|
rb_hash_foreach(hash, delete_if_i, hash);
|
2000-08-07 01:05:04 -04:00
|
|
|
return hash;
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.reject! {| key, value | block } -> hsh or nil
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Equivalent to <code>Hash#delete_if</code>, but returns
|
|
|
|
* <code>nil</code> if no changes were made.
|
|
|
|
*/
|
|
|
|
|
2000-08-07 01: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 06:44:21 -04:00
|
|
|
rb_hash_reject_bang(VALUE hash)
|
2000-08-07 01:05:04 -04:00
|
|
|
{
|
2009-05-08 23:19:52 -04:00
|
|
|
st_index_t n;
|
2008-04-14 04:31:38 -04:00
|
|
|
|
|
|
|
RETURN_ENUMERATOR(hash, 0, 0);
|
2009-06-08 01:44:17 -04:00
|
|
|
rb_hash_modify(hash);
|
2007-08-29 19:12:21 -04:00
|
|
|
if (!RHASH(hash)->ntbl)
|
|
|
|
return Qnil;
|
|
|
|
n = RHASH(hash)->ntbl->num_entries;
|
2009-06-08 01:44:17 -04:00
|
|
|
rb_hash_foreach(hash, delete_if_i, hash);
|
2007-08-29 19:12:21 -04:00
|
|
|
if (n == RHASH(hash)->ntbl->num_entries) return Qnil;
|
1999-01-19 23:59:39 -05:00
|
|
|
return hash;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.reject {| key, value | block } -> a_hash
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Same as <code>Hash#delete_if</code>, but works on (and returns) a
|
|
|
|
* copy of the <i>hsh</i>. Equivalent to
|
|
|
|
* <code><i>hsh</i>.dup.delete_if</code>.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
2000-02-08 03:54:01 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_reject(VALUE hash)
|
2000-02-08 03:54:01 -05:00
|
|
|
{
|
2000-07-17 05:38:10 -04:00
|
|
|
return rb_hash_delete_if(rb_obj_dup(hash));
|
2000-02-08 03:54:01 -05:00
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.values_at(key, ...) => array
|
|
|
|
*
|
|
|
|
* Return an array containing the values associated with the given keys.
|
|
|
|
* Also see <code>Hash.select</code>.
|
|
|
|
*
|
|
|
|
* h = { "cat" => "feline", "dog" => "canine", "cow" => "bovine" }
|
|
|
|
* h.values_at("cow", "cat") #=> ["bovine", "feline"]
|
2008-03-08 20:04:46 -05:00
|
|
|
*/
|
2003-12-23 11:21:17 -05:00
|
|
|
|
2001-12-10 22:48:08 -05:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_values_at(int argc, VALUE *argv, VALUE hash)
|
2001-12-10 22:48:08 -05:00
|
|
|
{
|
2004-06-11 09:33:47 -04:00
|
|
|
VALUE result = rb_ary_new2(argc);
|
2001-12-10 22:48:08 -05:00
|
|
|
long i;
|
|
|
|
|
2003-05-04 12:03:24 -04:00
|
|
|
for (i=0; i<argc; i++) {
|
|
|
|
rb_ary_push(result, rb_hash_aref(hash, argv[i]));
|
2001-12-10 22:48:08 -05:00
|
|
|
}
|
2003-05-04 12:03:24 -04:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2007-06-21 10:50:14 -04:00
|
|
|
static int
|
|
|
|
select_i(VALUE key, VALUE value, VALUE result)
|
|
|
|
{
|
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
|
|
|
if (RTEST(rb_yield_values(2, key, value)))
|
|
|
|
rb_hash_aset(result, key, value);
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2007-06-21 10:50:14 -04:00
|
|
|
* hsh.select {|key, value| block} => a_hash
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2007-06-21 10:50:14 -04:00
|
|
|
* Returns a new hash consisting of entries which the block returns true.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = { "a" => 100, "b" => 200, "c" => 300 }
|
2007-06-21 10:50:14 -04:00
|
|
|
* h.select {|k,v| k > "a"} #=> {"b" => 200, "c" => 300}
|
|
|
|
* h.select {|k,v| v < 200} #=> {"a" => 100}
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
2003-05-04 12: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 06:44:21 -04:00
|
|
|
rb_hash_select(VALUE hash)
|
2003-05-04 12:03:24 -04:00
|
|
|
{
|
|
|
|
VALUE result;
|
|
|
|
|
2005-08-30 10:49:51 -04:00
|
|
|
RETURN_ENUMERATOR(hash, 0, 0);
|
2007-06-21 10:50:14 -04:00
|
|
|
result = rb_hash_new();
|
2004-09-29 01:15:33 -04:00
|
|
|
rb_hash_foreach(hash, select_i, result);
|
2001-12-10 22:48:08 -05:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2004-09-29 01: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 06:44:21 -04:00
|
|
|
clear_i(VALUE key, VALUE value, VALUE dummy)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
return ST_DELETE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.clear -> hsh
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Removes all key-value pairs from <i>hsh</i>.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = { "a" => 100, "b" => 200 } #=> {"a"=>100, "b"=>200}
|
|
|
|
* h.clear #=> {}
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_clear(VALUE hash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2007-08-29 19:12:21 -04:00
|
|
|
rb_hash_modify_check(hash);
|
|
|
|
if (!RHASH(hash)->ntbl)
|
|
|
|
return hash;
|
|
|
|
if (RHASH(hash)->ntbl->num_entries > 0) {
|
2007-08-21 00:47:01 -04:00
|
|
|
if (RHASH(hash)->iter_lev > 0)
|
|
|
|
rb_hash_foreach(hash, clear_i, 0);
|
|
|
|
else
|
2007-08-29 19:12:21 -04:00
|
|
|
st_clear(RHASH(hash)->ntbl);
|
2004-09-22 00:48:52 -04:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
return hash;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh[key] = value => value
|
|
|
|
* hsh.store(key, value) => value
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Element Assignment---Associates the value given by
|
|
|
|
* <i>value</i> with the key given by <i>key</i>.
|
|
|
|
* <i>key</i> should not have its value changed while it is in
|
|
|
|
* use as a key (a <code>String</code> passed as a key will be
|
|
|
|
* duplicated and frozen).
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h["a"] = 9
|
|
|
|
* h["c"] = 4
|
|
|
|
* h #=> {"a"=>9, "b"=>200, "c"=>4}
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_aset(VALUE hash, VALUE key, VALUE val)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_hash_modify(hash);
|
2009-07-16 05:30:23 -04:00
|
|
|
if (hash == key) {
|
|
|
|
rb_raise(rb_eArgError, "recursive key for hash");
|
|
|
|
}
|
2009-05-27 11:56:14 -04:00
|
|
|
if (RHASH(hash)->ntbl->type == &identhash || rb_obj_class(key) != rb_cString) {
|
2007-08-29 19:12:21 -04:00
|
|
|
st_insert(RHASH(hash)->ntbl, key, val);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
else {
|
2009-05-27 11:56:14 -04:00
|
|
|
st_insert2(RHASH(hash)->ntbl, key, val, rb_str_new4);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2004-09-29 01: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 06:44:21 -04:00
|
|
|
replace_i(VALUE key, VALUE val, VALUE hash)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
2001-06-01 05:38:30 -04:00
|
|
|
if (key != Qundef) {
|
|
|
|
rb_hash_aset(hash, key, val);
|
|
|
|
}
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.replace(other_hash) -> hsh
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Replaces the contents of <i>hsh</i> with the contents of
|
|
|
|
* <i>other_hash</i>.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.replace({ "c" => 300, "d" => 400 }) #=> {"c"=>300, "d"=>400}
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_replace(VALUE hash, VALUE hash2)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
|
|
|
hash2 = to_hash(hash2);
|
2002-09-28 00:21:31 -04:00
|
|
|
if (hash == hash2) return hash;
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_hash_clear(hash);
|
2009-08-03 18:44:45 -04:00
|
|
|
if (RHASH(hash2)->ntbl) {
|
|
|
|
rb_hash_tbl(hash);
|
|
|
|
RHASH(hash)->ntbl->type = RHASH(hash2)->ntbl->type;
|
|
|
|
}
|
2004-09-29 01:15:33 -04:00
|
|
|
rb_hash_foreach(hash2, replace_i, hash);
|
2002-08-13 05:21:18 -04:00
|
|
|
RHASH(hash)->ifnone = RHASH(hash2)->ifnone;
|
|
|
|
if (FL_TEST(hash2, HASH_PROC_DEFAULT)) {
|
|
|
|
FL_SET(hash, HASH_PROC_DEFAULT);
|
|
|
|
}
|
2002-08-19 01:56:09 -04:00
|
|
|
else {
|
|
|
|
FL_UNSET(hash, HASH_PROC_DEFAULT);
|
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.length => fixnum
|
|
|
|
* hsh.size => fixnum
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Returns the number of key-value pairs in the hash.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = { "d" => 100, "a" => 200, "v" => 300, "e" => 400 }
|
|
|
|
* h.length #=> 4
|
|
|
|
* h.delete("a") #=> 200
|
|
|
|
* h.length #=> 3
|
|
|
|
*/
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_size(VALUE hash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2007-08-29 19:12:21 -04:00
|
|
|
if (!RHASH(hash)->ntbl)
|
|
|
|
return INT2FIX(0);
|
|
|
|
return INT2FIX(RHASH(hash)->ntbl->num_entries);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.empty? => true or false
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Returns <code>true</code> if <i>hsh</i> contains no key-value pairs.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* {}.empty? #=> true
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:19:22 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_empty_p(VALUE hash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2007-08-29 19:12:21 -04:00
|
|
|
return RHASH_EMPTY_P(hash) ? Qtrue : Qfalse;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2004-09-29 01: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 06:44:21 -04:00
|
|
|
each_value_i(VALUE key, VALUE value)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2000-01-04 23:41:21 -05:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_yield(value);
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.each_value {| value | block } -> hsh
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Calls <i>block</i> once for each key in <i>hsh</i>, passing the
|
|
|
|
* value as a parameter.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.each_value {|value| puts value }
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* <em>produces:</em>
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* 100
|
|
|
|
* 200
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_each_value(VALUE hash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2005-08-30 10:49:51 -04:00
|
|
|
RETURN_ENUMERATOR(hash, 0, 0);
|
2004-09-29 01:15:33 -04:00
|
|
|
rb_hash_foreach(hash, each_value_i, 0);
|
1999-01-19 23:59:39 -05:00
|
|
|
return hash;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2004-09-29 01: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 06:44:21 -04:00
|
|
|
each_key_i(VALUE key, VALUE value)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2000-01-04 23:41:21 -05:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_yield(key);
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.each_key {| key | block } -> hsh
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Calls <i>block</i> once for each key in <i>hsh</i>, passing the key
|
|
|
|
* as a parameter.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.each_key {|key| puts key }
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* <em>produces:</em>
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* a
|
|
|
|
* b
|
|
|
|
*/
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_each_key(VALUE hash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2005-08-30 10:49:51 -04:00
|
|
|
RETURN_ENUMERATOR(hash, 0, 0);
|
2004-09-29 01:15:33 -04:00
|
|
|
rb_hash_foreach(hash, each_key_i, 0);
|
1999-01-19 23:59:39 -05:00
|
|
|
return hash;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2004-09-29 01: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 06:44:21 -04:00
|
|
|
each_pair_i(VALUE key, VALUE value)
|
2003-10-24 10:31:14 -04:00
|
|
|
{
|
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
2007-06-15 00:25:07 -04:00
|
|
|
rb_yield(rb_assoc_new(key, value));
|
2003-10-24 10:31:14 -04:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.each {| key, value | block } -> hsh
|
2007-11-03 10:07:48 -04:00
|
|
|
* hsh.each_pair {| key, value | block } -> hsh
|
2007-06-29 01: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-09 17:20:17 -04:00
|
|
|
* Calls <i>block</i> once for each key in <i>hsh</i>, passing the key-value
|
2007-11-03 10:07:48 -04:00
|
|
|
* pair as parameters.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.each {|key, value| puts "#{key} is #{value}" }
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* <em>produces:</em>
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* a is 100
|
|
|
|
* b is 200
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
2003-10-24 10:31:14 -04:00
|
|
|
static VALUE
|
2007-11-03 10:07:48 -04:00
|
|
|
rb_hash_each_pair(VALUE hash)
|
2003-10-24 10:31:14 -04:00
|
|
|
{
|
2005-08-30 10:49:51 -04:00
|
|
|
RETURN_ENUMERATOR(hash, 0, 0);
|
2007-11-03 10:07:48 -04:00
|
|
|
rb_hash_foreach(hash, each_pair_i, 0);
|
2003-10-24 10:31:14 -04:00
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2004-09-29 01: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 06:44:21 -04:00
|
|
|
to_a_i(VALUE key, VALUE value, VALUE ary)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2000-01-04 23:41:21 -05:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_ary_push(ary, rb_assoc_new(key, value));
|
1998-01-16 07:13:05 -05:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.to_a -> array
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Converts <i>hsh</i> to a nested array of <code>[</code> <i>key,
|
|
|
|
* value</i> <code>]</code> arrays.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = { "c" => 300, "a" => 100, "d" => 400, "c" => 300 }
|
2008-03-08 20:04:46 -05:00
|
|
|
* h.to_a #=> [["c", 300], ["a", 100], ["d", 400]]
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_to_a(VALUE hash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
VALUE ary;
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
ary = rb_ary_new();
|
2004-09-29 01: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 03:25:05 -04:00
|
|
|
OBJ_INFECT(ary, hash);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2004-09-29 01:15:33 -04:00
|
|
|
static int
|
2009-05-29 04:08:25 -04:00
|
|
|
inspect_i(VALUE key, VALUE value, VALUE str)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2009-05-29 04:08:25 -04:00
|
|
|
VALUE str2;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2000-01-04 23:41:21 -05:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
2006-08-31 06:47:44 -04:00
|
|
|
if (RSTRING_LEN(str) > 1) {
|
2000-04-10 01:48:43 -04:00
|
|
|
rb_str_cat2(str, ", ");
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2009-05-29 04:08:25 -04:00
|
|
|
str2 = rb_inspect(key);
|
2001-05-30 05:12:34 -04:00
|
|
|
rb_str_buf_append(str, str2);
|
2000-02-23 00:23:12 -05:00
|
|
|
OBJ_INFECT(str, str2);
|
2001-05-30 05:12:34 -04:00
|
|
|
rb_str_buf_cat2(str, "=>");
|
2009-05-29 04:08:25 -04:00
|
|
|
str2 = rb_inspect(value);
|
2001-05-30 05:12:34 -04:00
|
|
|
rb_str_buf_append(str, str2);
|
2000-02-23 00:23:12 -05:00
|
|
|
OBJ_INFECT(str, str2);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2009-05-29 04:08:25 -04:00
|
|
|
inspect_hash(VALUE hash, VALUE dummy, int recur)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2009-05-29 04:08:25 -04:00
|
|
|
VALUE str;
|
1998-01-16 07:13:05 -05: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 11:40:02 -05:00
|
|
|
if (recur) return rb_usascii_str_new2("{...}");
|
2001-05-30 05:12:34 -04:00
|
|
|
str = rb_str_buf_new2("{");
|
2009-05-29 04:08:25 -04:00
|
|
|
rb_hash_foreach(hash, inspect_i, str);
|
2001-05-30 05:12:34 -04:00
|
|
|
rb_str_buf_cat2(str, "}");
|
2000-02-23 00:23:12 -05:00
|
|
|
OBJ_INFECT(str, hash);
|
2001-05-30 05:12:34 -04:00
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-09-07 12:33:08 -04:00
|
|
|
* hsh.to_s => string
|
2003-12-23 11:21:17 -05:00
|
|
|
* hsh.inspect => string
|
|
|
|
*
|
|
|
|
* Return the contents of this hash as a string.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2006-09-07 12:33:08 -04:00
|
|
|
* h = { "c" => 300, "a" => 100, "d" => 400, "c" => 300 }
|
2008-03-08 20:04:46 -05:00
|
|
|
* h.to_s #=> "{\"c\"=>300, \"a\"=>100, \"d\"=>400}"
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_inspect(VALUE hash)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
2007-08-29 19: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 11:40:02 -05:00
|
|
|
return rb_usascii_str_new2("{}");
|
2009-05-29 04:08:25 -04:00
|
|
|
return rb_exec_recursive(inspect_hash, hash, 0);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.to_hash => hsh
|
|
|
|
*
|
|
|
|
* Returns <i>self</i>.
|
|
|
|
*/
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_to_hash(VALUE hash)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
|
|
|
return hash;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2004-09-29 01: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 06:44:21 -04:00
|
|
|
keys_i(VALUE key, VALUE value, VALUE ary)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2000-01-04 23:41:21 -05:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_ary_push(ary, key);
|
1998-01-16 07:13:05 -05:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.keys => array
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Returns a new array populated with the keys from this hash. See also
|
|
|
|
* <code>Hash#values</code>.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = { "a" => 100, "b" => 200, "c" => 300, "d" => 400 }
|
|
|
|
* h.keys #=> ["a", "b", "c", "d"]
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_keys(VALUE hash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
VALUE ary;
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
ary = rb_ary_new();
|
2004-09-29 01:15:33 -04:00
|
|
|
rb_hash_foreach(hash, keys_i, ary);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2004-09-29 01: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 06:44:21 -04:00
|
|
|
values_i(VALUE key, VALUE value, VALUE ary)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2000-01-04 23:41:21 -05:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_ary_push(ary, value);
|
1998-01-16 07:13:05 -05:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.values => array
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Returns a new array populated with the values from <i>hsh</i>. See
|
|
|
|
* also <code>Hash#keys</code>.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = { "a" => 100, "b" => 200, "c" => 300 }
|
|
|
|
* h.values #=> [100, 200, 300]
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_values(VALUE hash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
VALUE ary;
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
ary = rb_ary_new();
|
2004-09-29 01:15:33 -04:00
|
|
|
rb_hash_foreach(hash, values_i, ary);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* 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 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Returns <code>true</code> if the given key is present in <i>hsh</i>.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.has_key?("a") #=> true
|
|
|
|
* h.has_key?("z") #=> false
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_has_key(VALUE hash, VALUE key)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2007-08-29 19:12:21 -04:00
|
|
|
if (!RHASH(hash)->ntbl)
|
|
|
|
return Qfalse;
|
|
|
|
if (st_lookup(RHASH(hash)->ntbl, key, 0)) {
|
1999-01-19 23:59:39 -05:00
|
|
|
return Qtrue;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
return Qfalse;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2004-09-29 01:15:33 -04:00
|
|
|
static int
|
2009-05-08 23:19:52 -04:00
|
|
|
rb_hash_search_value(VALUE key, VALUE value, VALUE arg)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2009-05-08 23:19:52 -04:00
|
|
|
VALUE *data = (VALUE *)arg;
|
|
|
|
|
2000-01-04 23:41:21 -05:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
1998-01-16 07:13:05 -05:00
|
|
|
if (rb_equal(value, data[1])) {
|
1999-01-19 23:59:39 -05:00
|
|
|
data[0] = Qtrue;
|
1998-01-16 07:13:05 -05:00
|
|
|
return ST_STOP;
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.has_value?(value) => true or false
|
|
|
|
* hsh.value?(value) => true or false
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Returns <code>true</code> if the given value is present for some key
|
|
|
|
* in <i>hsh</i>.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.has_value?(100) #=> true
|
|
|
|
* h.has_value?(999) #=> false
|
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_has_value(VALUE hash, VALUE val)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
VALUE data[2];
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
data[0] = Qfalse;
|
1998-01-16 07:13:05 -05:00
|
|
|
data[1] = val;
|
2009-05-08 23:19:52 -04:00
|
|
|
rb_hash_foreach(hash, rb_hash_search_value, (VALUE)data);
|
1998-01-16 07:13:05 -05:00
|
|
|
return data[0];
|
|
|
|
}
|
|
|
|
|
|
|
|
struct equal_data {
|
2007-09-24 09:43:58 -04:00
|
|
|
VALUE result;
|
1998-01-16 07:13:05 -05:00
|
|
|
st_table *tbl;
|
2007-09-24 09:43:58 -04:00
|
|
|
int eql;
|
1998-01-16 07:13:05 -05:00
|
|
|
};
|
|
|
|
|
2006-09-22 04:36:02 -04:00
|
|
|
static int
|
2009-05-08 23:19:52 -04:00
|
|
|
eql_i(VALUE key, VALUE val1, VALUE arg)
|
2006-09-22 04:36:02 -04:00
|
|
|
{
|
2009-05-08 23:19:52 -04:00
|
|
|
struct equal_data *data = (struct equal_data *)arg;
|
2006-09-22 04:36:02 -04:00
|
|
|
VALUE val2;
|
|
|
|
|
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
|
|
|
if (!st_lookup(data->tbl, key, &val2)) {
|
|
|
|
data->result = Qfalse;
|
|
|
|
return ST_STOP;
|
|
|
|
}
|
2009-05-08 23:19:52 -04:00
|
|
|
if (!(data->eql ? rb_eql(val1, val2) : (int)rb_equal(val1, val2))) {
|
2006-09-22 04:36:02 -04:00
|
|
|
data->result = Qfalse;
|
|
|
|
return ST_STOP;
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2007-09-24 09:43:58 -04:00
|
|
|
static VALUE
|
|
|
|
recursive_eql(VALUE hash, VALUE dt, int recur)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2007-09-24 09:43:58 -04:00
|
|
|
struct equal_data *data;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2009-05-24 09:48:23 -04:00
|
|
|
if (recur) return Qtrue; /* Subtle! */
|
2007-09-24 09:43:58 -04:00
|
|
|
data = (struct equal_data*)dt;
|
|
|
|
data->result = Qtrue;
|
2009-05-08 23:19:52 -04:00
|
|
|
rb_hash_foreach(hash, eql_i, dt);
|
2007-09-24 09:43:58 -04:00
|
|
|
|
|
|
|
return data->result;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2004-05-07 04:44:24 -04:00
|
|
|
static VALUE
|
2006-09-22 04:36:02 -04:00
|
|
|
hash_equal(VALUE hash1, VALUE hash2, int eql)
|
2004-05-07 04:44:24 -04:00
|
|
|
{
|
|
|
|
struct equal_data data;
|
|
|
|
|
|
|
|
if (hash1 == hash2) return Qtrue;
|
|
|
|
if (TYPE(hash2) != T_HASH) {
|
|
|
|
if (!rb_respond_to(hash2, rb_intern("to_hash"))) {
|
|
|
|
return Qfalse;
|
|
|
|
}
|
2007-09-20 13:03:41 -04:00
|
|
|
if (eql)
|
|
|
|
return rb_eql(hash2, hash1);
|
|
|
|
else
|
|
|
|
return rb_equal(hash2, hash1);
|
2004-05-07 04:44:24 -04:00
|
|
|
}
|
2007-08-29 19:12:21 -04:00
|
|
|
if (RHASH_SIZE(hash1) != RHASH_SIZE(hash2))
|
2004-05-07 04:44:24 -04:00
|
|
|
return Qfalse;
|
2007-08-29 19:12:21 -04:00
|
|
|
if (!RHASH(hash1)->ntbl || !RHASH(hash2)->ntbl)
|
|
|
|
return Qtrue;
|
2008-03-04 05:19:55 -05:00
|
|
|
if (RHASH(hash1)->ntbl->type != RHASH(hash2)->ntbl->type)
|
|
|
|
return Qfalse;
|
2006-09-22 04:36:02 -04:00
|
|
|
#if 0
|
|
|
|
if (!(rb_equal(RHASH(hash1)->ifnone, RHASH(hash2)->ifnone) &&
|
|
|
|
FL_TEST(hash1, HASH_PROC_DEFAULT) == FL_TEST(hash2, HASH_PROC_DEFAULT)))
|
|
|
|
return Qfalse;
|
|
|
|
#endif
|
2004-05-07 04:44:24 -04:00
|
|
|
|
2007-08-29 19:12:21 -04:00
|
|
|
data.tbl = RHASH(hash2)->ntbl;
|
2007-09-24 09:43:58 -04:00
|
|
|
data.eql = eql;
|
2009-05-24 09:48:23 -04:00
|
|
|
return rb_exec_recursive_paired(recursive_eql, hash1, hash2, (VALUE)&data);
|
2004-05-07 04:44:24 -04:00
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh == other_hash => true or false
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05: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
|
|
|
|
* <code>Object#==</code>) the corresponding elements in the other
|
|
|
|
* hash.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05: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 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_equal(VALUE hash1, VALUE hash2)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2009-07-18 04:05:32 -04:00
|
|
|
return hash_equal(hash1, hash2, FALSE);
|
2004-05-07 04:44:24 -04:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2006-09-22 04: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.
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_hash_eql(VALUE hash1, VALUE hash2)
|
|
|
|
{
|
2009-07-18 04:05:32 -04:00
|
|
|
return hash_equal(hash1, hash2, TRUE);
|
2006-09-22 04:36:02 -04:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2009-05-08 23:19:52 -04:00
|
|
|
hash_i(VALUE key, VALUE val, VALUE arg)
|
2006-09-22 04:36:02 -04:00
|
|
|
{
|
2009-09-08 09:10:04 -04:00
|
|
|
st_index_t *hval = (st_index_t *)arg;
|
2009-05-08 23:19:52 -04:00
|
|
|
|
2006-09-22 04:36:02 -04:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
2009-02-15 00:59:03 -05:00
|
|
|
*hval ^= rb_hash_end(rb_hash_uint(rb_hash_start(rb_hash(key)), rb_hash(val)));
|
2006-09-22 04:36:02 -04:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
recursive_hash(VALUE hash, VALUE dummy, int recur)
|
|
|
|
{
|
2009-09-08 09:10:04 -04:00
|
|
|
st_index_t hval;
|
2006-09-22 04:36:02 -04:00
|
|
|
|
2007-08-29 19:12:21 -04:00
|
|
|
if (!RHASH(hash)->ntbl)
|
|
|
|
return LONG2FIX(0);
|
|
|
|
hval = RHASH(hash)->ntbl->num_entries;
|
2009-09-15 17:30:50 -04:00
|
|
|
if (recur)
|
|
|
|
hval = rb_hash_end(rb_hash_uint(rb_hash_start(rb_hash(rb_cHash)), hval));
|
|
|
|
else
|
|
|
|
rb_hash_foreach(hash, hash_i, (VALUE)&hval);
|
2006-09-22 04:36:02 -04:00
|
|
|
return INT2FIX(hval);
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2009-07-01 17:20:44 -04:00
|
|
|
* hsh.hash -> fixnum
|
2006-09-22 04:36:02 -04:00
|
|
|
*
|
2009-07-01 17:20:44 -04:00
|
|
|
* Compute a hash-code for this hash. Two hashes with the same content
|
2006-09-22 04:36:02 -04:00
|
|
|
* will have the same hash code (and will compare using <code>eql?</code>).
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_hash_hash(VALUE hash)
|
|
|
|
{
|
2009-09-15 17:30:50 -04:00
|
|
|
return rb_exec_recursive_outer(recursive_hash, hash, 0);
|
2006-09-22 04:36:02 -04:00
|
|
|
}
|
|
|
|
|
2004-09-29 01: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 06:44:21 -04:00
|
|
|
rb_hash_invert_i(VALUE key, VALUE value, VALUE hash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2000-01-04 23:41:21 -05:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_hash_aset(hash, value, key);
|
1998-01-16 07:13:05 -05:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.invert -> aHash
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Returns a new hash created by using <i>hsh</i>'s values as keys, and
|
|
|
|
* the keys as values.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h = { "n" => 100, "m" => 100, "y" => 300, "d" => 200, "a" => 0 }
|
2008-03-08 20:04:46 -05:00
|
|
|
* h.invert #=> {0=>"a", 100=>"m", 200=>"d", 300=>"y"}
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_invert(VALUE hash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1999-01-19 23:59:39 -05:00
|
|
|
VALUE h = rb_hash_new();
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2004-09-29 01:15:33 -04:00
|
|
|
rb_hash_foreach(hash, rb_hash_invert_i, h);
|
1998-01-16 07:13:05 -05:00
|
|
|
return h;
|
|
|
|
}
|
|
|
|
|
2004-09-29 01: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 06:44:21 -04:00
|
|
|
rb_hash_update_i(VALUE key, VALUE value, VALUE hash)
|
1998-01-16 07:19:22 -05:00
|
|
|
{
|
2000-01-04 23:41:21 -05:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
2009-06-08 01:44:17 -04:00
|
|
|
st_insert(RHASH(hash)->ntbl, key, value);
|
1998-01-16 07:19:22 -05:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2004-09-29 01: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 06:44:21 -04:00
|
|
|
rb_hash_update_block_i(VALUE key, VALUE value, VALUE hash)
|
2002-01-25 03:22:11 -05:00
|
|
|
{
|
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
|
|
|
if (rb_hash_has_key(hash, key)) {
|
2003-05-20 02:29:23 -04:00
|
|
|
value = rb_yield_values(3, key, rb_hash_aref(hash, key), value);
|
2002-01-25 03:22:11 -05:00
|
|
|
}
|
2009-06-08 01:44:17 -04:00
|
|
|
st_insert(RHASH(hash)->ntbl, key, value);
|
2002-01-25 03:22:11 -05:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-11-16 09:51:38 -05:00
|
|
|
* hsh.merge!(other_hash) => hsh
|
|
|
|
* hsh.update(other_hash) => hsh
|
|
|
|
* hsh.merge!(other_hash){|key, oldval, newval| block} => hsh
|
|
|
|
* hsh.update(other_hash){|key, oldval, newval| block} => hsh
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
* Adds the contents of <i>other_hash</i> to <i>hsh</i>. If no
|
|
|
|
* block is specified entries with duplicate keys are overwritten
|
|
|
|
* with the values from <i>other_hash</i>, otherwise the value
|
2007-12-31 01:43:32 -05:00
|
|
|
* of each duplicate key is determined by calling the block with
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
* the key, its value in <i>hsh</i> and its value in <i>other_hash</i>.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h1 = { "a" => 100, "b" => 200 }
|
|
|
|
* h2 = { "b" => 254, "c" => 300 }
|
|
|
|
* h1.merge!(h2) #=> {"a"=>100, "b"=>254, "c"=>300}
|
2008-03-08 20:04:46 -05:00
|
|
|
*
|
|
|
|
* h1 = { "a" => 100, "b" => 200 }
|
|
|
|
* h2 = { "b" => 254, "c" => 300 }
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
* h1.merge!(h2) { |key, v1, v2| v1 }
|
|
|
|
* #=> {"a"=>100, "b"=>200, "c"=>300}
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
1998-01-16 07:19:22 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_update(VALUE hash1, VALUE hash2)
|
1998-01-16 07:19:22 -05:00
|
|
|
{
|
2009-06-08 01:44:17 -04:00
|
|
|
rb_hash_modify(hash1);
|
1999-01-19 23:59:39 -05:00
|
|
|
hash2 = to_hash(hash2);
|
2002-01-25 03:22:11 -05:00
|
|
|
if (rb_block_given_p()) {
|
2004-09-29 01:15:33 -04:00
|
|
|
rb_hash_foreach(hash2, rb_hash_update_block_i, hash1);
|
2002-01-25 03:22:11 -05:00
|
|
|
}
|
|
|
|
else {
|
2004-09-29 01:15:33 -04:00
|
|
|
rb_hash_foreach(hash2, rb_hash_update_i, hash1);
|
2002-01-25 03:22:11 -05:00
|
|
|
}
|
1998-01-16 07:19:22 -05:00
|
|
|
return hash1;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-11-16 09:51:38 -05:00
|
|
|
* hsh.merge(other_hash) -> a_hash
|
|
|
|
* hsh.merge(other_hash){|key, oldval, newval| block} -> a_hash
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Returns a new hash containing the contents of <i>other_hash</i> and
|
|
|
|
* the contents of <i>hsh</i>, overwriting entries in <i>hsh</i> with
|
|
|
|
* duplicate keys with those from <i>other_hash</i>.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* h1 = { "a" => 100, "b" => 200 }
|
|
|
|
* h2 = { "b" => 254, "c" => 300 }
|
|
|
|
* h1.merge(h2) #=> {"a"=>100, "b"=>254, "c"=>300}
|
|
|
|
* h1 #=> {"a"=>100, "b"=>200}
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
2003-02-03 00:34:16 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_hash_merge(VALUE hash1, VALUE hash2)
|
2003-02-03 00:34:16 -05:00
|
|
|
{
|
|
|
|
return rb_hash_update(rb_obj_dup(hash1), hash2);
|
|
|
|
}
|
|
|
|
|
2007-06-22 12:26:07 -04:00
|
|
|
static int
|
2009-05-08 23:19:52 -04:00
|
|
|
assoc_i(VALUE key, VALUE val, VALUE arg)
|
2007-06-22 12:26:07 -04:00
|
|
|
{
|
2009-05-08 23:19:52 -04:00
|
|
|
VALUE *args = (VALUE *)arg;
|
|
|
|
|
2007-06-22 12:26:07 -04:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
|
|
|
if (RTEST(rb_equal(args[0], key))) {
|
|
|
|
args[1] = rb_assoc_new(key, val);
|
|
|
|
return ST_STOP;
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2007-06-29 01:15:46 -04:00
|
|
|
/*
|
2007-06-22 12: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+
|
|
|
|
* if no match is found. See <code>Array#assoc</code>.
|
|
|
|
*
|
|
|
|
* h = {"colors" => ["red", "blue", "green"],
|
|
|
|
* "letters" => ["a", "b", "c" ]}
|
|
|
|
* h.assoc("letters") #=> ["letters", ["a", "b", "c"]]
|
|
|
|
* h.assoc("foo") #=> nil
|
|
|
|
*/
|
|
|
|
|
|
|
|
VALUE
|
|
|
|
rb_hash_assoc(VALUE hash, VALUE obj)
|
|
|
|
{
|
|
|
|
VALUE args[2];
|
|
|
|
|
|
|
|
args[0] = obj;
|
|
|
|
args[1] = Qnil;
|
2009-05-08 23:19:52 -04:00
|
|
|
rb_hash_foreach(hash, assoc_i, (VALUE)args);
|
2007-06-22 12:26:07 -04:00
|
|
|
return args[1];
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2009-05-08 23:19:52 -04:00
|
|
|
rassoc_i(VALUE key, VALUE val, VALUE arg)
|
2007-06-22 12:26:07 -04:00
|
|
|
{
|
2009-05-08 23:19:52 -04:00
|
|
|
VALUE *args = (VALUE *)arg;
|
|
|
|
|
2007-06-22 12:26:07 -04:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
|
|
|
if (RTEST(rb_equal(args[0], val))) {
|
|
|
|
args[1] = rb_assoc_new(key, val);
|
|
|
|
return ST_STOP;
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hash.rassoc(key) -> an_array or nil
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2007-06-22 12:26:07 -04:00
|
|
|
* Searches through the hash comparing _obj_ with the value using <code>==</code>.
|
|
|
|
* Returns the first key-value pair (two elements array) that matches. See
|
|
|
|
* also <code>Array#rassoc</code>.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2007-06-22 12: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-08 23:19:52 -04:00
|
|
|
rb_hash_foreach(hash, rassoc_i, (VALUE)args);
|
2007-06-22 12:26:07 -04:00
|
|
|
return args[1];
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hash.flatten -> an_array
|
|
|
|
* hash.flatten(level) -> an_array
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2007-06-22 12: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
|
|
|
|
* method does not flatten recursively by default. If the optional
|
2007-12-31 01:43:32 -05:00
|
|
|
* <i>level</i> argument determines the level of recursion to flatten.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2007-06-22 12: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)
|
|
|
|
{
|
2008-02-05 11:53:23 -05:00
|
|
|
VALUE ary, tmp;
|
2007-06-22 12:26:07 -04:00
|
|
|
|
|
|
|
ary = rb_hash_to_a(hash);
|
2008-02-05 11:51:30 -05:00
|
|
|
if (argc == 0) {
|
|
|
|
argc = 1;
|
|
|
|
tmp = INT2FIX(1);
|
|
|
|
argv = &tmp;
|
|
|
|
}
|
2007-06-22 12:26:07 -04:00
|
|
|
rb_funcall2(ary, rb_intern("flatten!"), argc, argv);
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2006-09-11 04:09:19 -04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-10-12 10:05:17 -04:00
|
|
|
* hsh.compare_by_identity => hsh
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2006-09-11 04:09:19 -04:00
|
|
|
* Makes <i>hsh</i> to compare its keys by their identity, i.e. it
|
|
|
|
* will consider exact same objects as same keys.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2006-09-11 04:09:19 -04:00
|
|
|
* h1 = { "a" => 100, "b" => 200, :c => "c" }
|
2006-10-12 12:07:21 -04:00
|
|
|
* h1["a"] #=> 100
|
2006-10-12 10:05:17 -04:00
|
|
|
* h1.compare_by_identity
|
|
|
|
* h1.compare_by_identity? #=> true
|
2006-09-13 04:10:28 -04:00
|
|
|
* h1["a"] #=> nil # different objects.
|
|
|
|
* h1[:c] #=> "c" # same symbols are all same.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2006-09-11 04:09:19 -04:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2006-10-12 10:05:17 -04:00
|
|
|
rb_hash_compare_by_id(VALUE hash)
|
2006-09-11 04:09:19 -04:00
|
|
|
{
|
|
|
|
rb_hash_modify(hash);
|
2007-08-29 19:12:21 -04:00
|
|
|
RHASH(hash)->ntbl->type = &identhash;
|
2006-09-11 04:09:19 -04:00
|
|
|
rb_hash_rehash(hash);
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-10-12 10:05:17 -04:00
|
|
|
* hsh.compare_by_identity? => true or false
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2006-09-11 04:09:19 -04:00
|
|
|
* Returns <code>true</code> if <i>hsh</i> will compare its keys by
|
2006-10-12 10:05:17 -04:00
|
|
|
* their identity. Also see <code>Hash#compare_by_identity</code>.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2006-09-11 04:09:19 -04:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2006-10-12 10:05:17 -04:00
|
|
|
rb_hash_compare_by_id_p(VALUE hash)
|
2006-09-11 04:09:19 -04:00
|
|
|
{
|
2007-08-29 19:12:21 -04:00
|
|
|
if (!RHASH(hash)->ntbl)
|
|
|
|
return Qfalse;
|
|
|
|
if (RHASH(hash)->ntbl->type == &identhash) {
|
2006-09-11 04:09:19 -04:00
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:19:22 -05:00
|
|
|
static int path_tainted = -1;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2001-11-12 22:59:20 -05: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-14 22:18:08 -05:00
|
|
|
#ifdef _WIN32
|
2002-05-29 06:22:19 -04:00
|
|
|
#define GET_ENVIRON(e) (e = rb_w32_get_environ())
|
|
|
|
#define FREE_ENVIRON(e) rb_w32_free_environ(e)
|
2001-11-12 22:59:20 -05:00
|
|
|
static char **my_environ;
|
|
|
|
#undef environ
|
|
|
|
#define environ my_environ
|
2002-10-17 12:13:44 -04:00
|
|
|
#elif defined(__APPLE__)
|
|
|
|
#undef environ
|
|
|
|
#define environ (*_NSGetEnviron())
|
|
|
|
#define GET_ENVIRON(e) (e)
|
|
|
|
#define FREE_ENVIRON(e)
|
2001-11-12 22:59:20 -05:00
|
|
|
#else
|
1998-01-16 07:13:05 -05:00
|
|
|
extern char **environ;
|
2001-11-12 22:59:20 -05:00
|
|
|
#define GET_ENVIRON(e) (e)
|
|
|
|
#define FREE_ENVIRON(e)
|
1998-01-16 07:13:05 -05:00
|
|
|
#endif
|
2008-09-23 03:59:48 -04:00
|
|
|
#ifdef ENV_IGNORECASE
|
|
|
|
#define ENVMATCH(s1, s2) (STRCASECMP(s1, s2) == 0)
|
|
|
|
#define ENVNMATCH(s1, s2, n) (STRNCASECMP(s1, s2, n) == 0)
|
|
|
|
#else
|
|
|
|
#define ENVMATCH(n1, n2) (strcmp(n1, n2) == 0)
|
|
|
|
#define ENVNMATCH(s1, s2, n) (memcmp(s1, s2, n) == 0)
|
|
|
|
#endif
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2003-06-06 05: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 06:44:21 -04:00
|
|
|
env_str_new(const char *ptr, long len)
|
2003-06-06 05:24:59 -04:00
|
|
|
{
|
2009-07-12 11:04:33 -04:00
|
|
|
VALUE str = rb_locale_str_new(ptr, len);
|
2003-06-06 05:24:59 -04:00
|
|
|
|
|
|
|
rb_obj_freeze(str);
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_str_new2(const char *ptr)
|
2003-06-06 05:24:59 -04:00
|
|
|
{
|
2003-06-23 02:52:39 -04:00
|
|
|
if (!ptr) return Qnil;
|
2003-06-06 05:24:59 -04:00
|
|
|
return env_str_new(ptr, strlen(ptr));
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_delete(VALUE obj, VALUE name)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1999-08-13 01:45:20 -04:00
|
|
|
char *nam, *val;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
rb_secure(4);
|
2002-08-27 04:31:08 -04:00
|
|
|
SafeStringValue(name);
|
2006-08-31 06:47:44 -04:00
|
|
|
nam = RSTRING_PTR(name);
|
2009-05-08 23:19:52 -04:00
|
|
|
if (memchr(nam, '\0', RSTRING_LEN(name))) {
|
1999-08-13 01:45:20 -04:00
|
|
|
rb_raise(rb_eArgError, "bad environment variable name");
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
1999-08-13 01:45:20 -04:00
|
|
|
val = getenv(nam);
|
1998-01-16 07:13:05 -05:00
|
|
|
if (val) {
|
2003-06-06 05:24:59 -04:00
|
|
|
VALUE value = env_str_new2(val);
|
2000-01-04 23:41:21 -05:00
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
ruby_setenv(nam, 0);
|
2008-09-23 03:59:48 -04:00
|
|
|
if (ENVMATCH(nam, PATH_ENV)) {
|
1999-08-13 01:45:20 -04:00
|
|
|
path_tainted = 0;
|
|
|
|
}
|
2000-01-04 23:41:21 -05:00
|
|
|
return value;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:19:22 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_delete_m(VALUE obj, VALUE name)
|
1998-01-16 07:19:22 -05:00
|
|
|
{
|
2003-03-30 21:06:23 -05:00
|
|
|
VALUE val;
|
|
|
|
|
|
|
|
val = env_delete(obj, name);
|
|
|
|
if (NIL_P(val) && rb_block_given_p()) rb_yield(name);
|
1998-01-16 07:19:22 -05:00
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
rb_f_getenv(VALUE obj, VALUE name)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1999-01-19 23:59:39 -05:00
|
|
|
char *nam, *env;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2004-11-18 03:11:12 -05:00
|
|
|
rb_secure(4);
|
|
|
|
SafeStringValue(name);
|
2006-08-31 06:47:44 -04:00
|
|
|
nam = RSTRING_PTR(name);
|
2009-05-08 23:19:52 -04:00
|
|
|
if (memchr(nam, '\0', RSTRING_LEN(name))) {
|
1999-08-13 01:45:20 -04:00
|
|
|
rb_raise(rb_eArgError, "bad environment variable name");
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
env = getenv(nam);
|
1998-01-16 07:13:05 -05:00
|
|
|
if (env) {
|
2008-09-23 03:59:48 -04:00
|
|
|
if (ENVMATCH(nam, PATH_ENV) && !rb_env_path_tainted()) {
|
2008-02-28 13:13:45 -05:00
|
|
|
VALUE str = rb_str_new2(env);
|
2003-06-06 05:24:59 -04:00
|
|
|
|
|
|
|
rb_obj_freeze(str);
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
return env_str_new2(env);
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2000-04-12 01:06:23 -04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_fetch(int argc, VALUE *argv)
|
2000-04-12 01:06:23 -04:00
|
|
|
{
|
|
|
|
VALUE key, if_none;
|
2003-11-06 02:22:39 -05:00
|
|
|
long block_given;
|
2000-04-12 01:06:23 -04:00
|
|
|
char *nam, *env;
|
|
|
|
|
2004-11-18 03:11:12 -05:00
|
|
|
rb_secure(4);
|
2000-04-12 01:06:23 -04:00
|
|
|
rb_scan_args(argc, argv, "11", &key, &if_none);
|
2003-11-06 02:22:39 -05:00
|
|
|
block_given = rb_block_given_p();
|
|
|
|
if (block_given && argc == 2) {
|
|
|
|
rb_warn("block supersedes default value argument");
|
|
|
|
}
|
2004-11-18 03:11:12 -05:00
|
|
|
SafeStringValue(key);
|
2006-08-31 06:47:44 -04:00
|
|
|
nam = RSTRING_PTR(key);
|
2009-05-08 23:19:52 -04:00
|
|
|
if (memchr(nam, '\0', RSTRING_LEN(key))) {
|
2000-04-12 01:06:23 -04:00
|
|
|
rb_raise(rb_eArgError, "bad environment variable name");
|
|
|
|
}
|
|
|
|
env = getenv(nam);
|
|
|
|
if (!env) {
|
2003-11-06 02:22:39 -05:00
|
|
|
if (block_given) return rb_yield(key);
|
2000-04-12 01:06:23 -04:00
|
|
|
if (argc == 1) {
|
2004-09-22 00:48:52 -04:00
|
|
|
rb_raise(rb_eKeyError, "key not found");
|
2000-04-12 01:06:23 -04:00
|
|
|
}
|
|
|
|
return if_none;
|
|
|
|
}
|
2008-09-23 03:59:48 -04:00
|
|
|
if (ENVMATCH(nam, PATH_ENV) && !rb_env_path_tainted())
|
2008-02-28 13:13:45 -05:00
|
|
|
return rb_str_new2(env);
|
2003-06-06 05:24:59 -04:00
|
|
|
return env_str_new2(env);
|
2000-04-12 01:06:23 -04:00
|
|
|
}
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
path_tainted_p(char *path)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
|
|
|
path_tainted = rb_path_check(path)?0:1;
|
1998-01-16 07:19:22 -05: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 06:44:21 -04:00
|
|
|
rb_env_path_tainted(void)
|
1998-01-16 07:19:22 -05:00
|
|
|
{
|
|
|
|
if (path_tainted < 0) {
|
2003-06-20 02:22:50 -04:00
|
|
|
path_tainted_p(getenv(PATH_ENV));
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
|
|
|
return path_tainted;
|
|
|
|
}
|
|
|
|
|
2006-08-29 06:11:27 -04:00
|
|
|
#if !defined(_WIN32) && !(defined(HAVE_SETENV) && defined(HAVE_UNSETENV))
|
1999-01-19 23:59:39 -05: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 06:44:21 -04:00
|
|
|
envix(const char *nam)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
|
|
|
register int i, len = strlen(nam);
|
2001-11-12 22:59:20 -05:00
|
|
|
char **env;
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2001-11-12 22:59:20 -05:00
|
|
|
env = GET_ENVIRON(environ);
|
|
|
|
for (i = 0; env[i]; i++) {
|
2008-09-23 03:59:48 -04:00
|
|
|
if (ENVNMATCH(env[i],nam,len) && env[i][len] == '=')
|
1999-01-19 23:59:39 -05:00
|
|
|
break; /* memcmp must come first to avoid */
|
|
|
|
} /* potential SEGV's */
|
2001-11-12 22:59:20 -05:00
|
|
|
FREE_ENVIRON(environ);
|
1999-01-19 23:59:39 -05:00
|
|
|
return i;
|
|
|
|
}
|
2006-08-29 06:11:27 -04:00
|
|
|
#endif
|
1999-01-19 23:59:39 -05:00
|
|
|
|
1999-08-13 01: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 06:44:21 -04:00
|
|
|
ruby_setenv(const char *name, const char *value)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
2003-06-20 02:22:50 -04:00
|
|
|
#if defined(_WIN32)
|
1999-01-19 23:59:39 -05:00
|
|
|
/* The sane way to deal with the environment.
|
|
|
|
* Has these advantages over putenv() & co.:
|
|
|
|
* * enables us to store a truly empty value in the
|
|
|
|
* environment (like in UNIX).
|
|
|
|
* * we don't have to deal with RTL globals, bugs and leaks.
|
|
|
|
* * Much faster.
|
|
|
|
* Why you may want to enable USE_WIN32_RTL_ENV:
|
|
|
|
* * environ[] and RTL functions will not reflect changes,
|
|
|
|
* which might be an issue if extensions want to access
|
|
|
|
* the env. via RTL. This cuts both ways, since RTL will
|
|
|
|
* not see changes made by extensions that call the Win32
|
|
|
|
* functions directly, either.
|
|
|
|
* GSAR 97-06-07
|
2001-11-14 13:41:46 -05:00
|
|
|
*
|
|
|
|
* REMARK: USE_WIN32_RTL_ENV is already obsoleted since we don't use
|
|
|
|
* RTL's environ global variable directly yet.
|
1999-01-19 23:59:39 -05:00
|
|
|
*/
|
|
|
|
SetEnvironmentVariable(name,value);
|
2006-02-01 08:27:47 -05:00
|
|
|
#elif defined(HAVE_SETENV) && defined(HAVE_UNSETENV)
|
1999-08-13 01:45:20 -04:00
|
|
|
#undef setenv
|
|
|
|
#undef unsetenv
|
|
|
|
if (value)
|
|
|
|
setenv(name,value,1);
|
|
|
|
else
|
|
|
|
unsetenv(name);
|
1999-01-19 23:59:39 -05:00
|
|
|
#else /* WIN32 */
|
2005-07-19 04:31:04 -04:00
|
|
|
size_t len;
|
1999-08-13 01:45:20 -04:00
|
|
|
int i=envix(name); /* where does it go? */
|
1999-01-19 23:59:39 -05: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 */
|
|
|
|
tmpenv[j] = strdup(environ[j]);
|
|
|
|
tmpenv[max] = 0;
|
|
|
|
environ = tmpenv; /* tell exec where it is now */
|
|
|
|
}
|
2005-06-13 00:04:33 -04:00
|
|
|
if (environ[i]) {
|
2005-06-12 12: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 06:01:40 -04:00
|
|
|
xfree(environ[i]);
|
2005-06-13 00:04:33 -04:00
|
|
|
if (!value) {
|
2005-06-12 12:56:06 -04:00
|
|
|
while (environ[i]) {
|
|
|
|
environ[i] = environ[i+1];
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
return;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
2005-06-13 00:04:33 -04:00
|
|
|
}
|
|
|
|
else { /* does not exist yet */
|
|
|
|
if (!value) return;
|
1999-01-19 23:59:39 -05: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 04: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-19 23:59:39 -05:00
|
|
|
#endif /* WIN32 */
|
|
|
|
}
|
|
|
|
|
1999-08-13 01: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 06:44:21 -04:00
|
|
|
ruby_unsetenv(const char *name)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
|
|
|
ruby_setenv(name, 0);
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_aset(VALUE obj, VALUE nm, VALUE val)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1999-01-19 23:59:39 -05:00
|
|
|
char *name, *value;
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
if (rb_safe_level() >= 4) {
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 01:47:45 -05:00
|
|
|
rb_raise(rb_eSecurityError, "can't change environment variable");
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2006-06-17 10:50:04 -04:00
|
|
|
if (NIL_P(val)) {
|
2008-09-22 19:27:33 -04:00
|
|
|
env_delete(obj, nm);
|
|
|
|
return Qnil;
|
2006-06-17 10:50:04 -04:00
|
|
|
}
|
2001-05-02 00:22:21 -04:00
|
|
|
StringValue(nm);
|
|
|
|
StringValue(val);
|
2006-08-31 06:47:44 -04:00
|
|
|
name = RSTRING_PTR(nm);
|
|
|
|
value = RSTRING_PTR(val);
|
2009-05-08 23:19:52 -04:00
|
|
|
if (memchr(name, '\0', RSTRING_LEN(nm)))
|
1999-08-13 01:45:20 -04:00
|
|
|
rb_raise(rb_eArgError, "bad environment variable name");
|
2009-05-08 23:19:52 -04:00
|
|
|
if (memchr(value, '\0', RSTRING_LEN(val)))
|
1999-08-13 01:45:20 -04:00
|
|
|
rb_raise(rb_eArgError, "bad environment variable value");
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
ruby_setenv(name, value);
|
2008-09-23 03:59:48 -04:00
|
|
|
if (ENVMATCH(name, PATH_ENV)) {
|
1999-01-19 23:59:39 -05:00
|
|
|
if (OBJ_TAINTED(val)) {
|
1998-01-16 07:19:22 -05:00
|
|
|
/* already tainted, no check */
|
|
|
|
path_tainted = 1;
|
2001-10-29 00:07:26 -05:00
|
|
|
return val;
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
path_tainted_p(value);
|
1998-01-16 07:19:22 -05:00
|
|
|
}
|
|
|
|
}
|
2001-10-29 00:07:26 -05:00
|
|
|
return val;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_keys(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
char **env;
|
2004-11-18 03:11:12 -05:00
|
|
|
VALUE ary;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2004-11-18 03:11:12 -05:00
|
|
|
rb_secure(4);
|
|
|
|
ary = rb_ary_new();
|
2001-11-12 22:59:20 -05:00
|
|
|
env = GET_ENVIRON(environ);
|
1998-01-16 07:13:05 -05:00
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
1999-01-19 23:59:39 -05:00
|
|
|
if (s) {
|
2003-06-06 05:24:59 -04:00
|
|
|
rb_ary_push(ary, env_str_new(*env, s-*env));
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
env++;
|
|
|
|
}
|
2001-11-12 22:59:20 -05:00
|
|
|
FREE_ENVIRON(environ);
|
1998-01-16 07:13:05 -05:00
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_each_key(VALUE ehash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2004-11-18 03:11:12 -05:00
|
|
|
VALUE keys;
|
2003-08-01 16:16:53 -04:00
|
|
|
long i;
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2005-08-30 10:49:51 -04:00
|
|
|
RETURN_ENUMERATOR(ehash, 0, 0);
|
2008-05-25 12:06:00 -04:00
|
|
|
keys = env_keys(); /* rb_secure(4); */
|
2006-09-02 10:42:08 -04:00
|
|
|
for (i=0; i<RARRAY_LEN(keys); i++) {
|
|
|
|
rb_yield(RARRAY_PTR(keys)[i]);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
2003-08-01 16:16:53 -04:00
|
|
|
return ehash;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_values(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2004-11-18 03:11:12 -05:00
|
|
|
VALUE ary;
|
1998-01-16 07:13:05 -05:00
|
|
|
char **env;
|
|
|
|
|
2004-11-18 03:11:12 -05:00
|
|
|
rb_secure(4);
|
|
|
|
ary = rb_ary_new();
|
2001-11-12 22:59:20 -05:00
|
|
|
env = GET_ENVIRON(environ);
|
1998-01-16 07:13:05 -05:00
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
1999-01-19 23:59:39 -05:00
|
|
|
if (s) {
|
2003-06-06 05:24:59 -04:00
|
|
|
rb_ary_push(ary, env_str_new2(s+1));
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
env++;
|
|
|
|
}
|
2001-11-12 22:59:20 -05:00
|
|
|
FREE_ENVIRON(environ);
|
1998-01-16 07:13:05 -05:00
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_each_value(VALUE ehash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2008-05-25 11:42:14 -04:00
|
|
|
VALUE values;
|
2003-08-01 16:16:53 -04:00
|
|
|
long i;
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2005-08-30 10:49:51 -04:00
|
|
|
RETURN_ENUMERATOR(ehash, 0, 0);
|
2008-05-25 12:06:00 -04:00
|
|
|
values = env_values(); /* rb_secure(4); */
|
2006-09-02 10:42:08 -04:00
|
|
|
for (i=0; i<RARRAY_LEN(values); i++) {
|
|
|
|
rb_yield(RARRAY_PTR(values)[i]);
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
2003-08-01 16:16:53 -04:00
|
|
|
return ehash;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2007-11-03 10:07:48 -04:00
|
|
|
env_each_pair(VALUE ehash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1999-01-19 23:59:39 -05:00
|
|
|
char **env;
|
2004-11-18 03:11:12 -05:00
|
|
|
VALUE ary;
|
2003-08-01 16:16:53 -04:00
|
|
|
long i;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2007-11-03 10:07:48 -04:00
|
|
|
RETURN_ENUMERATOR(ehash, 0, 0);
|
|
|
|
|
2004-11-18 03:11:12 -05:00
|
|
|
rb_secure(4);
|
|
|
|
ary = rb_ary_new();
|
2001-11-12 22:59:20 -05:00
|
|
|
env = GET_ENVIRON(environ);
|
1999-01-19 23:59:39 -05:00
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
if (s) {
|
2003-08-01 16: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 07:13:05 -05:00
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
env++;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
2001-11-12 22:59:20 -05:00
|
|
|
FREE_ENVIRON(environ);
|
2003-08-01 16:16:53 -04:00
|
|
|
|
2006-09-02 10:42:08 -04:00
|
|
|
for (i=0; i<RARRAY_LEN(ary); i+=2) {
|
2007-11-03 10:07:48 -04:00
|
|
|
rb_yield(rb_assoc_new(RARRAY_PTR(ary)[i], RARRAY_PTR(ary)[i+1]));
|
2003-08-01 16:16:53 -04:00
|
|
|
}
|
|
|
|
return ehash;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2008-04-14 04:31:38 -04:00
|
|
|
env_reject_bang(VALUE ehash)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1999-01-19 23:59:39 -05:00
|
|
|
volatile VALUE keys;
|
2003-07-31 22:52:21 -04:00
|
|
|
long i;
|
2002-08-21 11:47:54 -04:00
|
|
|
int del = 0;
|
1999-01-19 23:59:39 -05:00
|
|
|
|
2008-04-14 04:31:38 -04:00
|
|
|
RETURN_ENUMERATOR(ehash, 0, 0);
|
2008-05-25 12:06:00 -04:00
|
|
|
keys = env_keys(); /* rb_secure(4); */
|
2006-09-02 10:42:08 -04:00
|
|
|
for (i=0; i<RARRAY_LEN(keys); i++) {
|
|
|
|
VALUE val = rb_f_getenv(Qnil, RARRAY_PTR(keys)[i]);
|
1998-01-16 07:13:05 -05:00
|
|
|
if (!NIL_P(val)) {
|
2006-09-02 10:42:08 -04:00
|
|
|
if (RTEST(rb_yield_values(2, RARRAY_PTR(keys)[i], val))) {
|
|
|
|
FL_UNSET(RARRAY_PTR(keys)[i], FL_TAINT);
|
|
|
|
env_delete(Qnil, RARRAY_PTR(keys)[i]);
|
2000-08-07 01:05:04 -04:00
|
|
|
del++;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2000-08-07 01:05:04 -04:00
|
|
|
if (del == 0) return Qnil;
|
|
|
|
return envtbl;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2008-04-14 04:31:38 -04:00
|
|
|
env_delete_if(VALUE ehash)
|
2000-08-07 01:05:04 -04:00
|
|
|
{
|
2008-05-01 03:10:23 -04:00
|
|
|
RETURN_ENUMERATOR(ehash, 0, 0);
|
2008-04-14 04:31:38 -04:00
|
|
|
env_reject_bang(ehash);
|
1998-01-16 07:13:05 -05:00
|
|
|
return envtbl;
|
|
|
|
}
|
|
|
|
|
2001-12-10 22:48:08 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_values_at(int argc, VALUE *argv)
|
2001-12-10 22:48:08 -05:00
|
|
|
{
|
2004-11-18 03:11:12 -05:00
|
|
|
VALUE result;
|
2001-12-10 22:48:08 -05:00
|
|
|
long i;
|
|
|
|
|
2004-11-18 03:11:12 -05:00
|
|
|
rb_secure(4);
|
|
|
|
result = rb_ary_new();
|
2003-05-04 12:03:24 -04:00
|
|
|
for (i=0; i<argc; i++) {
|
|
|
|
rb_ary_push(result, rb_f_getenv(Qnil, argv[i]));
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
2001-12-10 22:48:08 -05:00
|
|
|
|
2003-05-04 12:03:24 -04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_select(VALUE ehash)
|
2003-05-04 12:03:24 -04:00
|
|
|
{
|
|
|
|
VALUE result;
|
|
|
|
char **env;
|
|
|
|
|
2005-08-30 10:49:51 -04:00
|
|
|
RETURN_ENUMERATOR(ehash, 0, 0);
|
2004-11-18 03:11:12 -05:00
|
|
|
rb_secure(4);
|
2007-06-21 10:50:14 -04:00
|
|
|
result = rb_hash_new();
|
2003-05-04 12:03:24 -04:00
|
|
|
env = GET_ENVIRON(environ);
|
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
if (s) {
|
2003-06-06 05:24:59 -04:00
|
|
|
VALUE k = env_str_new(*env, s-*env);
|
|
|
|
VALUE v = env_str_new2(s+1);
|
2003-05-20 02:29:23 -04:00
|
|
|
if (RTEST(rb_yield_values(2, k, v))) {
|
2007-06-21 10:50:14 -04:00
|
|
|
rb_hash_aset(result, k, v);
|
2003-05-04 12:03:24 -04:00
|
|
|
}
|
2001-12-10 22:48:08 -05:00
|
|
|
}
|
2003-05-04 12:03:24 -04:00
|
|
|
env++;
|
2001-12-10 22:48:08 -05:00
|
|
|
}
|
2003-05-04 12:03:24 -04:00
|
|
|
FREE_ENVIRON(environ);
|
|
|
|
|
2001-12-10 22:48:08 -05:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2008-04-24 10:46:39 -04:00
|
|
|
VALUE
|
|
|
|
rb_env_clear(void)
|
2003-01-07 02:36:40 -05:00
|
|
|
{
|
|
|
|
volatile VALUE keys;
|
2003-07-31 22:52:21 -04:00
|
|
|
long i;
|
2007-06-29 01:15:46 -04:00
|
|
|
|
2008-05-25 12:06:00 -04:00
|
|
|
keys = env_keys(); /* rb_secure(4); */
|
2006-09-02 10:42:08 -04:00
|
|
|
for (i=0; i<RARRAY_LEN(keys); i++) {
|
|
|
|
VALUE val = rb_f_getenv(Qnil, RARRAY_PTR(keys)[i]);
|
2003-01-07 02:36:40 -05:00
|
|
|
if (!NIL_P(val)) {
|
2006-09-02 10:42:08 -04:00
|
|
|
env_delete(Qnil, RARRAY_PTR(keys)[i]);
|
2003-01-07 02:36:40 -05:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return envtbl;
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_to_s(void)
|
1998-01-16 07:13:05 -05: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 11:40:02 -05:00
|
|
|
return rb_usascii_str_new2("ENV");
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2000-12-05 04:36:54 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_inspect(void)
|
2000-12-05 04:36:54 -05:00
|
|
|
{
|
|
|
|
char **env;
|
2004-11-18 03:11:12 -05:00
|
|
|
VALUE str, i;
|
2000-12-05 04:36:54 -05:00
|
|
|
|
2004-11-18 03:11:12 -05:00
|
|
|
rb_secure(4);
|
|
|
|
str = rb_str_buf_new2("{");
|
2001-11-12 22:59:20 -05:00
|
|
|
env = GET_ENVIRON(environ);
|
2000-12-05 04:36:54 -05:00
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
|
|
|
|
if (env != environ) {
|
2001-05-30 05:12:34 -04:00
|
|
|
rb_str_buf_cat2(str, ", ");
|
2000-12-05 04:36:54 -05:00
|
|
|
}
|
|
|
|
if (s) {
|
2001-05-30 05: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 13:13:45 -05:00
|
|
|
i = rb_inspect(rb_str_new2(s+1));
|
2001-05-30 05:12:34 -04:00
|
|
|
rb_str_buf_append(str, i);
|
2000-12-05 04:36:54 -05:00
|
|
|
}
|
|
|
|
env++;
|
|
|
|
}
|
2001-11-12 22:59:20 -05:00
|
|
|
FREE_ENVIRON(environ);
|
2001-05-30 05:12:34 -04:00
|
|
|
rb_str_buf_cat2(str, "}");
|
2000-12-05 04:36:54 -05:00
|
|
|
OBJ_TAINT(str);
|
|
|
|
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
1998-01-16 07:13:05 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_to_a(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
char **env;
|
2004-11-18 03:11:12 -05:00
|
|
|
VALUE ary;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2004-11-18 03:11:12 -05:00
|
|
|
rb_secure(4);
|
|
|
|
ary = rb_ary_new();
|
2001-11-12 22:59:20 -05:00
|
|
|
env = GET_ENVIRON(environ);
|
1998-01-16 07:13:05 -05:00
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
1999-01-19 23:59:39 -05:00
|
|
|
if (s) {
|
2003-06-06 05:24:59 -04:00
|
|
|
rb_ary_push(ary, rb_assoc_new(env_str_new(*env, s-*env),
|
|
|
|
env_str_new2(s+1)));
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
env++;
|
|
|
|
}
|
2001-11-12 22:59:20 -05:00
|
|
|
FREE_ENVIRON(environ);
|
1998-01-16 07:13:05 -05:00
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_none(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_size(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
int i;
|
2001-11-12 22:59:20 -05:00
|
|
|
char **env;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2004-11-18 03:11:12 -05:00
|
|
|
rb_secure(4);
|
2001-11-12 22:59:20 -05:00
|
|
|
env = GET_ENVIRON(environ);
|
|
|
|
for(i=0; env[i]; i++)
|
1998-01-16 07:13:05 -05:00
|
|
|
;
|
2001-11-12 22:59:20 -05:00
|
|
|
FREE_ENVIRON(environ);
|
1998-01-16 07:13:05 -05:00
|
|
|
return INT2FIX(i);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_empty_p(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2001-11-12 22:59:20 -05:00
|
|
|
char **env;
|
|
|
|
|
2004-11-18 03:11:12 -05:00
|
|
|
rb_secure(4);
|
2001-11-12 22:59:20 -05:00
|
|
|
env = GET_ENVIRON(environ);
|
|
|
|
if (env[0] == 0) {
|
|
|
|
FREE_ENVIRON(environ);
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
FREE_ENVIRON(environ);
|
1999-01-19 23:59:39 -05:00
|
|
|
return Qfalse;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_has_key(VALUE env, VALUE key)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
2001-05-02 00:22:21 -04:00
|
|
|
char *s;
|
|
|
|
|
2004-11-18 03:11:12 -05:00
|
|
|
rb_secure(4);
|
2001-05-02 00:22:21 -04:00
|
|
|
s = StringValuePtr(key);
|
2009-05-08 23:19:52 -04:00
|
|
|
if (memchr(s, '\0', RSTRING_LEN(key)))
|
2001-05-02 00:22:21 -04:00
|
|
|
rb_raise(rb_eArgError, "bad environment variable name");
|
|
|
|
if (getenv(s)) return Qtrue;
|
1999-01-19 23:59:39 -05:00
|
|
|
return Qfalse;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2007-06-22 12:26:07 -04:00
|
|
|
env_assoc(VALUE env, VALUE key)
|
|
|
|
{
|
|
|
|
char *s, *e;
|
|
|
|
|
|
|
|
rb_secure(4);
|
|
|
|
s = StringValuePtr(key);
|
2009-05-08 23:19:52 -04:00
|
|
|
if (memchr(s, '\0', RSTRING_LEN(key)))
|
2007-06-22 12:26:07 -04:00
|
|
|
rb_raise(rb_eArgError, "bad environment variable name");
|
|
|
|
e = getenv(s);
|
|
|
|
if (e) return rb_assoc_new(key, rb_tainted_str_new2(e));
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
env_has_value(VALUE dmy, VALUE obj)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
|
|
|
char **env;
|
|
|
|
|
2004-11-18 03:11:12 -05:00
|
|
|
rb_secure(4);
|
2007-06-22 12:26:07 -04:00
|
|
|
obj = rb_check_string_type(obj);
|
|
|
|
if (NIL_P(obj)) return Qnil;
|
2001-11-12 22:59:20 -05:00
|
|
|
env = GET_ENVIRON(environ);
|
1998-01-16 07:13:05 -05:00
|
|
|
while (*env) {
|
2003-06-23 04:41:07 -04:00
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
if (s++) {
|
2003-11-28 05:28:21 -05:00
|
|
|
long len = strlen(s);
|
2007-06-22 12:26:07 -04:00
|
|
|
if (RSTRING_LEN(obj) == len && strncmp(s, RSTRING_PTR(obj), len) == 0) {
|
2001-11-12 22:59:20 -05:00
|
|
|
FREE_ENVIRON(environ);
|
1999-01-19 23:59:39 -05:00
|
|
|
return Qtrue;
|
2001-11-12 22:59:20 -05:00
|
|
|
}
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
env++;
|
|
|
|
}
|
2001-11-12 22:59:20 -05:00
|
|
|
FREE_ENVIRON(environ);
|
1999-01-19 23:59:39 -05:00
|
|
|
return Qfalse;
|
1998-01-16 07:13:05 -05:00
|
|
|
}
|
|
|
|
|
2007-06-22 12:26:07 -04:00
|
|
|
static VALUE
|
|
|
|
env_rassoc(VALUE dmy, VALUE obj)
|
|
|
|
{
|
|
|
|
char **env;
|
|
|
|
|
|
|
|
rb_secure(4);
|
|
|
|
obj = rb_check_string_type(obj);
|
|
|
|
if (NIL_P(obj)) return Qnil;
|
|
|
|
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 10:25:35 -05:00
|
|
|
VALUE result = rb_assoc_new(rb_tainted_str_new(*env, s-*env-1), obj);
|
2007-06-22 12:26:07 -04:00
|
|
|
FREE_ENVIRON(environ);
|
2008-02-05 10:25:35 -05:00
|
|
|
return result;
|
2007-06-22 12:26:07 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
env++;
|
|
|
|
}
|
|
|
|
FREE_ENVIRON(environ);
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
1999-08-13 01:45:20 -04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_key(VALUE dmy, VALUE value)
|
1999-08-13 01:45:20 -04:00
|
|
|
{
|
|
|
|
char **env;
|
2001-11-12 22:59:20 -05:00
|
|
|
VALUE str;
|
1999-08-13 01:45:20 -04:00
|
|
|
|
2004-11-18 03:11:12 -05:00
|
|
|
rb_secure(4);
|
2003-06-23 02:52:39 -04:00
|
|
|
StringValue(value);
|
2001-11-12 22:59:20 -05:00
|
|
|
env = GET_ENVIRON(environ);
|
1999-08-13 01:45:20 -04:00
|
|
|
while (*env) {
|
2003-06-23 04:41:07 -04:00
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
if (s++) {
|
2003-11-28 05:28:21 -05:00
|
|
|
long len = strlen(s);
|
2006-08-31 06:47:44 -04:00
|
|
|
if (RSTRING_LEN(value) == len && strncmp(s, RSTRING_PTR(value), len) == 0) {
|
2003-06-06 05:24:59 -04:00
|
|
|
str = env_str_new(*env, s-*env-1);
|
2001-11-12 22:59:20 -05:00
|
|
|
FREE_ENVIRON(environ);
|
|
|
|
return str;
|
1999-08-13 01:45:20 -04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
env++;
|
|
|
|
}
|
2001-11-12 22:59:20 -05:00
|
|
|
FREE_ENVIRON(environ);
|
1999-08-13 01:45:20 -04:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2005-04-01 23:23:56 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_index(VALUE dmy, VALUE value)
|
2005-04-01 23:23:56 -05:00
|
|
|
{
|
|
|
|
rb_warn("ENV.index is deprecated; use ENV.key");
|
|
|
|
return env_key(dmy, value);
|
|
|
|
}
|
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_to_hash(void)
|
1998-01-16 07:13:05 -05:00
|
|
|
{
|
1999-01-19 23:59:39 -05:00
|
|
|
char **env;
|
2004-11-18 03:11:12 -05:00
|
|
|
VALUE hash;
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2004-11-18 03:11:12 -05:00
|
|
|
rb_secure(4);
|
|
|
|
hash = rb_hash_new();
|
2001-11-12 22:59:20 -05:00
|
|
|
env = GET_ENVIRON(environ);
|
1999-01-19 23:59:39 -05:00
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
if (s) {
|
2003-06-06 05:24:59 -04:00
|
|
|
rb_hash_aset(hash, env_str_new(*env, s-*env),
|
|
|
|
env_str_new2(s+1));
|
1999-01-19 23:59:39 -05:00
|
|
|
}
|
|
|
|
env++;
|
|
|
|
}
|
2001-11-12 22:59:20 -05:00
|
|
|
FREE_ENVIRON(environ);
|
1999-01-19 23:59:39 -05:00
|
|
|
return hash;
|
|
|
|
}
|
1998-01-16 07:13:05 -05:00
|
|
|
|
2000-02-08 03:54:02 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_reject(void)
|
2000-02-08 03:54:02 -05:00
|
|
|
{
|
|
|
|
return rb_hash_delete_if(env_to_hash());
|
|
|
|
}
|
|
|
|
|
2003-01-07 02:36:40 -05:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_shift(void)
|
2003-01-07 02:36:40 -05:00
|
|
|
{
|
|
|
|
char **env;
|
|
|
|
|
2004-11-18 03:11:12 -05:00
|
|
|
rb_secure(4);
|
2003-01-07 02:36:40 -05:00
|
|
|
env = GET_ENVIRON(environ);
|
|
|
|
if (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
if (s) {
|
2003-06-06 05:24:59 -04:00
|
|
|
VALUE key = env_str_new(*env, s-*env);
|
2006-08-31 06:47:44 -04:00
|
|
|
VALUE val = env_str_new2(getenv(RSTRING_PTR(key)));
|
2003-01-07 02:36:40 -05:00
|
|
|
env_delete(Qnil, key);
|
|
|
|
return rb_assoc_new(key, val);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
FREE_ENVIRON(environ);
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_invert(void)
|
2003-01-07 02:36:40 -05:00
|
|
|
{
|
|
|
|
return rb_hash_invert(env_to_hash());
|
|
|
|
}
|
|
|
|
|
2004-09-29 01: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 06:44:21 -04:00
|
|
|
env_replace_i(VALUE key, VALUE val, VALUE keys)
|
2003-01-07 02:36:40 -05:00
|
|
|
{
|
|
|
|
if (key != Qundef) {
|
|
|
|
env_aset(Qnil, key, val);
|
|
|
|
if (rb_ary_includes(keys, key)) {
|
|
|
|
rb_ary_delete(keys, key);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_replace(VALUE env, VALUE hash)
|
2003-01-07 02:36:40 -05:00
|
|
|
{
|
2004-11-18 03:11:12 -05:00
|
|
|
volatile VALUE keys;
|
2003-07-31 22:52:21 -04:00
|
|
|
long i;
|
2003-01-07 02:36:40 -05:00
|
|
|
|
2008-05-25 12:06:00 -04:00
|
|
|
keys = env_keys(); /* rb_secure(4); */
|
2003-01-07 02:36:40 -05:00
|
|
|
if (env == hash) return env;
|
|
|
|
hash = to_hash(hash);
|
2004-09-29 01:15:33 -04:00
|
|
|
rb_hash_foreach(hash, env_replace_i, keys);
|
2003-01-07 02:36:40 -05:00
|
|
|
|
2006-09-02 10:42:08 -04:00
|
|
|
for (i=0; i<RARRAY_LEN(keys); i++) {
|
|
|
|
env_delete(env, RARRAY_PTR(keys)[i]);
|
2003-01-07 02:36:40 -05:00
|
|
|
}
|
|
|
|
return env;
|
|
|
|
}
|
|
|
|
|
2004-09-29 01: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 06:44:21 -04:00
|
|
|
env_update_i(VALUE key, VALUE val)
|
2003-01-07 02:36:40 -05:00
|
|
|
{
|
|
|
|
if (key != Qundef) {
|
|
|
|
if (rb_block_given_p()) {
|
2003-05-20 02:29:23 -04:00
|
|
|
val = rb_yield_values(3, key, rb_f_getenv(Qnil, key), val);
|
2003-01-07 02:36:40 -05:00
|
|
|
}
|
|
|
|
env_aset(Qnil, key, val);
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 06:44:21 -04:00
|
|
|
env_update(VALUE env, VALUE hash)
|
2003-01-07 02:36:40 -05:00
|
|
|
{
|
2004-11-18 03:11:12 -05:00
|
|
|
rb_secure(4);
|
2003-01-07 02:36:40 -05:00
|
|
|
if (env == hash) return env;
|
|
|
|
hash = to_hash(hash);
|
2004-09-29 01:15:33 -04:00
|
|
|
rb_hash_foreach(hash, env_update_i, 0);
|
2003-01-07 02:36:40 -05:00
|
|
|
return env;
|
|
|
|
}
|
|
|
|
|
2003-12-23 11:21:17 -05:00
|
|
|
/*
|
|
|
|
* A <code>Hash</code> is a collection of key-value pairs. It is
|
|
|
|
* similar to an <code>Array</code>, except that indexing is done via
|
|
|
|
* arbitrary keys of any object type, not an integer index. The order
|
|
|
|
* in which you traverse a hash by either key or value may seem
|
|
|
|
* arbitrary, and will generally not be in the insertion order.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
* Hashes have a <em>default value</em> that is returned when accessing
|
|
|
|
* keys that do not exist in the hash. By default, that value is
|
|
|
|
* <code>nil</code>.
|
2007-06-29 01:15:46 -04:00
|
|
|
*
|
2003-12-23 11:21:17 -05:00
|
|
|
*/
|
|
|
|
|
1999-01-19 23:59:39 -05: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 06:44:21 -04:00
|
|
|
Init_Hash(void)
|
1999-01-19 23:59:39 -05:00
|
|
|
{
|
2008-06-09 05:25:32 -04:00
|
|
|
#undef rb_intern
|
2008-08-15 20:20:31 -04:00
|
|
|
#define rb_intern(str) rb_intern_const(str)
|
2008-06-09 05:25:32 -04:00
|
|
|
|
2001-12-10 02:18:16 -05: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-09 17:20:17 -04:00
|
|
|
id_yield = rb_intern("yield");
|
2001-12-10 02:18:16 -05:00
|
|
|
id_default = rb_intern("default");
|
1998-01-16 07:13:05 -05:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_cHash = rb_define_class("Hash", rb_cObject);
|
|
|
|
|
|
|
|
rb_include_module(rb_cHash, rb_mEnumerable);
|
|
|
|
|
2002-12-20 03:33:17 -05:00
|
|
|
rb_define_alloc_func(rb_cHash, hash_alloc);
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_singleton_method(rb_cHash, "[]", rb_hash_s_create, -1);
|
2007-08-24 13:47:09 -04:00
|
|
|
rb_define_singleton_method(rb_cHash, "try_convert", rb_hash_s_try_convert, 1);
|
2000-02-29 03:05:32 -05:00
|
|
|
rb_define_method(rb_cHash,"initialize", rb_hash_initialize, -1);
|
2003-05-19 01:41:08 -04:00
|
|
|
rb_define_method(rb_cHash,"initialize_copy", rb_hash_replace, 1);
|
1999-01-19 23:59:39 -05:00
|
|
|
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_a", rb_hash_to_a, 0);
|
|
|
|
rb_define_method(rb_cHash,"inspect", rb_hash_inspect, 0);
|
2009-05-29 04:08:25 -04:00
|
|
|
rb_define_alias(rb_cHash, "to_s", "inspect");
|
1999-01-19 23:59:39 -05:00
|
|
|
|
|
|
|
rb_define_method(rb_cHash,"==", rb_hash_equal, 1);
|
|
|
|
rb_define_method(rb_cHash,"[]", rb_hash_aref, 1);
|
2006-09-22 04:36:02 -04:00
|
|
|
rb_define_method(rb_cHash,"hash", rb_hash_hash, 0);
|
|
|
|
rb_define_method(rb_cHash,"eql?", rb_hash_eql, 1);
|
2008-09-30 04:01:11 -04:00
|
|
|
rb_define_method(rb_cHash,"fetch", rb_hash_fetch_m, -1);
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_method(rb_cHash,"[]=", rb_hash_aset, 2);
|
|
|
|
rb_define_method(rb_cHash,"store", rb_hash_aset, 2);
|
2001-12-10 02:18:16 -05:00
|
|
|
rb_define_method(rb_cHash,"default", rb_hash_default, -1);
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_method(rb_cHash,"default=", rb_hash_set_default, 1);
|
2002-08-13 05:21:18 -04:00
|
|
|
rb_define_method(rb_cHash,"default_proc", rb_hash_default_proc, 0);
|
2008-08-13 04:44:17 -04:00
|
|
|
rb_define_method(rb_cHash,"default_proc=", rb_hash_set_default_proc, 1);
|
2004-09-22 00:48:52 -04:00
|
|
|
rb_define_method(rb_cHash,"key", rb_hash_key, 1);
|
1999-08-13 01:45:20 -04:00
|
|
|
rb_define_method(rb_cHash,"index", rb_hash_index, 1);
|
1999-12-07 04:25:55 -05:00
|
|
|
rb_define_method(rb_cHash,"size", rb_hash_size, 0);
|
|
|
|
rb_define_method(rb_cHash,"length", rb_hash_size, 0);
|
1999-01-19 23:59:39 -05:00
|
|
|
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);
|
2007-11-03 10:07:48 -04:00
|
|
|
rb_define_method(rb_cHash,"each", rb_hash_each_pair, 0);
|
1999-01-19 23:59:39 -05:00
|
|
|
|
|
|
|
rb_define_method(rb_cHash,"keys", rb_hash_keys, 0);
|
|
|
|
rb_define_method(rb_cHash,"values", rb_hash_values, 0);
|
2003-05-04 12:03:24 -04:00
|
|
|
rb_define_method(rb_cHash,"values_at", rb_hash_values_at, -1);
|
1999-01-19 23:59:39 -05:00
|
|
|
|
|
|
|
rb_define_method(rb_cHash,"shift", rb_hash_shift, 0);
|
|
|
|
rb_define_method(rb_cHash,"delete", rb_hash_delete, 1);
|
|
|
|
rb_define_method(rb_cHash,"delete_if", rb_hash_delete_if, 0);
|
2004-06-11 09:33:47 -04:00
|
|
|
rb_define_method(rb_cHash,"select", rb_hash_select, 0);
|
2000-02-08 03:54:01 -05:00
|
|
|
rb_define_method(rb_cHash,"reject", rb_hash_reject, 0);
|
2000-08-07 01:05:04 -04:00
|
|
|
rb_define_method(rb_cHash,"reject!", rb_hash_reject_bang, 0);
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_method(rb_cHash,"clear", rb_hash_clear, 0);
|
|
|
|
rb_define_method(rb_cHash,"invert", rb_hash_invert, 0);
|
|
|
|
rb_define_method(rb_cHash,"update", rb_hash_update, 1);
|
2002-12-10 01:23:44 -05:00
|
|
|
rb_define_method(rb_cHash,"replace", rb_hash_replace, 1);
|
2003-02-03 00:34:16 -05:00
|
|
|
rb_define_method(rb_cHash,"merge!", rb_hash_update, 1);
|
|
|
|
rb_define_method(rb_cHash,"merge", rb_hash_merge, 1);
|
2007-06-22 12: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);
|
1999-01-19 23:59:39 -05:00
|
|
|
|
|
|
|
rb_define_method(rb_cHash,"include?", rb_hash_has_key, 1);
|
1999-08-13 01:45:20 -04:00
|
|
|
rb_define_method(rb_cHash,"member?", rb_hash_has_key, 1);
|
1999-01-19 23:59:39 -05:00
|
|
|
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);
|
|
|
|
|
2006-10-12 10:05:17 -04: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 04:09:19 -04:00
|
|
|
|
1999-01-19 23:59:39 -05:00
|
|
|
origenviron = environ;
|
|
|
|
envtbl = rb_obj_alloc(rb_cObject);
|
|
|
|
rb_extend_object(envtbl, rb_mEnumerable);
|
|
|
|
|
|
|
|
rb_define_singleton_method(envtbl,"[]", rb_f_getenv, 1);
|
2000-04-12 01:06:23 -04:00
|
|
|
rb_define_singleton_method(envtbl,"fetch", env_fetch, -1);
|
2001-10-29 00:07:26 -05:00
|
|
|
rb_define_singleton_method(envtbl,"[]=", env_aset, 2);
|
|
|
|
rb_define_singleton_method(envtbl,"store", env_aset, 2);
|
2007-11-03 10:07:48 -04:00
|
|
|
rb_define_singleton_method(envtbl,"each", env_each_pair, 0);
|
2003-10-24 10:31:14 -04:00
|
|
|
rb_define_singleton_method(envtbl,"each_pair", env_each_pair, 0);
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_define_singleton_method(envtbl,"each_key", env_each_key, 0);
|
|
|
|
rb_define_singleton_method(envtbl,"each_value", env_each_value, 0);
|
2000-01-04 23:41:21 -05:00
|
|
|
rb_define_singleton_method(envtbl,"delete", env_delete_m, 1);
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_define_singleton_method(envtbl,"delete_if", env_delete_if, 0);
|
2008-04-24 10:46:39 -04:00
|
|
|
rb_define_singleton_method(envtbl,"clear", rb_env_clear, 0);
|
2000-02-08 03:54:01 -05:00
|
|
|
rb_define_singleton_method(envtbl,"reject", env_reject, 0);
|
2000-08-07 01:05:04 -04:00
|
|
|
rb_define_singleton_method(envtbl,"reject!", env_reject_bang, 0);
|
2004-06-11 09:33:47 -04:00
|
|
|
rb_define_singleton_method(envtbl,"select", env_select, 0);
|
2003-01-07 02:36:40 -05:00
|
|
|
rb_define_singleton_method(envtbl,"shift", env_shift, 0);
|
|
|
|
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);
|
2000-12-05 04:36:54 -05:00
|
|
|
rb_define_singleton_method(envtbl,"inspect", env_inspect, 0);
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_define_singleton_method(envtbl,"rehash", env_none, 0);
|
|
|
|
rb_define_singleton_method(envtbl,"to_a", env_to_a, 0);
|
2003-07-24 14:33:50 -04:00
|
|
|
rb_define_singleton_method(envtbl,"to_s", env_to_s, 0);
|
2005-04-01 23:23:56 -05:00
|
|
|
rb_define_singleton_method(envtbl,"key", env_key, 1);
|
1999-08-13 01:45:20 -04:00
|
|
|
rb_define_singleton_method(envtbl,"index", env_index, 1);
|
1999-12-07 04:25:55 -05:00
|
|
|
rb_define_singleton_method(envtbl,"size", env_size, 0);
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_define_singleton_method(envtbl,"length", env_size, 0);
|
|
|
|
rb_define_singleton_method(envtbl,"empty?", env_empty_p, 0);
|
|
|
|
rb_define_singleton_method(envtbl,"keys", env_keys, 0);
|
|
|
|
rb_define_singleton_method(envtbl,"values", env_values, 0);
|
2003-05-04 12:03:24 -04:00
|
|
|
rb_define_singleton_method(envtbl,"values_at", env_values_at, -1);
|
1998-01-16 07:13:05 -05:00
|
|
|
rb_define_singleton_method(envtbl,"include?", env_has_key, 1);
|
1999-08-13 01:45:20 -04:00
|
|
|
rb_define_singleton_method(envtbl,"member?", env_has_key, 1);
|
1998-01-16 07:13:05 -05:00
|
|
|
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);
|
1999-01-19 23:59:39 -05:00
|
|
|
rb_define_singleton_method(envtbl,"to_hash", env_to_hash, 0);
|
2007-06-22 12:26:07 -04:00
|
|
|
rb_define_singleton_method(envtbl,"assoc", env_assoc, 1);
|
|
|
|
rb_define_singleton_method(envtbl,"rassoc", env_rassoc, 1);
|
1998-01-16 07:13:05 -05:00
|
|
|
|
|
|
|
rb_define_global_const("ENV", envtbl);
|
|
|
|
}
|