2000-05-01 13:42:38 +04:00
|
|
|
/**********************************************************************
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
hash.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
$Date$
|
|
|
|
created at: Mon Nov 22 18:51:18 JST 1993
|
|
|
|
|
2003-01-16 10:34:03 +03:00
|
|
|
Copyright (C) 1993-2003 Yukihiro Matsumoto
|
2000-05-01 13:42:38 +04:00
|
|
|
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
|
2000-05-09 08:53:16 +04:00
|
|
|
Copyright (C) 2000 Information-technology Promotion Agency, Japan
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2000-05-01 13:42:38 +04:00
|
|
|
**********************************************************************/
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
#include "ruby.h"
|
|
|
|
#include "st.h"
|
1999-08-13 09:45:20 +04:00
|
|
|
#include "util.h"
|
1999-01-20 07:59:39 +03:00
|
|
|
#include "rubysig.h"
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2002-10-17 20:13:44 +04:00
|
|
|
#ifdef __APPLE__
|
|
|
|
#include <crt_externs.h>
|
|
|
|
#endif
|
|
|
|
|
2000-02-01 06:12:21 +03:00
|
|
|
#define HASH_DELETED FL_USER1
|
2001-12-10 10:18:16 +03:00
|
|
|
#define HASH_PROC_DEFAULT FL_USER2
|
1998-01-16 15:19:22 +03:00
|
|
|
|
2000-02-17 10:11:22 +03:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_freeze(VALUE hash)
|
2000-02-17 10:11:22 +03:00
|
|
|
{
|
|
|
|
return rb_obj_freeze(hash);
|
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE rb_cHash;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
static VALUE envtbl;
|
2003-05-26 12:22:33 +04:00
|
|
|
static ID id_hash, id_call, id_default;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
eql(VALUE *args)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
|
|
|
return (VALUE)rb_eql(args[0], args[1]);
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_any_cmp(VALUE a, VALUE b)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-11-11 07:08:26 +03:00
|
|
|
VALUE args[2];
|
2003-03-04 10:04:11 +03:00
|
|
|
|
|
|
|
if (a == b) return 0;
|
2000-12-25 09:29:27 +03:00
|
|
|
if (FIXNUM_P(a) && FIXNUM_P(b)) {
|
|
|
|
return a != b;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2000-12-25 09:29:27 +03:00
|
|
|
if (TYPE(a) == T_STRING && RBASIC(a)->klass == rb_cString &&
|
|
|
|
TYPE(b) == T_STRING && RBASIC(b)->klass == rb_cString) {
|
|
|
|
return rb_str_cmp(a, b);
|
|
|
|
}
|
2003-03-04 10:04:11 +03:00
|
|
|
if (a == Qundef || b == Qundef) return -1;
|
2000-12-25 09:29:27 +03:00
|
|
|
if (SYMBOL_P(a) && SYMBOL_P(b)) {
|
|
|
|
return a != b;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
1999-11-11 07:08:26 +03:00
|
|
|
args[0] = a;
|
|
|
|
args[1] = b;
|
|
|
|
return !rb_with_disable_interrupt(eql, (VALUE)args);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-22 12:37:13 +03:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash(VALUE obj)
|
2003-12-22 12:37:13 +03:00
|
|
|
{
|
|
|
|
return rb_funcall(obj, id_hash, 0);
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_any_hash(VALUE a)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-02-13 08:09:11 +03:00
|
|
|
VALUE hval;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
switch (TYPE(a)) {
|
|
|
|
case T_FIXNUM:
|
2000-12-25 09:29:27 +03:00
|
|
|
case T_SYMBOL:
|
2001-02-13 08:09:11 +03:00
|
|
|
return (int)a;
|
1998-01-16 15:13:05 +03:00
|
|
|
break;
|
|
|
|
|
|
|
|
case T_STRING:
|
2001-02-13 08:09:11 +03:00
|
|
|
return rb_str_hash(a);
|
1998-01-16 15:13:05 +03:00
|
|
|
break;
|
|
|
|
|
|
|
|
default:
|
2001-12-10 10:18:16 +03:00
|
|
|
hval = rb_funcall(a, id_hash, 0);
|
2003-01-20 11:29:24 +03:00
|
|
|
if (!FIXNUM_P(hval)) {
|
2002-03-08 10:03:09 +03:00
|
|
|
hval = rb_funcall(hval, '%', 1, INT2FIX(536870923));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2001-02-13 08:09:11 +03:00
|
|
|
return (int)FIX2LONG(hval);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct st_hash_type objhash = {
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_any_cmp,
|
|
|
|
rb_any_hash,
|
1998-01-16 15:13:05 +03:00
|
|
|
};
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
struct foreach_safe_arg {
|
|
|
|
st_table *tbl;
|
|
|
|
int (*func)();
|
|
|
|
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 14:44:21 +04:00
|
|
|
foreach_safe_i(st_data_t key, st_data_t value, struct foreach_safe_arg *arg)
|
2004-09-29 09: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 09:47:45 +03:00
|
|
|
status = (*arg->func)(key, value, arg->arg);
|
2004-09-29 09:15:33 +04:00
|
|
|
if (status == ST_CONTINUE) {
|
|
|
|
return ST_CHECK;
|
|
|
|
}
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2005-10-20 06:56:22 +04:00
|
|
|
st_foreach_safe(st_table *table, int (*func)(ANYARGS), st_data_t a)
|
2004-09-29 09:15:33 +04:00
|
|
|
{
|
|
|
|
struct foreach_safe_arg arg;
|
|
|
|
|
|
|
|
arg.tbl = table;
|
|
|
|
arg.func = func;
|
|
|
|
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 09:47:45 +03:00
|
|
|
if (st_foreach(table, foreach_safe_i, (st_data_t)&arg)) {
|
|
|
|
rb_raise(rb_eRuntimeError, "hash modified during iteration");
|
|
|
|
}
|
2004-09-29 09:15:33 +04:00
|
|
|
}
|
|
|
|
|
2004-09-23 04:51:32 +04:00
|
|
|
struct hash_foreach_arg {
|
1998-01-16 15:19:22 +03:00
|
|
|
VALUE hash;
|
2004-09-29 09:15:33 +04:00
|
|
|
int (*func)();
|
2002-12-29 17:51:22 +03:00
|
|
|
VALUE arg;
|
1998-01-16 15:13:05 +03:00
|
|
|
};
|
|
|
|
|
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
hash_foreach_iter(VALUE key, VALUE value, struct hash_foreach_arg *arg)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
int status;
|
2004-09-22 08:48:52 +04:00
|
|
|
st_table *tbl;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-09-22 08:48:52 +04:00
|
|
|
tbl = RHASH(arg->hash)->tbl;
|
2000-01-05 07:41:21 +03:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
1998-01-16 15:13:05 +03:00
|
|
|
status = (*arg->func)(key, value, arg->arg);
|
2004-09-22 08:48:52 +04:00
|
|
|
if (RHASH(arg->hash)->tbl != tbl) {
|
|
|
|
rb_raise(rb_eRuntimeError, "rehash occurred during iteration");
|
|
|
|
}
|
|
|
|
switch (status) {
|
|
|
|
case ST_DELETE:
|
|
|
|
st_delete_safe(tbl, (st_data_t*)&key, 0, Qundef);
|
|
|
|
FL_SET(arg->hash, HASH_DELETED);
|
|
|
|
case ST_CONTINUE:
|
|
|
|
break;
|
|
|
|
case ST_STOP:
|
|
|
|
return ST_STOP;
|
2004-09-21 07:08:33 +04:00
|
|
|
}
|
2004-09-22 08:48:52 +04:00
|
|
|
return ST_CHECK;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
hash_foreach_ensure(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1998-01-16 15:19:22 +03:00
|
|
|
RHASH(hash)->iter_lev--;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
if (RHASH(hash)->iter_lev == 0) {
|
1999-01-20 07:59:39 +03:00
|
|
|
if (FL_TEST(hash, HASH_DELETED)) {
|
2000-01-05 07:41:21 +03:00
|
|
|
st_cleanup_safe(RHASH(hash)->tbl, Qundef);
|
1999-01-20 07:59:39 +03:00
|
|
|
FL_UNSET(hash, HASH_DELETED);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
return 0;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-09-23 04: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 14:44:21 +04:00
|
|
|
hash_foreach_call(struct hash_foreach_arg *arg)
|
2004-09-23 04:51:32 +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 09:47:45 +03:00
|
|
|
if (st_foreach(RHASH(arg->hash)->tbl, hash_foreach_iter, (st_data_t)arg)) {
|
|
|
|
rb_raise(rb_eRuntimeError, "hash modified during iteration");
|
|
|
|
}
|
2004-09-23 04:51:32 +04:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
void
|
2005-10-20 06:56:22 +04:00
|
|
|
rb_hash_foreach(VALUE hash, int (*func)(ANYARGS), VALUE farg)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2004-09-23 04:51:32 +04:00
|
|
|
struct hash_foreach_arg arg;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
RHASH(hash)->iter_lev++;
|
1998-01-16 15:13:05 +03:00
|
|
|
arg.hash = hash;
|
|
|
|
arg.func = func;
|
|
|
|
arg.arg = farg;
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_ensure(hash_foreach_call, (VALUE)&arg, hash_foreach_ensure, hash);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
* bignum.c: changed `foo _((boo))' to `foo(boo)`. [ruby-dev:27056]
* defines.h, dir.c, dln.h, enumerator.c, env.h, error.c, eval.c, file.c,
gc.c, hash.c, inits.c, intern.h, io.c, lex.c, marshal.c, missing.h,
node.h, numeric.c, pack.c, process.c, re.h, ruby.c, ruby.h, rubyio.h,
rubysig.h, signal.c, sprintf.c, st.h, string.c, struct.c, time.c,
util.c, util.h, variable.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9155 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-14 10:32:32 +04:00
|
|
|
static VALUE hash_alloc(VALUE);
|
2004-09-23 04:51:32 +04:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
hash_alloc(VALUE klass)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
NEWOBJ(hash, struct RHash);
|
1999-01-20 07:59:39 +03:00
|
|
|
OBJSETUP(hash, klass, T_HASH);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
hash->ifnone = Qnil;
|
2004-09-22 08:52:17 +04:00
|
|
|
hash->tbl = st_init_table(&objhash);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
return (VALUE)hash;
|
|
|
|
}
|
|
|
|
|
2000-02-29 11:05:32 +03:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_new(void)
|
2000-02-29 11:05:32 +03:00
|
|
|
{
|
2002-12-20 11:33:17 +03:00
|
|
|
return hash_alloc(rb_cHash);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-09-22 08:48:52 +04:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_modify(VALUE hash)
|
2004-09-22 08:48:52 +04:00
|
|
|
{
|
2004-09-22 08:52:17 +04:00
|
|
|
if (!RHASH(hash)->tbl) rb_raise(rb_eTypeError, "uninitialized Hash");
|
2004-09-22 08:48:52 +04:00
|
|
|
if (OBJ_FROZEN(hash)) rb_error_frozen("hash");
|
|
|
|
if (!OBJ_TAINTED(hash) && rb_safe_level() >= 4)
|
|
|
|
rb_raise(rb_eSecurityError, "Insecure: can't modify hash");
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Hash.new => hash
|
|
|
|
* Hash.new(obj) => aHash
|
|
|
|
* Hash.new {|hash, key| block } => aHash
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* 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"]
|
|
|
|
*
|
|
|
|
* # 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"]
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2000-02-29 11:05:32 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_initialize(int argc, VALUE *argv, VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2000-02-29 11:05:32 +03:00
|
|
|
VALUE ifnone;
|
|
|
|
|
|
|
|
rb_hash_modify(hash);
|
2001-12-10 10:18:16 +03:00
|
|
|
if (rb_block_given_p()) {
|
2002-01-28 11:44:45 +03:00
|
|
|
if (argc > 0) {
|
|
|
|
rb_raise(rb_eArgError, "wrong number of arguments");
|
2001-12-10 10:18:16 +03:00
|
|
|
}
|
2003-06-16 11:14:50 +04:00
|
|
|
RHASH(hash)->ifnone = rb_block_proc();
|
2001-12-10 10:18:16 +03:00
|
|
|
FL_SET(hash, HASH_PROC_DEFAULT);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_scan_args(argc, argv, "01", &ifnone);
|
|
|
|
RHASH(hash)->ifnone = ifnone;
|
|
|
|
}
|
2000-02-29 11:05:32 +03:00
|
|
|
|
|
|
|
return hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Hash[ [key =>|, value]* ] => hash
|
|
|
|
*
|
|
|
|
* Creates a new hash populated with the given objects. Equivalent to
|
|
|
|
* the literal <code>{ <i>key</i>, <i>value</i>, ... }</code>. Keys and
|
|
|
|
* values occur in pairs, so there must be an even number of arguments.
|
|
|
|
*
|
|
|
|
* Hash["a", 100, "b", 200] #=> {"a"=>100, "b"=>200}
|
|
|
|
* Hash["a" => 100, "b" => 200] #=> {"a"=>100, "b"=>200}
|
|
|
|
* { "a" => 100, "b" => 200 } #=> {"a"=>100, "b"=>200}
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_s_create(int argc, VALUE *argv, VALUE klass)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1998-01-16 15:19:22 +03:00
|
|
|
VALUE hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
int i;
|
|
|
|
|
2000-03-15 12:09:28 +03:00
|
|
|
if (argc == 1 && TYPE(argv[0]) == T_HASH) {
|
2002-12-20 11:33:17 +03:00
|
|
|
hash = hash_alloc(klass);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-10-03 11:19:19 +04:00
|
|
|
RHASH(hash)->ifnone = Qnil;
|
|
|
|
RHASH(hash)->tbl = st_copy(RHASH(argv[0])->tbl);
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2001-10-03 11:19:19 +04:00
|
|
|
return hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
if (argc % 2 != 0) {
|
2004-03-29 11:54:38 +04:00
|
|
|
rb_raise(rb_eArgError, "odd number of arguments for Hash");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2002-12-20 11:33:17 +03:00
|
|
|
hash = hash_alloc(klass);
|
1998-01-16 15:13:05 +03:00
|
|
|
for (i=0; i<argc; i+=2) {
|
2002-06-13 07:55:44 +04:00
|
|
|
rb_hash_aset(hash, argv[i], argv[i + 1]);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
return hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
to_hash(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2002-08-27 12:31:08 +04:00
|
|
|
return rb_convert_type(hash, T_HASH, "Hash", "to_hash");
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_rehash_i(VALUE key, VALUE value, st_table *tbl)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2000-01-05 07:41:21 +03:00
|
|
|
if (key != Qundef) st_insert(tbl, key, value);
|
1998-01-16 15:13:05 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.rehash -> hsh
|
|
|
|
*
|
|
|
|
* 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 08:48:52 +04:00
|
|
|
* <code>RuntimeError</code> will be raised in the iterator.
|
2003-12-23 19:21:17 +03:00
|
|
|
*
|
|
|
|
* a = [ "a", "b" ]
|
|
|
|
* c = [ "c", "d" ]
|
|
|
|
* h = { a => 100, c => 300 }
|
|
|
|
* h[a] #=> 100
|
|
|
|
* a[0] = "z"
|
|
|
|
* h[a] #=> nil
|
|
|
|
* h.rehash #=> {["z", "b"]=>100, ["c", "d"]=>300}
|
|
|
|
* h[a] #=> 100
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_rehash(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1998-01-16 15:19:22 +03:00
|
|
|
st_table *tbl;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-09-22 08:48:52 +04:00
|
|
|
if (RHASH(hash)->iter_lev > 0) {
|
|
|
|
rb_raise(rb_eRuntimeError, "rehash during iteration");
|
|
|
|
}
|
2002-08-12 11:39:12 +04:00
|
|
|
rb_hash_modify(hash);
|
1998-01-16 15:19:22 +03:00
|
|
|
tbl = st_init_table_with_size(&objhash, RHASH(hash)->tbl->num_entries);
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, rb_hash_rehash_i, (st_data_t)tbl);
|
1998-01-16 15:19:22 +03:00
|
|
|
st_free_table(RHASH(hash)->tbl);
|
|
|
|
RHASH(hash)->tbl = tbl;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
return hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh[key] => value
|
|
|
|
*
|
|
|
|
* 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).
|
|
|
|
*
|
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h["a"] #=> 100
|
|
|
|
* h["c"] #=> nil
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_aref(VALUE hash, VALUE key)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE val;
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
if (!st_lookup(RHASH(hash)->tbl, key, &val)) {
|
2001-12-10 10:18:16 +03:00
|
|
|
return rb_funcall(hash, id_default, 1, key);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.fetch(key [, default] ) => obj
|
|
|
|
* hsh.fetch(key) {| key | block } => obj
|
|
|
|
*
|
|
|
|
* 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 08:48:52 +04:00
|
|
|
* raise an <code>KeyError</code> exception; if <i>default</i> is
|
2003-12-23 19:21:17 +03:00
|
|
|
* given, then that will be returned; if the optional code block is
|
|
|
|
* specified, then that will be run and its result returned.
|
|
|
|
*
|
|
|
|
* 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"
|
|
|
|
*
|
|
|
|
* The following example shows that an exception is raised if the key
|
|
|
|
* is not found and a default value is not supplied.
|
|
|
|
*
|
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.fetch("z")
|
|
|
|
*
|
|
|
|
* <em>produces:</em>
|
|
|
|
*
|
2004-09-22 08:48:52 +04:00
|
|
|
* prog.rb:2:in `fetch': key not found (KeyError)
|
2003-12-23 19:21:17 +03:00
|
|
|
* from prog.rb:2
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_fetch(int argc, VALUE *argv, VALUE hash)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
|
|
|
VALUE key, if_none;
|
|
|
|
VALUE val;
|
2003-11-06 10:22:39 +03:00
|
|
|
long block_given;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "11", &key, &if_none);
|
|
|
|
|
2003-11-06 10:22:39 +03:00
|
|
|
block_given = rb_block_given_p();
|
|
|
|
if (block_given && argc == 2) {
|
|
|
|
rb_warn("block supersedes default value argument");
|
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
if (!st_lookup(RHASH(hash)->tbl, key, &val)) {
|
2003-11-06 10:22:39 +03:00
|
|
|
if (block_given) return rb_yield(key);
|
1999-10-13 10:44:42 +04:00
|
|
|
if (argc == 1) {
|
2004-09-22 08:48:52 +04:00
|
|
|
rb_raise(rb_eKeyError, "key not found");
|
1999-10-13 10:44:42 +04:00
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
return if_none;
|
|
|
|
}
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.default(key=nil) => obj
|
|
|
|
*
|
|
|
|
* 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>.
|
|
|
|
*
|
|
|
|
* h = Hash.new #=> {}
|
|
|
|
* h.default #=> nil
|
|
|
|
* h.default(2) #=> nil
|
|
|
|
*
|
|
|
|
* h = Hash.new("cat") #=> {}
|
|
|
|
* h.default #=> "cat"
|
|
|
|
* h.default(2) #=> "cat"
|
|
|
|
*
|
|
|
|
* h = Hash.new {|h,k| h[k] = k.to_i*10} #=> {}
|
|
|
|
* h.default #=> 0
|
|
|
|
* h.default(2) #=> 20
|
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_default(int argc, VALUE *argv, VALUE hash)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2001-12-10 10:18:16 +03:00
|
|
|
VALUE key;
|
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "01", &key);
|
|
|
|
if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
|
2003-05-26 12:22:33 +04:00
|
|
|
return rb_funcall(RHASH(hash)->ifnone, id_call, 2, hash, key);
|
2001-12-10 10:18:16 +03:00
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
return RHASH(hash)->ifnone;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.default = obj => hsh
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.default = "Go fish"
|
|
|
|
* h["a"] #=> 100
|
|
|
|
* h["z"] #=> "Go fish"
|
|
|
|
* # This doesn't do what you might hope...
|
|
|
|
* h.default = proc do |hash, key|
|
|
|
|
* hash[key] = key + key
|
|
|
|
* end
|
|
|
|
* h[2] #=> #<Proc:0x401b3948@-:6>
|
|
|
|
* h["cat"] #=> #<Proc:0x401b3948@-:6>
|
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_set_default(VALUE hash, VALUE ifnone)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2000-12-18 12:46:21 +03:00
|
|
|
rb_hash_modify(hash);
|
1999-01-20 07:59:39 +03:00
|
|
|
RHASH(hash)->ifnone = ifnone;
|
2001-12-10 10:18:16 +03:00
|
|
|
FL_UNSET(hash, HASH_PROC_DEFAULT);
|
2002-01-11 12:18:54 +03:00
|
|
|
return ifnone;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.default_proc -> anObject
|
|
|
|
*
|
|
|
|
* If <code>Hash::new</code> was invoked with a block, return that
|
|
|
|
* block, otherwise return <code>nil</code>.
|
|
|
|
*
|
|
|
|
* h = Hash.new {|h,k| h[k] = k*k } #=> {}
|
|
|
|
* p = h.default_proc #=> #<Proc:0x401b3d08@-:1>
|
|
|
|
* a = [] #=> []
|
|
|
|
* p.call(a, 2)
|
|
|
|
* a #=> [nil, nil, 4]
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
2002-08-13 13:21:18 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_default_proc(VALUE hash)
|
2002-08-13 13:21:18 +04:00
|
|
|
{
|
|
|
|
if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
|
|
|
|
return RHASH(hash)->ifnone;
|
|
|
|
}
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
key_i(VALUE key, VALUE value, VALUE *args)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
|
|
|
if (rb_equal(value, args[0])) {
|
|
|
|
args[1] = key;
|
|
|
|
return ST_STOP;
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-09-22 08:48:52 +04:00
|
|
|
* hsh.key(value) => key
|
2003-12-23 19:21:17 +03:00
|
|
|
*
|
|
|
|
* Returns the key for a given value. If not found, returns <code>nil</code>.
|
|
|
|
*
|
|
|
|
* h = { "a" => 100, "b" => 200 }
|
2005-04-02 08:23:56 +04:00
|
|
|
* h.key(200) #=> "b"
|
|
|
|
* h.key(999) #=> nil
|
2003-12-23 19:21:17 +03:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_key(VALUE hash, VALUE value)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
|
|
|
VALUE args[2];
|
|
|
|
|
|
|
|
args[0] = value;
|
2001-07-31 10:24:45 +04:00
|
|
|
args[1] = Qnil;
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, key_i, (st_data_t)args);
|
1999-08-13 09:45:20 +04:00
|
|
|
|
|
|
|
return args[1];
|
|
|
|
}
|
|
|
|
|
2004-10-20 05:38:04 +04:00
|
|
|
/* :nodoc: */
|
2004-09-22 08:48:52 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_index(VALUE hash, VALUE value)
|
2004-09-22 08:48:52 +04:00
|
|
|
{
|
|
|
|
rb_warn("Hash#index is deprecated; use Hash#key");
|
|
|
|
return rb_hash_key(hash, value);
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.delete(key) => value
|
|
|
|
* hsh.delete(key) {| key | block } => value
|
|
|
|
*
|
|
|
|
* 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>.
|
|
|
|
*
|
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.delete("a") #=> 100
|
|
|
|
* h.delete("z") #=> nil
|
|
|
|
* h.delete("z") { |el| "#{el} not found" } #=> "z not found"
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2001-07-24 13: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 14:44:21 +04:00
|
|
|
rb_hash_delete(VALUE hash, VALUE key)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE val;
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_hash_modify(hash);
|
2000-03-23 11:37:35 +03:00
|
|
|
if (RHASH(hash)->iter_lev > 0) {
|
2003-07-25 09:36:55 +04:00
|
|
|
if (st_delete_safe(RHASH(hash)->tbl, (st_data_t*)&key, &val, Qundef)) {
|
2000-03-23 11:37:35 +03:00
|
|
|
FL_SET(hash, HASH_DELETED);
|
|
|
|
return val;
|
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
2003-07-25 09:36:55 +04:00
|
|
|
else if (st_delete(RHASH(hash)->tbl, (st_data_t*)&key, &val))
|
1998-01-16 15:13:05 +03:00
|
|
|
return val;
|
2000-05-24 08:34:26 +04:00
|
|
|
if (rb_block_given_p()) {
|
1999-01-20 07:59:39 +03:00
|
|
|
return rb_yield(key);
|
|
|
|
}
|
2001-12-10 10:18:16 +03:00
|
|
|
return Qnil;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
struct shift_var {
|
|
|
|
int stop;
|
|
|
|
VALUE key;
|
|
|
|
VALUE val;
|
|
|
|
};
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
shift_i(VALUE key, VALUE value, struct shift_var *var)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2000-01-05 07:41:21 +03:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
1998-01-16 15:13:05 +03:00
|
|
|
if (var->stop) return ST_STOP;
|
|
|
|
var->stop = 1;
|
|
|
|
var->key = key;
|
|
|
|
var->val = value;
|
|
|
|
return ST_DELETE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.shift -> anArray or obj
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* h = { 1 => "a", 2 => "b", 3 => "c" }
|
|
|
|
* h.shift #=> [1, "a"]
|
|
|
|
* h #=> {2=>"b", 3=>"c"}
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_shift(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
struct shift_var var;
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_hash_modify(hash);
|
1998-01-16 15:13:05 +03:00
|
|
|
var.stop = 0;
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, shift_i, (st_data_t)&var);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2002-08-13 13:21:18 +04:00
|
|
|
if (var.stop) {
|
|
|
|
return rb_assoc_new(var.key, var.val);
|
|
|
|
}
|
|
|
|
else if (FL_TEST(hash, HASH_PROC_DEFAULT)) {
|
2003-05-26 12:22:33 +04:00
|
|
|
return rb_funcall(RHASH(hash)->ifnone, id_call, 2, hash, Qnil);
|
2002-08-13 13:21:18 +04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
return RHASH(hash)->ifnone;
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
delete_if_i(VALUE key, VALUE value, VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2003-12-20 19:59:09 +03:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
2004-02-26 20:15:00 +03:00
|
|
|
if (RTEST(rb_yield_values(2, key, value))) {
|
|
|
|
rb_hash_delete(hash, key);
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.delete_if {| key, value | block } -> hsh
|
|
|
|
*
|
|
|
|
* Deletes every key-value pair from <i>hsh</i> for which <i>block</i>
|
|
|
|
* evaluates to <code>true</code>.
|
|
|
|
*
|
|
|
|
* h = { "a" => 100, "b" => 200, "c" => 300 }
|
|
|
|
* h.delete_if {|key, value| key >= "b" } #=> {"a"=>100}
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2000-07-04 11:04:42 +04:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_delete_if(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_hash_modify(hash);
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, delete_if_i, hash);
|
2000-08-07 09:05:04 +04:00
|
|
|
return hash;
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.reject! {| key, value | block } -> hsh or nil
|
|
|
|
*
|
|
|
|
* Equivalent to <code>Hash#delete_if</code>, but returns
|
|
|
|
* <code>nil</code> if no changes were made.
|
|
|
|
*/
|
|
|
|
|
2000-08-07 09:05:04 +04:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_reject_bang(VALUE hash)
|
2000-08-07 09:05:04 +04:00
|
|
|
{
|
|
|
|
int n = RHASH(hash)->tbl->num_entries;
|
|
|
|
rb_hash_delete_if(hash);
|
|
|
|
if (n == RHASH(hash)->tbl->num_entries) return Qnil;
|
1999-01-20 07:59:39 +03:00
|
|
|
return hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.reject {| key, value | block } -> a_hash
|
|
|
|
*
|
|
|
|
* 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>.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2000-02-08 11:54:01 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_reject(VALUE hash)
|
2000-02-08 11:54:01 +03:00
|
|
|
{
|
2000-07-17 13:38:10 +04:00
|
|
|
return rb_hash_delete_if(rb_obj_dup(hash));
|
2000-02-08 11:54:01 +03:00
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
select_i(VALUE key, VALUE value, VALUE result)
|
2001-12-11 06:48:08 +03:00
|
|
|
{
|
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
2003-05-20 10:29:23 +04:00
|
|
|
if (RTEST(rb_yield_values(2, key, value)))
|
|
|
|
rb_ary_push(result, rb_assoc_new(key, value));
|
2001-12-11 06:48:08 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03: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"]
|
|
|
|
*/
|
|
|
|
|
2001-12-11 06:48:08 +03:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_values_at(int argc, VALUE *argv, VALUE hash)
|
2001-12-11 06:48:08 +03:00
|
|
|
{
|
2004-06-11 17:33:47 +04:00
|
|
|
VALUE result = rb_ary_new2(argc);
|
2001-12-11 06:48:08 +03:00
|
|
|
long i;
|
|
|
|
|
2003-05-04 20:03:24 +04:00
|
|
|
for (i=0; i<argc; i++) {
|
|
|
|
rb_ary_push(result, rb_hash_aref(hash, argv[i]));
|
2001-12-11 06:48:08 +03:00
|
|
|
}
|
2003-05-04 20:03:24 +04:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.select {|key, value| block} => array
|
|
|
|
*
|
|
|
|
* Returns a new array consisting of <code>[key,value]</code>
|
|
|
|
* pairs for which the block returns true.
|
|
|
|
* Also see <code>Hash.values_at</code>.
|
|
|
|
*
|
|
|
|
* h = { "a" => 100, "b" => 200, "c" => 300 }
|
|
|
|
* h.select {|k,v| k > "a"} #=> [["b", 200], ["c", 300]]
|
|
|
|
* h.select {|k,v| v < 200} #=> [["a", 100]]
|
|
|
|
*/
|
|
|
|
|
2003-05-04 20:03:24 +04:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_select(VALUE hash)
|
2003-05-04 20:03:24 +04:00
|
|
|
{
|
|
|
|
VALUE result;
|
|
|
|
|
2005-08-30 18:49:51 +04:00
|
|
|
RETURN_ENUMERATOR(hash, 0, 0);
|
2003-05-06 10:51:31 +04:00
|
|
|
result = rb_ary_new();
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, select_i, result);
|
2001-12-11 06:48:08 +03:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
clear_i(VALUE key, VALUE value, VALUE dummy)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
return ST_DELETE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.clear -> hsh
|
|
|
|
*
|
|
|
|
* Removes all key-value pairs from <i>hsh</i>.
|
|
|
|
*
|
|
|
|
* h = { "a" => 100, "b" => 200 } #=> {"a"=>100, "b"=>200}
|
|
|
|
* h.clear #=> {}
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_clear(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_hash_modify(hash);
|
2004-09-22 08:48:52 +04:00
|
|
|
if (RHASH(hash)->tbl->num_entries > 0) {
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, clear_i, 0);
|
2004-09-22 08:48:52 +04:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
return hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh[key] = value => value
|
|
|
|
* hsh.store(key, value) => value
|
|
|
|
*
|
|
|
|
* 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).
|
|
|
|
*
|
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h["a"] = 9
|
|
|
|
* h["c"] = 4
|
|
|
|
* h #=> {"a"=>9, "b"=>200, "c"=>4}
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_aset(VALUE hash, VALUE key, VALUE val)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_hash_modify(hash);
|
|
|
|
if (TYPE(key) != T_STRING || st_lookup(RHASH(hash)->tbl, key, 0)) {
|
|
|
|
st_insert(RHASH(hash)->tbl, key, val);
|
|
|
|
}
|
|
|
|
else {
|
1999-08-13 09:45:20 +04:00
|
|
|
st_add_direct(RHASH(hash)->tbl, rb_str_new4(key), val);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
replace_i(VALUE key, VALUE val, VALUE hash)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2001-06-01 13:38:30 +04:00
|
|
|
if (key != Qundef) {
|
|
|
|
rb_hash_aset(hash, key, val);
|
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.replace(other_hash) -> hsh
|
|
|
|
*
|
|
|
|
* Replaces the contents of <i>hsh</i> with the contents of
|
|
|
|
* <i>other_hash</i>.
|
|
|
|
*
|
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.replace({ "c" => 300, "d" => 400 }) #=> {"c"=>300, "d"=>400}
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_replace(VALUE hash, VALUE hash2)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
|
|
|
hash2 = to_hash(hash2);
|
2002-09-28 08:21:31 +04:00
|
|
|
if (hash == hash2) return hash;
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_hash_clear(hash);
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash2, replace_i, hash);
|
2002-08-13 13: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 09:56:09 +04:00
|
|
|
else {
|
|
|
|
FL_UNSET(hash, HASH_PROC_DEFAULT);
|
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
|
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.length => fixnum
|
|
|
|
* hsh.size => fixnum
|
|
|
|
*
|
|
|
|
* Returns the number of key-value pairs in the hash.
|
|
|
|
*
|
|
|
|
* h = { "d" => 100, "a" => 200, "v" => 300, "e" => 400 }
|
|
|
|
* h.length #=> 4
|
|
|
|
* h.delete("a") #=> 200
|
|
|
|
* h.length #=> 3
|
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_size(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1998-01-16 15:19:22 +03:00
|
|
|
return INT2FIX(RHASH(hash)->tbl->num_entries);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.empty? => true or false
|
|
|
|
*
|
|
|
|
* Returns <code>true</code> if <i>hsh</i> contains no key-value pairs.
|
|
|
|
*
|
|
|
|
* {}.empty? #=> true
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_empty_p(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1998-01-16 15:19:22 +03:00
|
|
|
if (RHASH(hash)->tbl->num_entries == 0)
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qtrue;
|
|
|
|
return Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
each_value_i(VALUE key, VALUE value)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2000-01-05 07:41:21 +03:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
1998-01-16 15:13:05 +03:00
|
|
|
rb_yield(value);
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.each_value {| value | block } -> hsh
|
|
|
|
*
|
|
|
|
* Calls <i>block</i> once for each key in <i>hsh</i>, passing the
|
|
|
|
* value as a parameter.
|
|
|
|
*
|
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.each_value {|value| puts value }
|
|
|
|
*
|
|
|
|
* <em>produces:</em>
|
|
|
|
*
|
|
|
|
* 100
|
|
|
|
* 200
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_each_value(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2005-08-30 18:49:51 +04:00
|
|
|
RETURN_ENUMERATOR(hash, 0, 0);
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, each_value_i, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
return hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
each_key_i(VALUE key, VALUE value)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2000-01-05 07:41:21 +03:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
1998-01-16 15:13:05 +03:00
|
|
|
rb_yield(key);
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.each_key {| key | block } -> hsh
|
|
|
|
*
|
|
|
|
* Calls <i>block</i> once for each key in <i>hsh</i>, passing the key
|
|
|
|
* as a parameter.
|
|
|
|
*
|
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.each_key {|key| puts key }
|
|
|
|
*
|
|
|
|
* <em>produces:</em>
|
|
|
|
*
|
|
|
|
* a
|
|
|
|
* b
|
|
|
|
*/
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_each_key(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2005-08-30 18:49:51 +04:00
|
|
|
RETURN_ENUMERATOR(hash, 0, 0);
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, each_key_i, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
return hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
each_pair_i(VALUE key, VALUE value)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2000-01-05 07:41:21 +03:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
2003-05-20 10:29:23 +04:00
|
|
|
rb_yield_values(2, key, value);
|
1998-01-16 15:13:05 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.each_pair {| key_value_array | block } -> hsh
|
|
|
|
*
|
|
|
|
* Calls <i>block</i> once for each key in <i>hsh</i>, passing the key
|
|
|
|
* and value as parameters.
|
|
|
|
*
|
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.each_pair {|key, value| puts "#{key} is #{value}" }
|
|
|
|
*
|
|
|
|
* <em>produces:</em>
|
|
|
|
*
|
|
|
|
* a is 100
|
|
|
|
* b is 200
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_each_pair(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2005-08-30 18:49:51 +04:00
|
|
|
RETURN_ENUMERATOR(hash, 0, 0);
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, each_pair_i, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
return hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
each_i(VALUE key, VALUE value)
|
2003-10-24 18:31:14 +04:00
|
|
|
{
|
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
2005-07-28 12:16:34 +04:00
|
|
|
rb_yield(rb_assoc_new(key, value));
|
2003-10-24 18:31:14 +04:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.each {| key, value | block } -> hsh
|
|
|
|
*
|
|
|
|
* Calls <i>block</i> once for each key in <i>hsh</i>, passing the key
|
|
|
|
* and value to the block as a two-element array. Because of the assignment
|
|
|
|
* semantics of block parameters, these elements will be split out if the
|
|
|
|
* block has two formal parameters. Also see <code>Hash.each_pair</code>, which
|
|
|
|
* will be marginally more efficient for blocks with two parameters.
|
|
|
|
*
|
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.each {|key, value| puts "#{key} is #{value}" }
|
|
|
|
*
|
|
|
|
* <em>produces:</em>
|
|
|
|
*
|
|
|
|
* a is 100
|
|
|
|
* b is 200
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2003-10-24 18:31:14 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_each(VALUE hash)
|
2003-10-24 18:31:14 +04:00
|
|
|
{
|
2005-08-30 18:49:51 +04:00
|
|
|
RETURN_ENUMERATOR(hash, 0, 0);
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, each_i, 0);
|
2003-10-24 18:31:14 +04:00
|
|
|
return hash;
|
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
to_a_i(VALUE key, VALUE value, VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2000-01-05 07:41:21 +03:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_ary_push(ary, rb_assoc_new(key, value));
|
1998-01-16 15:13:05 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.to_a -> array
|
|
|
|
*
|
|
|
|
* Converts <i>hsh</i> to a nested array of <code>[</code> <i>key,
|
|
|
|
* value</i> <code>]</code> arrays.
|
|
|
|
*
|
|
|
|
* h = { "c" => 300, "a" => 100, "d" => 400, "c" => 300 }
|
|
|
|
* h.to_a #=> [["a", 100], ["c", 300], ["d", 400]]
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_to_a(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE ary;
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
ary = rb_ary_new();
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, to_a_i, ary);
|
2000-01-05 07:41:21 +03:00
|
|
|
if (OBJ_TAINTED(hash)) OBJ_TAINT(ary);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.sort => array
|
|
|
|
* hsh.sort {| a, b | block } => array
|
|
|
|
*
|
|
|
|
* Converts <i>hsh</i> to a nested array of <code>[</code> <i>key,
|
|
|
|
* value</i> <code>]</code> arrays and sorts it, using
|
|
|
|
* <code>Array#sort</code>.
|
|
|
|
*
|
|
|
|
* h = { "a" => 20, "b" => 30, "c" => 10 }
|
|
|
|
* h.sort #=> [["a", 20], ["b", 30], ["c", 10]]
|
|
|
|
* h.sort {|a,b| a[1]<=>b[1]} #=> [["c", 10], ["a", 20], ["b", 30]]
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_sort(VALUE hash)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2000-09-04 12:24:09 +04:00
|
|
|
VALUE entries = rb_hash_to_a(hash);
|
|
|
|
rb_ary_sort_bang(entries);
|
|
|
|
return entries;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
inspect_i(VALUE key, VALUE value, VALUE str)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE str2;
|
|
|
|
|
2000-01-05 07:41:21 +03:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
1998-01-16 15:19:22 +03:00
|
|
|
if (RSTRING(str)->len > 1) {
|
2000-04-10 09:48:43 +04:00
|
|
|
rb_str_cat2(str, ", ");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
str2 = rb_inspect(key);
|
2001-05-30 13:12:34 +04:00
|
|
|
rb_str_buf_append(str, str2);
|
2000-02-23 08:23:12 +03:00
|
|
|
OBJ_INFECT(str, str2);
|
2001-05-30 13:12:34 +04:00
|
|
|
rb_str_buf_cat2(str, "=>");
|
1998-01-16 15:13:05 +03:00
|
|
|
str2 = rb_inspect(value);
|
2001-05-30 13:12:34 +04:00
|
|
|
rb_str_buf_append(str, str2);
|
2000-02-23 08:23:12 +03:00
|
|
|
OBJ_INFECT(str, str2);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
inspect_hash(VALUE hash, VALUE dummy, int recur)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE str;
|
|
|
|
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
if (recur) return rb_str_new2("{...}");
|
2001-05-30 13:12:34 +04:00
|
|
|
str = rb_str_buf_new2("{");
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, inspect_i, str);
|
2001-05-30 13:12:34 +04:00
|
|
|
rb_str_buf_cat2(str, "}");
|
2000-02-23 08:23:12 +03:00
|
|
|
OBJ_INFECT(str, hash);
|
2001-05-30 13:12:34 +04:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.inspect => string
|
|
|
|
*
|
|
|
|
* Return the contents of this hash as a string.
|
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_inspect(VALUE hash)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2001-06-22 13:12:24 +04:00
|
|
|
if (RHASH(hash)->tbl == 0 || RHASH(hash)->tbl->num_entries == 0)
|
|
|
|
return rb_str_new2("{}");
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
return rb_exec_recursive(inspect_hash, hash, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
to_s_hash(VALUE hash, VALUE dummy, int recur)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
if (recur) return rb_str_new2("{...}");
|
2000-01-05 07:41:21 +03:00
|
|
|
return rb_ary_to_s(rb_hash_to_a(hash));
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.to_s => string
|
|
|
|
*
|
|
|
|
* Converts <i>hsh</i> to a string by converting the hash to an array
|
|
|
|
* of <code>[</code> <i>key, value</i> <code>]</code> pairs and then
|
|
|
|
* converting that array to a string using <code>Array#join</code> with
|
|
|
|
* the default separator.
|
|
|
|
*
|
|
|
|
* h = { "c" => 300, "a" => 100, "d" => 400, "c" => 300 }
|
|
|
|
* h.to_s #=> "a100c300d400"
|
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_to_s(VALUE hash)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
return rb_exec_recursive(to_s_hash, hash, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.to_hash => hsh
|
|
|
|
*
|
|
|
|
* Returns <i>self</i>.
|
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_to_hash(VALUE hash)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
|
|
|
return hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
keys_i(VALUE key, VALUE value, VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2000-01-05 07:41:21 +03:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_ary_push(ary, key);
|
1998-01-16 15:13:05 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.keys => array
|
|
|
|
*
|
|
|
|
* Returns a new array populated with the keys from this hash. See also
|
|
|
|
* <code>Hash#values</code>.
|
|
|
|
*
|
|
|
|
* h = { "a" => 100, "b" => 200, "c" => 300, "d" => 400 }
|
|
|
|
* h.keys #=> ["a", "b", "c", "d"]
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_keys(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE ary;
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
ary = rb_ary_new();
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, keys_i, ary);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
values_i(VALUE key, VALUE value, VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2000-01-05 07:41:21 +03:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_ary_push(ary, value);
|
1998-01-16 15:13:05 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.values => array
|
|
|
|
*
|
|
|
|
* Returns a new array populated with the values from <i>hsh</i>. See
|
|
|
|
* also <code>Hash#keys</code>.
|
|
|
|
*
|
|
|
|
* h = { "a" => 100, "b" => 200, "c" => 300 }
|
|
|
|
* h.values #=> [100, 200, 300]
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_values(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE ary;
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
ary = rb_ary_new();
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, values_i, ary);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03: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
|
|
|
|
*
|
|
|
|
* Returns <code>true</code> if the given key is present in <i>hsh</i>.
|
|
|
|
*
|
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.has_key?("a") #=> true
|
|
|
|
* h.has_key?("z") #=> false
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_has_key(VALUE hash, VALUE key)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1998-01-16 15:19:22 +03:00
|
|
|
if (st_lookup(RHASH(hash)->tbl, key, 0)) {
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qtrue;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_search_value(VALUE key, VALUE value, VALUE *data)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2000-01-05 07:41:21 +03:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
1998-01-16 15:13:05 +03:00
|
|
|
if (rb_equal(value, data[1])) {
|
1999-01-20 07:59:39 +03:00
|
|
|
data[0] = Qtrue;
|
1998-01-16 15:13:05 +03:00
|
|
|
return ST_STOP;
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.has_value?(value) => true or false
|
|
|
|
* hsh.value?(value) => true or false
|
|
|
|
*
|
|
|
|
* Returns <code>true</code> if the given value is present for some key
|
|
|
|
* in <i>hsh</i>.
|
|
|
|
*
|
|
|
|
* h = { "a" => 100, "b" => 200 }
|
|
|
|
* h.has_value?(100) #=> true
|
|
|
|
* h.has_value?(999) #=> false
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_has_value(VALUE hash, VALUE val)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE data[2];
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
data[0] = Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
data[1] = val;
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, rb_hash_search_value, (st_data_t)data);
|
1998-01-16 15:13:05 +03:00
|
|
|
return data[0];
|
|
|
|
}
|
|
|
|
|
|
|
|
struct equal_data {
|
|
|
|
int result;
|
|
|
|
st_table *tbl;
|
|
|
|
};
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
equal_i(VALUE key, VALUE val1, struct equal_data *data)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE val2;
|
|
|
|
|
2000-01-05 07:41:21 +03:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
1998-01-16 15:13:05 +03:00
|
|
|
if (!st_lookup(data->tbl, key, &val2)) {
|
1999-01-20 07:59:39 +03:00
|
|
|
data->result = Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
return ST_STOP;
|
|
|
|
}
|
|
|
|
if (!rb_equal(val1, val2)) {
|
1999-01-20 07:59:39 +03:00
|
|
|
data->result = Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
return ST_STOP;
|
|
|
|
}
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2004-05-07 12:44:24 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
hash_equal(VALUE hash1, VALUE hash2, int eql /* compare default value if true */)
|
2004-05-07 12: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;
|
|
|
|
}
|
|
|
|
return rb_equal(hash2, hash1);
|
|
|
|
}
|
|
|
|
if (RHASH(hash1)->tbl->num_entries != RHASH(hash2)->tbl->num_entries)
|
|
|
|
return Qfalse;
|
|
|
|
if (eql) {
|
|
|
|
if (!(rb_equal(RHASH(hash1)->ifnone, RHASH(hash2)->ifnone) &&
|
|
|
|
FL_TEST(hash1, HASH_PROC_DEFAULT) == FL_TEST(hash2, HASH_PROC_DEFAULT)))
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
|
|
|
data.tbl = RHASH(hash2)->tbl;
|
|
|
|
data.result = Qtrue;
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash1, equal_i, (st_data_t)&data);
|
2004-05-07 12:44:24 +04:00
|
|
|
|
|
|
|
return data.result;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh == other_hash => true or false
|
|
|
|
*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* 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
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_equal(VALUE hash1, VALUE hash2)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2004-05-07 12:44:24 +04:00
|
|
|
return hash_equal(hash1, hash2, Qfalse);
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_invert_i(VALUE key, VALUE value, VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2000-01-05 07:41:21 +03:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_hash_aset(hash, value, key);
|
1998-01-16 15:13:05 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* hsh.invert -> aHash
|
|
|
|
*
|
|
|
|
* Returns a new hash created by using <i>hsh</i>'s values as keys, and
|
|
|
|
* the keys as values.
|
|
|
|
*
|
|
|
|
* h = { "n" => 100, "m" => 100, "y" => 300, "d" => 200, "a" => 0 }
|
|
|
|
* h.invert #=> {0=>"a", 100=>"n", 200=>"d", 300=>"y"}
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_invert(VALUE hash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE h = rb_hash_new();
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, rb_hash_invert_i, h);
|
1998-01-16 15:13:05 +03:00
|
|
|
return h;
|
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_update_i(VALUE key, VALUE value, VALUE hash)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
2000-01-05 07:41:21 +03:00
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_hash_aset(hash, key, value);
|
1998-01-16 15:19:22 +03:00
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_update_block_i(VALUE key, VALUE value, VALUE hash)
|
2002-01-25 11:22:11 +03:00
|
|
|
{
|
|
|
|
if (key == Qundef) return ST_CONTINUE;
|
|
|
|
if (rb_hash_has_key(hash, key)) {
|
2003-05-20 10:29:23 +04:00
|
|
|
value = rb_yield_values(3, key, rb_hash_aref(hash, key), value);
|
2002-01-25 11:22:11 +03:00
|
|
|
}
|
|
|
|
rb_hash_aset(hash, key, value);
|
|
|
|
return ST_CONTINUE;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-11-16 17:51:38 +03: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
|
2003-12-23 19:21:17 +03:00
|
|
|
*
|
* array.c: replace rb_protect_inspect() and rb_inspecting_p() by
rb_exec_recursive() in eval.c.
* eval.c (rb_exec_recursive): new function.
* array.c (rb_ary_join): use rb_exec_recursive().
* array.c (rb_ary_inspect, rb_ary_hash): ditto.
* file.c (rb_file_join): ditto.
* hash.c (rb_hash_inspect, rb_hash_to_s, rb_hash_hash): ditto.
* io.c (rb_io_puts): ditto.
* object.c (rb_obj_inspect): ditto
* struct.c (rb_struct_inspect): ditto.
* lib/set.rb (SortedSet::setup): a hack to shut up warning.
[ruby-talk:132866]
* lib/time.rb (Time::strptime): add new function. inspired by
[ruby-talk:132815].
* lib/parsedate.rb (ParseDate::strptime): ditto.
* regparse.c: move st_*_strend() functions from st.c. fixed some
potential memory leaks.
* exception error messages updated. [ruby-core:04497]
* ext/socket/socket.c (Init_socket): add bunch of Socket
constants. Patch from Sam Roberts <sroberts@uniserve.com>.
[ruby-core:04409]
* array.c (rb_ary_s_create): no need for negative argc check.
[ruby-core:04463]
* array.c (rb_ary_unshift_m): ditto.
* lib/xmlrpc/parser.rb (XMLRPC::FaultException): make it subclass
of StandardError class, not Exception class. [ruby-core:04429]
* parse.y (fcall_gen): lvar(arg) will be evaluated as
lvar.call(arg) when lvar is a defined local variable. [new]
* object.c (rb_class_initialize): call inherited method before
calling initializing block.
* eval.c (rb_thread_start_1): initialize newly pushed frame.
* lib/open3.rb (Open3::popen3): $? should not be EXIT_FAILURE.
fixed: [ruby-core:04444]
* eval.c (is_defined): NODE_IASGN is an assignment.
* ext/readline/readline.c (Readline.readline): use rl_outstream
and rl_instream. [ruby-dev:25699]
* ext/etc/etc.c (Init_etc): sGroup needs HAVE_ST_GR_PASSWD check
[ruby-dev:25675]
* misc/ruby-mode.el: [ruby-core:04415]
* lib/rdoc/generators/html_generator.rb: [ruby-core:04412]
* lib/rdoc/generators/ri_generator.rb: ditto.
* struct.c (make_struct): fixed: [ruby-core:04402]
* ext/curses/curses.c (window_color_set): [ruby-core:04393]
* ext/socket/socket.c (Init_socket): SO_REUSEPORT added.
[ruby-talk:130092]
* object.c: [ruby-doc:818]
* parse.y (open_args): fix too verbose warnings for the space
before argument parentheses. [ruby-dev:25492]
* parse.y (parser_yylex): ditto.
* parse.y (parser_yylex): the first expression in the parentheses
should not be a command. [ruby-dev:25492]
* lib/irb/context.rb (IRB::Context::initialize): [ruby-core:04330]
* object.c (Init_Object): remove Object#type. [ruby-core:04335]
* st.c (st_foreach): report success/failure by return value.
[ruby-Bugs-1396]
* parse.y: forgot to initialize parser struct. [ruby-dev:25492]
* parse.y (parser_yylex): no tLABEL on EXPR_BEG.
[ruby-talk:127711]
* document updates - [ruby-core:04296], [ruby-core:04301],
[ruby-core:04302], [ruby-core:04307]
* dir.c (rb_push_glob): should work for NUL delimited patterns.
* dir.c (rb_glob2): should aware of offset in the pattern.
* string.c (rb_str_new4): should propagate taintedness.
* env.h: rename member names in struct FRAME; last_func -> callee,
orig_func -> this_func, last_class -> this_class.
* struct.c (rb_struct_set): use original method name, not callee
name, to retrieve member slot. [ruby-core:04268]
* time.c (time_strftime): protect from format modification from GC
finalizers.
* object.c (Init_Object): remove rb_obj_id_obsolete()
* eval.c (rb_mod_define_method): incomplete subclass check.
[ruby-dev:25464]
* gc.c (rb_data_object_alloc): klass may be NULL.
[ruby-list:40498]
* bignum.c (rb_big_rand): should return positive random number.
[ruby-dev:25401]
* bignum.c (rb_big_rand): do not use rb_big_modulo to generate
random bignums. [ruby-dev:25396]
* variable.c (rb_autoload): [ruby-dev:25373]
* eval.c (svalue_to_avalue): [ruby-dev:25366]
* string.c (rb_str_justify): [ruby-dev:25367]
* io.c (rb_f_select): [ruby-dev:25312]
* ext/socket/socket.c (sock_s_getservbyport): [ruby-talk:124072]
* struct.c (make_struct): [ruby-dev:25249]
* dir.c (dir_open_dir): new function. [ruby-dev:25242]
* io.c (rb_f_open): add type check for return value from to_open.
* lib/pstore.rb (PStore#transaction): Use the empty content when a
file is not found. [ruby-dev:24561]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-03-04 09:47:45 +03:00
|
|
|
* 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
|
|
|
|
* of each duplicate key is detemined by calling the block with
|
|
|
|
* the key, its value in <i>hsh</i> and its value in <i>other_hash</i>.
|
2003-12-23 19:21:17 +03:00
|
|
|
*
|
|
|
|
* h1 = { "a" => 100, "b" => 200 }
|
|
|
|
* h2 = { "b" => 254, "c" => 300 }
|
|
|
|
* h1.merge!(h2) #=> {"a"=>100, "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 09:47:45 +03:00
|
|
|
* h1.merge!(h2) { |key, v1, v2| v1 }
|
|
|
|
* #=> {"a"=>100, "b"=>200, "c"=>300}
|
2003-12-23 19:21:17 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_update(VALUE hash1, VALUE hash2)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
hash2 = to_hash(hash2);
|
2002-01-25 11:22:11 +03:00
|
|
|
if (rb_block_given_p()) {
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash2, rb_hash_update_block_i, hash1);
|
2002-01-25 11:22:11 +03:00
|
|
|
}
|
|
|
|
else {
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash2, rb_hash_update_i, hash1);
|
2002-01-25 11:22:11 +03:00
|
|
|
}
|
1998-01-16 15:19:22 +03:00
|
|
|
return hash1;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-11-16 17:51:38 +03:00
|
|
|
* hsh.merge(other_hash) -> a_hash
|
|
|
|
* hsh.merge(other_hash){|key, oldval, newval| block} -> a_hash
|
2003-12-23 19:21:17 +03: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>.
|
|
|
|
*
|
|
|
|
* h1 = { "a" => 100, "b" => 200 }
|
|
|
|
* h2 = { "b" => 254, "c" => 300 }
|
|
|
|
* h1.merge(h2) #=> {"a"=>100, "b"=>254, "c"=>300}
|
|
|
|
* h1 #=> {"a"=>100, "b"=>200}
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2003-02-03 08:34:16 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_hash_merge(VALUE hash1, VALUE hash2)
|
2003-02-03 08:34:16 +03:00
|
|
|
{
|
|
|
|
return rb_hash_update(rb_obj_dup(hash1), hash2);
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
static int path_tainted = -1;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-11-13 06:59:20 +03:00
|
|
|
static char **origenviron;
|
* configure.in, defines.h, dir.c, dir.h, dln.c, error.c,
eval.c, file.c, hash.c, io.c, main.c, missing.c,
process.c, ruby.c, rubysig.h, signal.c, st.c, util.c, util.h,
bcc/Makefile.sub, win32/Makefile.sub, win32/win32.h,
ext/Win32API/Win32API.c, ext/socket/getaddrinfo.c,
ext/socket/getnameinfo.c, ext/socket/socket.c,
ext/tcltklib/stubs.c
: replace "NT" with "_WIN32", add DOSISH_DRIVE_LETTER
* wince/exe.mak : delete \r at the end of lines.
* wince/mswince-ruby17.def : delete rb_obj_become
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3148 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2002-12-15 06:18:08 +03:00
|
|
|
#ifdef _WIN32
|
2002-05-29 14:22:19 +04:00
|
|
|
#define GET_ENVIRON(e) (e = rb_w32_get_environ())
|
|
|
|
#define FREE_ENVIRON(e) rb_w32_free_environ(e)
|
2001-11-13 06:59:20 +03:00
|
|
|
static char **my_environ;
|
|
|
|
#undef environ
|
|
|
|
#define environ my_environ
|
2002-10-17 20:13:44 +04:00
|
|
|
#elif defined(__APPLE__)
|
|
|
|
#undef environ
|
|
|
|
#define environ (*_NSGetEnviron())
|
|
|
|
#define GET_ENVIRON(e) (e)
|
|
|
|
#define FREE_ENVIRON(e)
|
2001-11-13 06:59:20 +03:00
|
|
|
#else
|
1998-01-16 15:13:05 +03:00
|
|
|
extern char **environ;
|
2001-11-13 06:59:20 +03:00
|
|
|
#define GET_ENVIRON(e) (e)
|
|
|
|
#define FREE_ENVIRON(e)
|
1998-01-16 15:13:05 +03:00
|
|
|
#endif
|
|
|
|
|
2003-06-06 13:24:59 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_str_new(const char *ptr, long len)
|
2003-06-06 13:24:59 +04:00
|
|
|
{
|
|
|
|
VALUE str = rb_tainted_str_new(ptr, len);
|
|
|
|
|
|
|
|
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 14:44:21 +04:00
|
|
|
env_str_new2(const char *ptr)
|
2003-06-06 13:24:59 +04:00
|
|
|
{
|
2003-06-23 10:52:39 +04:00
|
|
|
if (!ptr) return Qnil;
|
2003-06-06 13:24:59 +04:00
|
|
|
return env_str_new(ptr, strlen(ptr));
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_delete(VALUE obj, VALUE name)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-08-13 09:45:20 +04:00
|
|
|
char *nam, *val;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
rb_secure(4);
|
2002-08-27 12:31:08 +04:00
|
|
|
SafeStringValue(name);
|
2001-05-02 08:22:21 +04:00
|
|
|
nam = RSTRING(name)->ptr;
|
|
|
|
if (strlen(nam) != RSTRING(name)->len) {
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_raise(rb_eArgError, "bad environment variable name");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
1999-08-13 09:45:20 +04:00
|
|
|
val = getenv(nam);
|
1998-01-16 15:13:05 +03:00
|
|
|
if (val) {
|
2003-06-06 13:24:59 +04:00
|
|
|
VALUE value = env_str_new2(val);
|
2000-01-05 07:41:21 +03:00
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
ruby_setenv(nam, 0);
|
2003-06-20 10:22:50 +04:00
|
|
|
#ifdef ENV_IGNORECASE
|
2003-07-15 11:35:14 +04:00
|
|
|
if (strcasecmp(nam, PATH_ENV) == 0)
|
2002-06-11 05:27:48 +04:00
|
|
|
#else
|
2003-07-15 11:35:14 +04:00
|
|
|
if (strcmp(nam, PATH_ENV) == 0)
|
2002-06-11 05:27:48 +04:00
|
|
|
#endif
|
2003-07-15 11:35:14 +04:00
|
|
|
{
|
1999-08-13 09:45:20 +04:00
|
|
|
path_tainted = 0;
|
|
|
|
}
|
2000-01-05 07:41:21 +03:00
|
|
|
return value;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_delete_m(VALUE obj, VALUE name)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
2003-03-31 06:06:23 +04:00
|
|
|
VALUE val;
|
|
|
|
|
|
|
|
val = env_delete(obj, name);
|
|
|
|
if (NIL_P(val) && rb_block_given_p()) rb_yield(name);
|
1998-01-16 15:19:22 +03:00
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_f_getenv(VALUE obj, VALUE name)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
char *nam, *env;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
rb_secure(4);
|
|
|
|
SafeStringValue(name);
|
2001-05-02 08:22:21 +04:00
|
|
|
nam = RSTRING(name)->ptr;
|
|
|
|
if (strlen(nam) != RSTRING(name)->len) {
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_raise(rb_eArgError, "bad environment variable name");
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
env = getenv(nam);
|
1998-01-16 15:13:05 +03:00
|
|
|
if (env) {
|
2003-06-20 10:22:50 +04:00
|
|
|
#ifdef ENV_IGNORECASE
|
|
|
|
if (strcasecmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
|
2002-06-11 05:27:48 +04:00
|
|
|
#else
|
2003-06-20 10:22:50 +04:00
|
|
|
if (strcmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
|
2002-06-11 05:27:48 +04:00
|
|
|
#endif
|
2003-06-06 13:24:59 +04:00
|
|
|
{
|
|
|
|
VALUE str = rb_str_new2(env);
|
|
|
|
|
|
|
|
rb_obj_freeze(str);
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
return env_str_new2(env);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2000-04-12 09: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 14:44:21 +04:00
|
|
|
env_fetch(int argc, VALUE *argv)
|
2000-04-12 09:06:23 +04:00
|
|
|
{
|
|
|
|
VALUE key, if_none;
|
2003-11-06 10:22:39 +03:00
|
|
|
long block_given;
|
2000-04-12 09:06:23 +04:00
|
|
|
char *nam, *env;
|
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
rb_secure(4);
|
2000-04-12 09:06:23 +04:00
|
|
|
rb_scan_args(argc, argv, "11", &key, &if_none);
|
2003-11-06 10:22:39 +03:00
|
|
|
block_given = rb_block_given_p();
|
|
|
|
if (block_given && argc == 2) {
|
|
|
|
rb_warn("block supersedes default value argument");
|
|
|
|
}
|
2004-11-18 11:11:12 +03:00
|
|
|
SafeStringValue(key);
|
2001-05-02 08:22:21 +04:00
|
|
|
nam = RSTRING(key)->ptr;
|
|
|
|
if (strlen(nam) != RSTRING(key)->len) {
|
2000-04-12 09:06:23 +04:00
|
|
|
rb_raise(rb_eArgError, "bad environment variable name");
|
|
|
|
}
|
|
|
|
env = getenv(nam);
|
|
|
|
if (!env) {
|
2003-11-06 10:22:39 +03:00
|
|
|
if (block_given) return rb_yield(key);
|
2000-04-12 09:06:23 +04:00
|
|
|
if (argc == 1) {
|
2004-09-22 08:48:52 +04:00
|
|
|
rb_raise(rb_eKeyError, "key not found");
|
2000-04-12 09:06:23 +04:00
|
|
|
}
|
|
|
|
return if_none;
|
|
|
|
}
|
2003-06-20 10:22:50 +04:00
|
|
|
#ifdef ENV_IGNORECASE
|
|
|
|
if (strcasecmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
|
2002-06-11 05:27:48 +04:00
|
|
|
#else
|
2003-06-20 10:22:50 +04:00
|
|
|
if (strcmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted())
|
2002-06-11 05:27:48 +04:00
|
|
|
#endif
|
2000-04-12 09:06:23 +04:00
|
|
|
return rb_str_new2(env);
|
2003-06-06 13:24:59 +04:00
|
|
|
return env_str_new2(env);
|
2000-04-12 09:06:23 +04:00
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
path_tainted_p(char *path)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
|
|
|
path_tainted = rb_path_check(path)?0:1;
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
rb_env_path_tainted(void)
|
1998-01-16 15:19:22 +03:00
|
|
|
{
|
|
|
|
if (path_tainted < 0) {
|
2003-06-20 10:22:50 +04:00
|
|
|
path_tainted_p(getenv(PATH_ENV));
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
return path_tainted;
|
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
envix(const char *nam)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
|
|
|
register int i, len = strlen(nam);
|
2001-11-13 06:59:20 +03:00
|
|
|
char **env;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
|
|
|
for (i = 0; env[i]; i++) {
|
1999-01-20 07:59:39 +03:00
|
|
|
if (
|
2003-06-20 10:22:50 +04:00
|
|
|
#ifdef ENV_IGNORECASE
|
|
|
|
strncasecmp(env[i],nam,len) == 0
|
1999-01-20 07:59:39 +03:00
|
|
|
#else
|
2001-11-13 06:59:20 +03:00
|
|
|
memcmp(env[i],nam,len) == 0
|
1999-01-20 07:59:39 +03:00
|
|
|
#endif
|
2001-11-13 06:59:20 +03:00
|
|
|
&& env[i][len] == '=')
|
1999-01-20 07:59:39 +03:00
|
|
|
break; /* memcmp must come first to avoid */
|
|
|
|
} /* potential SEGV's */
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
1999-01-20 07:59:39 +03:00
|
|
|
return i;
|
|
|
|
}
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
ruby_setenv(const char *name, const char *value)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2003-06-20 10:22:50 +04:00
|
|
|
#if defined(_WIN32)
|
1999-01-20 07:59:39 +03: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 21:41:46 +03:00
|
|
|
*
|
|
|
|
* REMARK: USE_WIN32_RTL_ENV is already obsoleted since we don't use
|
|
|
|
* RTL's environ global variable directly yet.
|
1999-01-20 07:59:39 +03:00
|
|
|
*/
|
|
|
|
SetEnvironmentVariable(name,value);
|
1999-08-13 09:45:20 +04:00
|
|
|
#elif defined __CYGWIN__
|
|
|
|
#undef setenv
|
|
|
|
#undef unsetenv
|
|
|
|
if (value)
|
|
|
|
setenv(name,value,1);
|
|
|
|
else
|
|
|
|
unsetenv(name);
|
1999-01-20 07:59:39 +03:00
|
|
|
#else /* WIN32 */
|
2005-07-19 12:31:04 +04:00
|
|
|
size_t len;
|
1999-08-13 09:45:20 +04:00
|
|
|
int i=envix(name); /* where does it go? */
|
1999-01-20 07:59:39 +03:00
|
|
|
|
|
|
|
if (environ == origenviron) { /* need we copy environment? */
|
|
|
|
int j;
|
|
|
|
int max;
|
|
|
|
char **tmpenv;
|
|
|
|
|
|
|
|
for (max = i; environ[max]; max++) ;
|
|
|
|
tmpenv = ALLOC_N(char*, max+2);
|
|
|
|
for (j=0; j<max; j++) /* copy environment */
|
|
|
|
tmpenv[j] = strdup(environ[j]);
|
|
|
|
tmpenv[max] = 0;
|
|
|
|
environ = tmpenv; /* tell exec where it is now */
|
|
|
|
}
|
2005-06-13 08:04:33 +04:00
|
|
|
if (environ[i]) {
|
2005-06-12 20:56:06 +04:00
|
|
|
char **envp = origenviron;
|
|
|
|
while (*envp && *envp != environ[i]) envp++;
|
|
|
|
if (!*envp)
|
|
|
|
free(environ[i]);
|
2005-06-13 08:04:33 +04:00
|
|
|
if (!value) {
|
2005-06-12 20:56:06 +04:00
|
|
|
while (environ[i]) {
|
|
|
|
environ[i] = environ[i+1];
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
return;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
2005-06-13 08:04:33 +04:00
|
|
|
}
|
|
|
|
else { /* does not exist yet */
|
|
|
|
if (!value) return;
|
1999-01-20 07:59:39 +03:00
|
|
|
REALLOC_N(environ, char*, i+2); /* just expand it a bit */
|
|
|
|
environ[i+1] = 0; /* make sure it's null terminated */
|
|
|
|
}
|
2005-07-19 12:31:04 +04:00
|
|
|
len = strlen(name) + strlen(value) + 2;
|
|
|
|
environ[i] = ALLOC_N(char, len);
|
1999-01-20 07:59:39 +03:00
|
|
|
#ifndef MSDOS
|
2005-07-19 12:31:04 +04:00
|
|
|
snprintf(environ[i],len,"%s=%s",name,value); /* all that work just for this */
|
1999-01-20 07:59:39 +03:00
|
|
|
#else
|
|
|
|
/* MS-DOS requires environment variable names to be in uppercase */
|
|
|
|
/* [Tom Dinger, 27 August 1990: Well, it doesn't _require_ it, but
|
|
|
|
* some utilities and applications may break because they only look
|
|
|
|
* for upper case strings. (Fixed strupr() bug here.)]
|
|
|
|
*/
|
|
|
|
strcpy(environ[i],name); strupr(environ[i]);
|
|
|
|
sprintf(environ[i] + strlen(name),"=%s", value);
|
|
|
|
#endif /* MSDOS */
|
|
|
|
|
|
|
|
#endif /* WIN32 */
|
|
|
|
}
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
ruby_unsetenv(const char *name)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
|
|
|
ruby_setenv(name, 0);
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_aset(VALUE obj, VALUE nm, VALUE val)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
char *name, *value;
|
|
|
|
|
1998-01-16 15:13:05 +03: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 09:47:45 +03:00
|
|
|
rb_raise(rb_eSecurityError, "can't change environment variable");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2001-05-02 08:22:21 +04:00
|
|
|
StringValue(nm);
|
|
|
|
StringValue(val);
|
|
|
|
name = RSTRING(nm)->ptr;
|
|
|
|
value = RSTRING(val)->ptr;
|
|
|
|
if (strlen(name) != RSTRING(nm)->len)
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_raise(rb_eArgError, "bad environment variable name");
|
2001-05-02 08:22:21 +04:00
|
|
|
if (strlen(value) != RSTRING(val)->len)
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_raise(rb_eArgError, "bad environment variable value");
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
ruby_setenv(name, value);
|
2003-06-20 10:22:50 +04:00
|
|
|
#ifdef ENV_IGNORECASE
|
|
|
|
if (strcasecmp(name, PATH_ENV) == 0) {
|
|
|
|
#else
|
|
|
|
if (strcmp(name, PATH_ENV) == 0) {
|
|
|
|
#endif
|
1999-01-20 07:59:39 +03:00
|
|
|
if (OBJ_TAINTED(val)) {
|
1998-01-16 15:19:22 +03:00
|
|
|
/* already tainted, no check */
|
|
|
|
path_tainted = 1;
|
2001-10-29 08:07:26 +03:00
|
|
|
return val;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
path_tainted_p(value);
|
1998-01-16 15:19:22 +03:00
|
|
|
}
|
|
|
|
}
|
2001-10-29 08:07:26 +03:00
|
|
|
return val;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_keys(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
char **env;
|
2004-11-18 11:11:12 +03:00
|
|
|
VALUE ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
rb_secure(4);
|
|
|
|
ary = rb_ary_new();
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
1998-01-16 15:13:05 +03:00
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
1999-01-20 07:59:39 +03:00
|
|
|
if (s) {
|
2003-06-06 13:24:59 +04:00
|
|
|
rb_ary_push(ary, env_str_new(*env, s-*env));
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
env++;
|
|
|
|
}
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
1998-01-16 15:13:05 +03:00
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_each_key(VALUE ehash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2004-11-18 11:11:12 +03:00
|
|
|
VALUE keys;
|
2003-08-02 00:16:53 +04:00
|
|
|
long i;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2005-08-30 18:49:51 +04:00
|
|
|
RETURN_ENUMERATOR(ehash, 0, 0);
|
2004-11-18 11:11:12 +03:00
|
|
|
rb_secure(4);
|
|
|
|
keys = env_keys();
|
2003-08-02 00:16:53 +04:00
|
|
|
for (i=0; i<RARRAY(keys)->len; i++) {
|
|
|
|
rb_yield(RARRAY(keys)->ptr[i]);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
2003-08-02 00:16:53 +04:00
|
|
|
return ehash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_values(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2004-11-18 11:11:12 +03:00
|
|
|
VALUE ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
char **env;
|
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
rb_secure(4);
|
|
|
|
ary = rb_ary_new();
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
1998-01-16 15:13:05 +03:00
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
1999-01-20 07:59:39 +03:00
|
|
|
if (s) {
|
2003-06-06 13:24:59 +04:00
|
|
|
rb_ary_push(ary, env_str_new2(s+1));
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
env++;
|
|
|
|
}
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
1998-01-16 15:13:05 +03:00
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_each_value(VALUE ehash)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2003-08-02 00:16:53 +04:00
|
|
|
VALUE values = env_values();
|
|
|
|
long i;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2005-08-30 18:49:51 +04:00
|
|
|
RETURN_ENUMERATOR(ehash, 0, 0);
|
2004-11-18 11:11:12 +03:00
|
|
|
rb_secure(4);
|
|
|
|
values = env_values();
|
2003-08-02 00:16:53 +04:00
|
|
|
for (i=0; i<RARRAY(values)->len; i++) {
|
|
|
|
rb_yield(RARRAY(values)->ptr[i]);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
2003-08-02 00:16:53 +04:00
|
|
|
return ehash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_each_i(VALUE ehash, int values)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
char **env;
|
2004-11-18 11:11:12 +03:00
|
|
|
VALUE ary;
|
2003-08-02 00:16:53 +04:00
|
|
|
long i;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
rb_secure(4);
|
|
|
|
ary = rb_ary_new();
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
1999-01-20 07:59:39 +03:00
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
if (s) {
|
2003-08-02 00:16:53 +04:00
|
|
|
rb_ary_push(ary, env_str_new(*env, s-*env));
|
|
|
|
rb_ary_push(ary, env_str_new2(s+1));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
env++;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
2003-08-02 00:16:53 +04:00
|
|
|
|
|
|
|
for (i=0; i<RARRAY(ary)->len; i+=2) {
|
2003-10-24 18:31:14 +04:00
|
|
|
if (values) {
|
|
|
|
rb_yield_values(2, RARRAY(ary)->ptr[i], RARRAY(ary)->ptr[i+1]);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_yield(rb_assoc_new(RARRAY(ary)->ptr[i], RARRAY(ary)->ptr[i+1]));
|
|
|
|
}
|
2003-08-02 00:16:53 +04:00
|
|
|
}
|
|
|
|
return ehash;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-10-24 18:31:14 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_each(VALUE ehash)
|
2003-10-24 18:31:14 +04:00
|
|
|
{
|
2005-08-30 18:49:51 +04:00
|
|
|
RETURN_ENUMERATOR(ehash, 0, 0);
|
2003-10-24 18:31:14 +04:00
|
|
|
return env_each_i(ehash, Qfalse);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_each_pair(VALUE ehash)
|
2003-10-24 18:31:14 +04:00
|
|
|
{
|
2005-08-30 18:49:51 +04:00
|
|
|
RETURN_ENUMERATOR(ehash, 0, 0);
|
2003-10-24 18:31:14 +04:00
|
|
|
return env_each_i(ehash, Qtrue);
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_reject_bang(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
volatile VALUE keys;
|
2003-08-01 06:52:21 +04:00
|
|
|
long i;
|
2002-08-21 19:47:54 +04:00
|
|
|
int del = 0;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
|
|
|
rb_secure(4);
|
|
|
|
keys = env_keys();
|
2003-08-01 06:52:21 +04:00
|
|
|
for (i=0; i<RARRAY(keys)->len; i++) {
|
|
|
|
VALUE val = rb_f_getenv(Qnil, RARRAY(keys)->ptr[i]);
|
1998-01-16 15:13:05 +03:00
|
|
|
if (!NIL_P(val)) {
|
2003-08-01 06:52:21 +04:00
|
|
|
if (RTEST(rb_yield_values(2, RARRAY(keys)->ptr[i], val))) {
|
|
|
|
FL_UNSET(RARRAY(keys)->ptr[i], FL_TAINT);
|
|
|
|
env_delete(Qnil, RARRAY(keys)->ptr[i]);
|
2000-08-07 09:05:04 +04:00
|
|
|
del++;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2000-08-07 09:05:04 +04:00
|
|
|
if (del == 0) return Qnil;
|
|
|
|
return envtbl;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_delete_if(void)
|
2000-08-07 09:05:04 +04:00
|
|
|
{
|
|
|
|
env_reject_bang();
|
1998-01-16 15:13:05 +03:00
|
|
|
return envtbl;
|
|
|
|
}
|
|
|
|
|
2001-12-11 06:48:08 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_values_at(int argc, VALUE *argv)
|
2001-12-11 06:48:08 +03:00
|
|
|
{
|
2004-11-18 11:11:12 +03:00
|
|
|
VALUE result;
|
2001-12-11 06:48:08 +03:00
|
|
|
long i;
|
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
rb_secure(4);
|
|
|
|
result = rb_ary_new();
|
2003-05-04 20:03:24 +04:00
|
|
|
for (i=0; i<argc; i++) {
|
|
|
|
rb_ary_push(result, rb_f_getenv(Qnil, argv[i]));
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
2001-12-11 06:48:08 +03:00
|
|
|
|
2003-05-04 20:03:24 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_select(VALUE ehash)
|
2003-05-04 20:03:24 +04:00
|
|
|
{
|
|
|
|
VALUE result;
|
|
|
|
char **env;
|
|
|
|
|
2005-08-30 18:49:51 +04:00
|
|
|
RETURN_ENUMERATOR(ehash, 0, 0);
|
2004-11-18 11:11:12 +03:00
|
|
|
rb_secure(4);
|
2003-05-04 20:03:24 +04:00
|
|
|
result = rb_ary_new();
|
|
|
|
env = GET_ENVIRON(environ);
|
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
if (s) {
|
2003-06-06 13:24:59 +04:00
|
|
|
VALUE k = env_str_new(*env, s-*env);
|
|
|
|
VALUE v = env_str_new2(s+1);
|
2003-05-20 10:29:23 +04:00
|
|
|
if (RTEST(rb_yield_values(2, k, v))) {
|
|
|
|
rb_ary_push(result, rb_assoc_new(k, v));
|
2003-05-04 20:03:24 +04:00
|
|
|
}
|
2001-12-11 06:48:08 +03:00
|
|
|
}
|
2003-05-04 20:03:24 +04:00
|
|
|
env++;
|
2001-12-11 06:48:08 +03:00
|
|
|
}
|
2003-05-04 20:03:24 +04:00
|
|
|
FREE_ENVIRON(environ);
|
|
|
|
|
2001-12-11 06:48:08 +03:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2003-01-07 10:36:40 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_clear(void)
|
2003-01-07 10:36:40 +03:00
|
|
|
{
|
|
|
|
volatile VALUE keys;
|
2003-08-01 06:52:21 +04:00
|
|
|
long i;
|
2003-01-07 10:36:40 +03:00
|
|
|
|
|
|
|
rb_secure(4);
|
|
|
|
keys = env_keys();
|
2003-08-01 06:52:21 +04:00
|
|
|
for (i=0; i<RARRAY(keys)->len; i++) {
|
|
|
|
VALUE val = rb_f_getenv(Qnil, RARRAY(keys)->ptr[i]);
|
2003-01-07 10:36:40 +03:00
|
|
|
if (!NIL_P(val)) {
|
2003-08-01 06:52:21 +04:00
|
|
|
env_delete(Qnil, RARRAY(keys)->ptr[i]);
|
2003-01-07 10:36:40 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return envtbl;
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_to_s(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
return rb_str_new2("ENV");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2000-12-05 12:36:54 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_inspect(void)
|
2000-12-05 12:36:54 +03:00
|
|
|
{
|
|
|
|
char **env;
|
2004-11-18 11:11:12 +03:00
|
|
|
VALUE str, i;
|
2000-12-05 12:36:54 +03:00
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
rb_secure(4);
|
|
|
|
str = rb_str_buf_new2("{");
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
2000-12-05 12:36:54 +03:00
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
|
|
|
|
if (env != environ) {
|
2001-05-30 13:12:34 +04:00
|
|
|
rb_str_buf_cat2(str, ", ");
|
2000-12-05 12:36:54 +03:00
|
|
|
}
|
|
|
|
if (s) {
|
2001-05-30 13:12:34 +04:00
|
|
|
rb_str_buf_cat2(str, "\"");
|
|
|
|
rb_str_buf_cat(str, *env, s-*env);
|
|
|
|
rb_str_buf_cat2(str, "\"=>");
|
2000-12-05 12:36:54 +03:00
|
|
|
i = rb_inspect(rb_str_new2(s+1));
|
2001-05-30 13:12:34 +04:00
|
|
|
rb_str_buf_append(str, i);
|
2000-12-05 12:36:54 +03:00
|
|
|
}
|
|
|
|
env++;
|
|
|
|
}
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
2001-05-30 13:12:34 +04:00
|
|
|
rb_str_buf_cat2(str, "}");
|
2000-12-05 12:36:54 +03:00
|
|
|
OBJ_TAINT(str);
|
|
|
|
|
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_to_a(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
char **env;
|
2004-11-18 11:11:12 +03:00
|
|
|
VALUE ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
rb_secure(4);
|
|
|
|
ary = rb_ary_new();
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
1998-01-16 15:13:05 +03:00
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
1999-01-20 07:59:39 +03:00
|
|
|
if (s) {
|
2003-06-06 13:24:59 +04:00
|
|
|
rb_ary_push(ary, rb_assoc_new(env_str_new(*env, s-*env),
|
|
|
|
env_str_new2(s+1)));
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
env++;
|
|
|
|
}
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
1998-01-16 15:13:05 +03:00
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_none(void)
|
1998-01-16 15:13:05 +03: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 14:44:21 +04:00
|
|
|
env_size(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
int i;
|
2001-11-13 06:59:20 +03:00
|
|
|
char **env;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
rb_secure(4);
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
|
|
|
for(i=0; env[i]; i++)
|
1998-01-16 15:13:05 +03:00
|
|
|
;
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
1998-01-16 15:13:05 +03:00
|
|
|
return INT2FIX(i);
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_empty_p(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-11-13 06:59:20 +03:00
|
|
|
char **env;
|
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
rb_secure(4);
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
|
|
|
if (env[0] == 0) {
|
|
|
|
FREE_ENVIRON(environ);
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
FREE_ENVIRON(environ);
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_has_key(VALUE env, VALUE key)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-05-02 08:22:21 +04:00
|
|
|
char *s;
|
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
rb_secure(4);
|
2001-05-02 08:22:21 +04:00
|
|
|
s = StringValuePtr(key);
|
|
|
|
if (strlen(s) != RSTRING(key)->len)
|
|
|
|
rb_raise(rb_eArgError, "bad environment variable name");
|
|
|
|
if (getenv(s)) return Qtrue;
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_has_value(VALUE dmy, VALUE value)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
char **env;
|
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
rb_secure(4);
|
1999-01-20 07:59:39 +03:00
|
|
|
if (TYPE(value) != T_STRING) return Qfalse;
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
1998-01-16 15:13:05 +03:00
|
|
|
while (*env) {
|
2003-06-23 12:41:07 +04:00
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
if (s++) {
|
2003-11-28 13:28:21 +03:00
|
|
|
long len = strlen(s);
|
|
|
|
if (RSTRING(value)->len == len && strncmp(s, RSTRING(value)->ptr, len) == 0) {
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qtrue;
|
2001-11-13 06:59:20 +03:00
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
env++;
|
|
|
|
}
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_key(VALUE dmy, VALUE value)
|
1999-08-13 09:45:20 +04:00
|
|
|
{
|
|
|
|
char **env;
|
2001-11-13 06:59:20 +03:00
|
|
|
VALUE str;
|
1999-08-13 09:45:20 +04:00
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
rb_secure(4);
|
2003-06-23 10:52:39 +04:00
|
|
|
StringValue(value);
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
1999-08-13 09:45:20 +04:00
|
|
|
while (*env) {
|
2003-06-23 12:41:07 +04:00
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
if (s++) {
|
2003-11-28 13:28:21 +03:00
|
|
|
long len = strlen(s);
|
|
|
|
if (RSTRING(value)->len == len && strncmp(s, RSTRING(value)->ptr, len) == 0) {
|
2003-06-06 13:24:59 +04:00
|
|
|
str = env_str_new(*env, s-*env-1);
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
|
|
|
return str;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
env++;
|
|
|
|
}
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
1999-08-13 09:45:20 +04:00
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2005-04-02 08:23:56 +04:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_index(VALUE dmy, VALUE value)
|
2005-04-02 08:23:56 +04:00
|
|
|
{
|
|
|
|
rb_warn("ENV.index is deprecated; use ENV.key");
|
|
|
|
return env_key(dmy, value);
|
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_to_hash(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-01-20 07:59:39 +03:00
|
|
|
char **env;
|
2004-11-18 11:11:12 +03:00
|
|
|
VALUE hash;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
rb_secure(4);
|
|
|
|
hash = rb_hash_new();
|
2001-11-13 06:59:20 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
1999-01-20 07:59:39 +03:00
|
|
|
while (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
if (s) {
|
2003-06-06 13:24:59 +04:00
|
|
|
rb_hash_aset(hash, env_str_new(*env, s-*env),
|
|
|
|
env_str_new2(s+1));
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
env++;
|
|
|
|
}
|
2001-11-13 06:59:20 +03:00
|
|
|
FREE_ENVIRON(environ);
|
1999-01-20 07:59:39 +03:00
|
|
|
return hash;
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2000-02-08 11:54:02 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_reject(void)
|
2000-02-08 11:54:02 +03:00
|
|
|
{
|
|
|
|
return rb_hash_delete_if(env_to_hash());
|
|
|
|
}
|
|
|
|
|
2003-01-07 10:36:40 +03:00
|
|
|
static VALUE
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_shift(void)
|
2003-01-07 10:36:40 +03:00
|
|
|
{
|
|
|
|
char **env;
|
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
rb_secure(4);
|
2003-01-07 10:36:40 +03:00
|
|
|
env = GET_ENVIRON(environ);
|
|
|
|
if (*env) {
|
|
|
|
char *s = strchr(*env, '=');
|
|
|
|
if (s) {
|
2003-06-06 13:24:59 +04:00
|
|
|
VALUE key = env_str_new(*env, s-*env);
|
|
|
|
VALUE val = env_str_new2(getenv(RSTRING(key)->ptr));
|
2003-01-07 10:36:40 +03: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 14:44:21 +04:00
|
|
|
env_invert(void)
|
2003-01-07 10:36:40 +03:00
|
|
|
{
|
|
|
|
return rb_hash_invert(env_to_hash());
|
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_replace_i(VALUE key, VALUE val, VALUE keys)
|
2003-01-07 10:36:40 +03:00
|
|
|
{
|
|
|
|
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 14:44:21 +04:00
|
|
|
env_replace(VALUE env, VALUE hash)
|
2003-01-07 10:36:40 +03:00
|
|
|
{
|
2004-11-18 11:11:12 +03:00
|
|
|
volatile VALUE keys;
|
2003-08-01 06:52:21 +04:00
|
|
|
long i;
|
2003-01-07 10:36:40 +03:00
|
|
|
|
2004-11-18 11:11:12 +03:00
|
|
|
rb_secure(4);
|
|
|
|
keys = env_keys();
|
2003-01-07 10:36:40 +03:00
|
|
|
if (env == hash) return env;
|
|
|
|
hash = to_hash(hash);
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, env_replace_i, keys);
|
2003-01-07 10:36:40 +03:00
|
|
|
|
2003-08-01 06:52:21 +04:00
|
|
|
for (i=0; i<RARRAY(keys)->len; i++) {
|
|
|
|
env_delete(env, RARRAY(keys)->ptr[i]);
|
2003-01-07 10:36:40 +03:00
|
|
|
}
|
|
|
|
return env;
|
|
|
|
}
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
static int
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
env_update_i(VALUE key, VALUE val)
|
2003-01-07 10:36:40 +03:00
|
|
|
{
|
|
|
|
if (key != Qundef) {
|
|
|
|
if (rb_block_given_p()) {
|
2003-05-20 10:29:23 +04:00
|
|
|
val = rb_yield_values(3, key, rb_f_getenv(Qnil, key), val);
|
2003-01-07 10:36:40 +03: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 14:44:21 +04:00
|
|
|
env_update(VALUE env, VALUE hash)
|
2003-01-07 10:36:40 +03:00
|
|
|
{
|
2004-11-18 11:11:12 +03:00
|
|
|
rb_secure(4);
|
2003-01-07 10:36:40 +03:00
|
|
|
if (env == hash) return env;
|
|
|
|
hash = to_hash(hash);
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_hash_foreach(hash, env_update_i, 0);
|
2003-01-07 10:36:40 +03:00
|
|
|
return env;
|
|
|
|
}
|
|
|
|
|
2003-12-23 19:21:17 +03:00
|
|
|
/*
|
|
|
|
* 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.
|
|
|
|
*
|
|
|
|
* 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>.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
void
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
Init_Hash(void)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2001-12-10 10:18:16 +03:00
|
|
|
id_hash = rb_intern("hash");
|
2003-05-26 12:22:33 +04:00
|
|
|
id_call = rb_intern("call");
|
2001-12-10 10:18:16 +03:00
|
|
|
id_default = rb_intern("default");
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_cHash = rb_define_class("Hash", rb_cObject);
|
|
|
|
|
|
|
|
rb_include_module(rb_cHash, rb_mEnumerable);
|
|
|
|
|
2002-12-20 11:33:17 +03:00
|
|
|
rb_define_alloc_func(rb_cHash, hash_alloc);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_singleton_method(rb_cHash, "[]", rb_hash_s_create, -1);
|
2000-02-29 11:05:32 +03:00
|
|
|
rb_define_method(rb_cHash,"initialize", rb_hash_initialize, -1);
|
2003-05-19 09:41:08 +04:00
|
|
|
rb_define_method(rb_cHash,"initialize_copy", rb_hash_replace, 1);
|
1999-01-20 07:59:39 +03: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,"to_s", rb_hash_to_s, 0);
|
|
|
|
rb_define_method(rb_cHash,"inspect", rb_hash_inspect, 0);
|
|
|
|
|
|
|
|
rb_define_method(rb_cHash,"==", rb_hash_equal, 1);
|
|
|
|
rb_define_method(rb_cHash,"[]", rb_hash_aref, 1);
|
|
|
|
rb_define_method(rb_cHash,"fetch", rb_hash_fetch, -1);
|
|
|
|
rb_define_method(rb_cHash,"[]=", rb_hash_aset, 2);
|
|
|
|
rb_define_method(rb_cHash,"store", rb_hash_aset, 2);
|
2001-12-10 10:18:16 +03:00
|
|
|
rb_define_method(rb_cHash,"default", rb_hash_default, -1);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cHash,"default=", rb_hash_set_default, 1);
|
2002-08-13 13:21:18 +04:00
|
|
|
rb_define_method(rb_cHash,"default_proc", rb_hash_default_proc, 0);
|
2004-09-22 08:48:52 +04:00
|
|
|
rb_define_method(rb_cHash,"key", rb_hash_key, 1);
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_define_method(rb_cHash,"index", rb_hash_index, 1);
|
1999-12-07 12:25:55 +03:00
|
|
|
rb_define_method(rb_cHash,"size", rb_hash_size, 0);
|
|
|
|
rb_define_method(rb_cHash,"length", rb_hash_size, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cHash,"empty?", rb_hash_empty_p, 0);
|
|
|
|
|
2003-10-24 18:31:14 +04:00
|
|
|
rb_define_method(rb_cHash,"each", rb_hash_each, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cHash,"each_value", rb_hash_each_value, 0);
|
|
|
|
rb_define_method(rb_cHash,"each_key", rb_hash_each_key, 0);
|
|
|
|
rb_define_method(rb_cHash,"each_pair", rb_hash_each_pair, 0);
|
|
|
|
rb_define_method(rb_cHash,"sort", rb_hash_sort, 0);
|
|
|
|
|
|
|
|
rb_define_method(rb_cHash,"keys", rb_hash_keys, 0);
|
|
|
|
rb_define_method(rb_cHash,"values", rb_hash_values, 0);
|
2003-05-04 20:03:24 +04:00
|
|
|
rb_define_method(rb_cHash,"values_at", rb_hash_values_at, -1);
|
1999-01-20 07:59:39 +03: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 17:33:47 +04:00
|
|
|
rb_define_method(rb_cHash,"select", rb_hash_select, 0);
|
2000-02-08 11:54:01 +03:00
|
|
|
rb_define_method(rb_cHash,"reject", rb_hash_reject, 0);
|
2000-08-07 09:05:04 +04:00
|
|
|
rb_define_method(rb_cHash,"reject!", rb_hash_reject_bang, 0);
|
1999-01-20 07:59:39 +03: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 09:23:44 +03:00
|
|
|
rb_define_method(rb_cHash,"replace", rb_hash_replace, 1);
|
2003-02-03 08:34:16 +03:00
|
|
|
rb_define_method(rb_cHash,"merge!", rb_hash_update, 1);
|
|
|
|
rb_define_method(rb_cHash,"merge", rb_hash_merge, 1);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
|
|
|
rb_define_method(rb_cHash,"include?", rb_hash_has_key, 1);
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_define_method(rb_cHash,"member?", rb_hash_has_key, 1);
|
1999-01-20 07:59:39 +03: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);
|
|
|
|
|
|
|
|
#ifndef __MACOS__ /* environment variables nothing on MacOS. */
|
|
|
|
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 09:06:23 +04:00
|
|
|
rb_define_singleton_method(envtbl,"fetch", env_fetch, -1);
|
2001-10-29 08:07:26 +03:00
|
|
|
rb_define_singleton_method(envtbl,"[]=", env_aset, 2);
|
|
|
|
rb_define_singleton_method(envtbl,"store", env_aset, 2);
|
1998-01-16 15:13:05 +03:00
|
|
|
rb_define_singleton_method(envtbl,"each", env_each, 0);
|
2003-10-24 18:31:14 +04:00
|
|
|
rb_define_singleton_method(envtbl,"each_pair", env_each_pair, 0);
|
1998-01-16 15:13:05 +03: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-05 07:41:21 +03:00
|
|
|
rb_define_singleton_method(envtbl,"delete", env_delete_m, 1);
|
1998-01-16 15:13:05 +03:00
|
|
|
rb_define_singleton_method(envtbl,"delete_if", env_delete_if, 0);
|
2003-01-07 10:36:40 +03:00
|
|
|
rb_define_singleton_method(envtbl,"clear", env_clear, 0);
|
2000-02-08 11:54:01 +03:00
|
|
|
rb_define_singleton_method(envtbl,"reject", env_reject, 0);
|
2000-08-07 09:05:04 +04:00
|
|
|
rb_define_singleton_method(envtbl,"reject!", env_reject_bang, 0);
|
2004-06-11 17:33:47 +04:00
|
|
|
rb_define_singleton_method(envtbl,"select", env_select, 0);
|
2003-01-07 10:36:40 +03: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 12:36:54 +03:00
|
|
|
rb_define_singleton_method(envtbl,"inspect", env_inspect, 0);
|
1998-01-16 15:13:05 +03:00
|
|
|
rb_define_singleton_method(envtbl,"rehash", env_none, 0);
|
|
|
|
rb_define_singleton_method(envtbl,"to_a", env_to_a, 0);
|
2003-07-24 22:33:50 +04:00
|
|
|
rb_define_singleton_method(envtbl,"to_s", env_to_s, 0);
|
2005-04-02 08:23:56 +04:00
|
|
|
rb_define_singleton_method(envtbl,"key", env_key, 1);
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_define_singleton_method(envtbl,"index", env_index, 1);
|
1999-12-07 12:25:55 +03:00
|
|
|
rb_define_singleton_method(envtbl,"size", env_size, 0);
|
1998-01-16 15:13:05 +03: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 20:03:24 +04:00
|
|
|
rb_define_singleton_method(envtbl,"values_at", env_values_at, -1);
|
1998-01-16 15:13:05 +03:00
|
|
|
rb_define_singleton_method(envtbl,"include?", env_has_key, 1);
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_define_singleton_method(envtbl,"member?", env_has_key, 1);
|
1998-01-16 15:13:05 +03: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-20 07:59:39 +03:00
|
|
|
rb_define_singleton_method(envtbl,"to_hash", env_to_hash, 0);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
rb_define_global_const("ENV", envtbl);
|
1999-01-20 07:59:39 +03:00
|
|
|
#else /* __MACOS__ */
|
|
|
|
envtbl = rb_hash_s_new(0, NULL, rb_cHash);
|
|
|
|
rb_define_global_const("ENV", envtbl);
|
|
|
|
#endif /* ifndef __MACOS__ environment variables nothing on MacOS. */
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|