2000-05-01 13:42:38 +04:00
|
|
|
/**********************************************************************
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
array.c -
|
|
|
|
|
|
|
|
$Author$
|
|
|
|
created at: Fri Aug 6 09:46:12 JST 1993
|
|
|
|
|
* encoding.c: provide basic features for M17N.
* parse.y: encoding aware parsing.
* parse.y (pragma_encoding): encoding specification pragma.
* parse.y (rb_intern3): encoding specified symbols.
* string.c (rb_str_length): length based on characters.
for older behavior, bytesize method added.
* string.c (rb_str_index_m): index based on characters. rindex as
well.
* string.c (succ_char): encoding aware succeeding string.
* string.c (rb_str_reverse): reverse based on characters.
* string.c (rb_str_inspect): encoding aware string description.
* string.c (rb_str_upcase_bang): encoding aware case conversion.
downcase, capitalize, swapcase as well.
* string.c (rb_str_tr_bang): tr based on characters. delete,
squeeze, tr_s, count as well.
* string.c (rb_str_split_m): split based on characters.
* string.c (rb_str_each_line): encoding aware each_line.
* string.c (rb_str_each_char): added. iteration based on
characters.
* string.c (rb_str_strip_bang): encoding aware whitespace
stripping. lstrip, rstrip as well.
* string.c (rb_str_justify): encoding aware justifying (ljust,
rjust, center).
* string.c (str_encoding): get encoding attribute from a string.
* re.c (rb_reg_initialize): encoding aware regular expression
* sprintf.c (rb_str_format): formatting (i.e. length count) based
on characters.
* io.c (rb_io_getc): getc to return one-character string.
for older behavior, getbyte method added.
* ext/stringio/stringio.c (strio_getc): ditto.
* io.c (rb_io_ungetc): allow pushing arbitrary string at the
current reading point.
* ext/stringio/stringio.c (strio_ungetc): ditto.
* ext/strscan/strscan.c: encoding support.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13261 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-08-25 07:29:39 +04:00
|
|
|
Copyright (C) 1993-2007 Yukihiro Matsumoto
|
2000-05-01 13:42:38 +04:00
|
|
|
Copyright (C) 2000 Network Applied Communication Laboratory, Inc.
|
2000-05-09 08:53:16 +04:00
|
|
|
Copyright (C) 2000 Information-technology Promotion Agency, Japan
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2000-05-01 13:42:38 +04:00
|
|
|
**********************************************************************/
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2007-06-10 07:06:15 +04:00
|
|
|
#include "ruby/ruby.h"
|
|
|
|
#include "ruby/util.h"
|
|
|
|
#include "ruby/st.h"
|
2008-10-17 14:42:11 +04:00
|
|
|
|
|
|
|
#ifndef ARRAY_DEBUG
|
|
|
|
# define NDEBUG
|
|
|
|
#endif
|
2008-10-09 09:47:04 +04:00
|
|
|
#include <assert.h>
|
1998-01-16 15:13:05 +03:00
|
|
|
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
VALUE rb_cArray;
|
2004-04-07 06:51:05 +04:00
|
|
|
|
2001-12-10 10:18:16 +03:00
|
|
|
static ID id_cmp;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
#define ARY_DEFAULT_SIZE 16
|
2008-06-20 03:12:46 +04:00
|
|
|
#define ARY_MAX_SIZE (LONG_MAX / sizeof(VALUE))
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
void
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_mem_clear(register VALUE *mem, register long size)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
while (size--) {
|
|
|
|
*mem++ = Qnil;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-06-16 11:05:24 +04:00
|
|
|
static inline void
|
2005-09-10 17:34:53 +04:00
|
|
|
memfill(register VALUE *mem, register long size, register VALUE val)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
|
|
|
while (size--) {
|
|
|
|
*mem++ = val;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-10-09 09:47:04 +04:00
|
|
|
# define ARY_SHARED_P(ary) \
|
|
|
|
(assert(!FL_TEST(ary, ELTS_SHARED) || !FL_TEST(ary, RARRAY_EMBED_FLAG)), \
|
|
|
|
FL_TEST(ary,ELTS_SHARED))
|
|
|
|
# define ARY_EMBED_P(ary) \
|
|
|
|
(assert(!FL_TEST(ary, ELTS_SHARED) || !FL_TEST(ary, RARRAY_EMBED_FLAG)), \
|
|
|
|
FL_TEST(ary, RARRAY_EMBED_FLAG))
|
2006-09-02 18:42:08 +04:00
|
|
|
|
2008-10-09 09:47:04 +04:00
|
|
|
#define ARY_HEAP_PTR(a) (assert(!ARY_EMBED_P(a)), RARRAY(a)->as.heap.ptr)
|
|
|
|
#define ARY_HEAP_LEN(a) (assert(!ARY_EMBED_P(a)), RARRAY(a)->as.heap.len)
|
|
|
|
#define ARY_EMBED_PTR(a) (assert(ARY_EMBED_P(a)), RARRAY(a)->as.ary)
|
|
|
|
#define ARY_EMBED_LEN(a) \
|
|
|
|
(assert(ARY_EMBED_P(a)), \
|
|
|
|
(long)((RBASIC(a)->flags >> RARRAY_EMBED_LEN_SHIFT) & \
|
|
|
|
(RARRAY_EMBED_LEN_MASK >> RARRAY_EMBED_LEN_SHIFT)))
|
|
|
|
|
|
|
|
#define ARY_OWNS_HEAP_P(a) (!FL_TEST(a, ELTS_SHARED|RARRAY_EMBED_FLAG))
|
|
|
|
#define FL_SET_EMBED(a) do { \
|
|
|
|
assert(!ARY_SHARED_P(a)); \
|
|
|
|
assert(!OBJ_FROZEN(a)); \
|
|
|
|
FL_SET(a, RARRAY_EMBED_FLAG); \
|
|
|
|
} while (0)
|
|
|
|
#define FL_UNSET_EMBED(ary) FL_UNSET(ary, RARRAY_EMBED_FLAG|RARRAY_EMBED_LEN_MASK)
|
|
|
|
#define FL_SET_SHARED(ary) do { \
|
|
|
|
assert(!ARY_EMBED_P(ary)); \
|
|
|
|
FL_SET(ary, ELTS_SHARED); \
|
|
|
|
} while (0)
|
|
|
|
#define FL_UNSET_SHARED(ary) FL_UNSET(ary, ELTS_SHARED)
|
|
|
|
|
|
|
|
#define ARY_SET_PTR(ary, p) do { \
|
|
|
|
assert(!ARY_EMBED_P(ary)); \
|
|
|
|
assert(!OBJ_FROZEN(ary)); \
|
|
|
|
RARRAY(ary)->as.heap.ptr = (p); \
|
|
|
|
} while (0)
|
|
|
|
#define ARY_SET_EMBED_LEN(ary, n) do { \
|
|
|
|
long tmp_n = n; \
|
|
|
|
assert(ARY_EMBED_P(ary)); \
|
|
|
|
assert(!OBJ_FROZEN(ary)); \
|
|
|
|
RBASIC(ary)->flags &= ~RARRAY_EMBED_LEN_MASK; \
|
|
|
|
RBASIC(ary)->flags |= (tmp_n) << RARRAY_EMBED_LEN_SHIFT; \
|
|
|
|
} while (0)
|
|
|
|
#define ARY_SET_HEAP_LEN(ary, n) do { \
|
|
|
|
assert(!ARY_EMBED_P(ary)); \
|
|
|
|
RARRAY(ary)->as.heap.len = n; \
|
|
|
|
} while (0)
|
2006-09-02 18:42:08 +04:00
|
|
|
#define ARY_SET_LEN(ary, n) do { \
|
2008-10-09 09:47:04 +04:00
|
|
|
if (ARY_EMBED_P(ary)) { \
|
|
|
|
ARY_SET_EMBED_LEN(ary, n); \
|
|
|
|
} \
|
|
|
|
else { \
|
|
|
|
ARY_SET_HEAP_LEN(ary, n); \
|
|
|
|
} \
|
|
|
|
assert(RARRAY_LEN(ary) == n); \
|
2006-09-02 18:42:08 +04:00
|
|
|
} while (0)
|
2008-10-09 09:47:04 +04:00
|
|
|
#define ARY_INCREASE_PTR(ary, n) do { \
|
|
|
|
assert(!ARY_EMBED_P(ary)); \
|
|
|
|
assert(!OBJ_FROZEN(ary)); \
|
|
|
|
RARRAY(ary)->as.heap.ptr += n; \
|
|
|
|
} while (0)
|
|
|
|
#define ARY_INCREASE_LEN(ary, n) do { \
|
|
|
|
assert(!OBJ_FROZEN(ary)); \
|
|
|
|
if (ARY_EMBED_P(ary)) { \
|
|
|
|
ARY_SET_EMBED_LEN(ary, RARRAY_LEN(ary)+n); \
|
|
|
|
} \
|
|
|
|
else { \
|
|
|
|
RARRAY(ary)->as.heap.len += n; \
|
|
|
|
} \
|
|
|
|
} while (0)
|
|
|
|
|
2008-10-17 17:09:33 +04:00
|
|
|
#define ARY_CAPA(ary) (ARY_EMBED_P(ary) ? RARRAY_EMBED_LEN_MAX : \
|
|
|
|
ARY_SHARED_ROOT_P(ary) ? RARRAY_LEN(ary) : RARRAY(ary)->as.heap.aux.capa)
|
2008-10-09 09:47:04 +04:00
|
|
|
#define ARY_SET_CAPA(ary, n) do { \
|
|
|
|
assert(!ARY_EMBED_P(ary)); \
|
|
|
|
assert(!ARY_SHARED_P(ary)); \
|
|
|
|
assert(!OBJ_FROZEN(ary)); \
|
|
|
|
RARRAY(ary)->as.heap.aux.capa = (n); \
|
|
|
|
} while (0)
|
2006-09-02 18:42:08 +04:00
|
|
|
|
2008-10-09 09:47:04 +04:00
|
|
|
#define ARY_SHARED(ary) (assert(ARY_SHARED_P(ary)), RARRAY(ary)->as.heap.aux.shared)
|
|
|
|
#define ARY_SET_SHARED(ary, value) do { \
|
|
|
|
assert(!ARY_EMBED_P(ary)); \
|
|
|
|
assert(ARY_SHARED_P(ary)); \
|
2008-10-17 17:09:33 +04:00
|
|
|
assert(ARY_SHARED_ROOT_P(value)); \
|
2008-10-09 09:47:04 +04:00
|
|
|
RARRAY(ary)->as.heap.aux.shared = (value); \
|
2006-09-02 18:42:08 +04:00
|
|
|
} while (0)
|
2008-10-17 17:09:33 +04:00
|
|
|
#define RARRAY_SHARED_ROOT_FLAG FL_USER5
|
|
|
|
#define ARY_SHARED_ROOT_P(ary) (FL_TEST(ary, RARRAY_SHARED_ROOT_FLAG))
|
|
|
|
#define ARY_SHARED_NUM(ary) \
|
|
|
|
(assert(ARY_SHARED_ROOT_P(ary)), RARRAY(ary)->as.heap.aux.capa)
|
|
|
|
#define ARY_SET_SHARED_NUM(ary, value) do { \
|
|
|
|
assert(ARY_SHARED_ROOT_P(ary)); \
|
|
|
|
RARRAY(ary)->as.heap.aux.capa = (value); \
|
|
|
|
} while (0)
|
|
|
|
#define FL_SET_SHARED_ROOT(ary) do { \
|
|
|
|
assert(!ARY_EMBED_P(ary)); \
|
|
|
|
FL_SET(ary, RARRAY_SHARED_ROOT_FLAG); \
|
|
|
|
} while (0)
|
2006-09-02 18:42:08 +04:00
|
|
|
|
2008-10-09 09:47:04 +04:00
|
|
|
static void
|
2008-10-17 14:42:11 +04:00
|
|
|
ary_resize_capa(VALUE ary, long capacity)
|
2008-10-09 09:47:04 +04:00
|
|
|
{
|
2008-10-15 17:21:37 +04:00
|
|
|
assert(RARRAY_LEN(ary) <= capacity);
|
2008-10-09 09:47:04 +04:00
|
|
|
assert(!OBJ_FROZEN(ary));
|
|
|
|
assert(!ARY_SHARED_P(ary));
|
|
|
|
if (capacity > RARRAY_EMBED_LEN_MAX) {
|
|
|
|
if (ARY_EMBED_P(ary)) {
|
|
|
|
long len = ARY_EMBED_LEN(ary);
|
|
|
|
VALUE *ptr = ALLOC_N(VALUE, (capacity));
|
|
|
|
MEMCPY(ptr, ARY_EMBED_PTR(ary), VALUE, len);
|
|
|
|
FL_UNSET_EMBED(ary);
|
|
|
|
ARY_SET_PTR(ary, ptr);
|
|
|
|
ARY_SET_HEAP_LEN(ary, len);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, (capacity));
|
|
|
|
}
|
|
|
|
ARY_SET_CAPA(ary, (capacity));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
if (!ARY_EMBED_P(ary)) {
|
|
|
|
long len = RARRAY_LEN(ary);
|
|
|
|
VALUE *ptr = RARRAY_PTR(ary);
|
|
|
|
MEMCPY(RARRAY(ary)->as.ary, ptr, VALUE, len);
|
|
|
|
FL_SET_EMBED(ary);
|
|
|
|
ARY_SET_LEN(ary, len);
|
|
|
|
xfree(ptr);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-10-17 17:09:33 +04:00
|
|
|
static void
|
|
|
|
rb_ary_decrement_share(VALUE shared)
|
|
|
|
{
|
|
|
|
if (shared) {
|
|
|
|
int num = ARY_SHARED_NUM(shared) - 1;
|
2008-10-31 06:49:29 +03:00
|
|
|
if (num == 0) {
|
2008-10-17 17:09:33 +04:00
|
|
|
rb_ary_free(shared);
|
|
|
|
rb_gc_force_recycle(shared);
|
|
|
|
}
|
|
|
|
else if (num > 0) {
|
|
|
|
ARY_SET_SHARED_NUM(shared, num);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
rb_ary_unshare(VALUE ary)
|
|
|
|
{
|
|
|
|
VALUE shared = RARRAY(ary)->as.heap.aux.shared;
|
|
|
|
rb_ary_decrement_share(shared);
|
|
|
|
FL_UNSET_SHARED(ary);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline void
|
|
|
|
rb_ary_unshare_safe(VALUE ary) {
|
|
|
|
if (ARY_SHARED_P(ary) && !ARY_EMBED_P(ary)) {
|
|
|
|
rb_ary_unshare(ary);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-10-31 06:49:29 +03:00
|
|
|
static VALUE
|
|
|
|
rb_ary_increment_share(VALUE shared) {
|
2008-10-17 17:09:33 +04:00
|
|
|
int num = ARY_SHARED_NUM(shared);
|
|
|
|
if (num >= 0) {
|
|
|
|
ARY_SET_SHARED_NUM(shared, num + 1);
|
|
|
|
}
|
2008-10-31 06:49:29 +03:00
|
|
|
return shared;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
rb_ary_set_shared(VALUE ary, VALUE shared)
|
|
|
|
{
|
|
|
|
rb_ary_increment_share(shared);
|
2008-10-17 17:09:33 +04:00
|
|
|
FL_SET_SHARED(ary);
|
|
|
|
ARY_SET_SHARED(ary, shared);
|
|
|
|
}
|
|
|
|
|
2003-01-08 09:05:08 +03:00
|
|
|
static inline void
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_modify_check(VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2000-02-01 06:12:21 +03:00
|
|
|
if (OBJ_FROZEN(ary)) rb_error_frozen("array");
|
* object.c (rb_obj_untrusted): new method Object#untrusted?.
(rb_obj_untrust): new method Object#untrust.
(rb_obj_trust): new method Object#trust.
* array.c, debug.c, time.c, include/ruby/ruby.h, re.c, variable.c,
string.c, io.c, dir.c, vm_method.c, struct.c, class.c, hash.c,
ruby.c, marshal.c: fixes for Object#untrusted?.
* test/ruby/test_module.rb, test/ruby/test_array.rb,
test/ruby/test_object.rb, test/ruby/test_string.rb,
test/ruby/test_marshal.rb, test/ruby/test_hash.rb: added tests for
Object#untrusted?.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-08-13 11:25:05 +04:00
|
|
|
if (!OBJ_UNTRUSTED(ary) && rb_safe_level() >= 4)
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_raise(rb_eSecurityError, "Insecure: can't modify array");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2001-12-10 10:18:16 +03:00
|
|
|
static void
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_modify(VALUE ary)
|
2001-12-10 10:18:16 +03:00
|
|
|
{
|
|
|
|
rb_ary_modify_check(ary);
|
2006-09-02 18:42:08 +04:00
|
|
|
if (ARY_SHARED_P(ary)) {
|
2008-10-09 09:47:04 +04:00
|
|
|
long len = RARRAY_LEN(ary);
|
|
|
|
if (len <= RARRAY_EMBED_LEN_MAX) {
|
|
|
|
VALUE *ptr = ARY_HEAP_PTR(ary);
|
2008-10-17 17:09:33 +04:00
|
|
|
VALUE shared = ARY_SHARED(ary);
|
2008-10-09 09:47:04 +04:00
|
|
|
FL_UNSET_SHARED(ary);
|
|
|
|
FL_SET_EMBED(ary);
|
|
|
|
MEMCPY(ARY_EMBED_PTR(ary), ptr, VALUE, len);
|
2008-10-17 17:09:33 +04:00
|
|
|
rb_ary_decrement_share(shared);
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_EMBED_LEN(ary, len);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
VALUE *ptr = ALLOC_N(VALUE, len);
|
|
|
|
MEMCPY(ptr, RARRAY_PTR(ary), VALUE, len);
|
2008-10-17 17:09:33 +04:00
|
|
|
rb_ary_unshare(ary);
|
|
|
|
ARY_SET_CAPA(ary, len);
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_PTR(ary, ptr);
|
|
|
|
}
|
2002-05-21 09:39:19 +04:00
|
|
|
}
|
2001-12-10 10:18:16 +03:00
|
|
|
}
|
2004-06-16 11:05:24 +04:00
|
|
|
|
2000-02-17 10:11:22 +03:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_freeze(VALUE ary)
|
2000-02-17 10:11:22 +03:00
|
|
|
{
|
|
|
|
return rb_obj_freeze(ary);
|
|
|
|
}
|
|
|
|
|
2003-12-29 05:02:08 +03:00
|
|
|
/*
|
2004-07-13 20:21:23 +04:00
|
|
|
* call-seq:
|
|
|
|
* array.frozen? -> true or false
|
2003-12-29 05:02:08 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* Return <code>true</code> if this array is frozen (or temporarily frozen
|
|
|
|
* while being sorted).
|
2003-12-29 05:02:08 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_frozen_p(VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2003-11-15 02:54:06 +03:00
|
|
|
if (OBJ_FROZEN(ary)) return Qtrue;
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2001-10-03 11:19:19 +04:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
ary_alloc(VALUE klass)
|
2001-10-03 11:19:19 +04:00
|
|
|
{
|
|
|
|
NEWOBJ(ary, struct RArray);
|
2001-10-05 10:30:42 +04:00
|
|
|
OBJSETUP(ary, klass, T_ARRAY);
|
2008-10-09 09:47:04 +04:00
|
|
|
FL_SET_EMBED((VALUE)ary);
|
|
|
|
ARY_SET_EMBED_LEN((VALUE)ary, 0);
|
2001-10-03 11:19:19 +04:00
|
|
|
|
|
|
|
return (VALUE)ary;
|
|
|
|
}
|
|
|
|
|
2001-12-10 10:18:16 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
ary_new(VALUE klass, long len)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2004-06-16 11:05:24 +04:00
|
|
|
VALUE ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
if (len < 0) {
|
|
|
|
rb_raise(rb_eArgError, "negative array size (or size too big)");
|
|
|
|
}
|
2008-06-20 03:12:46 +04:00
|
|
|
if (len > ARY_MAX_SIZE) {
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_raise(rb_eArgError, "array size too big");
|
|
|
|
}
|
2004-06-16 11:05:24 +04:00
|
|
|
ary = ary_alloc(klass);
|
2008-10-09 09:47:04 +04:00
|
|
|
if (len > RARRAY_EMBED_LEN_MAX) {
|
|
|
|
FL_UNSET_EMBED(ary);
|
|
|
|
ARY_SET_PTR(ary, ALLOC_N(VALUE, len));
|
|
|
|
ARY_SET_CAPA(ary, len);
|
|
|
|
ARY_SET_HEAP_LEN(ary, 0);
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-10-03 11:19:19 +04:00
|
|
|
return ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2001-10-16 07:27:23 +04:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_new2(long len)
|
2001-10-16 07:27:23 +04:00
|
|
|
{
|
2001-12-10 10:18:16 +03:00
|
|
|
return ary_new(rb_cArray, len);
|
2001-10-16 07:27:23 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_new(void)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-10-09 09:47:04 +04:00
|
|
|
return rb_ary_new2(RARRAY_EMBED_LEN_MAX);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
#include <stdarg.h>
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
VALUE
|
1999-08-13 09:45:20 +04:00
|
|
|
rb_ary_new3(long n, ...)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
va_list ar;
|
1998-01-16 15:19:22 +03:00
|
|
|
VALUE ary;
|
1999-08-13 09:45:20 +04:00
|
|
|
long i;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2002-05-21 09:39:19 +04:00
|
|
|
ary = rb_ary_new2(n);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
* array.c: moved to ANSI function style from K&R function style.
(used protoize on windows, so still K&R remains on #ifdef part of
other platforms. And `foo _((boo))' stuff is still there)
[ruby-dev:26975]
* bignum.c, class.c, compar.c, dir.c, dln.c, dmyext.c, enum.c,
enumerator.c, error.c, eval.c, file.c, gc.c, hash.c, inits.c,
io.c, main.c, marshal.c, math.c, numeric.c, object.c, pack.c,
prec.c, process.c, random.c, range.c, re.c, regcomp.c, regenc.c,
regerror.c, regexec.c, regparse.c, regparse.h, ruby.c, signal.c,
sprintf.c, st.c, string.c, struct.c, time.c, util.h, variable.c,
version.c: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9126 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2005-09-12 14:44:21 +04:00
|
|
|
va_start(ar, n);
|
1998-01-16 15:13:05 +03:00
|
|
|
for (i=0; i<n; i++) {
|
2006-09-02 18:42:08 +04:00
|
|
|
RARRAY_PTR(ary)[i] = va_arg(ar, VALUE);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
va_end(ar);
|
|
|
|
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_LEN(ary, n);
|
1998-01-16 15:19:22 +03:00
|
|
|
return ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_new4(long n, const VALUE *elts)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1998-01-16 15:19:22 +03:00
|
|
|
VALUE ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
ary = rb_ary_new2(n);
|
2001-10-03 11:19:19 +04:00
|
|
|
if (n > 0 && elts) {
|
2006-09-02 18:42:08 +04:00
|
|
|
MEMCPY(RARRAY_PTR(ary), elts, VALUE, n);
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_LEN(ary, n);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
return ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2008-08-04 14:21:46 +04:00
|
|
|
VALUE
|
|
|
|
rb_ary_tmp_new(long len)
|
|
|
|
{
|
|
|
|
return ary_new(0, len);
|
|
|
|
}
|
|
|
|
|
2006-09-27 02:46:16 +04:00
|
|
|
void
|
|
|
|
rb_ary_free(VALUE ary)
|
|
|
|
{
|
2008-10-09 09:47:04 +04:00
|
|
|
if (ARY_OWNS_HEAP_P(ary)) {
|
|
|
|
xfree(RARRAY_PTR(ary));
|
2006-09-27 02:46:16 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-09-24 09:53:43 +04:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
ary_make_shared(VALUE ary)
|
2004-05-07 12:44:24 +04:00
|
|
|
{
|
2008-10-09 09:47:04 +04:00
|
|
|
assert(!ARY_EMBED_P(ary));
|
2006-09-02 18:42:08 +04:00
|
|
|
if (ARY_SHARED_P(ary)) {
|
2008-10-09 09:47:04 +04:00
|
|
|
return ARY_SHARED(ary);
|
2006-09-02 18:42:08 +04:00
|
|
|
}
|
|
|
|
else {
|
2004-05-07 12:44:24 +04:00
|
|
|
NEWOBJ(shared, struct RArray);
|
2006-09-02 18:42:08 +04:00
|
|
|
OBJSETUP(shared, 0, T_ARRAY);
|
2008-10-09 09:47:04 +04:00
|
|
|
FL_UNSET_EMBED(shared);
|
2004-05-07 12:44:24 +04:00
|
|
|
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_LEN((VALUE)shared, RARRAY_LEN(ary));
|
|
|
|
ARY_SET_PTR((VALUE)shared, RARRAY_PTR(ary));
|
2008-10-17 17:09:33 +04:00
|
|
|
FL_SET_SHARED_ROOT(shared);
|
|
|
|
ARY_SET_SHARED_NUM((VALUE)shared, 1);
|
2008-10-09 09:47:04 +04:00
|
|
|
FL_SET_SHARED(ary);
|
|
|
|
ARY_SET_SHARED(ary, (VALUE)shared);
|
2004-09-24 09:53:43 +04:00
|
|
|
OBJ_FREEZE(shared);
|
|
|
|
return (VALUE)shared;
|
|
|
|
}
|
2004-05-07 12:44:24 +04:00
|
|
|
}
|
|
|
|
|
2008-10-09 09:47:04 +04:00
|
|
|
|
|
|
|
static VALUE
|
|
|
|
ary_make_substitution(VALUE ary)
|
|
|
|
{
|
|
|
|
if (RARRAY_LEN(ary) <= RARRAY_EMBED_LEN_MAX) {
|
|
|
|
VALUE subst = rb_ary_new2(RARRAY_LEN(ary));
|
|
|
|
MEMCPY(ARY_EMBED_PTR(subst), RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary));
|
|
|
|
ARY_SET_EMBED_LEN(subst, RARRAY_LEN(ary));
|
|
|
|
return subst;
|
|
|
|
}
|
|
|
|
else {
|
2008-10-31 06:49:29 +03:00
|
|
|
return rb_ary_increment_share(ary_make_shared(ary));
|
2008-10-09 09:47:04 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-04-07 06:51:05 +04:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_assoc_new(VALUE car, VALUE cdr)
|
2004-04-07 06:51:05 +04:00
|
|
|
{
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
return rb_ary_new3(2, car, cdr);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2001-10-02 08:31:23 +04:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
to_ary(VALUE ary)
|
2001-10-02 08:31:23 +04:00
|
|
|
{
|
|
|
|
return rb_convert_type(ary, T_ARRAY, "Array", "to_ary");
|
|
|
|
}
|
|
|
|
|
2002-12-19 12:20:20 +03:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_check_array_type(VALUE ary)
|
2002-12-19 12:20:20 +03:00
|
|
|
{
|
|
|
|
return rb_check_convert_type(ary, T_ARRAY, "Array", "to_ary");
|
|
|
|
}
|
|
|
|
|
2007-08-24 21:47:09 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Array.try_convert(obj) -> array or nil
|
|
|
|
*
|
|
|
|
* Try to convert <i>obj</i> into an array, using to_ary method.
|
|
|
|
* Returns converted array or nil if <i>obj</i> cannot be converted
|
2007-08-25 04:43:13 +04:00
|
|
|
* for any reason. This method is to check if an argument is an
|
|
|
|
* array.
|
2007-08-24 21:47:09 +04:00
|
|
|
*
|
|
|
|
* Array.try_convert([1]) # => [1]
|
|
|
|
* Array.try_convert("1") # => nil
|
2007-08-25 04:43:13 +04:00
|
|
|
*
|
|
|
|
* if tmp = Array.try_convert(arg)
|
|
|
|
* # the argument is an array
|
|
|
|
* elsif tmp = String.try_convert(arg)
|
|
|
|
* # the argument is a string
|
|
|
|
* end
|
|
|
|
*
|
2007-08-24 21:47:09 +04:00
|
|
|
*/
|
2007-08-25 04:43:13 +04:00
|
|
|
|
2007-08-24 21:47:09 +04:00
|
|
|
static VALUE
|
|
|
|
rb_ary_s_try_convert(VALUE dummy, VALUE ary)
|
|
|
|
{
|
|
|
|
return rb_check_array_type(ary);
|
|
|
|
}
|
|
|
|
|
2004-07-13 20:21:23 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* Array.new(size=0, obj=nil)
|
|
|
|
* Array.new(array)
|
|
|
|
* Array.new(size) {|index| block }
|
|
|
|
*
|
|
|
|
* Returns a new array. In the first form, the new array is
|
|
|
|
* empty. In the second it is created with _size_ copies of _obj_
|
|
|
|
* (that is, _size_ references to the same
|
|
|
|
* _obj_). The third form creates a copy of the array
|
|
|
|
* passed as a parameter (the array is generated by calling
|
|
|
|
* to_ary on the parameter). In the last form, an array
|
|
|
|
* of the given size is created. Each element in this array is
|
|
|
|
* calculated by passing the element's index to the given block and
|
|
|
|
* storing the return value.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* Array.new
|
|
|
|
* Array.new(2)
|
|
|
|
* Array.new(5, "A")
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* # only one copy of the object is created
|
|
|
|
* a = Array.new(2, Hash.new)
|
|
|
|
* a[0]['cat'] = 'feline'
|
|
|
|
* a
|
|
|
|
* a[1]['cat'] = 'Felix'
|
|
|
|
* a
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* # here multiple copies are created
|
|
|
|
* a = Array.new(2) { Hash.new }
|
|
|
|
* a[0]['cat'] = 'feline'
|
|
|
|
* a
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* squares = Array.new(5) {|i| i*i}
|
|
|
|
* squares
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* copy = Array.new(squares)
|
2003-12-16 23:28:44 +03:00
|
|
|
*/
|
|
|
|
|
2000-02-29 11:05:32 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_initialize(int argc, VALUE *argv, VALUE ary)
|
2000-02-29 11:05:32 +03:00
|
|
|
{
|
|
|
|
long len;
|
|
|
|
VALUE size, val;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
rb_ary_modify(ary);
|
2008-03-05 08:22:17 +03:00
|
|
|
if (argc == 0) {
|
2008-10-09 09:47:04 +04:00
|
|
|
if (ARY_OWNS_HEAP_P(ary) && RARRAY_PTR(ary)) {
|
|
|
|
xfree(RARRAY_PTR(ary));
|
2006-09-02 18:42:08 +04:00
|
|
|
}
|
2008-10-17 17:09:33 +04:00
|
|
|
rb_ary_unshare_safe(ary);
|
2008-10-09 09:47:04 +04:00
|
|
|
FL_SET_EMBED(ary);
|
|
|
|
ARY_SET_EMBED_LEN(ary, 0);
|
2002-01-28 11:44:45 +03:00
|
|
|
if (rb_block_given_p()) {
|
|
|
|
rb_warning("given block not used");
|
|
|
|
}
|
2001-10-02 08:31:23 +04:00
|
|
|
return ary;
|
|
|
|
}
|
2008-03-05 08:22:17 +03:00
|
|
|
rb_scan_args(argc, argv, "02", &size, &val);
|
2002-01-28 11:44:45 +03:00
|
|
|
if (argc == 1 && !FIXNUM_P(size)) {
|
2002-12-19 12:20:20 +03:00
|
|
|
val = rb_check_array_type(size);
|
2002-01-28 11:44:45 +03:00
|
|
|
if (!NIL_P(val)) {
|
|
|
|
rb_ary_replace(ary, val);
|
|
|
|
return ary;
|
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2000-02-29 11:05:32 +03:00
|
|
|
len = NUM2LONG(size);
|
|
|
|
if (len < 0) {
|
|
|
|
rb_raise(rb_eArgError, "negative array size");
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
2008-06-20 03:12:46 +04:00
|
|
|
if (len > ARY_MAX_SIZE) {
|
2000-02-29 11:05:32 +03:00
|
|
|
rb_raise(rb_eArgError, "array size too big");
|
|
|
|
}
|
2004-11-18 06:45:23 +03:00
|
|
|
rb_ary_modify(ary);
|
2008-10-17 14:42:11 +04:00
|
|
|
ary_resize_capa(ary, len);
|
2002-01-28 11:44:45 +03:00
|
|
|
if (rb_block_given_p()) {
|
|
|
|
long i;
|
|
|
|
|
2003-11-04 12:13:57 +03:00
|
|
|
if (argc == 2) {
|
|
|
|
rb_warn("block supersedes default value argument");
|
2002-01-28 11:44:45 +03:00
|
|
|
}
|
|
|
|
for (i=0; i<len; i++) {
|
2004-09-21 07:08:33 +04:00
|
|
|
rb_ary_store(ary, i, rb_yield(LONG2NUM(i)));
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_LEN(ary, i + 1);
|
2002-01-28 11:44:45 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2006-09-02 18:42:08 +04:00
|
|
|
memfill(RARRAY_PTR(ary), len, val);
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_LEN(ary, len);
|
2002-01-28 11:44:45 +03:00
|
|
|
}
|
2000-02-29 11:05:32 +03:00
|
|
|
return ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Returns a new array populated with the given objects.
|
|
|
|
*
|
|
|
|
* Array.[]( 1, 'a', /^A/ )
|
|
|
|
* Array[ 1, 'a', /^A/ ]
|
|
|
|
* [ 1, 'a', /^A/ ]
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_s_create(int argc, VALUE *argv, VALUE klass)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-10-09 09:47:04 +04:00
|
|
|
VALUE ary = ary_new(klass, argc);
|
|
|
|
if (argc > 0 && argv) {
|
|
|
|
MEMCPY(RARRAY_PTR(ary), argv, VALUE, argc);
|
|
|
|
ARY_SET_LEN(ary, argc);
|
2006-09-02 18:42:08 +04:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-10-03 11:19:19 +04:00
|
|
|
return ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_store(VALUE ary, long idx, VALUE val)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
if (idx < 0) {
|
2006-09-02 18:42:08 +04:00
|
|
|
idx += RARRAY_LEN(ary);
|
1999-01-20 07:59:39 +03:00
|
|
|
if (idx < 0) {
|
2002-05-28 22:11:07 +04:00
|
|
|
rb_raise(rb_eIndexError, "index %ld out of array",
|
2008-02-21 10:35:29 +03:00
|
|
|
idx - RARRAY_LEN(ary));
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2008-06-20 03:12:46 +04:00
|
|
|
else if (idx >= ARY_MAX_SIZE) {
|
|
|
|
rb_raise(rb_eIndexError, "index %ld too big", idx);
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2004-11-18 06:45:23 +03:00
|
|
|
rb_ary_modify(ary);
|
2006-09-02 18:42:08 +04:00
|
|
|
if (idx >= ARY_CAPA(ary)) {
|
|
|
|
long new_capa = ARY_CAPA(ary) / 2;
|
2002-08-13 13:21:18 +04:00
|
|
|
|
|
|
|
if (new_capa < ARY_DEFAULT_SIZE) {
|
|
|
|
new_capa = ARY_DEFAULT_SIZE;
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
2008-06-20 10:42:07 +04:00
|
|
|
if (new_capa >= ARY_MAX_SIZE - idx) {
|
2008-06-20 03:12:46 +04:00
|
|
|
new_capa = (ARY_MAX_SIZE - idx) / 2;
|
2006-09-02 18:42:08 +04:00
|
|
|
}
|
2002-08-13 13:21:18 +04:00
|
|
|
new_capa += idx;
|
2008-10-17 14:42:11 +04:00
|
|
|
ary_resize_capa(ary, new_capa);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
if (idx > RARRAY_LEN(ary)) {
|
|
|
|
rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary),
|
|
|
|
idx-RARRAY_LEN(ary) + 1);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
if (idx >= RARRAY_LEN(ary)) {
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_LEN(ary, idx + 1);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
RARRAY_PTR(ary)[idx] = val;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-06-16 11:05:24 +04:00
|
|
|
static VALUE
|
2008-11-03 07:13:04 +03:00
|
|
|
ary_make_partial(VALUE ary, VALUE klass, long offset, long len)
|
2006-09-02 18:42:08 +04:00
|
|
|
{
|
2008-10-09 09:47:04 +04:00
|
|
|
assert(offset >= 0);
|
|
|
|
assert(len >= 0);
|
|
|
|
assert(offset+len <= RARRAY_LEN(ary));
|
2006-09-02 18:42:08 +04:00
|
|
|
|
2008-10-09 09:47:04 +04:00
|
|
|
if (len <= RARRAY_EMBED_LEN_MAX) {
|
2008-11-03 07:13:04 +03:00
|
|
|
VALUE result = ary_alloc(klass);
|
2008-10-31 12:46:31 +03:00
|
|
|
MEMCPY(ARY_EMBED_PTR(result), RARRAY_PTR(ary) + offset, VALUE, len);
|
|
|
|
ARY_SET_EMBED_LEN(result, len);
|
|
|
|
return result;
|
2008-10-09 09:47:04 +04:00
|
|
|
}
|
|
|
|
else {
|
2008-11-03 07:13:04 +03:00
|
|
|
VALUE shared, result = ary_alloc(klass);
|
2008-10-09 09:47:04 +04:00
|
|
|
FL_UNSET_EMBED(result);
|
|
|
|
|
|
|
|
shared = ary_make_shared(ary);
|
|
|
|
ARY_SET_PTR(result, RARRAY_PTR(ary));
|
|
|
|
ARY_SET_LEN(result, RARRAY_LEN(ary));
|
2008-10-17 17:09:33 +04:00
|
|
|
rb_ary_set_shared(result, shared);
|
2008-10-09 09:47:04 +04:00
|
|
|
|
|
|
|
ARY_INCREASE_PTR(result, offset);
|
|
|
|
ARY_SET_LEN(result, len);
|
|
|
|
return result;
|
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
}
|
|
|
|
|
2008-11-03 07:13:04 +03:00
|
|
|
enum ary_take_pos_flags
|
|
|
|
{
|
|
|
|
ARY_TAKE_FIRST = 0,
|
|
|
|
ARY_TAKE_LAST = 1
|
|
|
|
};
|
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
static VALUE
|
2008-11-03 07:13:04 +03:00
|
|
|
ary_take_first_or_last(int argc, VALUE *argv, VALUE ary, enum ary_take_pos_flags last)
|
2004-06-16 11:05:24 +04:00
|
|
|
{
|
2008-10-09 09:47:04 +04:00
|
|
|
VALUE nv;
|
2004-06-16 11:05:24 +04:00
|
|
|
long n;
|
2006-09-02 18:42:08 +04:00
|
|
|
long offset = 0;
|
2004-06-16 11:05:24 +04:00
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "1", &nv);
|
|
|
|
n = NUM2LONG(nv);
|
2006-09-02 18:42:08 +04:00
|
|
|
if (n > RARRAY_LEN(ary)) {
|
|
|
|
n = RARRAY_LEN(ary);
|
2004-06-16 11:05:24 +04:00
|
|
|
}
|
|
|
|
else if (n < 0) {
|
|
|
|
rb_raise(rb_eArgError, "negative array size");
|
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
if (last) {
|
|
|
|
offset = RARRAY_LEN(ary) - n;
|
|
|
|
}
|
2008-11-03 07:13:04 +03:00
|
|
|
return ary_make_partial(ary, rb_cArray, offset, n);
|
2004-06-16 11:05:24 +04:00
|
|
|
}
|
|
|
|
|
2004-07-13 20:21:23 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* array << obj -> array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* Append---Pushes the given object on to the end of this array. This
|
|
|
|
* expression returns the array itself, so several appends
|
|
|
|
* may be chained together.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* [ 1, 2 ] << "c" << "d" << [ 3, 4 ]
|
|
|
|
* #=> [ 1, 2, "c", "d", [ 3, 4 ] ]
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_push(VALUE ary, VALUE item)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2006-09-02 18:42:08 +04:00
|
|
|
rb_ary_store(ary, RARRAY_LEN(ary), item);
|
1998-01-16 15:19:22 +03:00
|
|
|
return ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
2004-07-13 20:21:23 +04:00
|
|
|
* call-seq:
|
|
|
|
* array.push(obj, ... ) -> array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* Append---Pushes the given object(s) on to the end of this array. This
|
|
|
|
* expression returns the array itself, so several appends
|
|
|
|
* may be chained together.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* a = [ "a", "b", "c" ]
|
|
|
|
* a.push("d", "e", "f")
|
|
|
|
* #=> ["a", "b", "c", "d", "e", "f"]
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_push_m(int argc, VALUE *argv, VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-12-17 09:56:42 +03:00
|
|
|
rb_ary_modify_check(ary);
|
2002-05-21 09:39:19 +04:00
|
|
|
while (argc--) {
|
|
|
|
rb_ary_push(ary, *argv++);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
1998-01-16 15:19:22 +03:00
|
|
|
return ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_pop(VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2006-09-02 18:42:08 +04:00
|
|
|
long n;
|
2001-12-10 10:18:16 +03:00
|
|
|
rb_ary_modify_check(ary);
|
2006-09-02 18:42:08 +04:00
|
|
|
if (RARRAY_LEN(ary) == 0) return Qnil;
|
2008-10-09 09:47:04 +04:00
|
|
|
if (ARY_OWNS_HEAP_P(ary) &&
|
2006-10-16 18:35:51 +04:00
|
|
|
RARRAY_LEN(ary) * 3 < ARY_CAPA(ary) &&
|
|
|
|
ARY_CAPA(ary) > ARY_DEFAULT_SIZE)
|
|
|
|
{
|
2008-10-17 14:42:11 +04:00
|
|
|
ary_resize_capa(ary, RARRAY_LEN(ary) * 2);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
n = RARRAY_LEN(ary)-1;
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_LEN(ary, n);
|
2006-09-02 18:42:08 +04:00
|
|
|
return RARRAY_PTR(ary)[n];
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2008-04-10 14:25:44 +04:00
|
|
|
* array.pop -> obj or nil
|
|
|
|
* array.pop(n) -> array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-06-16 11:05:24 +04:00
|
|
|
* Removes the last element from <i>self</i> and returns it, or
|
|
|
|
* <code>nil</code> if the array is empty.
|
2008-04-10 14:25:44 +04:00
|
|
|
*
|
|
|
|
* If a number _n_ is given, returns an array of the last n elements
|
2008-04-10 14:34:49 +04:00
|
|
|
* (or less) just like <code>array.slice!(-n, n)</code> does.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-06-16 16:52:59 +04:00
|
|
|
* a = [ "a", "b", "c", "d" ]
|
|
|
|
* a.pop #=> "d"
|
|
|
|
* a.pop(2) #=> ["b", "c"]
|
|
|
|
* a #=> ["a"]
|
2003-12-16 23:28:44 +03:00
|
|
|
*/
|
|
|
|
|
2004-06-16 11:05:24 +04:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_pop_m(int argc, VALUE *argv, VALUE ary)
|
2004-06-16 11:05:24 +04:00
|
|
|
{
|
|
|
|
VALUE result;
|
|
|
|
|
|
|
|
if (argc == 0) {
|
|
|
|
return rb_ary_pop(ary);
|
|
|
|
}
|
|
|
|
|
|
|
|
rb_ary_modify_check(ary);
|
2008-12-17 09:52:18 +03:00
|
|
|
result = ary_take_first_or_last(argc, argv, ary, ARY_TAKE_LAST);
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_INCREASE_LEN(ary, -RARRAY_LEN(result));
|
2004-06-16 11:05:24 +04:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_shift(VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE top;
|
|
|
|
|
2001-12-10 10:18:16 +03:00
|
|
|
rb_ary_modify_check(ary);
|
2006-09-02 18:42:08 +04:00
|
|
|
if (RARRAY_LEN(ary) == 0) return Qnil;
|
|
|
|
top = RARRAY_PTR(ary)[0];
|
2006-09-27 02:46:16 +04:00
|
|
|
if (!ARY_SHARED_P(ary)) {
|
2006-11-02 03:19:57 +03:00
|
|
|
if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE) {
|
2007-10-09 16:29:21 +04:00
|
|
|
MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+1, VALUE, RARRAY_LEN(ary)-1);
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_INCREASE_LEN(ary, -1);
|
2007-10-09 16:29:21 +04:00
|
|
|
return top;
|
|
|
|
}
|
2008-10-09 09:47:04 +04:00
|
|
|
assert(!ARY_EMBED_P(ary)); /* ARY_EMBED_LEN_MAX < ARY_DEFAULT_SIZE */
|
|
|
|
|
2006-11-02 03:19:57 +03:00
|
|
|
RARRAY_PTR(ary)[0] = Qnil;
|
|
|
|
ary_make_shared(ary);
|
2006-09-02 18:42:08 +04:00
|
|
|
}
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_INCREASE_PTR(ary, 1); /* shift ptr */
|
|
|
|
ARY_INCREASE_LEN(ary, -1);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
return top;
|
|
|
|
}
|
|
|
|
|
2004-06-16 11:05:24 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2008-04-10 14:25:44 +04:00
|
|
|
* array.shift -> obj or nil
|
|
|
|
* array.shift(n) -> array
|
2004-06-16 11:05:24 +04:00
|
|
|
*
|
|
|
|
* Returns the first element of <i>self</i> and removes it (shifting all
|
|
|
|
* other elements down by one). Returns <code>nil</code> if the array
|
|
|
|
* is empty.
|
2008-04-10 14:25:44 +04:00
|
|
|
*
|
|
|
|
* If a number _n_ is given, returns an array of the first n elements
|
2008-04-10 14:34:49 +04:00
|
|
|
* (or less) just like <code>array.slice!(0, n)</code> does.
|
2004-06-16 11:05:24 +04:00
|
|
|
*
|
|
|
|
* args = [ "-m", "-q", "filename" ]
|
|
|
|
* args.shift #=> "-m"
|
|
|
|
* args #=> ["-q", "filename"]
|
|
|
|
*
|
|
|
|
* args = [ "-m", "-q", "filename" ]
|
|
|
|
* args.shift(2) #=> ["-m", "-q"]
|
|
|
|
* args #=> ["filename"]
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_shift_m(int argc, VALUE *argv, VALUE ary)
|
2004-06-16 11:05:24 +04:00
|
|
|
{
|
|
|
|
VALUE result;
|
|
|
|
long n;
|
|
|
|
|
|
|
|
if (argc == 0) {
|
|
|
|
return rb_ary_shift(ary);
|
|
|
|
}
|
|
|
|
|
|
|
|
rb_ary_modify_check(ary);
|
2008-11-03 07:13:04 +03:00
|
|
|
result = ary_take_first_or_last(argc, argv, ary, ARY_TAKE_FIRST);
|
2006-09-02 18:42:08 +04:00
|
|
|
n = RARRAY_LEN(result);
|
|
|
|
if (ARY_SHARED_P(ary)) {
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_INCREASE_PTR(ary, n);
|
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
else {
|
|
|
|
MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+n, VALUE, RARRAY_LEN(ary)-n);
|
|
|
|
}
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_INCREASE_LEN(ary, -n);
|
2004-06-16 11:05:24 +04:00
|
|
|
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.unshift(obj, ...) -> array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Prepends objects to the front of <i>array</i>.
|
|
|
|
* other elements up one.
|
|
|
|
*
|
|
|
|
* a = [ "b", "c", "d" ]
|
|
|
|
* a.unshift("a") #=> ["a", "b", "c", "d"]
|
|
|
|
* a.unshift(1, 2) #=> [ 1, 2, "a", "b", "c", "d"]
|
|
|
|
*/
|
|
|
|
|
2000-05-01 13:42:38 +04:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_unshift_m(int argc, VALUE *argv, VALUE ary)
|
2000-05-01 13:42:38 +04:00
|
|
|
{
|
2008-02-21 10:35:29 +03:00
|
|
|
long len;
|
2006-10-16 18:35:51 +04:00
|
|
|
|
2003-06-23 21:40:14 +04:00
|
|
|
if (argc == 0) return ary;
|
2006-11-02 03:19:57 +03:00
|
|
|
rb_ary_modify(ary);
|
2008-10-09 09:47:04 +04:00
|
|
|
if (ARY_CAPA(ary) <= (len = RARRAY_LEN(ary)) + argc) {
|
2008-10-17 14:42:11 +04:00
|
|
|
ary_resize_capa(ary, len + argc + ARY_DEFAULT_SIZE);
|
2006-09-27 02:46:16 +04:00
|
|
|
}
|
|
|
|
|
2006-11-02 03:19:57 +03:00
|
|
|
/* sliding items */
|
2008-10-09 09:47:04 +04:00
|
|
|
MEMMOVE(RARRAY_PTR(ary) + argc, RARRAY_PTR(ary), VALUE, len);
|
|
|
|
MEMCPY(RARRAY_PTR(ary), argv, VALUE, argc);
|
|
|
|
ARY_INCREASE_LEN(ary, argc);
|
2006-11-02 03:19:57 +03:00
|
|
|
|
2000-05-01 13:42:38 +04:00
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2006-09-27 02:46:16 +04:00
|
|
|
VALUE
|
|
|
|
rb_ary_unshift(VALUE ary, VALUE item)
|
|
|
|
{
|
|
|
|
return rb_ary_unshift_m(1,&item,ary);
|
|
|
|
}
|
|
|
|
|
2004-09-21 07:08:33 +04:00
|
|
|
/* faster version - use this if you don't need to treat negative offset */
|
|
|
|
static inline VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_elt(VALUE ary, long offset)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2006-09-02 18:42:08 +04:00
|
|
|
if (RARRAY_LEN(ary) == 0) return Qnil;
|
|
|
|
if (offset < 0 || RARRAY_LEN(ary) <= offset) {
|
1998-01-16 15:13:05 +03:00
|
|
|
return Qnil;
|
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
return RARRAY_PTR(ary)[offset];
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-09-21 07:08:33 +04:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_entry(VALUE ary, long offset)
|
2004-09-21 07:08:33 +04:00
|
|
|
{
|
|
|
|
if (offset < 0) {
|
2006-09-02 18:42:08 +04:00
|
|
|
offset += RARRAY_LEN(ary);
|
2004-09-21 07:08:33 +04:00
|
|
|
}
|
|
|
|
return rb_ary_elt(ary, offset);
|
|
|
|
}
|
|
|
|
|
2007-10-18 10:58:35 +04:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_subseq(VALUE ary, long beg, long len)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-10-09 09:47:04 +04:00
|
|
|
VALUE klass;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
if (beg > RARRAY_LEN(ary)) return Qnil;
|
2000-11-20 10:31:55 +03:00
|
|
|
if (beg < 0 || len < 0) return Qnil;
|
|
|
|
|
2007-09-05 17:37:18 +04:00
|
|
|
if (RARRAY_LEN(ary) < len || RARRAY_LEN(ary) < beg + len) {
|
2006-09-02 18:42:08 +04:00
|
|
|
len = RARRAY_LEN(ary) - beg;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
2001-10-16 07:27:23 +04:00
|
|
|
klass = rb_obj_class(ary);
|
2002-05-21 09:39:19 +04:00
|
|
|
if (len == 0) return ary_new(klass, 0);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-11-03 07:13:04 +03:00
|
|
|
return ary_make_partial(ary, klass, beg, len);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
2004-07-13 20:21:23 +04:00
|
|
|
* call-seq:
|
|
|
|
* array[index] -> obj or nil
|
|
|
|
* array[start, length] -> an_array or nil
|
|
|
|
* array[range] -> an_array or nil
|
|
|
|
* array.slice(index) -> obj or nil
|
|
|
|
* array.slice(start, length) -> an_array or nil
|
|
|
|
* array.slice(range) -> an_array or nil
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* Element Reference---Returns the element at _index_,
|
|
|
|
* or returns a subarray starting at _start_ and
|
|
|
|
* continuing for _length_ elements, or returns a subarray
|
|
|
|
* specified by _range_.
|
|
|
|
* Negative indices count backward from the end of the
|
2004-07-24 13:48:21 +04:00
|
|
|
* array (-1 is the last element). Returns nil if the index
|
|
|
|
* (or starting index) are out of range.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* a = [ "a", "b", "c", "d", "e" ]
|
|
|
|
* a[2] + a[0] + a[1] #=> "cab"
|
|
|
|
* a[6] #=> nil
|
|
|
|
* a[1, 2] #=> [ "b", "c" ]
|
|
|
|
* a[1..3] #=> [ "b", "c", "d" ]
|
|
|
|
* a[4..7] #=> [ "e" ]
|
|
|
|
* a[6..10] #=> nil
|
|
|
|
* a[-3, 3] #=> [ "c", "d", "e" ]
|
|
|
|
* # special cases
|
|
|
|
* a[5] #=> nil
|
|
|
|
* a[5, 1] #=> []
|
|
|
|
* a[5..10] #=> []
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_aref(int argc, VALUE *argv, VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-07-02 12:46:28 +04:00
|
|
|
VALUE arg;
|
1999-08-13 09:45:20 +04:00
|
|
|
long beg, len;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-07-02 12:46:28 +04:00
|
|
|
if (argc == 2) {
|
|
|
|
beg = NUM2LONG(argv[0]);
|
|
|
|
len = NUM2LONG(argv[1]);
|
1999-01-20 07:59:39 +03:00
|
|
|
if (beg < 0) {
|
2006-09-02 18:42:08 +04:00
|
|
|
beg += RARRAY_LEN(ary);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2000-02-01 06:12:21 +03:00
|
|
|
return rb_ary_subseq(ary, beg, len);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2001-07-02 12:46:28 +04:00
|
|
|
if (argc != 1) {
|
|
|
|
rb_scan_args(argc, argv, "11", 0, 0);
|
|
|
|
}
|
|
|
|
arg = argv[0];
|
1998-01-16 15:13:05 +03:00
|
|
|
/* special case - speeding up */
|
2001-07-02 12:46:28 +04:00
|
|
|
if (FIXNUM_P(arg)) {
|
|
|
|
return rb_ary_entry(ary, FIX2LONG(arg));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2002-05-21 09:39:19 +04:00
|
|
|
/* check if idx is Range */
|
2006-09-02 18:42:08 +04:00
|
|
|
switch (rb_range_beg_len(arg, &beg, &len, RARRAY_LEN(ary), 0)) {
|
2002-05-21 09:39:19 +04:00
|
|
|
case Qfalse:
|
|
|
|
break;
|
|
|
|
case Qnil:
|
|
|
|
return Qnil;
|
|
|
|
default:
|
|
|
|
return rb_ary_subseq(ary, beg, len);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2001-07-02 12:46:28 +04:00
|
|
|
return rb_ary_entry(ary, NUM2LONG(arg));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
2004-07-13 20:21:23 +04:00
|
|
|
* call-seq:
|
|
|
|
* array.at(index) -> obj or nil
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* Returns the element at _index_. A
|
|
|
|
* negative index counts from the end of _self_. Returns +nil+
|
|
|
|
* if the index is out of range. See also <code>Array#[]</code>.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* a = [ "a", "b", "c", "d", "e" ]
|
|
|
|
* a.at(0) #=> "a"
|
|
|
|
* a.at(-1) #=> "e"
|
|
|
|
*/
|
|
|
|
|
1999-10-13 10:44:42 +04:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_at(VALUE ary, VALUE pos)
|
1999-10-13 10:44:42 +04:00
|
|
|
{
|
|
|
|
return rb_ary_entry(ary, NUM2LONG(pos));
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.first -> obj or nil
|
2006-12-31 18:02:22 +03:00
|
|
|
* array.first(n) -> an_array
|
|
|
|
*
|
2005-11-14 11:39:34 +03:00
|
|
|
* Returns the first element, or the first +n+ elements, of the array.
|
|
|
|
* If the array is empty, the first form returns <code>nil</code>, and the
|
|
|
|
* second form returns an empty array.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* a = [ "q", "r", "s", "t" ]
|
2004-06-16 11:05:24 +04:00
|
|
|
* a.first #=> "q"
|
|
|
|
* a.first(2) #=> ["q", "r"]
|
2003-12-16 23:28:44 +03:00
|
|
|
*/
|
|
|
|
|
1999-10-13 10:44:42 +04:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_first(int argc, VALUE *argv, VALUE ary)
|
1999-10-13 10:44:42 +04:00
|
|
|
{
|
2003-06-06 13:24:59 +04:00
|
|
|
if (argc == 0) {
|
2006-09-02 18:42:08 +04:00
|
|
|
if (RARRAY_LEN(ary) == 0) return Qnil;
|
|
|
|
return RARRAY_PTR(ary)[0];
|
2003-06-06 13:24:59 +04:00
|
|
|
}
|
|
|
|
else {
|
2008-11-03 07:13:04 +03:00
|
|
|
return ary_take_first_or_last(argc, argv, ary, ARY_TAKE_FIRST);
|
2003-06-06 13:24:59 +04:00
|
|
|
}
|
1999-10-13 10:44:42 +04:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.last -> obj or nil
|
|
|
|
* array.last(n) -> an_array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Returns the last element(s) of <i>self</i>. If the array is empty,
|
|
|
|
* the first form returns <code>nil</code>.
|
|
|
|
*
|
2004-06-16 11:05:24 +04:00
|
|
|
* a = [ "w", "x", "y", "z" ]
|
|
|
|
* a.last #=> "z"
|
|
|
|
* a.last(2) #=> ["y", "z"]
|
2003-12-16 23:28:44 +03:00
|
|
|
*/
|
|
|
|
|
2007-10-18 10:58:35 +04:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_last(int argc, VALUE *argv, VALUE ary)
|
1999-10-13 10:44:42 +04:00
|
|
|
{
|
2003-06-06 13:24:59 +04:00
|
|
|
if (argc == 0) {
|
2006-09-02 18:42:08 +04:00
|
|
|
if (RARRAY_LEN(ary) == 0) return Qnil;
|
|
|
|
return RARRAY_PTR(ary)[RARRAY_LEN(ary)-1];
|
2003-06-06 13:24:59 +04:00
|
|
|
}
|
|
|
|
else {
|
2008-11-03 07:13:04 +03:00
|
|
|
return ary_take_first_or_last(argc, argv, ary, ARY_TAKE_LAST);
|
2003-06-06 13:24:59 +04:00
|
|
|
}
|
1999-10-13 10:44:42 +04:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.fetch(index) -> obj
|
|
|
|
* array.fetch(index, default ) -> obj
|
|
|
|
* array.fetch(index) {|index| block } -> obj
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Tries to return the element at position <i>index</i>. If the index
|
|
|
|
* lies outside the array, the first form throws an
|
|
|
|
* <code>IndexError</code> exception, the second form returns
|
|
|
|
* <i>default</i>, and the third form returns the value of invoking
|
2003-12-24 00:19:03 +03:00
|
|
|
* the block, passing in the index. Negative values of <i>index</i>
|
2003-12-16 23:28:44 +03:00
|
|
|
* count from the end of the array.
|
|
|
|
*
|
|
|
|
* a = [ 11, 22, 33, 44 ]
|
|
|
|
* a.fetch(1) #=> 22
|
|
|
|
* a.fetch(-1) #=> 44
|
|
|
|
* a.fetch(4, 'cat') #=> "cat"
|
|
|
|
* a.fetch(4) { |i| i*i } #=> 16
|
|
|
|
*/
|
|
|
|
|
2001-02-02 14:38:20 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_fetch(int argc, VALUE *argv, VALUE ary)
|
2001-02-02 14:38:20 +03:00
|
|
|
{
|
|
|
|
VALUE pos, ifnone;
|
2003-11-06 10:22:39 +03:00
|
|
|
long block_given;
|
2001-02-02 14:38:20 +03:00
|
|
|
long idx;
|
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "11", &pos, &ifnone);
|
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");
|
|
|
|
}
|
2001-02-02 14:38:20 +03:00
|
|
|
idx = NUM2LONG(pos);
|
|
|
|
|
|
|
|
if (idx < 0) {
|
2006-09-02 18:42:08 +04:00
|
|
|
idx += RARRAY_LEN(ary);
|
2001-02-02 14:38:20 +03:00
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
if (idx < 0 || RARRAY_LEN(ary) <= idx) {
|
2003-11-06 10:22:39 +03:00
|
|
|
if (block_given) return rb_yield(pos);
|
2002-01-25 11:22:11 +03:00
|
|
|
if (argc == 1) {
|
2002-05-28 22:11:07 +04:00
|
|
|
rb_raise(rb_eIndexError, "index %ld out of array", idx);
|
2002-01-25 11:22:11 +03:00
|
|
|
}
|
|
|
|
return ifnone;
|
2001-02-02 14:38:20 +03:00
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
return RARRAY_PTR(ary)[idx];
|
2001-02-02 14:38:20 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-10-05 05:37:46 +04:00
|
|
|
* array.index(obj) -> int or nil
|
|
|
|
* array.index {|item| block} -> int or nil
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-10-05 05:37:46 +04:00
|
|
|
* Returns the index of the first object in <i>self</i> such that is
|
|
|
|
* <code>==</code> to <i>obj</i>. If a block is given instead of an
|
|
|
|
* argument, returns first object for which <em>block</em> is true.
|
|
|
|
* Returns <code>nil</code> if no match is found.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* a = [ "a", "b", "c" ]
|
2004-10-05 05:37:46 +04:00
|
|
|
* a.index("b") #=> 1
|
|
|
|
* a.index("z") #=> nil
|
2004-10-07 06:33:37 +04:00
|
|
|
* a.index{|x|x=="b"} #=> 1
|
2008-04-11 11:58:06 +04:00
|
|
|
*
|
|
|
|
* This is an alias of <code>#find_index</code>.
|
2003-12-16 23:28:44 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_index(int argc, VALUE *argv, VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2004-10-05 05:37:46 +04:00
|
|
|
VALUE val;
|
1999-08-13 09:45:20 +04:00
|
|
|
long i;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-03-05 08:22:17 +03:00
|
|
|
if (argc == 0) {
|
2005-08-30 18:49:51 +04:00
|
|
|
RETURN_ENUMERATOR(ary, 0, 0);
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i=0; i<RARRAY_LEN(ary); i++) {
|
|
|
|
if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) {
|
2004-10-05 05:37:46 +04:00
|
|
|
return LONG2NUM(i);
|
|
|
|
}
|
|
|
|
}
|
2008-03-05 08:22:17 +03:00
|
|
|
return Qnil;
|
2004-10-05 05:37:46 +04:00
|
|
|
}
|
2008-03-05 08:22:17 +03:00
|
|
|
rb_scan_args(argc, argv, "01", &val);
|
|
|
|
for (i=0; i<RARRAY_LEN(ary); i++) {
|
|
|
|
if (rb_equal(RARRAY_PTR(ary)[i], val))
|
|
|
|
return LONG2NUM(i);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.rindex(obj) -> int or nil
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-10-05 05:37:46 +04:00
|
|
|
* Returns the index of the last object in <i>array</i>
|
|
|
|
* <code>==</code> to <i>obj</i>. If a block is given instead of an
|
|
|
|
* argument, returns first object for which <em>block</em> is
|
|
|
|
* true. Returns <code>nil</code> if no match is found.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* a = [ "a", "b", "b", "b", "c" ]
|
2004-10-05 05:37:46 +04:00
|
|
|
* a.rindex("b") #=> 3
|
|
|
|
* a.rindex("z") #=> nil
|
2004-10-07 06:33:37 +04:00
|
|
|
* a.rindex{|x|x=="b"} #=> 3
|
2003-12-16 23:28:44 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_rindex(int argc, VALUE *argv, VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2004-10-05 05:37:46 +04:00
|
|
|
VALUE val;
|
2006-09-02 18:42:08 +04:00
|
|
|
long i = RARRAY_LEN(ary);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-03-05 08:22:17 +03:00
|
|
|
if (argc == 0) {
|
2007-08-20 18:46:03 +04:00
|
|
|
RETURN_ENUMERATOR(ary, 0, 0);
|
2004-10-05 05:37:46 +04:00
|
|
|
while (i--) {
|
2006-09-02 18:42:08 +04:00
|
|
|
if (RTEST(rb_yield(RARRAY_PTR(ary)[i])))
|
2004-10-05 05:37:46 +04:00
|
|
|
return LONG2NUM(i);
|
2006-09-02 18:42:08 +04:00
|
|
|
if (i > RARRAY_LEN(ary)) {
|
|
|
|
i = RARRAY_LEN(ary);
|
2004-10-05 05:37:46 +04:00
|
|
|
}
|
|
|
|
}
|
2008-03-05 08:22:17 +03:00
|
|
|
return Qnil;
|
2004-10-05 05:37:46 +04:00
|
|
|
}
|
2008-03-05 08:22:17 +03:00
|
|
|
rb_scan_args(argc, argv, "01", &val);
|
|
|
|
while (i--) {
|
|
|
|
if (rb_equal(RARRAY_PTR(ary)[i], val))
|
|
|
|
return LONG2NUM(i);
|
|
|
|
if (i > RARRAY_LEN(ary)) {
|
|
|
|
i = RARRAY_LEN(ary);
|
2004-09-21 07:08:33 +04:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qnil;
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2001-10-02 08:31:23 +04:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_to_ary(VALUE obj)
|
2001-10-02 08:31:23 +04:00
|
|
|
{
|
|
|
|
if (TYPE(obj) == T_ARRAY) {
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
if (rb_respond_to(obj, rb_intern("to_ary"))) {
|
2004-03-18 09:59:04 +03:00
|
|
|
return to_ary(obj);
|
2001-10-02 08:31:23 +04:00
|
|
|
}
|
|
|
|
return rb_ary_new3(1, obj);
|
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static void
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl)
|
2001-05-02 08:22:21 +04:00
|
|
|
{
|
2001-05-06 19:06:00 +04:00
|
|
|
long rlen;
|
|
|
|
|
2002-05-28 22:11:07 +04:00
|
|
|
if (len < 0) rb_raise(rb_eIndexError, "negative length (%ld)", len);
|
1999-08-13 09:45:20 +04:00
|
|
|
if (beg < 0) {
|
2006-09-02 18:42:08 +04:00
|
|
|
beg += RARRAY_LEN(ary);
|
2002-05-21 09:39:19 +04:00
|
|
|
if (beg < 0) {
|
2006-09-02 18:42:08 +04:00
|
|
|
beg -= RARRAY_LEN(ary);
|
2002-05-28 22:11:07 +04:00
|
|
|
rb_raise(rb_eIndexError, "index %ld out of array", beg);
|
2002-05-21 09:39:19 +04:00
|
|
|
}
|
1999-08-13 09:45:20 +04:00
|
|
|
}
|
2007-09-05 17:37:18 +04:00
|
|
|
if (RARRAY_LEN(ary) < len || RARRAY_LEN(ary) < beg + len) {
|
2006-09-02 18:42:08 +04:00
|
|
|
len = RARRAY_LEN(ary) - beg;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2004-10-30 10:56:18 +04:00
|
|
|
if (rpl == Qundef) {
|
2003-01-07 10:36:40 +03:00
|
|
|
rlen = 0;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rpl = rb_ary_to_ary(rpl);
|
2006-09-02 18:42:08 +04:00
|
|
|
rlen = RARRAY_LEN(rpl);
|
2003-01-07 10:36:40 +03:00
|
|
|
}
|
2004-11-15 19:45:03 +03:00
|
|
|
rb_ary_modify(ary);
|
2006-09-02 18:42:08 +04:00
|
|
|
if (beg >= RARRAY_LEN(ary)) {
|
2008-06-20 10:42:07 +04:00
|
|
|
if (beg > ARY_MAX_SIZE - rlen) {
|
2008-06-20 03:12:46 +04:00
|
|
|
rb_raise(rb_eIndexError, "index %ld too big", beg);
|
|
|
|
}
|
2008-06-20 10:42:07 +04:00
|
|
|
len = beg + rlen;
|
2006-09-02 18:42:08 +04:00
|
|
|
if (len >= ARY_CAPA(ary)) {
|
2008-10-17 14:42:11 +04:00
|
|
|
ary_resize_capa(ary, len);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary), beg - RARRAY_LEN(ary));
|
2003-01-07 10:36:40 +03:00
|
|
|
if (rlen > 0) {
|
2006-09-02 18:42:08 +04:00
|
|
|
MEMCPY(RARRAY_PTR(ary) + beg, RARRAY_PTR(rpl), VALUE, rlen);
|
2003-01-07 10:36:40 +03:00
|
|
|
}
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_LEN(ary, len);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
else {
|
1999-08-13 09:45:20 +04:00
|
|
|
long alen;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
alen = RARRAY_LEN(ary) + rlen - len;
|
|
|
|
if (alen >= ARY_CAPA(ary)) {
|
2008-10-17 14:42:11 +04:00
|
|
|
ary_resize_capa(ary, alen);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2001-05-02 08:22:21 +04:00
|
|
|
if (len != rlen) {
|
2006-09-02 18:42:08 +04:00
|
|
|
MEMMOVE(RARRAY_PTR(ary) + beg + rlen, RARRAY_PTR(ary) + beg + len,
|
|
|
|
VALUE, RARRAY_LEN(ary) - (beg + len));
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_LEN(ary, alen);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2003-01-07 10:36:40 +03:00
|
|
|
if (rlen > 0) {
|
2006-09-02 18:42:08 +04:00
|
|
|
MEMMOVE(RARRAY_PTR(ary) + beg, RARRAY_PTR(rpl), VALUE, rlen);
|
2003-01-07 10:36:40 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
2004-07-13 20:21:23 +04:00
|
|
|
* call-seq:
|
|
|
|
* array[index] = obj -> obj
|
|
|
|
* array[start, length] = obj or an_array or nil -> obj or an_array or nil
|
|
|
|
* array[range] = obj or an_array or nil -> obj or an_array or nil
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* Element Assignment---Sets the element at _index_,
|
|
|
|
* or replaces a subarray starting at _start_ and
|
|
|
|
* continuing for _length_ elements, or replaces a subarray
|
|
|
|
* specified by _range_. If indices are greater than
|
|
|
|
* the current capacity of the array, the array grows
|
|
|
|
* automatically. A negative indices will count backward
|
|
|
|
* from the end of the array. Inserts elements if _length_ is
|
2004-11-11 11:59:20 +03:00
|
|
|
* zero. An +IndexError+ is raised if a negative index points
|
|
|
|
* past the beginning of the array. See also
|
2004-07-13 20:21:23 +04:00
|
|
|
* <code>Array#push</code>, and <code>Array#unshift</code>.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* a = Array.new
|
2004-07-13 19:34:34 +04:00
|
|
|
* a[4] = "4"; #=> [nil, nil, nil, nil, "4"]
|
|
|
|
* a[0, 3] = [ 'a', 'b', 'c' ] #=> ["a", "b", "c", nil, "4"]
|
|
|
|
* a[1..2] = [ 1, 2 ] #=> ["a", 1, 2, nil, "4"]
|
|
|
|
* a[0, 2] = "?" #=> ["?", 2, nil, "4"]
|
|
|
|
* a[0..2] = "A" #=> ["A", "4"]
|
|
|
|
* a[-1] = "Z" #=> ["A", "Z"]
|
2004-11-11 11:59:20 +03:00
|
|
|
* a[1..-1] = nil #=> ["A", nil]
|
2008-03-09 04:04:46 +03:00
|
|
|
* a[1..-1] = [] #=> ["A"]
|
2003-12-16 23:28:44 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_aset(int argc, VALUE *argv, VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-08-13 09:45:20 +04:00
|
|
|
long offset, beg, len;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2000-05-24 08:34:26 +04:00
|
|
|
if (argc == 3) {
|
2004-11-18 06:45:23 +03:00
|
|
|
rb_ary_splice(ary, NUM2LONG(argv[0]), NUM2LONG(argv[1]), argv[2]);
|
2000-05-24 08:34:26 +04:00
|
|
|
return argv[2];
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2000-05-24 08:34:26 +04:00
|
|
|
if (argc != 2) {
|
2002-05-21 09:39:19 +04:00
|
|
|
rb_raise(rb_eArgError, "wrong number of arguments (%d for 2)", argc);
|
2000-05-24 08:34:26 +04:00
|
|
|
}
|
|
|
|
if (FIXNUM_P(argv[0])) {
|
|
|
|
offset = FIX2LONG(argv[0]);
|
1998-01-16 15:13:05 +03:00
|
|
|
goto fixnum;
|
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
if (rb_range_beg_len(argv[0], &beg, &len, RARRAY_LEN(ary), 1)) {
|
1998-01-16 15:13:05 +03:00
|
|
|
/* check if idx is Range */
|
2004-11-18 06:45:23 +03:00
|
|
|
rb_ary_splice(ary, beg, len, argv[1]);
|
2000-05-24 08:34:26 +04:00
|
|
|
return argv[1];
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2000-05-24 08:34:26 +04:00
|
|
|
offset = NUM2LONG(argv[0]);
|
2002-05-21 09:39:19 +04:00
|
|
|
fixnum:
|
2000-05-24 08:34:26 +04:00
|
|
|
rb_ary_store(ary, offset, argv[1]);
|
|
|
|
return argv[1];
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.insert(index, obj...) -> array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Inserts the given values before the element with the given index
|
|
|
|
* (which may be negative).
|
|
|
|
*
|
|
|
|
* a = %w{ a b c d }
|
|
|
|
* a.insert(2, 99) #=> ["a", "b", 99, "c", "d"]
|
|
|
|
* a.insert(-2, 1, 2, 3) #=> ["a", "b", 99, "c", 1, 2, 3, "d"]
|
|
|
|
*/
|
|
|
|
|
2001-05-02 08:22:21 +04:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_insert(int argc, VALUE *argv, VALUE ary)
|
2001-05-02 08:22:21 +04:00
|
|
|
{
|
2001-05-06 19:06:00 +04:00
|
|
|
long pos;
|
|
|
|
|
2005-11-15 08:42:36 +03:00
|
|
|
if (argc == 1) return ary;
|
2003-05-02 10:41:33 +04:00
|
|
|
if (argc < 1) {
|
|
|
|
rb_raise(rb_eArgError, "wrong number of arguments (at least 1)");
|
2001-05-02 08:22:21 +04:00
|
|
|
}
|
2001-05-06 19:06:00 +04:00
|
|
|
pos = NUM2LONG(argv[0]);
|
|
|
|
if (pos == -1) {
|
2006-09-02 18:42:08 +04:00
|
|
|
pos = RARRAY_LEN(ary);
|
2001-05-06 19:06:00 +04:00
|
|
|
}
|
2005-11-15 08:42:36 +03:00
|
|
|
if (pos < 0) {
|
2001-05-06 19:06:00 +04:00
|
|
|
pos++;
|
|
|
|
}
|
2004-11-18 06:45:23 +03:00
|
|
|
rb_ary_splice(ary, pos, 0, rb_ary_new4(argc - 1, argv + 1));
|
2001-05-02 08:22:21 +04:00
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.each {|item| block } -> array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Calls <i>block</i> once for each element in <i>self</i>, passing that
|
|
|
|
* element as a parameter.
|
|
|
|
*
|
|
|
|
* a = [ "a", "b", "c" ]
|
|
|
|
* a.each {|x| print x, " -- " }
|
|
|
|
*
|
|
|
|
* produces:
|
|
|
|
*
|
|
|
|
* a -- b -- c --
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_each(VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2006-10-11 12:06:16 +04:00
|
|
|
long i;
|
|
|
|
|
2008-01-24 09:18:18 +03:00
|
|
|
RETURN_ENUMERATOR(ary, 0, 0);
|
2006-10-11 12:06:16 +04:00
|
|
|
for (i=0; i<RARRAY_LEN(ary); i++) {
|
2008-01-24 09:18:18 +03:00
|
|
|
rb_yield(RARRAY_PTR(ary)[i]);
|
2006-10-11 12:06:16 +04:00
|
|
|
}
|
1999-08-13 09:45:20 +04:00
|
|
|
return ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.each_index {|index| block } -> array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Same as <code>Array#each</code>, but passes the index of the element
|
|
|
|
* instead of the element itself.
|
|
|
|
*
|
|
|
|
* a = [ "a", "b", "c" ]
|
|
|
|
* a.each_index {|x| print x, " -- " }
|
|
|
|
*
|
|
|
|
* produces:
|
|
|
|
*
|
|
|
|
* 0 -- 1 -- 2 --
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_each_index(VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-01-24 09:18:18 +03:00
|
|
|
long i;
|
2005-08-30 18:49:51 +04:00
|
|
|
RETURN_ENUMERATOR(ary, 0, 0);
|
* array.c (ary_iter_check): should check modification (size
change) during iteration.
* array.c (rb_ary_initialize, rb_ary_shift, rb_ary_unshift,
rb_ary_splice, rb_ary_reverse, rb_ary_sort, rb_ary_delete,
rb_ary_delete_at, rb_ary_reject_bang, rb_ary_replace,
rb_ary_clear, rb_ary_fill, rb_ary_uniq_bang, rb_ary_compact,
rb_ary_shuffle): add iteration check.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11429 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-12-29 22:25:11 +03:00
|
|
|
|
2008-01-24 09:18:18 +03:00
|
|
|
for (i=0; i<RARRAY_LEN(ary); i++) {
|
|
|
|
rb_yield(LONG2NUM(i));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
1999-08-13 09:45:20 +04:00
|
|
|
return ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* array.reverse_each {|item| block }
|
|
|
|
*
|
|
|
|
* Same as <code>Array#each</code>, but traverses <i>self</i> in reverse
|
|
|
|
* order.
|
|
|
|
*
|
|
|
|
* a = [ "a", "b", "c" ]
|
|
|
|
* a.reverse_each {|x| print x, " " }
|
|
|
|
*
|
|
|
|
* produces:
|
|
|
|
*
|
|
|
|
* c b a
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_reverse_each(VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-01-24 09:18:18 +03:00
|
|
|
long len;
|
|
|
|
|
2005-08-30 18:49:51 +04:00
|
|
|
RETURN_ENUMERATOR(ary, 0, 0);
|
2008-01-24 09:18:18 +03:00
|
|
|
len = RARRAY_LEN(ary);
|
|
|
|
while (len--) {
|
|
|
|
rb_yield(RARRAY_PTR(ary)[len]);
|
|
|
|
if (RARRAY_LEN(ary) < len) {
|
|
|
|
len = RARRAY_LEN(ary);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* array.length -> int
|
|
|
|
*
|
|
|
|
* Returns the number of elements in <i>self</i>. May be zero.
|
|
|
|
*
|
|
|
|
* [ 1, 2, 3, 4, 5 ].length #=> 5
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_length(VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2006-09-02 18:42:08 +04:00
|
|
|
long len = RARRAY_LEN(ary);
|
|
|
|
return LONG2NUM(len);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.empty? -> true or false
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Returns <code>true</code> if <i>self</i> array contains no elements.
|
|
|
|
*
|
|
|
|
* [].empty? #=> true
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_empty_p(VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2006-09-02 18:42:08 +04:00
|
|
|
if (RARRAY_LEN(ary) == 0)
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qtrue;
|
|
|
|
return Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2001-07-14 19:17:19 +04:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_dup(VALUE ary)
|
2001-07-14 19:17:19 +04:00
|
|
|
{
|
2006-09-02 18:42:08 +04:00
|
|
|
VALUE dup = rb_ary_new2(RARRAY_LEN(ary));
|
2008-10-09 09:47:04 +04:00
|
|
|
int is_embed = ARY_EMBED_P(dup);
|
2008-05-05 06:40:13 +04:00
|
|
|
DUPSETUP(dup, ary);
|
2008-10-09 09:47:04 +04:00
|
|
|
if (is_embed) FL_SET_EMBED(dup);
|
2006-09-02 18:42:08 +04:00
|
|
|
MEMCPY(RARRAY_PTR(dup), RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary));
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_LEN(dup, RARRAY_LEN(ary));
|
2001-07-14 19:17:19 +04:00
|
|
|
|
|
|
|
return dup;
|
|
|
|
}
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
extern VALUE rb_output_fs;
|
|
|
|
|
|
|
|
static VALUE
|
2005-10-11 16:30:48 +04:00
|
|
|
recursive_join(VALUE ary, VALUE argp, int recur)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2005-10-11 16:30:48 +04:00
|
|
|
VALUE *arg = (VALUE *)argp;
|
* 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) {
|
* string.c (rb_str_usascii_new{,2}: defined.
(rb_str_new): set US-ASCII and ENC_CODERANGE_7BIT when empty
string.
* encoding.c (rb_usascii_encoding, rb_usascii_encindex): defined.
(rb_enc_inspect, enc_name, rb_locale_charmap, rb_enc_name_list_i):
use rb_str_ascii_new.
* array.c (recursive_join, inspect_ary): ditto.
* object.c (nil_to_s, nil_inspect, true_to_s, false_to_s,
rb_mod_to_s): ditto.
* hash.c (inspect_hash, rb_hash_inspect, rb_f_getenv, env_fetch,
env_clear, env_to_s, env_inspect): ditto.
* numeric.c (flo_to_s, int_chr, rb_fix2str): ditto.
* bignum.c (rb_big2str): ditto.
* file.c (rb_file_ftype, rb_file_s_dirname, rb_file_s_extname,
file_inspect_join, Init_file): ditto.
* test/ruby/test_ruby_m17n.rb: add checks for encoding of string.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-01-25 19:40:02 +03:00
|
|
|
return rb_usascii_str_new2("[...]");
|
* 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
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
return rb_ary_join(arg[0], arg[1]);
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_join(VALUE ary, VALUE sep)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2002-05-21 09:39:19 +04:00
|
|
|
long len = 1, i;
|
|
|
|
int taint = Qfalse;
|
* object.c (rb_obj_untrusted): new method Object#untrusted?.
(rb_obj_untrust): new method Object#untrust.
(rb_obj_trust): new method Object#trust.
* array.c, debug.c, time.c, include/ruby/ruby.h, re.c, variable.c,
string.c, io.c, dir.c, vm_method.c, struct.c, class.c, hash.c,
ruby.c, marshal.c: fixes for Object#untrusted?.
* test/ruby/test_module.rb, test/ruby/test_array.rb,
test/ruby/test_object.rb, test/ruby/test_string.rb,
test/ruby/test_marshal.rb, test/ruby/test_hash.rb: added tests for
Object#untrusted?.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-08-13 11:25:05 +04:00
|
|
|
int untrust = Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE result, tmp;
|
2000-01-05 07:41:21 +03:00
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
if (RARRAY_LEN(ary) == 0) return rb_str_new(0, 0);
|
2002-05-21 09:39:19 +04:00
|
|
|
if (OBJ_TAINTED(ary) || OBJ_TAINTED(sep)) taint = Qtrue;
|
* object.c (rb_obj_untrusted): new method Object#untrusted?.
(rb_obj_untrust): new method Object#untrust.
(rb_obj_trust): new method Object#trust.
* array.c, debug.c, time.c, include/ruby/ruby.h, re.c, variable.c,
string.c, io.c, dir.c, vm_method.c, struct.c, class.c, hash.c,
ruby.c, marshal.c: fixes for Object#untrusted?.
* test/ruby/test_module.rb, test/ruby/test_array.rb,
test/ruby/test_object.rb, test/ruby/test_string.rb,
test/ruby/test_marshal.rb, test/ruby/test_hash.rb: added tests for
Object#untrusted?.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-08-13 11:25:05 +04:00
|
|
|
if (OBJ_UNTRUSTED(ary) || OBJ_UNTRUSTED(sep)) untrust = Qtrue;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i=0; i<RARRAY_LEN(ary); i++) {
|
|
|
|
tmp = rb_check_string_type(RARRAY_PTR(ary)[i]);
|
2006-08-31 12:24:36 +04:00
|
|
|
len += NIL_P(tmp) ? 10 : RSTRING_LEN(tmp);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2001-11-15 18:56:08 +03:00
|
|
|
if (!NIL_P(sep)) {
|
|
|
|
StringValue(sep);
|
2006-09-02 18:42:08 +04:00
|
|
|
len += RSTRING_LEN(sep) * (RARRAY_LEN(ary) - 1);
|
2001-05-16 13:05:54 +04:00
|
|
|
}
|
2001-05-30 13:12:34 +04:00
|
|
|
result = rb_str_buf_new(len);
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i=0; i<RARRAY_LEN(ary); i++) {
|
|
|
|
tmp = RARRAY_PTR(ary)[i];
|
1998-01-16 15:13:05 +03:00
|
|
|
switch (TYPE(tmp)) {
|
|
|
|
case T_STRING:
|
|
|
|
break;
|
|
|
|
case T_ARRAY:
|
2008-11-03 21:28:34 +03:00
|
|
|
if (tmp == ary) {
|
|
|
|
tmp = rb_usascii_str_new2("[...]");
|
|
|
|
}
|
|
|
|
else {
|
1999-01-20 07:59:39 +03:00
|
|
|
VALUE args[2];
|
|
|
|
|
|
|
|
args[0] = tmp;
|
|
|
|
args[1] = sep;
|
* 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
|
|
|
tmp = rb_exec_recursive(recursive_join, ary, (VALUE)args);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
break;
|
|
|
|
default:
|
1999-01-20 07:59:39 +03:00
|
|
|
tmp = rb_obj_as_string(tmp);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2001-05-30 13:12:34 +04:00
|
|
|
if (i > 0 && !NIL_P(sep))
|
|
|
|
rb_str_buf_append(result, sep);
|
|
|
|
rb_str_buf_append(result, tmp);
|
2002-05-21 09:39:19 +04:00
|
|
|
if (OBJ_TAINTED(tmp)) taint = Qtrue;
|
* object.c (rb_obj_untrusted): new method Object#untrusted?.
(rb_obj_untrust): new method Object#untrust.
(rb_obj_trust): new method Object#trust.
* array.c, debug.c, time.c, include/ruby/ruby.h, re.c, variable.c,
string.c, io.c, dir.c, vm_method.c, struct.c, class.c, hash.c,
ruby.c, marshal.c: fixes for Object#untrusted?.
* test/ruby/test_module.rb, test/ruby/test_array.rb,
test/ruby/test_object.rb, test/ruby/test_string.rb,
test/ruby/test_marshal.rb, test/ruby/test_hash.rb: added tests for
Object#untrusted?.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-08-13 11:25:05 +04:00
|
|
|
if (OBJ_UNTRUSTED(tmp)) untrust = Qtrue;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2000-01-05 07:41:21 +03:00
|
|
|
if (taint) OBJ_TAINT(result);
|
* object.c (rb_obj_untrusted): new method Object#untrusted?.
(rb_obj_untrust): new method Object#untrust.
(rb_obj_trust): new method Object#trust.
* array.c, debug.c, time.c, include/ruby/ruby.h, re.c, variable.c,
string.c, io.c, dir.c, vm_method.c, struct.c, class.c, hash.c,
ruby.c, marshal.c: fixes for Object#untrusted?.
* test/ruby/test_module.rb, test/ruby/test_array.rb,
test/ruby/test_object.rb, test/ruby/test_string.rb,
test/ruby/test_marshal.rb, test/ruby/test_hash.rb: added tests for
Object#untrusted?.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-08-13 11:25:05 +04:00
|
|
|
if (untrust) OBJ_UNTRUST(result);
|
1998-01-16 15:13:05 +03:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.join(sep=$,) -> str
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Returns a string created by converting each element of the array to
|
|
|
|
* a string, separated by <i>sep</i>.
|
|
|
|
*
|
|
|
|
* [ "a", "b", "c" ].join #=> "abc"
|
|
|
|
* [ "a", "b", "c" ].join("-") #=> "a-b-c"
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_join_m(int argc, VALUE *argv, VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE sep;
|
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "01", &sep);
|
1999-01-20 07:59:39 +03:00
|
|
|
if (NIL_P(sep)) sep = rb_output_fs;
|
2002-05-21 09:39:19 +04:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
return rb_ary_join(ary, sep);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
inspect_ary(VALUE ary, VALUE dummy, int recur)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2000-02-23 08:23:12 +03:00
|
|
|
int tainted = OBJ_TAINTED(ary);
|
* object.c (rb_obj_untrusted): new method Object#untrusted?.
(rb_obj_untrust): new method Object#untrust.
(rb_obj_trust): new method Object#trust.
* array.c, debug.c, time.c, include/ruby/ruby.h, re.c, variable.c,
string.c, io.c, dir.c, vm_method.c, struct.c, class.c, hash.c,
ruby.c, marshal.c: fixes for Object#untrusted?.
* test/ruby/test_module.rb, test/ruby/test_array.rb,
test/ruby/test_object.rb, test/ruby/test_string.rb,
test/ruby/test_marshal.rb, test/ruby/test_hash.rb: added tests for
Object#untrusted?.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-08-13 11:25:05 +04:00
|
|
|
int untrust = OBJ_UNTRUSTED(ary);
|
2002-05-21 09:39:19 +04:00
|
|
|
long i;
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE s, 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_tainted_str_new2("[...]");
|
2001-05-30 13:12:34 +04:00
|
|
|
str = rb_str_buf_new2("[");
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i=0; i<RARRAY_LEN(ary); i++) {
|
|
|
|
s = rb_inspect(RARRAY_PTR(ary)[i]);
|
2002-05-21 09:39:19 +04:00
|
|
|
if (OBJ_TAINTED(s)) tainted = Qtrue;
|
* object.c (rb_obj_untrusted): new method Object#untrusted?.
(rb_obj_untrust): new method Object#untrust.
(rb_obj_trust): new method Object#trust.
* array.c, debug.c, time.c, include/ruby/ruby.h, re.c, variable.c,
string.c, io.c, dir.c, vm_method.c, struct.c, class.c, hash.c,
ruby.c, marshal.c: fixes for Object#untrusted?.
* test/ruby/test_module.rb, test/ruby/test_array.rb,
test/ruby/test_object.rb, test/ruby/test_string.rb,
test/ruby/test_marshal.rb, test/ruby/test_hash.rb: added tests for
Object#untrusted?.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-08-13 11:25:05 +04:00
|
|
|
if (OBJ_UNTRUSTED(s)) untrust = Qtrue;
|
2001-05-30 13:12:34 +04:00
|
|
|
if (i > 0) rb_str_buf_cat2(str, ", ");
|
|
|
|
rb_str_buf_append(str, s);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2001-05-30 13:12:34 +04:00
|
|
|
rb_str_buf_cat2(str, "]");
|
2000-02-23 08:23:12 +03:00
|
|
|
if (tainted) OBJ_TAINT(str);
|
* object.c (rb_obj_untrusted): new method Object#untrusted?.
(rb_obj_untrust): new method Object#untrust.
(rb_obj_trust): new method Object#trust.
* array.c, debug.c, time.c, include/ruby/ruby.h, re.c, variable.c,
string.c, io.c, dir.c, vm_method.c, struct.c, class.c, hash.c,
ruby.c, marshal.c: fixes for Object#untrusted?.
* test/ruby/test_module.rb, test/ruby/test_array.rb,
test/ruby/test_object.rb, test/ruby/test_string.rb,
test/ruby/test_marshal.rb, test/ruby/test_hash.rb: added tests for
Object#untrusted?.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-08-13 11:25:05 +04:00
|
|
|
if (untrust) OBJ_UNTRUST(str);
|
1998-01-16 15:13:05 +03:00
|
|
|
return str;
|
|
|
|
}
|
|
|
|
|
2003-12-29 05:02:08 +03:00
|
|
|
/*
|
2004-07-13 20:21:23 +04:00
|
|
|
* call-seq:
|
2006-09-07 20:33:08 +04:00
|
|
|
* array.to_s -> string
|
2004-07-13 20:21:23 +04:00
|
|
|
* array.inspect -> string
|
2003-12-29 05:02:08 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* Create a printable version of <i>array</i>.
|
2003-12-29 05:02:08 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_inspect(VALUE ary)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
* string.c (rb_str_usascii_new{,2}: defined.
(rb_str_new): set US-ASCII and ENC_CODERANGE_7BIT when empty
string.
* encoding.c (rb_usascii_encoding, rb_usascii_encindex): defined.
(rb_enc_inspect, enc_name, rb_locale_charmap, rb_enc_name_list_i):
use rb_str_ascii_new.
* array.c (recursive_join, inspect_ary): ditto.
* object.c (nil_to_s, nil_inspect, true_to_s, false_to_s,
rb_mod_to_s): ditto.
* hash.c (inspect_hash, rb_hash_inspect, rb_f_getenv, env_fetch,
env_clear, env_to_s, env_inspect): ditto.
* numeric.c (flo_to_s, int_chr, rb_fix2str): ditto.
* bignum.c (rb_big2str): ditto.
* file.c (rb_file_ftype, rb_file_s_dirname, rb_file_s_extname,
file_inspect_join, Init_file): ditto.
* test/ruby/test_ruby_m17n.rb: add checks for encoding of string.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15244 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-01-25 19:40:02 +03:00
|
|
|
if (RARRAY_LEN(ary) == 0) return rb_usascii_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_ary, ary, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2006-09-07 20:33:08 +04:00
|
|
|
VALUE
|
|
|
|
rb_ary_to_s(VALUE ary)
|
|
|
|
{
|
|
|
|
return rb_ary_inspect(ary);
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.to_a -> array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Returns _self_. If called on a subclass of Array, converts
|
|
|
|
* the receiver to an Array object.
|
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_to_a(VALUE ary)
|
2003-02-10 12:40:13 +03:00
|
|
|
{
|
|
|
|
if (rb_obj_class(ary) != rb_cArray) {
|
2006-09-02 18:42:08 +04:00
|
|
|
VALUE dup = rb_ary_new2(RARRAY_LEN(ary));
|
2003-02-10 12:40:13 +03:00
|
|
|
rb_ary_replace(dup, ary);
|
|
|
|
return dup;
|
|
|
|
}
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* array.to_ary -> array
|
|
|
|
*
|
|
|
|
* Returns _self_.
|
|
|
|
*/
|
|
|
|
|
2003-02-10 12:40:13 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_to_ary_m(VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_reverse(VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE *p1, *p2;
|
|
|
|
VALUE tmp;
|
|
|
|
|
1999-10-18 13:03:16 +04:00
|
|
|
rb_ary_modify(ary);
|
2006-09-02 18:42:08 +04:00
|
|
|
if (RARRAY_LEN(ary) > 1) {
|
|
|
|
p1 = RARRAY_PTR(ary);
|
|
|
|
p2 = p1 + RARRAY_LEN(ary) - 1; /* points last item */
|
2003-09-05 09:07:54 +04:00
|
|
|
|
|
|
|
while (p1 < p2) {
|
|
|
|
tmp = *p1;
|
|
|
|
*p1++ = *p2;
|
|
|
|
*p2-- = tmp;
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
1998-01-16 15:19:22 +03:00
|
|
|
return ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.reverse! -> array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Reverses _self_ in place.
|
|
|
|
*
|
|
|
|
* a = [ "a", "b", "c" ]
|
|
|
|
* a.reverse! #=> ["c", "b", "a"]
|
|
|
|
* a #=> ["c", "b", "a"]
|
|
|
|
*/
|
|
|
|
|
2000-08-24 10:21:43 +04:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_reverse_bang(VALUE ary)
|
2000-08-24 10:21:43 +04:00
|
|
|
{
|
|
|
|
return rb_ary_reverse(ary);
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* array.reverse -> an_array
|
|
|
|
*
|
|
|
|
* Returns a new array containing <i>self</i>'s elements in reverse order.
|
|
|
|
*
|
|
|
|
* [ "a", "b", "c" ].reverse #=> ["c", "b", "a"]
|
|
|
|
* [ 1 ].reverse #=> [1]
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_reverse_m(VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2002-08-27 12:31:08 +04:00
|
|
|
return rb_ary_reverse(rb_ary_dup(ary));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2008-08-04 22:29:55 +04:00
|
|
|
struct ary_sort_data {
|
|
|
|
VALUE ary;
|
|
|
|
int opt_methods;
|
|
|
|
int opt_inited;
|
|
|
|
};
|
|
|
|
|
|
|
|
enum {
|
|
|
|
sort_opt_Fixnum,
|
|
|
|
sort_opt_String,
|
|
|
|
sort_optimizable_count
|
|
|
|
};
|
|
|
|
|
|
|
|
#define STRING_P(s) (TYPE(s) == T_STRING && CLASS_OF(s) == rb_cString)
|
|
|
|
|
|
|
|
#define SORT_OPTIMIZABLE_BIT(type) (1U << TOKEN_PASTE(sort_opt_,type))
|
|
|
|
#define SORT_OPTIMIZABLE(data, type) \
|
|
|
|
((data->opt_inited & SORT_OPTIMIZABLE_BIT(type)) ? \
|
|
|
|
(data->opt_methods & SORT_OPTIMIZABLE_BIT(type)) : \
|
|
|
|
((data->opt_inited |= SORT_OPTIMIZABLE_BIT(type)), \
|
|
|
|
rb_method_basic_definition_p(TOKEN_PASTE(rb_c,type), id_cmp) && \
|
|
|
|
(data->opt_methods |= SORT_OPTIMIZABLE_BIT(type))))
|
|
|
|
|
2008-05-08 04:51:55 +04:00
|
|
|
static VALUE
|
2008-08-04 22:29:55 +04:00
|
|
|
sort_reentered(VALUE ary)
|
2008-05-08 03:56:33 +04:00
|
|
|
{
|
2008-08-04 22:29:55 +04:00
|
|
|
if (RBASIC(ary)->klass) {
|
2008-05-08 05:44:50 +04:00
|
|
|
rb_raise(rb_eRuntimeError, "sort reentered");
|
2008-05-08 03:56:33 +04:00
|
|
|
}
|
2008-05-08 04:51:55 +04:00
|
|
|
return Qnil;
|
2008-05-08 03:56:33 +04:00
|
|
|
}
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static int
|
2008-01-24 09:50:22 +03:00
|
|
|
sort_1(const void *ap, const void *bp, void *dummy)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-08-04 22:29:55 +04:00
|
|
|
struct ary_sort_data *data = dummy;
|
|
|
|
VALUE retval = sort_reentered(data->ary);
|
2005-10-11 16:30:48 +04:00
|
|
|
VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
|
2004-09-23 04:51:32 +04:00
|
|
|
int n;
|
2004-09-21 07:08:33 +04:00
|
|
|
|
2008-05-08 04:51:55 +04:00
|
|
|
retval = rb_yield_values(2, a, b);
|
2005-10-11 16:30:48 +04:00
|
|
|
n = rb_cmpint(retval, a, b);
|
2008-08-04 22:29:55 +04:00
|
|
|
sort_reentered(data->ary);
|
2004-09-23 04:51:32 +04:00
|
|
|
return n;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
2008-01-24 09:50:22 +03:00
|
|
|
sort_2(const void *ap, const void *bp, void *dummy)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-08-04 22:29:55 +04:00
|
|
|
struct ary_sort_data *data = dummy;
|
|
|
|
VALUE retval = sort_reentered(data->ary);
|
2005-10-11 16:30:48 +04:00
|
|
|
VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp;
|
2004-09-23 04:51:32 +04:00
|
|
|
int n;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-08-04 22:29:55 +04:00
|
|
|
if (FIXNUM_P(a) && FIXNUM_P(b) && SORT_OPTIMIZABLE(data, Fixnum)) {
|
2004-09-23 04:51:32 +04:00
|
|
|
if ((long)a > (long)b) return 1;
|
|
|
|
if ((long)a < (long)b) return -1;
|
2002-08-19 10:41:02 +04:00
|
|
|
return 0;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2008-08-04 22:29:55 +04:00
|
|
|
if (STRING_P(a) && STRING_P(b) && SORT_OPTIMIZABLE(data, String)) {
|
|
|
|
return rb_str_cmp(a, b);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2002-08-19 09:56:09 +04:00
|
|
|
retval = rb_funcall(a, id_cmp, 1, b);
|
2004-09-23 04:51:32 +04:00
|
|
|
n = rb_cmpint(retval, a, b);
|
2008-08-04 22:29:55 +04:00
|
|
|
sort_reentered(data->ary);
|
2004-09-23 04:51:32 +04:00
|
|
|
|
|
|
|
return n;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.sort! -> array
|
|
|
|
* array.sort! {| a,b | block } -> array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Sorts _self_. Comparisons for
|
|
|
|
* the sort will be done using the <code><=></code> operator or using
|
|
|
|
* an optional code block. The block implements a comparison between
|
|
|
|
* <i>a</i> and <i>b</i>, returning -1, 0, or +1. See also
|
|
|
|
* <code>Enumerable#sort_by</code>.
|
|
|
|
*
|
|
|
|
* a = [ "d", "a", "e", "c", "b" ]
|
|
|
|
* a.sort #=> ["a", "b", "c", "d", "e"]
|
|
|
|
* a.sort {|x,y| y <=> x } #=> ["e", "d", "c", "b", "a"]
|
|
|
|
*/
|
|
|
|
|
2003-12-29 05:02:08 +03:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_sort_bang(VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-10-16 14:33:06 +04:00
|
|
|
rb_ary_modify(ary);
|
2008-10-09 09:47:04 +04:00
|
|
|
assert(!ARY_SHARED_P(ary));
|
2006-09-02 18:42:08 +04:00
|
|
|
if (RARRAY_LEN(ary) > 1) {
|
2008-10-09 09:47:04 +04:00
|
|
|
VALUE tmp = ary_make_substitution(ary); /* only ary refers tmp */
|
2008-08-04 22:29:55 +04:00
|
|
|
struct ary_sort_data data;
|
2008-01-24 09:50:22 +03:00
|
|
|
|
|
|
|
RBASIC(tmp)->klass = 0;
|
2008-08-04 22:29:55 +04:00
|
|
|
data.ary = tmp;
|
|
|
|
data.opt_methods = 0;
|
|
|
|
data.opt_inited = 0;
|
2008-01-24 09:50:22 +03:00
|
|
|
ruby_qsort(RARRAY_PTR(tmp), RARRAY_LEN(tmp), sizeof(VALUE),
|
2008-08-04 22:29:55 +04:00
|
|
|
rb_block_given_p()?sort_1:sort_2, &data);
|
2008-10-09 09:47:04 +04:00
|
|
|
|
2008-10-29 17:58:30 +03:00
|
|
|
if (ARY_EMBED_P(tmp)) {
|
2008-10-09 09:47:04 +04:00
|
|
|
assert(ARY_EMBED_P(tmp));
|
2008-10-29 17:58:30 +03:00
|
|
|
if (ARY_SHARED_P(ary)) { /* ary might be destructively operated in the given block */
|
|
|
|
rb_ary_unshare(ary);
|
|
|
|
}
|
2008-11-08 14:09:20 +03:00
|
|
|
FL_SET_EMBED(ary);
|
2008-10-09 09:47:04 +04:00
|
|
|
MEMCPY(RARRAY_PTR(ary), ARY_EMBED_PTR(tmp), VALUE, ARY_EMBED_LEN(tmp));
|
|
|
|
ARY_SET_LEN(ary, ARY_EMBED_LEN(tmp));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
assert(!ARY_EMBED_P(tmp));
|
2008-11-08 14:09:20 +03:00
|
|
|
if (ARY_HEAP_PTR(ary) == ARY_HEAP_PTR(tmp)) {
|
|
|
|
assert(!ARY_EMBED_P(ary));
|
|
|
|
FL_UNSET_SHARED(ary);
|
|
|
|
ARY_SET_CAPA(ary, ARY_CAPA(tmp));
|
|
|
|
}
|
|
|
|
else {
|
2008-10-09 09:47:04 +04:00
|
|
|
assert(!ARY_SHARED_P(tmp));
|
2008-10-29 20:24:44 +03:00
|
|
|
if (ARY_EMBED_P(ary)) {
|
|
|
|
FL_UNSET_EMBED(ary);
|
|
|
|
}
|
|
|
|
else if (ARY_SHARED_P(ary)) {
|
2008-11-08 14:09:20 +03:00
|
|
|
/* ary might be destructively operated in the given block */
|
2008-10-17 17:09:33 +04:00
|
|
|
rb_ary_unshare(ary);
|
2008-10-09 09:47:04 +04:00
|
|
|
}
|
|
|
|
else {
|
|
|
|
xfree(ARY_HEAP_PTR(ary));
|
|
|
|
}
|
|
|
|
ARY_SET_PTR(ary, RARRAY_PTR(tmp));
|
|
|
|
ARY_SET_HEAP_LEN(ary, RARRAY_LEN(tmp));
|
|
|
|
ARY_SET_CAPA(ary, ARY_CAPA(tmp));
|
|
|
|
}
|
|
|
|
/* tmp was lost ownership for the ptr */
|
|
|
|
FL_UNSET(tmp, FL_FREEZE);
|
|
|
|
FL_SET_EMBED(tmp);
|
|
|
|
ARY_SET_EMBED_LEN(tmp, 0);
|
|
|
|
FL_SET(tmp, FL_FREEZE);
|
|
|
|
}
|
|
|
|
/* tmp will be GC'ed. */
|
|
|
|
RBASIC(tmp)->klass = rb_cArray;
|
2003-09-05 09:07:54 +04:00
|
|
|
}
|
1998-01-16 15:19:22 +03:00
|
|
|
return ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.sort -> an_array
|
|
|
|
* array.sort {| a,b | block } -> an_array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Returns a new array created by sorting <i>self</i>. Comparisons for
|
|
|
|
* the sort will be done using the <code><=></code> operator or using
|
|
|
|
* an optional code block. The block implements a comparison between
|
|
|
|
* <i>a</i> and <i>b</i>, returning -1, 0, or +1. See also
|
|
|
|
* <code>Enumerable#sort_by</code>.
|
|
|
|
*
|
|
|
|
* a = [ "d", "a", "e", "c", "b" ]
|
|
|
|
* a.sort #=> ["a", "b", "c", "d", "e"]
|
|
|
|
* a.sort {|x,y| y <=> x } #=> ["e", "d", "c", "b", "a"]
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_sort(VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2002-08-27 12:31:08 +04:00
|
|
|
ary = rb_ary_dup(ary);
|
1999-10-20 11:10:23 +04:00
|
|
|
rb_ary_sort_bang(ary);
|
|
|
|
return ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
* array.c (ary_iter_check): should check modification (size
change) during iteration.
* array.c (rb_ary_initialize, rb_ary_shift, rb_ary_unshift,
rb_ary_splice, rb_ary_reverse, rb_ary_sort, rb_ary_delete,
rb_ary_delete_at, rb_ary_reject_bang, rb_ary_replace,
rb_ary_clear, rb_ary_fill, rb_ary_uniq_bang, rb_ary_compact,
rb_ary_shuffle): add iteration check.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11429 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-12-29 22:25:11 +03:00
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.collect {|item| block } -> an_array
|
|
|
|
* array.map {|item| block } -> an_array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Invokes <i>block</i> once for each element of <i>self</i>. Creates a
|
|
|
|
* new array containing the values returned by the block.
|
2004-02-26 16:50:40 +03:00
|
|
|
* See also <code>Enumerable#collect</code>.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* a = [ "a", "b", "c", "d" ]
|
|
|
|
* a.collect {|x| x + "!" } #=> ["a!", "b!", "c!", "d!"]
|
|
|
|
* a #=> ["a", "b", "c", "d"]
|
|
|
|
*/
|
|
|
|
|
1999-10-29 13:25:48 +04:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_collect(VALUE ary)
|
1999-10-29 13:25:48 +04:00
|
|
|
{
|
2003-07-31 10:30:35 +04:00
|
|
|
long i;
|
2008-01-24 09:18:18 +03:00
|
|
|
VALUE collect;
|
1999-10-29 13:25:48 +04:00
|
|
|
|
2008-01-24 09:18:18 +03:00
|
|
|
RETURN_ENUMERATOR(ary, 0, 0);
|
|
|
|
collect = rb_ary_new2(RARRAY_LEN(ary));
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i = 0; i < RARRAY_LEN(ary); i++) {
|
2008-01-24 09:18:18 +03:00
|
|
|
rb_ary_push(collect, rb_yield(RARRAY_PTR(ary)[i]));
|
1999-10-29 13:25:48 +04:00
|
|
|
}
|
2008-01-24 09:18:18 +03:00
|
|
|
return collect;
|
1999-10-29 13:25:48 +04:00
|
|
|
}
|
|
|
|
|
2008-01-24 09:18:18 +03:00
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
2004-07-13 20:21:23 +04:00
|
|
|
* call-seq:
|
|
|
|
* array.collect! {|item| block } -> array
|
|
|
|
* array.map! {|item| block } -> array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* Invokes the block once for each element of _self_, replacing the
|
|
|
|
* element with the value returned by _block_.
|
|
|
|
* See also <code>Enumerable#collect</code>.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* a = [ "a", "b", "c", "d" ]
|
|
|
|
* a.collect! {|x| x + "!" }
|
|
|
|
* a #=> [ "a!", "b!", "c!", "d!" ]
|
|
|
|
*/
|
|
|
|
|
2000-05-01 13:42:38 +04:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_collect_bang(VALUE ary)
|
2000-05-01 13:42:38 +04:00
|
|
|
{
|
2008-01-24 09:18:18 +03:00
|
|
|
long i;
|
|
|
|
|
2005-08-30 18:49:51 +04:00
|
|
|
RETURN_ENUMERATOR(ary, 0, 0);
|
2008-01-24 09:18:18 +03:00
|
|
|
rb_ary_modify(ary);
|
|
|
|
for (i = 0; i < RARRAY_LEN(ary); i++) {
|
|
|
|
rb_ary_store(ary, i, rb_yield(RARRAY_PTR(ary)[i]));
|
|
|
|
}
|
|
|
|
return ary;
|
2000-05-01 13:42:38 +04:00
|
|
|
}
|
|
|
|
|
2003-07-03 15:02:53 +04:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_get_values_at(VALUE obj, long olen, int argc, VALUE *argv, VALUE (*func) (VALUE, long))
|
2003-06-02 08:49:46 +04:00
|
|
|
{
|
2003-07-03 15:02:53 +04:00
|
|
|
VALUE result = rb_ary_new2(argc);
|
|
|
|
long beg, len, i, j;
|
2003-06-02 08:49:46 +04:00
|
|
|
|
2003-07-03 15:02:53 +04:00
|
|
|
for (i=0; i<argc; i++) {
|
|
|
|
if (FIXNUM_P(argv[i])) {
|
|
|
|
rb_ary_push(result, (*func)(obj, FIX2LONG(argv[i])));
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
/* check if idx is Range */
|
|
|
|
switch (rb_range_beg_len(argv[i], &beg, &len, olen, 0)) {
|
|
|
|
case Qfalse:
|
|
|
|
break;
|
|
|
|
case Qnil:
|
|
|
|
continue;
|
|
|
|
default:
|
|
|
|
for (j=0; j<len; j++) {
|
|
|
|
rb_ary_push(result, (*func)(obj, j+beg));
|
|
|
|
}
|
|
|
|
continue;
|
2003-06-02 08:49:46 +04:00
|
|
|
}
|
2003-07-03 15:02:53 +04:00
|
|
|
rb_ary_push(result, (*func)(obj, NUM2LONG(argv[i])));
|
2003-06-02 08:49:46 +04:00
|
|
|
}
|
2003-07-03 15:02:53 +04:00
|
|
|
return result;
|
2003-06-02 08:49:46 +04:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
2004-07-13 20:21:23 +04:00
|
|
|
* call-seq:
|
|
|
|
* array.values_at(selector,... ) -> an_array
|
2004-07-09 17:38:34 +04:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* Returns an array containing the elements in
|
|
|
|
* _self_ corresponding to the given selector(s). The selectors
|
|
|
|
* may be either integer indices or ranges.
|
|
|
|
* See also <code>Array#select</code>.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* a = %w{ a b c d e f }
|
|
|
|
* a.values_at(1, 3, 5)
|
|
|
|
* a.values_at(1, 3, 5, 7)
|
|
|
|
* a.values_at(-1, -3, -5, -7)
|
|
|
|
* a.values_at(1..3, 2...5)
|
2003-12-16 23:28:44 +03:00
|
|
|
*/
|
|
|
|
|
2003-05-04 20:03:24 +04:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_values_at(int argc, VALUE *argv, VALUE ary)
|
2003-05-04 20:03:24 +04:00
|
|
|
{
|
2006-09-02 18:42:08 +04:00
|
|
|
return rb_get_values_at(ary, RARRAY_LEN(ary), argc, argv, rb_ary_entry);
|
2003-05-04 20:03:24 +04:00
|
|
|
}
|
|
|
|
|
* array.c (ary_iter_check): should check modification (size
change) during iteration.
* array.c (rb_ary_initialize, rb_ary_shift, rb_ary_unshift,
rb_ary_splice, rb_ary_reverse, rb_ary_sort, rb_ary_delete,
rb_ary_delete_at, rb_ary_reject_bang, rb_ary_replace,
rb_ary_clear, rb_ary_fill, rb_ary_uniq_bang, rb_ary_compact,
rb_ary_shuffle): add iteration check.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11429 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-12-29 22:25:11 +03:00
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.select {|item| block } -> an_array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 19:34:34 +04:00
|
|
|
* Invokes the block passing in successive elements from <i>array</i>,
|
2003-12-16 23:28:44 +03:00
|
|
|
* returning an array containing those elements for which the block
|
|
|
|
* returns a true value (equivalent to <code>Enumerable#select</code>).
|
|
|
|
*
|
|
|
|
* a = %w{ a b c d e f }
|
|
|
|
* a.select {|v| v =~ /[aeiou]/} #=> ["a", "e"]
|
|
|
|
*/
|
|
|
|
|
2001-12-11 06:48:08 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_select(VALUE ary)
|
2001-12-11 06:48:08 +03:00
|
|
|
{
|
2008-01-24 09:18:18 +03:00
|
|
|
VALUE result;
|
|
|
|
long i;
|
|
|
|
|
2005-08-30 18:49:51 +04:00
|
|
|
RETURN_ENUMERATOR(ary, 0, 0);
|
2008-01-24 09:18:18 +03:00
|
|
|
result = rb_ary_new2(RARRAY_LEN(ary));
|
|
|
|
for (i = 0; i < RARRAY_LEN(ary); i++) {
|
|
|
|
if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) {
|
|
|
|
rb_ary_push(result, rb_ary_elt(ary, i));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result;
|
2001-12-11 06:48:08 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.delete(obj) -> obj or nil
|
|
|
|
* array.delete(obj) { block } -> obj or nil
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Deletes items from <i>self</i> that are equal to <i>obj</i>. If
|
|
|
|
* the item is not found, returns <code>nil</code>. If the optional
|
|
|
|
* code block is given, returns the result of <i>block</i> if the item
|
|
|
|
* is not found.
|
|
|
|
*
|
|
|
|
* a = [ "a", "b", "b", "b", "c" ]
|
|
|
|
* a.delete("b") #=> "b"
|
|
|
|
* a #=> ["a", "c"]
|
|
|
|
* a.delete("z") #=> nil
|
|
|
|
* a.delete("z") { "not found" } #=> "not found"
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_delete(VALUE ary, VALUE item)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2008-08-12 13:12:24 +04:00
|
|
|
VALUE v = item;
|
1999-08-13 09:45:20 +04:00
|
|
|
long i1, i2;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
|
|
|
|
VALUE e = RARRAY_PTR(ary)[i1];
|
2004-09-21 07:08:33 +04:00
|
|
|
|
2008-08-12 13:12:24 +04:00
|
|
|
if (rb_equal(e, item)) {
|
|
|
|
v = e;
|
|
|
|
continue;
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
if (i1 != i2) {
|
2004-09-29 09:15:33 +04:00
|
|
|
rb_ary_store(ary, i2, e);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
i2++;
|
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
if (RARRAY_LEN(ary) == i2) {
|
2000-05-24 08:34:26 +04:00
|
|
|
if (rb_block_given_p()) {
|
1999-01-20 07:59:39 +03:00
|
|
|
return rb_yield(item);
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
return Qnil;
|
|
|
|
}
|
2002-05-21 09:39:19 +04:00
|
|
|
|
2004-11-18 06:45:23 +03:00
|
|
|
rb_ary_modify(ary);
|
2006-09-02 18:42:08 +04:00
|
|
|
if (RARRAY_LEN(ary) > i2) {
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_LEN(ary, i2);
|
2006-09-02 18:42:08 +04:00
|
|
|
if (i2 * 2 < ARY_CAPA(ary) &&
|
|
|
|
ARY_CAPA(ary) > ARY_DEFAULT_SIZE) {
|
2008-10-17 14:42:11 +04:00
|
|
|
ary_resize_capa(ary, i2*2);
|
2004-09-29 09:15:33 +04:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2008-08-12 13:12:24 +04:00
|
|
|
return v;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_delete_at(VALUE ary, long pos)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
* this commit is a result of refactoring. only renaming functions,
moving definitions place, add/remove prototypes, deleting
unused variables and removing yarv.h.
This commit doesn't change any behavior of ruby/vm.
* yarv.h, common.mk: remove yarv.h (contents are moved to yarvcore.h).
* error.c, eval_intern.h: include yarvcore.h instead yarv.h
* rename some functions:
* debug.[ch]: debug_*() -> ruby_debug_*()
* iseq.c: iseq_*() -> rb_iseq_*(), ruby_iseq_disasm()
* iseq.c: node_name() -> ruby_node_name()
* vm.c: yarv_check_redefinition_opt_method() ->
rb_vm_check_redefinition_opt_method()
* some refactoring with checking -Wall.
* array.c: remove rb_ary_ptr() (unused) and remove unused
local variables.
* object.c: add a prototype of rb_mod_module_exec().
* eval_intern.h (ruby_cref): set it inline.
* eval_load.c (rb_load), yarvcore.c: yarv_load() -> rb_load_internal().
* parse.y: add a prototype of rb_parse_in_eval() (in eval.c).
* process.c: add a prototype of rb_thread_stop_timer_thread() (in thread.c).
* thread.c: remove raw_gets() function (unused) and fix some format
mismatch (format mismatchs have remained yet. this is todo).
* thread.c (rb_thread_wait_fd_rw): fix typo on label name.
* thread_pthread.ci: comment out codes with USE_THREAD_CACHE.
* vm.c (rb_svar, rb_backref_get, rb_backref_get,
rb_lastline_get, rb_lastline_set) : moved from yarvcore.c.
* vm.c (yarv_init_redefined_flag): add a prototype and rename
yarv_opt_method_table to vm_opt_method_table.
* vm.c (rb_thread_eval): moved from yarvcore.c.
* yarvcore.c: remove unused global variables and fix to use nsdr().
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11652 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2007-02-07 04:25:05 +03:00
|
|
|
long len = RARRAY_LEN(ary);
|
2002-05-21 09:39:19 +04:00
|
|
|
VALUE del;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-10-13 10:44:42 +04:00
|
|
|
if (pos >= len) return Qnil;
|
2002-05-21 09:39:19 +04:00
|
|
|
if (pos < 0) {
|
|
|
|
pos += len;
|
|
|
|
if (pos < 0) return Qnil;
|
|
|
|
}
|
1999-10-13 10:44:42 +04:00
|
|
|
|
2004-11-18 06:45:23 +03:00
|
|
|
rb_ary_modify(ary);
|
2006-09-02 18:42:08 +04:00
|
|
|
del = RARRAY_PTR(ary)[pos];
|
2006-10-16 18:35:51 +04:00
|
|
|
MEMMOVE(RARRAY_PTR(ary)+pos, RARRAY_PTR(ary)+pos+1, VALUE,
|
|
|
|
RARRAY_LEN(ary)-pos-1);
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_INCREASE_LEN(ary, -1);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
|
|
|
return del;
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* array.delete_at(index) -> obj or nil
|
|
|
|
*
|
|
|
|
* Deletes the element at the specified index, returning that element,
|
|
|
|
* or <code>nil</code> if the index is out of range. See also
|
|
|
|
* <code>Array#slice!</code>.
|
|
|
|
*
|
|
|
|
* a = %w( ant bat cat dog )
|
|
|
|
* a.delete_at(2) #=> "cat"
|
|
|
|
* a #=> ["ant", "bat", "dog"]
|
|
|
|
* a.delete_at(99) #=> nil
|
|
|
|
*/
|
|
|
|
|
2001-03-13 08:45:13 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_delete_at_m(VALUE ary, VALUE pos)
|
2000-05-30 08:24:17 +04:00
|
|
|
{
|
|
|
|
return rb_ary_delete_at(ary, NUM2LONG(pos));
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.slice!(index) -> obj or nil
|
|
|
|
* array.slice!(start, length) -> sub_array or nil
|
|
|
|
* array.slice!(range) -> sub_array or nil
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Deletes the element(s) given by an index (optionally with a length)
|
|
|
|
* or by a range. Returns the deleted object, subarray, or
|
2008-04-10 14:25:44 +04:00
|
|
|
* <code>nil</code> if the index is out of range.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* a = [ "a", "b", "c" ]
|
|
|
|
* a.slice!(1) #=> "b"
|
|
|
|
* a #=> ["a", "c"]
|
|
|
|
* a.slice!(-1) #=> "c"
|
|
|
|
* a #=> ["a"]
|
|
|
|
* a.slice!(100) #=> nil
|
|
|
|
* a #=> ["a"]
|
|
|
|
*/
|
|
|
|
|
2000-01-05 07:41:21 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary)
|
2000-01-05 07:41:21 +03:00
|
|
|
{
|
|
|
|
VALUE arg1, arg2;
|
2008-05-23 13:01:19 +04:00
|
|
|
long pos, len, orig_len;
|
2000-01-05 07:41:21 +03:00
|
|
|
|
2008-05-28 11:52:34 +04:00
|
|
|
rb_ary_modify_check(ary);
|
2000-01-05 07:41:21 +03:00
|
|
|
if (rb_scan_args(argc, argv, "11", &arg1, &arg2) == 2) {
|
|
|
|
pos = NUM2LONG(arg1);
|
|
|
|
len = NUM2LONG(arg2);
|
2002-05-22 09:57:08 +04:00
|
|
|
delete_pos_len:
|
2008-05-23 13:01:19 +04:00
|
|
|
if (len < 0) return Qnil;
|
|
|
|
orig_len = RARRAY_LEN(ary);
|
2000-01-05 07:41:21 +03:00
|
|
|
if (pos < 0) {
|
2008-05-23 13:01:19 +04:00
|
|
|
pos += orig_len;
|
2007-12-10 15:01:45 +03:00
|
|
|
if (pos < 0) return Qnil;
|
2000-01-05 07:41:21 +03:00
|
|
|
}
|
2008-05-27 15:18:50 +04:00
|
|
|
else if (orig_len < pos) return Qnil;
|
2008-05-23 13:01:19 +04:00
|
|
|
if (orig_len < pos + len) {
|
|
|
|
len = orig_len - pos;
|
2008-05-05 07:13:32 +04:00
|
|
|
}
|
2008-05-27 15:18:50 +04:00
|
|
|
if (len == 0) return rb_ary_new2(0);
|
2008-03-13 19:39:45 +03:00
|
|
|
arg2 = rb_ary_new4(len, RARRAY_PTR(ary)+pos);
|
|
|
|
RBASIC(arg2)->klass = rb_obj_class(ary);
|
2008-05-27 15:18:50 +04:00
|
|
|
rb_ary_splice(ary, pos, len, Qundef);
|
2000-01-05 07:41:21 +03:00
|
|
|
return arg2;
|
|
|
|
}
|
|
|
|
|
2007-12-10 16:25:39 +03:00
|
|
|
if (!FIXNUM_P(arg1)) {
|
|
|
|
switch (rb_range_beg_len(arg1, &pos, &len, RARRAY_LEN(ary), 0)) {
|
|
|
|
case Qtrue:
|
|
|
|
/* valid range */
|
|
|
|
goto delete_pos_len;
|
|
|
|
case Qnil:
|
|
|
|
/* invalid range */
|
|
|
|
return Qnil;
|
|
|
|
default:
|
|
|
|
/* not a range */
|
|
|
|
break;
|
|
|
|
}
|
2000-01-05 07:41:21 +03:00
|
|
|
}
|
|
|
|
|
2002-05-22 09:57:08 +04:00
|
|
|
return rb_ary_delete_at(ary, NUM2LONG(arg1));
|
2000-01-05 07:41:21 +03:00
|
|
|
}
|
2000-02-01 06:12:21 +03:00
|
|
|
|
2008-01-24 09:18:18 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* array.reject! {|item| block } -> array or nil
|
|
|
|
*
|
|
|
|
* Equivalent to <code>Array#delete_if</code>, deleting elements from
|
|
|
|
* _self_ for which the block evaluates to true, but returns
|
|
|
|
* <code>nil</code> if no changes were made. Also see
|
|
|
|
* <code>Enumerable#reject</code>.
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2008-01-24 09:18:18 +03:00
|
|
|
rb_ary_reject_bang(VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-08-13 09:45:20 +04:00
|
|
|
long i1, i2;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-01-24 09:18:18 +03:00
|
|
|
RETURN_ENUMERATOR(ary, 0, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_ary_modify(ary);
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
|
|
|
|
VALUE v = RARRAY_PTR(ary)[i1];
|
2004-09-22 04:19:15 +04:00
|
|
|
if (RTEST(rb_yield(v))) continue;
|
1998-01-16 15:13:05 +03:00
|
|
|
if (i1 != i2) {
|
2004-09-22 04:19:15 +04:00
|
|
|
rb_ary_store(ary, i2, v);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
i2++;
|
|
|
|
}
|
2006-12-31 18:02:22 +03:00
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
if (RARRAY_LEN(ary) == i2) return Qnil;
|
|
|
|
if (i2 < RARRAY_LEN(ary))
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_LEN(ary, i2);
|
1998-01-16 15:19:22 +03:00
|
|
|
return ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.reject {|item| block } -> an_array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Returns a new array containing the items in _self_
|
|
|
|
* for which the block is not true.
|
|
|
|
*/
|
|
|
|
|
2001-10-16 07:27:23 +04:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_reject(VALUE ary)
|
2001-10-16 07:27:23 +04:00
|
|
|
{
|
2005-08-30 18:49:51 +04:00
|
|
|
RETURN_ENUMERATOR(ary, 0, 0);
|
2006-12-31 10:24:56 +03:00
|
|
|
ary = rb_ary_dup(ary);
|
|
|
|
rb_ary_reject_bang(ary);
|
|
|
|
return ary;
|
2001-10-16 07:27:23 +04:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* array.delete_if {|item| block } -> array
|
|
|
|
*
|
|
|
|
* Deletes every element of <i>self</i> for which <i>block</i> evaluates
|
|
|
|
* to <code>true</code>.
|
|
|
|
*
|
|
|
|
* a = [ "a", "b", "c" ]
|
|
|
|
* a.delete_if {|x| x >= "b" } #=> ["a"]
|
|
|
|
*/
|
|
|
|
|
2000-08-07 09:05:04 +04:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_delete_if(VALUE ary)
|
2000-08-07 09:05:04 +04:00
|
|
|
{
|
2008-05-31 13:27:42 +04:00
|
|
|
RETURN_ENUMERATOR(ary, 0, 0);
|
2000-08-07 09:05:04 +04:00
|
|
|
rb_ary_reject_bang(ary);
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2008-01-08 12:50:01 +03:00
|
|
|
static VALUE
|
|
|
|
take_i(VALUE val, VALUE *args, int argc, VALUE *argv)
|
|
|
|
{
|
|
|
|
if (args[1]-- == 0) rb_iter_break();
|
|
|
|
if (argc > 1) val = rb_ary_new4(argc, argv);
|
|
|
|
rb_ary_push(args[0], val);
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
take_items(VALUE obj, long n)
|
|
|
|
{
|
|
|
|
VALUE result = rb_ary_new2(n);
|
|
|
|
VALUE args[2];
|
|
|
|
|
|
|
|
args[0] = result; args[1] = (VALUE)n;
|
|
|
|
rb_block_call(obj, rb_intern("each"), 0, 0, take_i, (VALUE)args);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* array.zip(arg, ...) -> an_array
|
|
|
|
* array.zip(arg, ...) {| arr | block } -> nil
|
|
|
|
*
|
|
|
|
* Converts any arguments to arrays, then merges elements of
|
|
|
|
* <i>self</i> with corresponding elements from each argument. This
|
|
|
|
* generates a sequence of <code>self.size</code> <em>n</em>-element
|
|
|
|
* arrays, where <em>n</em> is one more that the count of arguments. If
|
|
|
|
* the size of any argument is less than <code>enumObj.size</code>,
|
|
|
|
* <code>nil</code> values are supplied. If a block given, it is
|
|
|
|
* invoked for each output array, otherwise an array of arrays is
|
|
|
|
* returned.
|
|
|
|
*
|
|
|
|
* a = [ 4, 5, 6 ]
|
|
|
|
* b = [ 7, 8, 9 ]
|
|
|
|
* [1,2,3].zip(a, b) #=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
|
|
|
|
* [1,2].zip(a,b) #=> [[1, 4, 7], [2, 5, 8]]
|
|
|
|
* a.zip([1,2],[8]) #=> [[4,1,8], [5,2,nil], [6,nil,nil]]
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2008-06-11 21:43:52 +04:00
|
|
|
rb_ary_zip(int argc, VALUE *argv, VALUE ary)
|
2008-01-08 12:50:01 +03:00
|
|
|
{
|
|
|
|
int i, j;
|
|
|
|
long len;
|
|
|
|
VALUE result = Qnil;
|
|
|
|
|
|
|
|
len = RARRAY_LEN(ary);
|
|
|
|
for (i=0; i<argc; i++) {
|
|
|
|
argv[i] = take_items(argv[i], len);
|
|
|
|
}
|
|
|
|
if (!rb_block_given_p()) {
|
|
|
|
result = rb_ary_new2(len);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i=0; i<RARRAY_LEN(ary); i++) {
|
|
|
|
VALUE tmp = rb_ary_new2(argc+1);
|
|
|
|
|
|
|
|
rb_ary_push(tmp, rb_ary_elt(ary, i));
|
|
|
|
for (j=0; j<argc; j++) {
|
|
|
|
rb_ary_push(tmp, rb_ary_elt(argv[j], i));
|
|
|
|
}
|
|
|
|
if (NIL_P(result)) {
|
|
|
|
rb_yield(tmp);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_ary_push(result, tmp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* array.transpose -> an_array
|
|
|
|
*
|
|
|
|
* Assumes that <i>self</i> is an array of arrays and transposes the
|
|
|
|
* rows and columns.
|
|
|
|
*
|
|
|
|
* a = [[1,2], [3,4], [5,6]]
|
|
|
|
* a.transpose #=> [[1, 3, 5], [2, 4, 6]]
|
|
|
|
*/
|
|
|
|
|
2002-11-19 11:07:51 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_transpose(VALUE ary)
|
2002-11-19 11:07:51 +03:00
|
|
|
{
|
|
|
|
long elen = -1, alen, i, j;
|
2003-07-24 22:33:50 +04:00
|
|
|
VALUE tmp, result = 0;
|
2002-11-19 11:07:51 +03:00
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
alen = RARRAY_LEN(ary);
|
2002-11-19 11:07:51 +03:00
|
|
|
if (alen == 0) return rb_ary_dup(ary);
|
|
|
|
for (i=0; i<alen; i++) {
|
2004-09-21 07:08:33 +04:00
|
|
|
tmp = to_ary(rb_ary_elt(ary, i));
|
2002-11-19 11:07:51 +03:00
|
|
|
if (elen < 0) { /* first element */
|
2006-09-02 18:42:08 +04:00
|
|
|
elen = RARRAY_LEN(tmp);
|
2002-11-19 11:07:51 +03:00
|
|
|
result = rb_ary_new2(elen);
|
|
|
|
for (j=0; j<elen; j++) {
|
|
|
|
rb_ary_store(result, j, rb_ary_new2(alen));
|
|
|
|
}
|
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
else if (elen != RARRAY_LEN(tmp)) {
|
2005-09-24 04:17:43 +04:00
|
|
|
rb_raise(rb_eIndexError, "element size differs (%ld should be %ld)",
|
2006-09-02 18:42:08 +04:00
|
|
|
RARRAY_LEN(tmp), elen);
|
2002-11-19 11:07:51 +03:00
|
|
|
}
|
|
|
|
for (j=0; j<elen; j++) {
|
2004-09-21 07:08:33 +04:00
|
|
|
rb_ary_store(rb_ary_elt(result, j), i, rb_ary_elt(tmp, j));
|
2002-11-19 11:07:51 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.replace(other_array) -> array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Replaces the contents of <i>self</i> with the contents of
|
|
|
|
* <i>other_array</i>, truncating or expanding if necessary.
|
|
|
|
*
|
|
|
|
* a = [ "a", "b", "c", "d", "e" ]
|
|
|
|
* a.replace([ "x", "y", "z" ]) #=> ["x", "y", "z"]
|
|
|
|
* a #=> ["x", "y", "z"]
|
|
|
|
*/
|
|
|
|
|
2006-12-31 18:02:22 +03:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_replace(VALUE copy, VALUE orig)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2002-09-03 09:20:14 +04:00
|
|
|
orig = to_ary(orig);
|
2007-01-09 18:11:01 +03:00
|
|
|
rb_ary_modify_check(copy);
|
2002-09-03 09:20:14 +04:00
|
|
|
if (copy == orig) return copy;
|
|
|
|
|
2008-10-09 09:47:04 +04:00
|
|
|
if (RARRAY_LEN(orig) <= RARRAY_EMBED_LEN_MAX) {
|
|
|
|
VALUE *ptr;
|
2008-10-17 17:09:33 +04:00
|
|
|
VALUE shared = 0;
|
|
|
|
|
|
|
|
if (ARY_OWNS_HEAP_P(copy)) {
|
|
|
|
xfree(RARRAY_PTR(copy));
|
|
|
|
}
|
|
|
|
else if (ARY_SHARED_P(copy)) {
|
|
|
|
shared = ARY_SHARED(copy);
|
|
|
|
FL_UNSET_SHARED(copy);
|
|
|
|
}
|
2008-10-09 09:47:04 +04:00
|
|
|
FL_SET_EMBED(copy);
|
|
|
|
ptr = RARRAY_PTR(orig);
|
|
|
|
MEMCPY(RARRAY_PTR(copy), ptr, VALUE, RARRAY_LEN(orig));
|
2008-10-17 17:09:33 +04:00
|
|
|
if (shared) {
|
|
|
|
rb_ary_decrement_share(shared);
|
|
|
|
}
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_LEN(copy, RARRAY_LEN(orig));
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
VALUE shared = ary_make_shared(orig);
|
|
|
|
if (ARY_OWNS_HEAP_P(copy)) {
|
|
|
|
xfree(RARRAY_PTR(copy));
|
2008-10-17 17:09:33 +04:00
|
|
|
} else {
|
|
|
|
rb_ary_unshare_safe(copy);
|
2008-10-09 09:47:04 +04:00
|
|
|
}
|
|
|
|
FL_UNSET_EMBED(copy);
|
|
|
|
ARY_SET_PTR(copy, RARRAY_PTR(orig));
|
|
|
|
ARY_SET_LEN(copy, RARRAY_LEN(orig));
|
2008-10-17 17:09:33 +04:00
|
|
|
rb_ary_set_shared(copy, shared);
|
2008-10-09 09:47:04 +04:00
|
|
|
}
|
2002-09-03 09:20:14 +04:00
|
|
|
return copy;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
2004-07-13 19:34:34 +04:00
|
|
|
* call-seq:
|
|
|
|
* array.clear -> array
|
|
|
|
*
|
|
|
|
* Removes all elements from _self_.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* a = [ "a", "b", "c", "d", "e" ]
|
|
|
|
* a.clear #=> [ ]
|
|
|
|
*/
|
|
|
|
|
2001-03-13 08:45:13 +03:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_clear(VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-10-18 13:03:16 +04:00
|
|
|
rb_ary_modify(ary);
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_LEN(ary, 0);
|
2006-09-02 18:42:08 +04:00
|
|
|
if (ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) {
|
2008-10-17 14:42:11 +04:00
|
|
|
ary_resize_capa(ary, ARY_DEFAULT_SIZE * 2);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
1998-01-16 15:19:22 +03:00
|
|
|
return ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.fill(obj) -> array
|
|
|
|
* array.fill(obj, start [, length]) -> array
|
|
|
|
* array.fill(obj, range ) -> array
|
|
|
|
* array.fill {|index| block } -> array
|
|
|
|
* array.fill(start [, length] ) {|index| block } -> array
|
|
|
|
* array.fill(range) {|index| block } -> array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* The first three forms set the selected elements of <i>self</i> (which
|
|
|
|
* may be the entire array) to <i>obj</i>. A <i>start</i> of
|
|
|
|
* <code>nil</code> is equivalent to zero. A <i>length</i> of
|
2004-07-13 19:34:34 +04:00
|
|
|
* <code>nil</code> is equivalent to <i>self.length</i>. The last three
|
2003-12-16 23:28:44 +03:00
|
|
|
* forms fill the array with the value of the block. The block is
|
|
|
|
* passed the absolute index of each element to be filled.
|
|
|
|
*
|
|
|
|
* a = [ "a", "b", "c", "d" ]
|
|
|
|
* a.fill("x") #=> ["x", "x", "x", "x"]
|
|
|
|
* a.fill("z", 2, 2) #=> ["x", "x", "z", "z"]
|
|
|
|
* a.fill("y", 0..1) #=> ["y", "y", "z", "z"]
|
|
|
|
* a.fill {|i| i*i} #=> [0, 1, 4, 9]
|
|
|
|
* a.fill(-2) {|i| i*i*i} #=> [0, 1, 8, 27]
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_fill(int argc, VALUE *argv, VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE item, arg1, arg2;
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
long beg = 0, end = 0, len = 0;
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE *p, *pend;
|
2002-01-28 13:18:14 +03:00
|
|
|
int block_p = Qfalse;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2002-01-28 11:44:45 +03:00
|
|
|
if (rb_block_given_p()) {
|
|
|
|
block_p = Qtrue;
|
|
|
|
rb_scan_args(argc, argv, "02", &arg1, &arg2);
|
|
|
|
argc += 1; /* hackish */
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
rb_scan_args(argc, argv, "12", &item, &arg1, &arg2);
|
|
|
|
}
|
1999-08-13 09:45:20 +04:00
|
|
|
switch (argc) {
|
|
|
|
case 1:
|
|
|
|
beg = 0;
|
2006-09-02 18:42:08 +04:00
|
|
|
len = RARRAY_LEN(ary);
|
1999-08-13 09:45:20 +04:00
|
|
|
break;
|
|
|
|
case 2:
|
2006-09-02 18:42:08 +04:00
|
|
|
if (rb_range_beg_len(arg1, &beg, &len, RARRAY_LEN(ary), 1)) {
|
1999-08-13 09:45:20 +04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
/* fall through */
|
|
|
|
case 3:
|
2002-05-21 09:39:19 +04:00
|
|
|
beg = NIL_P(arg1) ? 0 : NUM2LONG(arg1);
|
1998-01-16 15:13:05 +03:00
|
|
|
if (beg < 0) {
|
2006-09-02 18:42:08 +04:00
|
|
|
beg = RARRAY_LEN(ary) + beg;
|
1998-01-16 15:13:05 +03:00
|
|
|
if (beg < 0) beg = 0;
|
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
len = NIL_P(arg2) ? RARRAY_LEN(ary) - beg : NUM2LONG(arg2);
|
1999-08-13 09:45:20 +04:00
|
|
|
break;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_ary_modify(ary);
|
2008-07-09 16:01:08 +04:00
|
|
|
if (len < 0) {
|
|
|
|
return ary;
|
|
|
|
}
|
2008-07-01 08:19:47 +04:00
|
|
|
if (beg >= ARY_MAX_SIZE || len > ARY_MAX_SIZE - beg) {
|
2007-09-05 17:37:18 +04:00
|
|
|
rb_raise(rb_eArgError, "argument too big");
|
|
|
|
}
|
2008-06-25 10:28:53 +04:00
|
|
|
end = beg + len;
|
2007-09-05 17:37:18 +04:00
|
|
|
if (RARRAY_LEN(ary) < end) {
|
2006-09-02 18:42:08 +04:00
|
|
|
if (end >= ARY_CAPA(ary)) {
|
2008-10-17 14:42:11 +04:00
|
|
|
ary_resize_capa(ary, end);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary), end - RARRAY_LEN(ary));
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_LEN(ary, end);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2002-01-28 11:44:45 +03:00
|
|
|
if (block_p) {
|
2003-08-01 06:52:21 +04:00
|
|
|
VALUE v;
|
|
|
|
long i;
|
|
|
|
|
2004-09-29 09:15:33 +04:00
|
|
|
for (i=beg; i<end; i++) {
|
2003-08-07 01:50:06 +04:00
|
|
|
v = rb_yield(LONG2NUM(i));
|
2006-09-02 18:42:08 +04:00
|
|
|
if (i>=RARRAY_LEN(ary)) break;
|
|
|
|
RARRAY_PTR(ary)[i] = v;
|
2002-01-28 11:44:45 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2006-09-02 18:42:08 +04:00
|
|
|
p = RARRAY_PTR(ary) + beg;
|
2003-08-01 06:52:21 +04:00
|
|
|
pend = p + len;
|
2002-01-28 11:44:45 +03:00
|
|
|
while (p < pend) {
|
|
|
|
*p++ = item;
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
1998-01-16 15:19:22 +03:00
|
|
|
return ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
2004-07-13 20:21:23 +04:00
|
|
|
* call-seq:
|
|
|
|
* array + other_array -> an_array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* Concatenation---Returns a new array built by concatenating the
|
|
|
|
* two arrays together to produce a third array.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* [ 1, 2, 3 ] + [ 4, 5 ] #=> [ 1, 2, 3, 4, 5 ]
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_plus(VALUE x, VALUE y)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2005-08-10 05:39:24 +04:00
|
|
|
VALUE z;
|
2002-05-21 09:39:19 +04:00
|
|
|
long len;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2005-08-10 05:39:24 +04:00
|
|
|
y = to_ary(y);
|
2006-09-02 18:42:08 +04:00
|
|
|
len = RARRAY_LEN(x) + RARRAY_LEN(y);
|
2002-05-21 09:39:19 +04:00
|
|
|
z = rb_ary_new2(len);
|
2006-09-02 18:42:08 +04:00
|
|
|
MEMCPY(RARRAY_PTR(z), RARRAY_PTR(x), VALUE, RARRAY_LEN(x));
|
|
|
|
MEMCPY(RARRAY_PTR(z) + RARRAY_LEN(x), RARRAY_PTR(y), VALUE, RARRAY_LEN(y));
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_LEN(z, len);
|
1998-01-16 15:19:22 +03:00
|
|
|
return z;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
2004-07-13 20:21:23 +04:00
|
|
|
* call-seq:
|
|
|
|
* array.concat(other_array) -> array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Appends the elements in other_array to _self_.
|
|
|
|
*
|
|
|
|
* [ "a", "b" ].concat( ["c", "d"] ) #=> [ "a", "b", "c", "d" ]
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_concat(VALUE x, VALUE y)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2000-10-10 11:03:36 +04:00
|
|
|
y = to_ary(y);
|
2006-09-02 18:42:08 +04:00
|
|
|
if (RARRAY_LEN(y) > 0) {
|
|
|
|
rb_ary_splice(x, RARRAY_LEN(x), 0, y);
|
2000-10-10 11:03:36 +04:00
|
|
|
}
|
1998-01-16 15:19:22 +03:00
|
|
|
return x;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
|
|
|
|
/*
|
2004-07-13 20:21:23 +04:00
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array * int -> an_array
|
|
|
|
* array * str -> a_string
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* Repetition---With a String argument, equivalent to
|
|
|
|
* self.join(str). Otherwise, returns a new array
|
|
|
|
* built by concatenating the _int_ copies of _self_.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
*
|
|
|
|
* [ 1, 2, 3 ] * 3 #=> [ 1, 2, 3, 1, 2, 3, 1, 2, 3 ]
|
2004-07-13 19:34:34 +04:00
|
|
|
* [ 1, 2, 3 ] * "," #=> "1,2,3"
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_times(VALUE ary, VALUE times)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2003-01-07 10:36:40 +03:00
|
|
|
VALUE ary2, tmp;
|
1999-08-13 09:45:20 +04:00
|
|
|
long i, len;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2003-01-07 10:36:40 +03:00
|
|
|
tmp = rb_check_string_type(times);
|
|
|
|
if (!NIL_P(tmp)) {
|
|
|
|
return rb_ary_join(ary, tmp);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
1999-08-13 09:45:20 +04:00
|
|
|
len = NUM2LONG(times);
|
2008-11-25 17:29:39 +03:00
|
|
|
if (len == 0) {
|
|
|
|
ary2 = ary_new(rb_obj_class(ary), 0);
|
|
|
|
goto out;
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
if (len < 0) {
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_raise(rb_eArgError, "negative argument");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2008-06-20 03:12:46 +04:00
|
|
|
if (ARY_MAX_SIZE/len < RARRAY_LEN(ary)) {
|
2003-04-10 13:48:15 +04:00
|
|
|
rb_raise(rb_eArgError, "argument too big");
|
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
len *= RARRAY_LEN(ary);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2001-12-10 10:18:16 +03:00
|
|
|
ary2 = ary_new(rb_obj_class(ary), len);
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_LEN(ary2, len);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i=0; i<len; i+=RARRAY_LEN(ary)) {
|
|
|
|
MEMCPY(RARRAY_PTR(ary2)+i, RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary));
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2008-11-25 17:29:39 +03:00
|
|
|
out:
|
2001-10-02 08:31:23 +04:00
|
|
|
OBJ_INFECT(ary2, ary);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
return ary2;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
2004-07-13 20:21:23 +04:00
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.assoc(obj) -> an_array or nil
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* Searches through an array whose elements are also arrays
|
|
|
|
* comparing _obj_ with the first element of each contained array
|
|
|
|
* using obj.==.
|
|
|
|
* Returns the first contained array that matches (that
|
|
|
|
* is, the first associated array),
|
|
|
|
* or +nil+ if no match is found.
|
|
|
|
* See also <code>Array#rassoc</code>.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* s1 = [ "colors", "red", "blue", "green" ]
|
|
|
|
* s2 = [ "letters", "a", "b", "c" ]
|
|
|
|
* s3 = "foo"
|
|
|
|
* a = [ s1, s2, s3 ]
|
|
|
|
* a.assoc("letters") #=> [ "letters", "a", "b", "c" ]
|
|
|
|
* a.assoc("foo") #=> nil
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_assoc(VALUE ary, VALUE key)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2004-09-17 13:24:13 +04:00
|
|
|
long i;
|
|
|
|
VALUE v;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i = 0; i < RARRAY_LEN(ary); ++i) {
|
2007-10-25 20:52:40 +04:00
|
|
|
v = rb_check_array_type(RARRAY_PTR(ary)[i]);
|
|
|
|
if (!NIL_P(v) && RARRAY_LEN(v) > 0 &&
|
2006-09-02 18:42:08 +04:00
|
|
|
rb_equal(RARRAY_PTR(v)[0], key))
|
2004-09-17 13:24:13 +04:00
|
|
|
return v;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2007-06-22 20:26:07 +04:00
|
|
|
* array.rassoc(obj) -> an_array or nil
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Searches through the array whose elements are also arrays. Compares
|
2007-06-22 20:26:07 +04:00
|
|
|
* _obj_ with the second element of each contained array using
|
2003-12-16 23:28:44 +03:00
|
|
|
* <code>==</code>. Returns the first contained array that matches. See
|
|
|
|
* also <code>Array#assoc</code>.
|
|
|
|
*
|
|
|
|
* a = [ [ 1, "one"], [2, "two"], [3, "three"], ["ii", "two"] ]
|
|
|
|
* a.rassoc("two") #=> [2, "two"]
|
|
|
|
* a.rassoc("four") #=> nil
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_rassoc(VALUE ary, VALUE value)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2004-09-17 13:24:13 +04:00
|
|
|
long i;
|
|
|
|
VALUE v;
|
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i = 0; i < RARRAY_LEN(ary); ++i) {
|
|
|
|
v = RARRAY_PTR(ary)[i];
|
2004-09-17 13:24:13 +04:00
|
|
|
if (TYPE(v) == T_ARRAY &&
|
2006-09-02 18:42:08 +04:00
|
|
|
RARRAY_LEN(v) > 1 &&
|
|
|
|
rb_equal(RARRAY_PTR(v)[1], value))
|
2004-09-17 13:24:13 +04:00
|
|
|
return v;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2007-09-24 17:43:58 +04:00
|
|
|
static VALUE
|
|
|
|
recursive_equal(VALUE ary1, VALUE ary2, int recur)
|
|
|
|
{
|
|
|
|
long i;
|
|
|
|
|
|
|
|
if (recur) return Qfalse;
|
|
|
|
for (i=0; i<RARRAY_LEN(ary1); i++) {
|
|
|
|
if (!rb_equal(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
2004-07-13 20:21:23 +04:00
|
|
|
* call-seq:
|
|
|
|
* array == other_array -> bool
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* Equality---Two arrays are equal if they contain the same number
|
|
|
|
* of elements and if each element is equal to (according to
|
|
|
|
* Object.==) the corresponding element in the other array.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* [ "a", "c" ] == [ "a", "c", 7 ] #=> false
|
|
|
|
* [ "a", "c", 7 ] == [ "a", "c", 7 ] #=> true
|
|
|
|
* [ "a", "c", 7 ] == [ "a", "d", "f" ] #=> false
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_equal(VALUE ary1, VALUE ary2)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2001-08-29 10:28:51 +04:00
|
|
|
if (ary1 == ary2) return Qtrue;
|
2003-02-04 10:27:43 +03:00
|
|
|
if (TYPE(ary2) != T_ARRAY) {
|
2003-02-04 10:40:52 +03:00
|
|
|
if (!rb_respond_to(ary2, rb_intern("to_ary"))) {
|
2003-02-04 10:27:43 +03:00
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
return rb_equal(ary2, ary1);
|
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse;
|
2007-09-24 17:43:58 +04:00
|
|
|
return rb_exec_recursive(recursive_equal, ary1, ary2);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2008-02-26 09:30:38 +03:00
|
|
|
static VALUE
|
|
|
|
recursive_eql(VALUE ary1, VALUE ary2, int recur)
|
|
|
|
{
|
|
|
|
long i;
|
|
|
|
|
|
|
|
if (recur) return Qfalse;
|
|
|
|
for (i=0; i<RARRAY_LEN(ary1); i++) {
|
|
|
|
if (!rb_eql(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i)))
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
|
2003-12-29 05:02:08 +03:00
|
|
|
/*
|
2004-07-13 20:21:23 +04:00
|
|
|
* call-seq:
|
|
|
|
* array.eql?(other) -> true or false
|
2003-12-29 05:02:08 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* Returns <code>true</code> if _array_ and _other_ are the same object,
|
|
|
|
* or are both arrays with the same content.
|
2003-12-29 05:02:08 +03:00
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_eql(VALUE ary1, VALUE ary2)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2003-01-07 10:36:40 +03:00
|
|
|
if (ary1 == ary2) return Qtrue;
|
2003-02-03 11:45:26 +03:00
|
|
|
if (TYPE(ary2) != T_ARRAY) return Qfalse;
|
2006-09-02 18:42:08 +04:00
|
|
|
if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse;
|
2008-02-26 09:30:38 +03:00
|
|
|
return rb_exec_recursive(recursive_eql, ary1, ary2);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
recursive_hash(VALUE ary, VALUE dummy, int recur)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2002-08-23 11:48:48 +04:00
|
|
|
long i, h;
|
2000-11-20 10:31:55 +03:00
|
|
|
VALUE n;
|
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 LONG2FIX(0);
|
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
h = RARRAY_LEN(ary);
|
|
|
|
for (i=0; i<RARRAY_LEN(ary); i++) {
|
2002-05-21 09:39:19 +04:00
|
|
|
h = (h << 1) | (h<0 ? 1 : 0);
|
2006-09-02 18:42:08 +04:00
|
|
|
n = rb_hash(RARRAY_PTR(ary)[i]);
|
1999-01-20 07:59:39 +03:00
|
|
|
h ^= NUM2LONG(n);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2002-05-21 09:39:19 +04:00
|
|
|
return LONG2FIX(h);
|
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
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* array.hash -> fixnum
|
|
|
|
*
|
|
|
|
* Compute a hash-code for this array. Two arrays with the same content
|
|
|
|
* will have the same hash code (and will compare using <code>eql?</code>).
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_hash(VALUE ary)
|
* 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(recursive_hash, ary, 0);
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.include?(obj) -> true or false
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Returns <code>true</code> if the given object is present in
|
|
|
|
* <i>self</i> (that is, if any object <code>==</code> <i>anObject</i>),
|
|
|
|
* <code>false</code> otherwise.
|
|
|
|
*
|
|
|
|
* a = [ "a", "b", "c" ]
|
|
|
|
* a.include?("b") #=> true
|
|
|
|
* a.include?("z") #=> false
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_includes(VALUE ary, VALUE item)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
1999-08-13 09:45:20 +04:00
|
|
|
long i;
|
2002-08-23 11:48:48 +04:00
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i=0; i<RARRAY_LEN(ary); i++) {
|
|
|
|
if (rb_equal(RARRAY_PTR(ary)[i], item)) {
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qtrue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return Qfalse;
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
|
2008-02-26 09:30:38 +03:00
|
|
|
static VALUE
|
|
|
|
recursive_cmp(VALUE ary1, VALUE ary2, int recur)
|
|
|
|
{
|
|
|
|
long i, len;
|
|
|
|
|
|
|
|
if (recur) return Qnil;
|
|
|
|
len = RARRAY_LEN(ary1);
|
|
|
|
if (len > RARRAY_LEN(ary2)) {
|
|
|
|
len = RARRAY_LEN(ary2);
|
|
|
|
}
|
2008-02-26 10:38:13 +03:00
|
|
|
for (i=0; i<len; i++) {
|
2008-02-26 09:30:38 +03:00
|
|
|
VALUE v = rb_funcall(rb_ary_elt(ary1, i), id_cmp, 1, rb_ary_elt(ary2, i));
|
|
|
|
if (v != INT2FIX(0)) {
|
|
|
|
return v;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return Qundef;
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
2004-07-13 20:21:23 +04:00
|
|
|
* call-seq:
|
|
|
|
* array <=> other_array -> -1, 0, +1
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* Comparison---Returns an integer (-1, 0,
|
|
|
|
* or +1) if this array is less than, equal to, or greater than
|
|
|
|
* other_array. Each object in each array is compared
|
|
|
|
* (using <=>). If any value isn't
|
|
|
|
* equal, then that inequality is the return value. If all the
|
|
|
|
* values found are equal, then the return is based on a
|
|
|
|
* comparison of the array lengths. Thus, two arrays are
|
|
|
|
* ``equal'' according to <code>Array#<=></code> if and only if they have
|
|
|
|
* the same length and the value of each element is equal to the
|
|
|
|
* value of the corresponding element in the other array.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* [ "a", "a", "c" ] <=> [ "a", "b", "c" ] #=> -1
|
|
|
|
* [ 1, 2, 3, 4, 5, 6 ] <=> [ 1, 2 ] #=> +1
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2001-08-23 10:02:15 +04:00
|
|
|
VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_cmp(VALUE ary1, VALUE ary2)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2008-02-26 09:30:38 +03:00
|
|
|
long len;
|
|
|
|
VALUE v;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2002-08-23 11:48:48 +04:00
|
|
|
ary2 = to_ary(ary2);
|
2008-02-26 09:30:38 +03:00
|
|
|
if (ary1 == ary2) return INT2FIX(0);
|
|
|
|
v = rb_exec_recursive(recursive_cmp, ary1, ary2);
|
|
|
|
if (v != Qundef) return v;
|
2006-09-02 18:42:08 +04:00
|
|
|
len = RARRAY_LEN(ary1) - RARRAY_LEN(ary2);
|
1999-01-20 07:59:39 +03:00
|
|
|
if (len == 0) return INT2FIX(0);
|
|
|
|
if (len > 0) return INT2FIX(1);
|
|
|
|
return INT2FIX(-1);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2000-12-08 10:10:38 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
ary_make_hash(VALUE ary1, VALUE ary2)
|
2000-12-05 12:36:54 +03:00
|
|
|
{
|
2000-12-08 10:10:38 +03:00
|
|
|
VALUE hash = rb_hash_new();
|
2002-08-23 11:48:48 +04:00
|
|
|
long i;
|
2000-12-05 12:36:54 +03:00
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i=0; i<RARRAY_LEN(ary1); i++) {
|
|
|
|
rb_hash_aset(hash, RARRAY_PTR(ary1)[i], Qtrue);
|
2000-12-05 12:36:54 +03:00
|
|
|
}
|
|
|
|
if (ary2) {
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i=0; i<RARRAY_LEN(ary2); i++) {
|
|
|
|
rb_hash_aset(hash, RARRAY_PTR(ary2)[i], Qtrue);
|
2000-12-05 12:36:54 +03:00
|
|
|
}
|
|
|
|
}
|
2000-12-08 10:10:38 +03:00
|
|
|
return hash;
|
2000-12-05 12:36:54 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
2004-07-13 20:21:23 +04:00
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array - other_array -> an_array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* Array Difference---Returns a new array that is a copy of
|
|
|
|
* the original array, removing any items that also appear in
|
|
|
|
* other_array. (If you need set-like behavior, see the
|
|
|
|
* library class Set.)
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* [ 1, 1, 2, 2, 3, 3, 4, 5 ] - [ 1, 2, 4 ] #=> [ 3, 3, 5 ]
|
|
|
|
*/
|
|
|
|
|
2003-02-03 08:34:16 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_diff(VALUE ary1, VALUE ary2)
|
2003-02-03 08:34:16 +03:00
|
|
|
{
|
2005-12-12 19:47:17 +03:00
|
|
|
VALUE ary3;
|
|
|
|
volatile VALUE hash;
|
2003-02-03 08:34:16 +03:00
|
|
|
long i;
|
|
|
|
|
2005-08-10 05:39:24 +04:00
|
|
|
hash = ary_make_hash(to_ary(ary2), 0);
|
2003-02-03 08:34:16 +03:00
|
|
|
ary3 = rb_ary_new();
|
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i=0; i<RARRAY_LEN(ary1); i++) {
|
2007-08-30 03:12:21 +04:00
|
|
|
if (st_lookup(RHASH_TBL(hash), RARRAY_PTR(ary1)[i], 0)) continue;
|
2004-09-21 07:08:33 +04:00
|
|
|
rb_ary_push(ary3, rb_ary_elt(ary1, i));
|
2003-02-03 08:34:16 +03:00
|
|
|
}
|
|
|
|
return ary3;
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
2004-07-13 20:21:23 +04:00
|
|
|
* call-seq:
|
|
|
|
* array & other_array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* Set Intersection---Returns a new array
|
|
|
|
* containing elements common to the two arrays, with no duplicates.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* [ 1, 1, 3, 5 ] & [ 1, 2, 3 ] #=> [ 1, 3 ]
|
2003-12-16 23:28:44 +03:00
|
|
|
*/
|
|
|
|
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_and(VALUE ary1, VALUE ary2)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2004-11-03 14:34:57 +03:00
|
|
|
VALUE hash, ary3, v, vv;
|
1999-08-13 09:45:20 +04:00
|
|
|
long i;
|
2000-12-08 10:10:38 +03:00
|
|
|
|
2005-08-10 05:39:24 +04:00
|
|
|
ary2 = to_ary(ary2);
|
2006-09-02 18:42:08 +04:00
|
|
|
ary3 = rb_ary_new2(RARRAY_LEN(ary1) < RARRAY_LEN(ary2) ?
|
|
|
|
RARRAY_LEN(ary1) : RARRAY_LEN(ary2));
|
2000-12-08 10:10:38 +03:00
|
|
|
hash = ary_make_hash(ary2, 0);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2007-08-30 03:12:21 +04:00
|
|
|
if (RHASH_EMPTY_P(hash))
|
|
|
|
return ary3;
|
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i=0; i<RARRAY_LEN(ary1); i++) {
|
2004-11-03 14:34:57 +03:00
|
|
|
v = vv = rb_ary_elt(ary1, i);
|
2007-08-30 03:12:21 +04:00
|
|
|
if (st_delete(RHASH_TBL(hash), (st_data_t*)&vv, 0)) {
|
2004-09-21 07:08:33 +04:00
|
|
|
rb_ary_push(ary3, v);
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
}
|
2000-12-05 12:36:54 +03:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
return ary3;
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
2004-07-13 20:21:23 +04:00
|
|
|
* call-seq:
|
|
|
|
* array | other_array -> an_array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Set Union---Returns a new array by joining this array with
|
|
|
|
* other_array, removing duplicates.
|
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* [ "a", "b", "c" ] | [ "c", "d", "a" ]
|
2003-12-16 23:28:44 +03:00
|
|
|
* #=> [ "a", "b", "c", "d" ]
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_or(VALUE ary1, VALUE ary2)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2002-08-23 11:48:48 +04:00
|
|
|
VALUE hash, ary3;
|
2004-11-03 14:34:57 +03:00
|
|
|
VALUE v, vv;
|
1999-08-13 09:45:20 +04:00
|
|
|
long i;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2005-08-10 05:39:24 +04:00
|
|
|
ary2 = to_ary(ary2);
|
2006-09-02 18:42:08 +04:00
|
|
|
ary3 = rb_ary_new2(RARRAY_LEN(ary1)+RARRAY_LEN(ary2));
|
2000-12-08 10:10:38 +03:00
|
|
|
hash = ary_make_hash(ary1, ary2);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i=0; i<RARRAY_LEN(ary1); i++) {
|
2004-11-03 14:34:57 +03:00
|
|
|
v = vv = rb_ary_elt(ary1, i);
|
2007-08-30 03:12:21 +04:00
|
|
|
if (st_delete(RHASH_TBL(hash), (st_data_t*)&vv, 0)) {
|
2004-09-21 07:08:33 +04:00
|
|
|
rb_ary_push(ary3, v);
|
2000-12-05 12:36:54 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i=0; i<RARRAY_LEN(ary2); i++) {
|
2004-11-03 14:34:57 +03:00
|
|
|
v = vv = rb_ary_elt(ary2, i);
|
2007-08-30 03:12:21 +04:00
|
|
|
if (st_delete(RHASH_TBL(hash), (st_data_t*)&vv, 0)) {
|
2004-09-21 07:08:33 +04:00
|
|
|
rb_ary_push(ary3, v);
|
2000-12-05 12:36:54 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
return ary3;
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.uniq! -> array or nil
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Removes duplicate elements from _self_.
|
|
|
|
* Returns <code>nil</code> if no changes are made (that is, no
|
|
|
|
* duplicates are found).
|
|
|
|
*
|
|
|
|
* a = [ "a", "a", "b", "b", "c" ]
|
|
|
|
* a.uniq! #=> ["a", "b", "c"]
|
|
|
|
* b = [ "a", "b", "c" ]
|
|
|
|
* b.uniq! #=> nil
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_uniq_bang(VALUE ary)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2004-11-03 14:34:57 +03:00
|
|
|
VALUE hash, v, vv;
|
2004-09-22 04:19:15 +04:00
|
|
|
long i, j;
|
1999-01-20 07:59:39 +03:00
|
|
|
|
2002-08-23 11:48:48 +04:00
|
|
|
hash = ary_make_hash(ary, 0);
|
|
|
|
|
2007-08-30 03:12:21 +04:00
|
|
|
if (RARRAY_LEN(ary) == RHASH_SIZE(hash)) {
|
2000-12-05 12:36:54 +03:00
|
|
|
return Qnil;
|
|
|
|
}
|
2006-09-02 18:42:08 +04:00
|
|
|
for (i=j=0; i<RARRAY_LEN(ary); i++) {
|
2004-11-03 14:34:57 +03:00
|
|
|
v = vv = rb_ary_elt(ary, i);
|
2007-08-30 03:12:21 +04:00
|
|
|
if (st_delete(RHASH_TBL(hash), (st_data_t*)&vv, 0)) {
|
2004-09-22 04:19:15 +04:00
|
|
|
rb_ary_store(ary, j++, v);
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
}
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_LEN(ary, j);
|
1999-01-20 07:59:39 +03:00
|
|
|
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2004-07-13 19:34:34 +04:00
|
|
|
* array.uniq -> an_array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Returns a new array by removing duplicate values in <i>self</i>.
|
|
|
|
*
|
|
|
|
* a = [ "a", "a", "b", "b", "c" ]
|
|
|
|
* a.uniq #=> ["a", "b", "c"]
|
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_uniq(VALUE ary)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2002-08-27 12:31:08 +04:00
|
|
|
ary = rb_ary_dup(ary);
|
1999-10-20 11:10:23 +04:00
|
|
|
rb_ary_uniq_bang(ary);
|
|
|
|
return ary;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
2004-07-13 20:21:23 +04:00
|
|
|
* call-seq:
|
|
|
|
* array.compact! -> array or nil
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Removes +nil+ elements from array.
|
2004-07-13 19:34:34 +04:00
|
|
|
* Returns +nil+ if no changes were made.
|
2004-07-13 20:21:23 +04:00
|
|
|
*
|
2003-12-16 23:28:44 +03:00
|
|
|
* [ "a", nil, "b", nil, "c" ].compact! #=> [ "a", "b", "c" ]
|
|
|
|
* [ "a", "b", "c" ].compact! #=> nil
|
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_compact_bang(VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
|
|
|
VALUE *p, *t, *end;
|
2006-09-02 18:42:08 +04:00
|
|
|
long n;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_ary_modify(ary);
|
2006-09-02 18:42:08 +04:00
|
|
|
p = t = RARRAY_PTR(ary);
|
|
|
|
end = p + RARRAY_LEN(ary);
|
2002-05-21 09:39:19 +04:00
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
while (t < end) {
|
|
|
|
if (NIL_P(*t)) t++;
|
|
|
|
else *p++ = *t++;
|
|
|
|
}
|
2008-05-21 11:50:27 +04:00
|
|
|
n = p - RARRAY_PTR(ary);
|
|
|
|
if (RARRAY_LEN(ary) == n) {
|
1999-01-20 07:59:39 +03:00
|
|
|
return Qnil;
|
|
|
|
}
|
2008-10-15 17:21:37 +04:00
|
|
|
ARY_SET_LEN(ary, n);
|
2008-05-21 11:50:27 +04:00
|
|
|
if (n * 2 < ARY_CAPA(ary) && ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) {
|
2008-10-17 14:42:11 +04:00
|
|
|
ary_resize_capa(ary, n * 2);
|
2008-05-21 11:50:27 +04:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
1998-01-16 15:19:22 +03:00
|
|
|
return ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2004-07-13 20:21:23 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* array.compact -> an_array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
2004-07-13 20:21:23 +04:00
|
|
|
* Returns a copy of _self_ with all +nil+ elements removed.
|
|
|
|
*
|
|
|
|
* [ "a", nil, "b", nil, "c", nil ].compact
|
2003-12-16 23:28:44 +03:00
|
|
|
* #=> [ "a", "b", "c" ]
|
|
|
|
*/
|
|
|
|
|
1998-01-16 15:13:05 +03:00
|
|
|
static VALUE
|
2005-09-10 17:34:53 +04:00
|
|
|
rb_ary_compact(VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2002-08-27 12:31:08 +04:00
|
|
|
ary = rb_ary_dup(ary);
|
1999-10-20 11:10:23 +04:00
|
|
|
rb_ary_compact_bang(ary);
|
|
|
|
return ary;
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|
|
|
|
|
2008-05-14 07:46:37 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2008-05-29 23:18:54 +04:00
|
|
|
* array.count -> int
|
2008-05-14 07:46:37 +04:00
|
|
|
* array.count(obj) -> int
|
|
|
|
* array.count { |item| block } -> int
|
|
|
|
*
|
2008-05-29 23:18:54 +04:00
|
|
|
* Returns the number of elements. If an argument is given, counts
|
|
|
|
* the number of elements which equals to <i>obj</i>. If a block is
|
|
|
|
* given, counts the number of elements yielding a true value.
|
2008-05-14 07:46:37 +04:00
|
|
|
*
|
|
|
|
* ary = [1, 2, 4, 2]
|
2008-05-29 23:18:54 +04:00
|
|
|
* ary.count # => 4
|
2008-05-14 07:46:37 +04:00
|
|
|
* ary.count(2) # => 2
|
|
|
|
* ary.count{|x|x%2==0} # => 3
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_ary_count(int argc, VALUE *argv, VALUE ary)
|
|
|
|
{
|
|
|
|
long n = 0;
|
|
|
|
|
|
|
|
if (argc == 0) {
|
|
|
|
VALUE *p, *pend;
|
|
|
|
|
2008-05-29 23:18:54 +04:00
|
|
|
if (!rb_block_given_p())
|
|
|
|
return LONG2NUM(RARRAY_LEN(ary));
|
2008-05-14 07:46:37 +04:00
|
|
|
|
|
|
|
for (p = RARRAY_PTR(ary), pend = p + RARRAY_LEN(ary); p < pend; p++) {
|
|
|
|
if (RTEST(rb_yield(*p))) n++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
VALUE obj, *p, *pend;
|
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "1", &obj);
|
|
|
|
if (rb_block_given_p()) {
|
|
|
|
rb_warn("given block not used");
|
|
|
|
}
|
|
|
|
for (p = RARRAY_PTR(ary), pend = p + RARRAY_LEN(ary); p < pend; p++) {
|
|
|
|
if (rb_equal(*p, obj)) n++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return LONG2NUM(n);
|
|
|
|
}
|
|
|
|
|
2007-12-07 06:27:20 +03:00
|
|
|
static VALUE
|
|
|
|
flatten(VALUE ary, int level, int *modified)
|
|
|
|
{
|
|
|
|
long i = 0;
|
|
|
|
VALUE stack, result, tmp, elt;
|
|
|
|
st_table *memo;
|
|
|
|
st_data_t id;
|
|
|
|
|
2008-05-22 07:40:57 +04:00
|
|
|
stack = ary_new(0, ARY_DEFAULT_SIZE);
|
|
|
|
result = ary_new(0, RARRAY_LEN(ary));
|
2007-12-07 06:27:20 +03:00
|
|
|
memo = st_init_numtable();
|
|
|
|
st_insert(memo, (st_data_t)ary, (st_data_t)Qtrue);
|
|
|
|
*modified = 0;
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
while (i < RARRAY_LEN(ary)) {
|
|
|
|
elt = RARRAY_PTR(ary)[i++];
|
|
|
|
tmp = rb_check_array_type(elt);
|
2008-05-22 07:40:57 +04:00
|
|
|
if (RBASIC(result)->klass) {
|
|
|
|
rb_raise(rb_eRuntimeError, "flatten reentered");
|
|
|
|
}
|
2007-12-07 06:27:20 +03:00
|
|
|
if (NIL_P(tmp) || (level >= 0 && RARRAY_LEN(stack) / 2 >= level)) {
|
|
|
|
rb_ary_push(result, elt);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
*modified = 1;
|
|
|
|
id = (st_data_t)tmp;
|
|
|
|
if (st_lookup(memo, id, 0)) {
|
2008-05-22 04:57:47 +04:00
|
|
|
st_free_table(memo);
|
2007-12-07 06:27:20 +03:00
|
|
|
rb_raise(rb_eArgError, "tried to flatten recursive array");
|
|
|
|
}
|
|
|
|
st_insert(memo, id, (st_data_t)Qtrue);
|
|
|
|
rb_ary_push(stack, ary);
|
|
|
|
rb_ary_push(stack, LONG2NUM(i));
|
|
|
|
ary = tmp;
|
|
|
|
i = 0;
|
|
|
|
}
|
2001-05-02 08:22:21 +04:00
|
|
|
}
|
2007-12-07 06:27:20 +03:00
|
|
|
if (RARRAY_LEN(stack) == 0) {
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
id = (st_data_t)ary;
|
|
|
|
st_delete(memo, &id, 0);
|
|
|
|
tmp = rb_ary_pop(stack);
|
|
|
|
i = NUM2LONG(tmp);
|
|
|
|
ary = rb_ary_pop(stack);
|
2001-05-02 08:22:21 +04:00
|
|
|
}
|
|
|
|
|
2008-05-22 01:41:09 +04:00
|
|
|
st_free_table(memo);
|
|
|
|
|
2008-05-22 07:40:57 +04:00
|
|
|
RBASIC(result)->klass = rb_class_of(ary);
|
2007-12-07 06:27:20 +03:00
|
|
|
return result;
|
2001-05-02 08:22:21 +04:00
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2006-12-31 18:02:22 +03:00
|
|
|
* array.flatten! -> array or nil
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
* array.flatten!(level) -> array or nil
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Flattens _self_ in place.
|
|
|
|
* Returns <code>nil</code> if no modifications were made (i.e.,
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
* <i>array</i> contains no subarrays.) If the optional <i>level</i>
|
2007-12-31 09:43:32 +03:00
|
|
|
* argument determines the level of recursion to flatten.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* a = [ 1, 2, [3, [4, 5] ] ]
|
2006-12-31 18:02:22 +03:00
|
|
|
* a.flatten! #=> [1, 2, 3, 4, 5]
|
|
|
|
* a.flatten! #=> nil
|
|
|
|
* a #=> [1, 2, 3, 4, 5]
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
* a = [ 1, 2, [3, [4, 5] ] ]
|
|
|
|
* a.flatten!(1) #=> [1, 2, 3, [4, 5]]
|
2003-12-16 23:28:44 +03:00
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary)
|
1998-01-16 15:13:05 +03:00
|
|
|
{
|
2007-12-07 06:27:20 +03:00
|
|
|
int mod = 0, level = -1;
|
|
|
|
VALUE result, lv;
|
1998-01-16 15:13:05 +03:00
|
|
|
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
rb_scan_args(argc, argv, "01", &lv);
|
2007-07-13 05:33:31 +04:00
|
|
|
if (!NIL_P(lv)) level = NUM2INT(lv);
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
if (level == 0) return ary;
|
2007-12-07 06:27:20 +03:00
|
|
|
|
|
|
|
result = flatten(ary, level, &mod);
|
1999-01-20 07:59:39 +03:00
|
|
|
if (mod == 0) return Qnil;
|
2007-12-07 06:27:20 +03:00
|
|
|
rb_ary_replace(ary, result);
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
return ary;
|
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* array.flatten -> an_array
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
* array.flatten(level) -> an_array
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* Returns a new array that is a one-dimensional flattening of this
|
|
|
|
* array (recursively). That is, for every element that is an array,
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
* extract its elements into the new array. If the optional
|
2007-12-31 09:43:32 +03:00
|
|
|
* <i>level</i> argument determines the level of recursion to flatten.
|
2003-12-16 23:28:44 +03:00
|
|
|
*
|
|
|
|
* s = [ 1, 2, 3 ] #=> [1, 2, 3]
|
|
|
|
* t = [ 4, 5, 6, [7, 8] ] #=> [4, 5, 6, [7, 8]]
|
|
|
|
* a = [ s, t, 9, 10 ] #=> [[1, 2, 3], [4, 5, 6, [7, 8]], 9, 10]
|
2008-03-07 13:18:18 +03:00
|
|
|
* a.flatten #=> [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
* a = [ 1, 2, [3, [4, 5] ] ]
|
|
|
|
* a.flatten(1) #=> [1, 2, 3, [4, 5]]
|
2003-12-16 23:28:44 +03:00
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
static VALUE
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
rb_ary_flatten(int argc, VALUE *argv, VALUE ary)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2007-12-07 06:27:20 +03:00
|
|
|
int mod = 0, level = -1;
|
|
|
|
VALUE result, lv;
|
|
|
|
|
|
|
|
rb_scan_args(argc, argv, "01", &lv);
|
|
|
|
if (!NIL_P(lv)) level = NUM2INT(lv);
|
|
|
|
if (level == 0) return ary;
|
|
|
|
|
|
|
|
result = flatten(ary, level, &mod);
|
* object.c (rb_obj_untrusted): new method Object#untrusted?.
(rb_obj_untrust): new method Object#untrust.
(rb_obj_trust): new method Object#trust.
* array.c, debug.c, time.c, include/ruby/ruby.h, re.c, variable.c,
string.c, io.c, dir.c, vm_method.c, struct.c, class.c, hash.c,
ruby.c, marshal.c: fixes for Object#untrusted?.
* test/ruby/test_module.rb, test/ruby/test_array.rb,
test/ruby/test_object.rb, test/ruby/test_string.rb,
test/ruby/test_marshal.rb, test/ruby/test_hash.rb: added tests for
Object#untrusted?.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18568 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2008-08-13 11:25:05 +04:00
|
|
|
OBJ_INFECT(result, ary);
|
2007-12-07 06:27:20 +03:00
|
|
|
|
|
|
|
return result;
|
1999-01-20 07:59:39 +03:00
|
|
|
}
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2006-08-31 12:24:36 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2008-06-10 12:44:30 +04:00
|
|
|
* array.shuffle! -> array
|
2006-08-31 12:24:36 +04:00
|
|
|
*
|
|
|
|
* Shuffles elements in _self_ in place.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_ary_shuffle_bang(VALUE ary)
|
|
|
|
{
|
2006-09-02 18:42:08 +04:00
|
|
|
long i = RARRAY_LEN(ary);
|
2006-08-31 12:24:36 +04:00
|
|
|
|
* array.c (ary_iter_check): should check modification (size
change) during iteration.
* array.c (rb_ary_initialize, rb_ary_shift, rb_ary_unshift,
rb_ary_splice, rb_ary_reverse, rb_ary_sort, rb_ary_delete,
rb_ary_delete_at, rb_ary_reject_bang, rb_ary_replace,
rb_ary_clear, rb_ary_fill, rb_ary_uniq_bang, rb_ary_compact,
rb_ary_shuffle): add iteration check.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11429 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-12-29 22:25:11 +03:00
|
|
|
rb_ary_modify(ary);
|
2006-08-31 12:24:36 +04:00
|
|
|
while (i) {
|
2007-12-24 11:19:28 +03:00
|
|
|
long j = rb_genrand_real()*i;
|
2006-09-02 18:42:08 +04:00
|
|
|
VALUE tmp = RARRAY_PTR(ary)[--i];
|
|
|
|
RARRAY_PTR(ary)[i] = RARRAY_PTR(ary)[j];
|
|
|
|
RARRAY_PTR(ary)[j] = tmp;
|
2006-08-31 12:24:36 +04:00
|
|
|
}
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* array.shuffle -> an_array
|
|
|
|
*
|
2006-09-01 17:07:05 +04:00
|
|
|
* Returns a new array with elements of this array shuffled.
|
2006-08-31 12:24:36 +04:00
|
|
|
*
|
2006-09-01 09:24:05 +04:00
|
|
|
* a = [ 1, 2, 3 ] #=> [1, 2, 3]
|
|
|
|
* a.shuffle #=> [2, 3, 1]
|
2006-08-31 12:24:36 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_ary_shuffle(VALUE ary)
|
|
|
|
{
|
|
|
|
ary = rb_ary_dup(ary);
|
|
|
|
rb_ary_shuffle_bang(ary);
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
|
2007-05-01 12:45:28 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
2008-08-11 14:00:47 +04:00
|
|
|
* array.sample -> obj
|
|
|
|
* array.sample(n) -> an_array
|
|
|
|
*
|
2008-09-07 15:07:31 +04:00
|
|
|
* Choose a random element, or the random +n+ elements, from the array.
|
2008-08-11 14:00:47 +04:00
|
|
|
* If the array is empty, the first form returns <code>nil</code>, and the
|
|
|
|
* second form returns an empty array.
|
2007-05-01 12:45:28 +04:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
static VALUE
|
2008-08-11 14:00:47 +04:00
|
|
|
rb_ary_sample(int argc, VALUE *argv, VALUE ary)
|
2007-05-01 12:45:28 +04:00
|
|
|
{
|
2008-08-20 11:40:03 +04:00
|
|
|
VALUE nv, result, *ptr;
|
|
|
|
long n, len, i, j, k, idx[10];
|
2007-05-01 12:45:28 +04:00
|
|
|
|
2008-08-11 14:00:47 +04:00
|
|
|
len = RARRAY_LEN(ary);
|
|
|
|
if (argc == 0) {
|
|
|
|
if (len == 0) return Qnil;
|
2008-08-20 11:40:03 +04:00
|
|
|
i = len == 1 ? 0 : rb_genrand_real()*len;
|
2008-08-11 14:00:47 +04:00
|
|
|
return RARRAY_PTR(ary)[i];
|
|
|
|
}
|
|
|
|
rb_scan_args(argc, argv, "1", &nv);
|
2008-08-20 11:40:03 +04:00
|
|
|
n = NUM2LONG(nv);
|
|
|
|
ptr = RARRAY_PTR(ary);
|
|
|
|
len = RARRAY_LEN(ary);
|
2008-08-20 07:28:34 +04:00
|
|
|
if (n > len) n = len;
|
2008-08-20 11:40:03 +04:00
|
|
|
switch (n) {
|
|
|
|
case 0: return rb_ary_new2(0);
|
|
|
|
case 1:
|
|
|
|
return rb_ary_new4(1, &ptr[(long)(rb_genrand_real()*len)]);
|
|
|
|
case 2:
|
|
|
|
i = rb_genrand_real()*len;
|
|
|
|
j = rb_genrand_real()*(len-1);
|
2008-10-24 19:14:44 +04:00
|
|
|
if (j >= i) j++;
|
2008-08-20 11:40:03 +04:00
|
|
|
return rb_ary_new3(2, ptr[i], ptr[j]);
|
|
|
|
case 3:
|
|
|
|
i = rb_genrand_real()*len;
|
|
|
|
j = rb_genrand_real()*(len-1);
|
|
|
|
k = rb_genrand_real()*(len-2);
|
2008-10-24 19:14:44 +04:00
|
|
|
{
|
|
|
|
long l = j, g = i;
|
|
|
|
if (j >= i) l = i, g = ++j;
|
|
|
|
if (k >= l && (++k >= g)) ++k;
|
|
|
|
}
|
2008-08-20 11:40:03 +04:00
|
|
|
return rb_ary_new3(3, ptr[i], ptr[j], ptr[k]);
|
|
|
|
}
|
|
|
|
if (n < sizeof(idx)/sizeof(idx[0])) {
|
2008-10-24 19:14:44 +04:00
|
|
|
long sorted[sizeof(idx)/sizeof(idx[0])];
|
|
|
|
sorted[0] = idx[0] = rb_genrand_real()*len;
|
2008-08-20 11:40:03 +04:00
|
|
|
for (i=1; i<n; i++) {
|
|
|
|
k = rb_genrand_real()*--len;
|
2008-10-24 19:14:44 +04:00
|
|
|
for (j = 0; j < i; ++j) {
|
|
|
|
if (k < sorted[j]) break;
|
|
|
|
++k;
|
|
|
|
}
|
|
|
|
memmove(&sorted[j+1], &sorted[j], sizeof(sorted[0])*(i-j));
|
|
|
|
sorted[j] = idx[i] = k;
|
2008-08-20 11:40:03 +04:00
|
|
|
}
|
|
|
|
result = rb_ary_new2(n);
|
|
|
|
for (i=0; i<n; i++) {
|
|
|
|
RARRAY_PTR(result)[i] = RARRAY_PTR(ary)[idx[i]];
|
2008-08-11 14:00:47 +04:00
|
|
|
}
|
|
|
|
}
|
2008-08-20 11:40:03 +04:00
|
|
|
else {
|
|
|
|
result = rb_ary_new4(len, ptr);
|
|
|
|
RB_GC_GUARD(ary);
|
|
|
|
for (i=0; i<n; i++) {
|
|
|
|
j = (long)(rb_genrand_real()*(len-i)) + i;
|
|
|
|
nv = RARRAY_PTR(result)[j];
|
|
|
|
RARRAY_PTR(result)[j] = RARRAY_PTR(result)[i];
|
|
|
|
RARRAY_PTR(result)[i] = nv;
|
|
|
|
}
|
2008-08-11 14:00:47 +04:00
|
|
|
}
|
2008-10-24 19:14:44 +04:00
|
|
|
ARY_SET_LEN(result, n);
|
2008-08-20 11:40:03 +04:00
|
|
|
|
2008-08-11 14:00:47 +04:00
|
|
|
return result;
|
2007-05-01 12:45:28 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2007-08-06 20:26:17 +04:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ary.cycle {|obj| block }
|
2008-04-13 18:59:55 +04:00
|
|
|
* ary.cycle(n) {|obj| block }
|
2007-08-06 20:26:17 +04:00
|
|
|
*
|
2008-04-13 18:59:55 +04:00
|
|
|
* Calls <i>block</i> for each element repeatedly _n_ times or
|
|
|
|
* forever if none or nil is given. If a non-positive number is
|
|
|
|
* given or the array is empty, does nothing. Returns nil if the
|
|
|
|
* loop has finished without getting interrupted.
|
2007-08-06 20:26:17 +04:00
|
|
|
*
|
|
|
|
* a = ["a", "b", "c"]
|
2007-09-06 16:33:45 +04:00
|
|
|
* a.cycle {|x| puts x } # print, a, b, c, a, b, c,.. forever.
|
2008-04-13 18:59:55 +04:00
|
|
|
* a.cycle(2) {|x| puts x } # print, a, b, c, a, b, c.
|
2007-08-06 20:26:17 +04:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2008-04-13 18:59:55 +04:00
|
|
|
rb_ary_cycle(int argc, VALUE *argv, VALUE ary)
|
2007-08-06 20:26:17 +04:00
|
|
|
{
|
2008-04-13 18:59:55 +04:00
|
|
|
long n, i;
|
|
|
|
VALUE nv = Qnil;
|
2007-08-06 20:26:17 +04:00
|
|
|
|
2008-04-13 18:59:55 +04:00
|
|
|
rb_scan_args(argc, argv, "01", &nv);
|
|
|
|
|
|
|
|
RETURN_ENUMERATOR(ary, argc, argv);
|
|
|
|
if (NIL_P(nv)) {
|
|
|
|
n = -1;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
n = NUM2LONG(nv);
|
|
|
|
if (n <= 0) return Qnil;
|
|
|
|
}
|
|
|
|
|
|
|
|
while (RARRAY_LEN(ary) > 0 && (n < 0 || 0 < n--)) {
|
|
|
|
for (i=0; i<RARRAY_LEN(ary); i++) {
|
|
|
|
rb_yield(RARRAY_PTR(ary)[i]);
|
|
|
|
}
|
2007-08-06 20:26:17 +04:00
|
|
|
}
|
|
|
|
return Qnil;
|
|
|
|
}
|
|
|
|
|
2007-12-26 07:29:37 +03:00
|
|
|
#define tmpbuf(n, size) rb_str_tmp_new((n)*(size))
|
2007-10-09 13:11:36 +04:00
|
|
|
|
2007-10-02 03:35:30 +04:00
|
|
|
/*
|
|
|
|
* Recursively compute permutations of r elements of the set [0..n-1].
|
|
|
|
* When we have a complete permutation of array indexes, copy the values
|
|
|
|
* at those indexes into a new array and yield that array.
|
|
|
|
*
|
|
|
|
* n: the size of the set
|
|
|
|
* r: the number of elements in each permutation
|
|
|
|
* p: the array (of size r) that we're filling in
|
|
|
|
* index: what index we're filling in now
|
|
|
|
* used: an array of booleans: whether a given index is already used
|
|
|
|
* values: the Ruby array that holds the actual values to permute
|
|
|
|
*/
|
|
|
|
static void
|
2007-10-02 07:33:53 +04:00
|
|
|
permute0(long n, long r, long *p, long index, int *used, VALUE values)
|
|
|
|
{
|
2007-10-02 03:35:30 +04:00
|
|
|
long i,j;
|
2007-10-09 16:29:21 +04:00
|
|
|
for (i = 0; i < n; i++) {
|
2007-10-02 03:35:30 +04:00
|
|
|
if (used[i] == 0) {
|
|
|
|
p[index] = i;
|
|
|
|
if (index < r-1) { /* if not done yet */
|
|
|
|
used[i] = 1; /* mark index used */
|
2007-10-09 16:29:21 +04:00
|
|
|
permute0(n, r, p, index+1, /* recurse */
|
2007-10-02 03:35:30 +04:00
|
|
|
used, values);
|
|
|
|
used[i] = 0; /* index unused */
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/* We have a complete permutation of array indexes */
|
|
|
|
/* Build a ruby array of the corresponding values */
|
|
|
|
/* And yield it to the associated block */
|
|
|
|
VALUE result = rb_ary_new2(r);
|
|
|
|
VALUE *result_array = RARRAY_PTR(result);
|
2007-10-09 16:35:31 +04:00
|
|
|
const VALUE *values_array = RARRAY_PTR(values);
|
2007-10-02 03:35:30 +04:00
|
|
|
|
2007-10-09 16:29:21 +04:00
|
|
|
for (j = 0; j < r; j++) result_array[j] = values_array[p[j]];
|
2008-10-09 09:47:04 +04:00
|
|
|
ARY_SET_LEN(result, r);
|
2007-10-02 03:35:30 +04:00
|
|
|
rb_yield(result);
|
|
|
|
}
|
|
|
|
}
|
2007-09-29 12:43:59 +04:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2007-11-19 10:06:03 +03:00
|
|
|
* ary.permutation { |p| block } -> array
|
|
|
|
* ary.permutation -> enumerator
|
2007-10-02 03:35:30 +04:00
|
|
|
* ary.permutation(n) { |p| block } -> array
|
|
|
|
* ary.permutation(n) -> enumerator
|
2007-09-29 12:43:59 +04:00
|
|
|
*
|
2007-10-02 03:35:30 +04:00
|
|
|
* When invoked with a block, yield all permutations of length <i>n</i>
|
|
|
|
* of the elements of <i>ary</i>, then return the array itself.
|
2007-11-19 10:06:03 +03:00
|
|
|
* If <i>n</i> is not specified, yield all permutations of all elements.
|
2007-10-02 03:35:30 +04:00
|
|
|
* The implementation makes no guarantees about the order in which
|
|
|
|
* the permutations are yielded.
|
|
|
|
*
|
|
|
|
* When invoked without a block, return an enumerator object instead.
|
|
|
|
*
|
|
|
|
* Examples:
|
2008-03-09 04:04:46 +03:00
|
|
|
*
|
2007-09-29 12:43:59 +04:00
|
|
|
* a = [1, 2, 3]
|
2007-11-19 10:06:03 +03:00
|
|
|
* a.permutation.to_a #=> [[1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]]
|
2007-09-29 12:43:59 +04:00
|
|
|
* a.permutation(1).to_a #=> [[1],[2],[3]]
|
|
|
|
* a.permutation(2).to_a #=> [[1,2],[1,3],[2,1],[2,3],[3,1],[3,2]]
|
|
|
|
* a.permutation(3).to_a #=> [[1,2,3],[1,3,2],[2,1,3],[2,3,1],[3,1,2],[3,2,1]]
|
2008-03-09 04:04:46 +03:00
|
|
|
* a.permutation(0).to_a #=> [[]] # one permutation of length 0
|
|
|
|
* a.permutation(4).to_a #=> [] # no permutations of length 4
|
2007-09-29 12:43:59 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2007-11-19 10:06:03 +03:00
|
|
|
rb_ary_permutation(int argc, VALUE *argv, VALUE ary)
|
2007-09-29 12:43:59 +04:00
|
|
|
{
|
2007-11-19 10:06:03 +03:00
|
|
|
VALUE num;
|
2007-10-04 10:51:17 +04:00
|
|
|
long r, n, i;
|
|
|
|
|
2007-11-19 10:06:03 +03:00
|
|
|
n = RARRAY_LEN(ary); /* Array length */
|
2008-03-11 19:15:14 +03:00
|
|
|
RETURN_ENUMERATOR(ary, argc, argv); /* Return enumerator if no block */
|
2007-11-19 10:06:03 +03:00
|
|
|
rb_scan_args(argc, argv, "01", &num);
|
|
|
|
r = NIL_P(num) ? n : NUM2LONG(num); /* Permutation size from argument */
|
2007-10-02 03:35:30 +04:00
|
|
|
|
|
|
|
if (r < 0 || n < r) {
|
|
|
|
/* no permutations: yield nothing */
|
|
|
|
}
|
|
|
|
else if (r == 0) { /* exactly one permutation: the zero-length array */
|
|
|
|
rb_yield(rb_ary_new2(0));
|
|
|
|
}
|
|
|
|
else if (r == 1) { /* this is a special, easy case */
|
|
|
|
for (i = 0; i < RARRAY_LEN(ary); i++) {
|
|
|
|
rb_yield(rb_ary_new3(1, RARRAY_PTR(ary)[i]));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else { /* this is the general case */
|
2007-12-22 08:05:30 +03:00
|
|
|
volatile VALUE t0 = tmpbuf(n,sizeof(long));
|
2007-10-09 13:11:36 +04:00
|
|
|
long *p = (long*)RSTRING_PTR(t0);
|
2007-12-22 08:05:30 +03:00
|
|
|
volatile VALUE t1 = tmpbuf(n,sizeof(int));
|
2007-10-09 16:29:21 +04:00
|
|
|
int *used = (int*)RSTRING_PTR(t1);
|
2008-10-09 09:47:04 +04:00
|
|
|
VALUE ary0 = ary_make_substitution(ary); /* private defensive copy of ary */
|
2008-10-30 15:35:04 +03:00
|
|
|
RBASIC(ary0)->klass = 0;
|
2007-10-02 03:37:02 +04:00
|
|
|
|
2007-10-09 16:29:21 +04:00
|
|
|
for (i = 0; i < n; i++) used[i] = 0; /* initialize array */
|
2007-10-02 03:35:30 +04:00
|
|
|
|
2007-10-09 16:35:31 +04:00
|
|
|
permute0(n, r, p, 0, used, ary0); /* compute and yield permutations */
|
2007-11-21 09:06:10 +03:00
|
|
|
RB_GC_GUARD(t0);
|
|
|
|
RB_GC_GUARD(t1);
|
2008-10-30 15:35:04 +03:00
|
|
|
RBASIC(ary0)->klass = rb_cArray;
|
2007-10-02 03:35:30 +04:00
|
|
|
}
|
|
|
|
return ary;
|
2007-09-29 12:43:59 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
static long
|
|
|
|
combi_len(long n, long k)
|
|
|
|
{
|
|
|
|
long i, val = 1;
|
|
|
|
|
|
|
|
if (k*2 > n) k = n-k;
|
|
|
|
if (k == 0) return 1;
|
|
|
|
if (k < 0) return 0;
|
|
|
|
val = 1;
|
|
|
|
for (i=1; i <= k; i++,n--) {
|
2008-02-26 10:41:34 +03:00
|
|
|
long m = val;
|
2007-09-29 12:43:59 +04:00
|
|
|
val *= n;
|
2008-02-26 10:41:34 +03:00
|
|
|
if (val < m) {
|
|
|
|
rb_raise(rb_eRangeError, "too big for combination");
|
|
|
|
}
|
2007-09-29 12:43:59 +04:00
|
|
|
val /= i;
|
|
|
|
}
|
|
|
|
return val;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2007-10-02 03:35:30 +04:00
|
|
|
* ary.combination(n) { |c| block } -> ary
|
|
|
|
* ary.combination(n) -> enumerator
|
2007-09-29 12:43:59 +04:00
|
|
|
*
|
2007-10-02 03:35:30 +04:00
|
|
|
* When invoked with a block, yields all combinations of length <i>n</i>
|
|
|
|
* of elements from <i>ary</i> and then returns <i>ary</i> itself.
|
|
|
|
* The implementation makes no guarantees about the order in which
|
|
|
|
* the combinations are yielded.
|
|
|
|
*
|
|
|
|
* When invoked without a block, returns an enumerator object instead.
|
2007-09-29 12:43:59 +04:00
|
|
|
*
|
2007-10-02 03:35:30 +04:00
|
|
|
* Examples:
|
2008-03-09 04:04:46 +03:00
|
|
|
*
|
2007-09-29 12:43:59 +04:00
|
|
|
* a = [1, 2, 3, 4]
|
|
|
|
* a.combination(1).to_a #=> [[1],[2],[3],[4]]
|
|
|
|
* a.combination(2).to_a #=> [[1,2],[1,3],[1,4],[2,3],[2,4],[3,4]]
|
|
|
|
* a.combination(3).to_a #=> [[1,2,3],[1,2,4],[1,3,4],[2,3,4]]
|
|
|
|
* a.combination(4).to_a #=> [[1,2,3,4]]
|
2008-03-09 04:04:46 +03:00
|
|
|
* a.combination(0).to_a #=> [[]] # one combination of length 0
|
|
|
|
* a.combination(5).to_a #=> [] # no combinations of length 5
|
2007-09-29 12:43:59 +04:00
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_ary_combination(VALUE ary, VALUE num)
|
|
|
|
{
|
|
|
|
long n, i, len;
|
|
|
|
|
|
|
|
n = NUM2LONG(num);
|
2008-03-11 19:15:14 +03:00
|
|
|
RETURN_ENUMERATOR(ary, 1, &num);
|
2007-09-29 12:43:59 +04:00
|
|
|
len = RARRAY_LEN(ary);
|
2007-10-02 03:35:30 +04:00
|
|
|
if (n < 0 || len < n) {
|
2007-09-29 12:43:59 +04:00
|
|
|
/* yield nothing */
|
|
|
|
}
|
2007-10-02 03:35:30 +04:00
|
|
|
else if (n == 0) {
|
2007-10-01 18:46:07 +04:00
|
|
|
rb_yield(rb_ary_new2(0));
|
2007-09-29 12:43:59 +04:00
|
|
|
}
|
|
|
|
else if (n == 1) {
|
|
|
|
for (i = 0; i < len; i++) {
|
|
|
|
rb_yield(rb_ary_new3(1, RARRAY_PTR(ary)[i]));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
2007-10-12 18:34:37 +04:00
|
|
|
volatile VALUE t0 = tmpbuf(n+1, sizeof(long));
|
2007-10-09 13:11:36 +04:00
|
|
|
long *stack = (long*)RSTRING_PTR(t0);
|
2007-09-29 12:43:59 +04:00
|
|
|
long nlen = combi_len(len, n);
|
|
|
|
volatile VALUE cc = rb_ary_new2(n);
|
|
|
|
VALUE *chosen = RARRAY_PTR(cc);
|
|
|
|
long lev = 0;
|
|
|
|
|
2007-10-09 11:33:35 +04:00
|
|
|
RBASIC(cc)->klass = 0;
|
2007-09-29 12:43:59 +04:00
|
|
|
MEMZERO(stack, long, n);
|
|
|
|
stack[0] = -1;
|
|
|
|
for (i = 0; i < nlen; i++) {
|
|
|
|
chosen[lev] = RARRAY_PTR(ary)[stack[lev+1]];
|
|
|
|
for (lev++; lev < n; lev++) {
|
|
|
|
chosen[lev] = RARRAY_PTR(ary)[stack[lev+1] = stack[lev]+1];
|
|
|
|
}
|
|
|
|
rb_yield(rb_ary_new4(n, chosen));
|
|
|
|
do {
|
|
|
|
stack[lev--]++;
|
|
|
|
} while (lev && (stack[lev+1]+n == len+lev+1));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return ary;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
2007-10-02 07:33:53 +04:00
|
|
|
* ary.product(other_ary, ...)
|
2007-09-29 12:43:59 +04:00
|
|
|
*
|
2007-10-02 07:33:53 +04:00
|
|
|
* Returns an array of all combinations of elements from all arrays.
|
|
|
|
* The length of the returned array is the product of the length
|
|
|
|
* of ary and the argument arrays
|
2007-09-29 12:43:59 +04:00
|
|
|
*
|
2007-10-02 07:33:53 +04:00
|
|
|
* [1,2,3].product([4,5]) # => [[1,4],[1,5],[2,4],[2,5],[3,4],[3,5]]
|
|
|
|
* [1,2].product([1,2]) # => [[1,1],[1,2],[2,1],[2,2]]
|
|
|
|
* [1,2].product([3,4],[5,6]) # => [[1,3,5],[1,3,6],[1,4,5],[1,4,6],
|
|
|
|
* # [2,3,5],[2,3,6],[2,4,5],[2,4,6]]
|
|
|
|
* [1,2].product() # => [[1],[2]]
|
|
|
|
* [1,2].product([]) # => []
|
2007-09-29 12:43:59 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
2007-10-02 07:33:53 +04:00
|
|
|
rb_ary_product(int argc, VALUE *argv, VALUE ary)
|
2007-09-29 12:43:59 +04:00
|
|
|
{
|
2007-10-02 07:33:53 +04:00
|
|
|
int n = argc+1; /* How many arrays we're operating on */
|
2007-10-09 13:11:36 +04:00
|
|
|
volatile VALUE t0 = tmpbuf(n, sizeof(VALUE));
|
|
|
|
volatile VALUE t1 = tmpbuf(n, sizeof(int));
|
2007-10-04 10:51:17 +04:00
|
|
|
VALUE *arrays = (VALUE*)RSTRING_PTR(t0); /* The arrays we're computing the product of */
|
|
|
|
int *counters = (int*)RSTRING_PTR(t1); /* The current position in each one */
|
2007-10-02 07:33:53 +04:00
|
|
|
VALUE result; /* The array we'll be returning */
|
|
|
|
long i,j;
|
2007-10-04 15:18:14 +04:00
|
|
|
long resultlen = 1;
|
2007-09-29 12:43:59 +04:00
|
|
|
|
2007-10-09 11:33:35 +04:00
|
|
|
RBASIC(t0)->klass = 0;
|
|
|
|
RBASIC(t1)->klass = 0;
|
|
|
|
|
2007-10-02 07:33:53 +04:00
|
|
|
/* initialize the arrays of arrays */
|
|
|
|
arrays[0] = ary;
|
2007-11-06 21:54:02 +03:00
|
|
|
for (i = 1; i < n; i++) arrays[i] = to_ary(argv[i-1]);
|
2007-10-02 07:33:53 +04:00
|
|
|
|
|
|
|
/* initialize the counters for the arrays */
|
2007-10-09 16:29:21 +04:00
|
|
|
for (i = 0; i < n; i++) counters[i] = 0;
|
2007-10-02 07:33:53 +04:00
|
|
|
|
|
|
|
/* Compute the length of the result array; return [] if any is empty */
|
2007-10-09 16:29:21 +04:00
|
|
|
for (i = 0; i < n; i++) {
|
2008-02-26 10:41:34 +03:00
|
|
|
long k = RARRAY_LEN(arrays[i]), l = resultlen;
|
|
|
|
if (k == 0) return rb_ary_new2(0);
|
|
|
|
resultlen *= k;
|
|
|
|
if (resultlen < k || resultlen < l || resultlen / k != l) {
|
|
|
|
rb_raise(rb_eRangeError, "too big to product");
|
|
|
|
}
|
2007-10-02 07:33:53 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Otherwise, allocate and fill in an array of results */
|
|
|
|
result = rb_ary_new2(resultlen);
|
2007-10-09 16:29:21 +04:00
|
|
|
for (i = 0; i < resultlen; i++) {
|
2007-10-04 15:18:14 +04:00
|
|
|
int m;
|
2007-10-02 07:33:53 +04:00
|
|
|
/* fill in one subarray */
|
|
|
|
VALUE subarray = rb_ary_new2(n);
|
2007-10-09 16:29:21 +04:00
|
|
|
for (j = 0; j < n; j++) {
|
2007-10-02 07:33:53 +04:00
|
|
|
rb_ary_push(subarray, rb_ary_entry(arrays[j], counters[j]));
|
|
|
|
}
|
|
|
|
|
|
|
|
/* put it on the result array */
|
|
|
|
rb_ary_push(result, subarray);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Increment the last counter. If it overflows, reset to 0
|
|
|
|
* and increment the one before it.
|
|
|
|
*/
|
2007-10-04 15:18:14 +04:00
|
|
|
m = n-1;
|
2007-10-02 07:33:53 +04:00
|
|
|
counters[m]++;
|
2007-10-12 18:34:37 +04:00
|
|
|
while (m > 0 && counters[m] == RARRAY_LEN(arrays[m])) {
|
2007-10-02 07:33:53 +04:00
|
|
|
counters[m] = 0;
|
|
|
|
m--;
|
|
|
|
counters[m]++;
|
2007-09-29 12:43:59 +04:00
|
|
|
}
|
|
|
|
}
|
2007-10-02 07:33:53 +04:00
|
|
|
|
2007-09-29 12:43:59 +04:00
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2008-03-17 16:28:46 +03:00
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ary.take(n) => array
|
|
|
|
*
|
|
|
|
* Returns first n elements from <i>ary</i>.
|
|
|
|
*
|
|
|
|
* a = [1, 2, 3, 4, 5, 0]
|
|
|
|
* a.take(3) # => [1, 2, 3]
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_ary_take(VALUE obj, VALUE n)
|
|
|
|
{
|
2008-03-25 13:13:03 +03:00
|
|
|
long len = NUM2LONG(n);
|
|
|
|
if (len < 0) {
|
|
|
|
rb_raise(rb_eArgError, "attempt to take negative size");
|
|
|
|
}
|
|
|
|
return rb_ary_subseq(obj, 0, len);
|
2008-03-17 16:28:46 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ary.take_while {|arr| block } => array
|
|
|
|
*
|
|
|
|
* Passes elements to the block until the block returns nil or false,
|
|
|
|
* then stops iterating and returns an array of all prior elements.
|
|
|
|
*
|
|
|
|
* a = [1, 2, 3, 4, 5, 0]
|
|
|
|
* a.take_while {|i| i < 3 } # => [1, 2]
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_ary_take_while(VALUE ary)
|
|
|
|
{
|
|
|
|
long i;
|
|
|
|
|
|
|
|
RETURN_ENUMERATOR(ary, 0, 0);
|
|
|
|
for (i = 0; i < RARRAY_LEN(ary); i++) {
|
|
|
|
if (!RTEST(rb_yield(RARRAY_PTR(ary)[i]))) break;
|
|
|
|
}
|
|
|
|
return rb_ary_take(ary, LONG2FIX(i));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ary.drop(n) => array
|
|
|
|
*
|
|
|
|
* Drops first n elements from <i>ary</i>, and returns rest elements
|
|
|
|
* in an array.
|
|
|
|
*
|
|
|
|
* a = [1, 2, 3, 4, 5, 0]
|
|
|
|
* a.drop(3) # => [4, 5, 0]
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_ary_drop(VALUE ary, VALUE n)
|
|
|
|
{
|
|
|
|
VALUE result;
|
2008-03-25 13:13:03 +03:00
|
|
|
long pos = NUM2LONG(n);
|
|
|
|
if (pos < 0) {
|
|
|
|
rb_raise(rb_eArgError, "attempt to drop negative size");
|
|
|
|
}
|
2008-03-17 16:28:46 +03:00
|
|
|
|
2008-03-25 13:13:03 +03:00
|
|
|
result = rb_ary_subseq(ary, pos, RARRAY_LEN(ary));
|
2008-03-17 16:28:46 +03:00
|
|
|
if (result == Qnil) result = rb_ary_new();
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* call-seq:
|
|
|
|
* ary.drop_while {|arr| block } => array
|
|
|
|
*
|
|
|
|
* Drops elements up to, but not including, the first element for
|
|
|
|
* which the block returns nil or false and returns an array
|
|
|
|
* containing the remaining elements.
|
|
|
|
*
|
|
|
|
* a = [1, 2, 3, 4, 5, 0]
|
|
|
|
* a.drop_while {|i| i < 3 } # => [3, 4, 5, 0]
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
static VALUE
|
|
|
|
rb_ary_drop_while(VALUE ary)
|
|
|
|
{
|
|
|
|
long i;
|
|
|
|
|
|
|
|
RETURN_ENUMERATOR(ary, 0, 0);
|
|
|
|
for (i = 0; i < RARRAY_LEN(ary); i++) {
|
|
|
|
if (!RTEST(rb_yield(RARRAY_PTR(ary)[i]))) break;
|
|
|
|
}
|
|
|
|
return rb_ary_drop(ary, LONG2FIX(i));
|
|
|
|
}
|
|
|
|
|
2007-10-02 07:33:53 +04:00
|
|
|
|
|
|
|
|
2003-12-16 23:28:44 +03:00
|
|
|
/* Arrays are ordered, integer-indexed collections of any object.
|
|
|
|
* Array indexing starts at 0, as in C or Java. A negative index is
|
|
|
|
* assumed to be relative to the end of the array---that is, an index of -1
|
|
|
|
* indicates the last element of the array, -2 is the next to last
|
|
|
|
* element in the array, and so on.
|
|
|
|
*/
|
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
void
|
2005-09-10 17:34:53 +04:00
|
|
|
Init_Array(void)
|
1999-01-20 07:59:39 +03:00
|
|
|
{
|
2008-06-09 13:25:32 +04:00
|
|
|
#undef rb_intern
|
2008-08-16 04:20:31 +04:00
|
|
|
#define rb_intern(str) rb_intern_const(str)
|
2008-06-09 13:25:32 +04:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_cArray = rb_define_class("Array", rb_cObject);
|
|
|
|
rb_include_module(rb_cArray, rb_mEnumerable);
|
|
|
|
|
2002-12-20 11:33:17 +03:00
|
|
|
rb_define_alloc_func(rb_cArray, ary_alloc);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_singleton_method(rb_cArray, "[]", rb_ary_s_create, -1);
|
2007-08-24 21:47:09 +04:00
|
|
|
rb_define_singleton_method(rb_cArray, "try_convert", rb_ary_s_try_convert, 1);
|
2000-02-29 11:05:32 +03:00
|
|
|
rb_define_method(rb_cArray, "initialize", rb_ary_initialize, -1);
|
2003-05-19 09:41:08 +04:00
|
|
|
rb_define_method(rb_cArray, "initialize_copy", rb_ary_replace, 1);
|
2003-04-03 09:25:00 +04:00
|
|
|
|
2006-09-07 20:33:08 +04:00
|
|
|
rb_define_method(rb_cArray, "to_s", rb_ary_inspect, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cArray, "inspect", rb_ary_inspect, 0);
|
|
|
|
rb_define_method(rb_cArray, "to_a", rb_ary_to_a, 0);
|
2003-02-10 12:40:13 +03:00
|
|
|
rb_define_method(rb_cArray, "to_ary", rb_ary_to_ary_m, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cArray, "frozen?", rb_ary_frozen_p, 0);
|
|
|
|
|
|
|
|
rb_define_method(rb_cArray, "==", rb_ary_equal, 1);
|
|
|
|
rb_define_method(rb_cArray, "eql?", rb_ary_eql, 1);
|
|
|
|
rb_define_method(rb_cArray, "hash", rb_ary_hash, 0);
|
|
|
|
|
|
|
|
rb_define_method(rb_cArray, "[]", rb_ary_aref, -1);
|
|
|
|
rb_define_method(rb_cArray, "[]=", rb_ary_aset, -1);
|
1999-10-13 10:44:42 +04:00
|
|
|
rb_define_method(rb_cArray, "at", rb_ary_at, 1);
|
2001-02-02 14:38:20 +03:00
|
|
|
rb_define_method(rb_cArray, "fetch", rb_ary_fetch, -1);
|
2003-06-06 13:24:59 +04:00
|
|
|
rb_define_method(rb_cArray, "first", rb_ary_first, -1);
|
|
|
|
rb_define_method(rb_cArray, "last", rb_ary_last, -1);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cArray, "concat", rb_ary_concat, 1);
|
|
|
|
rb_define_method(rb_cArray, "<<", rb_ary_push, 1);
|
2000-01-05 07:41:21 +03:00
|
|
|
rb_define_method(rb_cArray, "push", rb_ary_push_m, -1);
|
2004-06-16 11:05:24 +04:00
|
|
|
rb_define_method(rb_cArray, "pop", rb_ary_pop_m, -1);
|
|
|
|
rb_define_method(rb_cArray, "shift", rb_ary_shift_m, -1);
|
2000-05-01 13:42:38 +04:00
|
|
|
rb_define_method(rb_cArray, "unshift", rb_ary_unshift_m, -1);
|
2001-05-02 08:22:21 +04:00
|
|
|
rb_define_method(rb_cArray, "insert", rb_ary_insert, -1);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cArray, "each", rb_ary_each, 0);
|
|
|
|
rb_define_method(rb_cArray, "each_index", rb_ary_each_index, 0);
|
|
|
|
rb_define_method(rb_cArray, "reverse_each", rb_ary_reverse_each, 0);
|
|
|
|
rb_define_method(rb_cArray, "length", rb_ary_length, 0);
|
|
|
|
rb_define_alias(rb_cArray, "size", "length");
|
|
|
|
rb_define_method(rb_cArray, "empty?", rb_ary_empty_p, 0);
|
2008-04-11 11:58:06 +04:00
|
|
|
rb_define_method(rb_cArray, "find_index", rb_ary_index, -1);
|
2004-10-05 05:37:46 +04:00
|
|
|
rb_define_method(rb_cArray, "index", rb_ary_index, -1);
|
|
|
|
rb_define_method(rb_cArray, "rindex", rb_ary_rindex, -1);
|
2000-01-05 07:41:21 +03:00
|
|
|
rb_define_method(rb_cArray, "join", rb_ary_join_m, -1);
|
|
|
|
rb_define_method(rb_cArray, "reverse", rb_ary_reverse_m, 0);
|
2000-08-24 10:21:43 +04:00
|
|
|
rb_define_method(rb_cArray, "reverse!", rb_ary_reverse_bang, 0);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cArray, "sort", rb_ary_sort, 0);
|
|
|
|
rb_define_method(rb_cArray, "sort!", rb_ary_sort_bang, 0);
|
1999-10-29 13:25:48 +04:00
|
|
|
rb_define_method(rb_cArray, "collect", rb_ary_collect, 0);
|
2000-05-01 13:42:38 +04:00
|
|
|
rb_define_method(rb_cArray, "collect!", rb_ary_collect_bang, 0);
|
2001-07-14 19:17:19 +04:00
|
|
|
rb_define_method(rb_cArray, "map", rb_ary_collect, 0);
|
2000-05-01 13:42:38 +04:00
|
|
|
rb_define_method(rb_cArray, "map!", rb_ary_collect_bang, 0);
|
2004-06-16 11:05:24 +04:00
|
|
|
rb_define_method(rb_cArray, "select", rb_ary_select, 0);
|
2003-05-04 20:03:24 +04:00
|
|
|
rb_define_method(rb_cArray, "values_at", rb_ary_values_at, -1);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cArray, "delete", rb_ary_delete, 1);
|
2000-05-30 08:24:17 +04:00
|
|
|
rb_define_method(rb_cArray, "delete_at", rb_ary_delete_at_m, 1);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cArray, "delete_if", rb_ary_delete_if, 0);
|
2001-10-16 07:27:23 +04:00
|
|
|
rb_define_method(rb_cArray, "reject", rb_ary_reject, 0);
|
2000-08-07 09:05:04 +04:00
|
|
|
rb_define_method(rb_cArray, "reject!", rb_ary_reject_bang, 0);
|
2008-01-08 12:50:01 +03:00
|
|
|
rb_define_method(rb_cArray, "zip", rb_ary_zip, -1);
|
2002-11-19 11:07:51 +03:00
|
|
|
rb_define_method(rb_cArray, "transpose", rb_ary_transpose, 0);
|
2001-05-06 19:06:00 +04:00
|
|
|
rb_define_method(rb_cArray, "replace", rb_ary_replace, 1);
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cArray, "clear", rb_ary_clear, 0);
|
|
|
|
rb_define_method(rb_cArray, "fill", rb_ary_fill, -1);
|
|
|
|
rb_define_method(rb_cArray, "include?", rb_ary_includes, 1);
|
|
|
|
rb_define_method(rb_cArray, "<=>", rb_ary_cmp, 1);
|
|
|
|
|
2000-02-01 06:12:21 +03:00
|
|
|
rb_define_method(rb_cArray, "slice", rb_ary_aref, -1);
|
2000-05-24 08:34:26 +04:00
|
|
|
rb_define_method(rb_cArray, "slice!", rb_ary_slice_bang, -1);
|
2000-02-01 06:12:21 +03:00
|
|
|
|
1999-01-20 07:59:39 +03:00
|
|
|
rb_define_method(rb_cArray, "assoc", rb_ary_assoc, 1);
|
|
|
|
rb_define_method(rb_cArray, "rassoc", rb_ary_rassoc, 1);
|
|
|
|
|
|
|
|
rb_define_method(rb_cArray, "+", rb_ary_plus, 1);
|
|
|
|
rb_define_method(rb_cArray, "*", rb_ary_times, 1);
|
|
|
|
|
|
|
|
rb_define_method(rb_cArray, "-", rb_ary_diff, 1);
|
|
|
|
rb_define_method(rb_cArray, "&", rb_ary_and, 1);
|
|
|
|
rb_define_method(rb_cArray, "|", rb_ary_or, 1);
|
|
|
|
|
|
|
|
rb_define_method(rb_cArray, "uniq", rb_ary_uniq, 0);
|
|
|
|
rb_define_method(rb_cArray, "uniq!", rb_ary_uniq_bang, 0);
|
|
|
|
rb_define_method(rb_cArray, "compact", rb_ary_compact, 0);
|
|
|
|
rb_define_method(rb_cArray, "compact!", rb_ary_compact_bang, 0);
|
* sprintf.c (rb_str_format): allow %c to print one character
string (e.g. ?x).
* lib/tempfile.rb (Tempfile::make_tmpname): put dot between
basename and pid. [ruby-talk:196272]
* parse.y (do_block): remove -> style block.
* parse.y (parser_yylex): remove tLAMBDA_ARG.
* eval.c (rb_call0): binding for the return event hook should have
consistent scope. [ruby-core:07928]
* eval.c (proc_invoke): return behavior should depend whether it
is surrounded by a lambda or a mere block.
* eval.c (formal_assign): handles post splat arguments.
* eval.c (rb_call0): ditto.
* st.c (strhash): use FNV-1a hash.
* parse.y (parser_yylex): removed experimental ';;' terminator.
* eval.c (rb_node_arity): should be aware of post splat arguments.
* eval.c (rb_proc_arity): ditto.
* parse.y (f_args): syntax rule enhanced to support arguments
after the splat.
* parse.y (block_param): ditto for block parameters.
* parse.y (f_post_arg): mandatory formal arguments after the splat
argument.
* parse.y (new_args_gen): generate nodes for mandatory formal
arguments after the splat argument.
* eval.c (rb_eval): dispatch mandatory formal arguments after the
splat argument.
* parse.y (args): allow more than one splat in the argument list.
* parse.y (method_call): allow aref [] to accept all kind of
method argument, including assocs, splat, and block argument.
* eval.c (SETUP_ARGS0): prepare block argument as well.
* lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931]
* eval.c (error_line): print receivers true/false/nil specially.
* eval.c (rb_proc_yield): handles parameters in yield semantics.
* eval.c (nil_yield): gives LocalJumpError to denote no block
error.
* io.c (rb_io_getc): now takes one-character string.
* string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo
hashing algorithm.
* string.c (rb_str_aref): str[0] now returns 1 character string,
instead of a fixnum. [Ruby2]
* parse.y (parser_yylex): ?c now returns 1 character string,
instead of a fixnum. [Ruby2]
* string.c (rb_str_aset): no longer support fixnum insertion.
* eval.c (umethod_bind): should not update original class.
[ruby-dev:28636]
* eval.c (ev_const_get): should support constant access from
within instance_eval(). [ruby-dev:28327]
* time.c (time_timeval): should round for usec floating
number. [ruby-core:07896]
* time.c (time_add): ditto.
* dir.c (sys_warning): should not call a vararg function
rb_sys_warning() indirectly. [ruby-core:07886]
* numeric.c (flo_divmod): the first element of Float#divmod should
be an integer. [ruby-dev:28589]
* test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder.
* re.c (rb_reg_initialize): should not allow modifying literal
regexps. frozen check moved from rb_reg_initialize_m as well.
* re.c (rb_reg_initialize): should not modify untainted objects in
safe levels higher than 3.
* re.c (rb_memcmp): type change from char* to const void*.
* dir.c (dir_close): should not close untainted dir stream.
* dir.c (GetDIR): add tainted/frozen check for each dir operation.
* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg):
typo fixed. a patch from Florian Gross <florg at florg.net>.
* eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from
event_hooks. no guarantee for arbitrary hook deletion.
[ruby-dev:28632]
* util.c (ruby_strtod): differ addition to minimize error.
[ruby-dev:28619]
* util.c (ruby_strtod): should not raise ERANGE when the input
string does not have any digits. [ruby-dev:28629]
* eval.c (proc_invoke): should restore old ruby_frame->block.
thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833]
also fix [ruby-dev:28614] as well.
* signal.c (trap): sig should be less then NSIG. Coverity found
this bug. a patch from Kevin Tew <tewk at tewk.com>.
[ruby-core:07823]
* math.c (math_log2): add new method inspired by
[ruby-talk:191237].
* math.c (math_log): add optional base argument to Math::log().
[ruby-talk:191308]
* ext/syck/emitter.c (syck_scan_scalar): avoid accessing
uninitialized array element. a patch from Pat Eyler
<rubypate at gmail.com>. [ruby-core:07809]
* array.c (rb_ary_fill): initialize local variables first. a
patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810]
* ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free
type_tag. a patch from Pat Eyler <rubypate at gmail.com>.
[ruby-core:07808]
* ext/socket/socket.c (make_hostent_internal): accept ai_family
check from Sam Roberts <sroberts at uniserve.com>.
[ruby-core:07691]
* util.c (ruby_strtod): should not cut off 18 digits for no
reason. [ruby-core:07796]
* array.c (rb_ary_fill): internalize local variable "beg" to
pacify Coverity. [ruby-core:07770]
* pack.c (pack_unpack): now supports CRLF newlines. a patch from
<tommy at tmtm.org>. [ruby-dev:28601]
* applied code clean-up patch from Stefan Huehner
<stefan at huehner.org>. [ruby-core:07764]
* lib/jcode.rb (String::tr_s): should have translated non
squeezing character sequence (i.e. a character) as well. thanks
to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090]
* ext/socket/socket.c: document update patch from Sam Roberts
<sroberts at uniserve.com>. [ruby-core:07701]
* lib/mathn.rb (Integer): need not to remove gcd2. a patch from
NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570]
* parse.y (arg): too much NEW_LIST()
* eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen.
* eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1.
[ruby-dev:28585]
* parse.y (arg): use NODE_ARGSCAT for placeholder.
* lib/getoptlong.rb (GetoptLong::get): RDoc update patch from
mathew <meta at pobox.com>. [ruby-core:07738]
* variable.c (rb_const_set): raise error when no target klass is
supplied. [ruby-dev:28582]
* prec.c (prec_prec_f): documentation patch from
<gerardo.santana at gmail.com>. [ruby-core:07689]
* bignum.c (rb_big_pow): second operand may be too big even if
it's a Fixnum. [ruby-talk:187984]
* README.EXT: update symbol description. [ruby-talk:188104]
* COPYING: explicitly note GPLv2. [ruby-talk:187922]
* parse.y: remove some obsolete syntax rules (unparenthesized
method calls in argument list).
* eval.c (rb_call0): insecure calling should be checked for non
NODE_SCOPE method invocations too.
* eval.c (rb_alias): should preserve the current safe level as
well as method definition.
* process.c (rb_f_sleep): remove RDoc description about SIGALRM
which is not valid on the current implementation. [ruby-dev:28464]
Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp>
* eval.c (method_missing): should support argument splat in
super. a bug in combination of super, splat and
method_missing. [ruby-talk:185438]
* configure.in: Solaris SunPro compiler -rapth patch from
<kuwa at labs.fujitsu.com>. [ruby-dev:28443]
* configure.in: remove enable_rpath=no for Solaris.
[ruby-dev:28440]
* ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior
of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby
String object.
* ruby.1: a clarification patch from David Lutterkort
<dlutter at redhat.com>. [ruby-core:7508]
* lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems
directories. a patch from Eric Hodel <drbrain at segment7.net>.
[ruby-core:07423]
* eval.c (rb_clear_cache_by_class): clearing wrong cache.
* ext/extmk.rb: use :remove_destination to install extension libraries
to avoid SEGV. [ruby-dev:28417]
* eval.c (rb_thread_fd_writable): should not re-schedule output
from KILLED thread (must be error printing).
* array.c (rb_ary_flatten_bang): allow specifying recursion
level. [ruby-talk:182170]
* array.c (rb_ary_flatten): ditto.
* gc.c (add_heap): a heap_slots may overflow. a patch from Stefan
Weil <weil at mail.berlios.de>.
* eval.c (rb_call): use separate cache for fcall/vcall
invocation.
* eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local
functions.
* eval.c (rb_mod_local): a new method to specify newly added
visibility "local".
* eval.c (search_method): search for local methods which are
visible only from the current class.
* class.c (rb_class_local_methods): a method to list local methods.
* object.c (Init_Object): add BasicObject class as a top level
BlankSlate class.
* ruby.h (SYM2ID): should not cast to signed long.
[ruby-core:07414]
* class.c (rb_include_module): allow module duplication.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
2006-06-10 01:20:17 +04:00
|
|
|
rb_define_method(rb_cArray, "flatten", rb_ary_flatten, -1);
|
|
|
|
rb_define_method(rb_cArray, "flatten!", rb_ary_flatten_bang, -1);
|
2008-05-14 07:46:37 +04:00
|
|
|
rb_define_method(rb_cArray, "count", rb_ary_count, -1);
|
2006-08-31 12:24:36 +04:00
|
|
|
rb_define_method(rb_cArray, "shuffle!", rb_ary_shuffle_bang, 0);
|
|
|
|
rb_define_method(rb_cArray, "shuffle", rb_ary_shuffle, 0);
|
2008-08-11 14:00:47 +04:00
|
|
|
rb_define_method(rb_cArray, "sample", rb_ary_sample, -1);
|
2008-04-13 18:59:55 +04:00
|
|
|
rb_define_method(rb_cArray, "cycle", rb_ary_cycle, -1);
|
2007-11-19 10:06:03 +03:00
|
|
|
rb_define_method(rb_cArray, "permutation", rb_ary_permutation, -1);
|
2007-09-29 12:43:59 +04:00
|
|
|
rb_define_method(rb_cArray, "combination", rb_ary_combination, 1);
|
2007-10-02 07:33:53 +04:00
|
|
|
rb_define_method(rb_cArray, "product", rb_ary_product, -1);
|
1998-01-16 15:13:05 +03:00
|
|
|
|
2008-03-17 16:28:46 +03:00
|
|
|
rb_define_method(rb_cArray, "take", rb_ary_take, 1);
|
|
|
|
rb_define_method(rb_cArray, "take_while", rb_ary_take_while, 0);
|
|
|
|
rb_define_method(rb_cArray, "drop", rb_ary_drop, 1);
|
|
|
|
rb_define_method(rb_cArray, "drop_while", rb_ary_drop_while, 0);
|
|
|
|
|
2001-12-10 10:18:16 +03:00
|
|
|
id_cmp = rb_intern("<=>");
|
1998-01-16 15:13:05 +03:00
|
|
|
}
|