diff options
Diffstat (limited to 'array.c')
| -rw-r--r-- | array.c | 3662 |
1 files changed, 2682 insertions, 980 deletions
@@ -11,41 +11,29 @@ **********************************************************************/ -#include "ruby/ruby.h" +#include "ruby/encoding.h" #include "ruby/util.h" #include "ruby/st.h" -#include "ruby/encoding.h" +#include "probes.h" +#include "id.h" +#include "debug_counter.h" +#include "gc.h" +#include "transient_heap.h" #include "internal.h" -#ifndef ARRAY_DEBUG +#if !ARRAY_DEBUG # define NDEBUG #endif -#include <assert.h> - -#define numberof(array) (int)(sizeof(array) / sizeof((array)[0])) +#include "ruby_assert.h" VALUE rb_cArray; -static ID id_cmp; +/* for OPTIMIZED_CMP: */ +#define id_cmp idCmp #define ARY_DEFAULT_SIZE 16 #define ARY_MAX_SIZE (LONG_MAX / (int)sizeof(VALUE)) - -void -rb_mem_clear(register VALUE *mem, register long size) -{ - while (size--) { - *mem++ = Qnil; - } -} - -static inline void -memfill(register VALUE *mem, register long size, register VALUE val) -{ - while (size--) { - *mem++ = val; - } -} +#define SMALL_ARRAY_LEN 16 # define ARY_SHARED_P(ary) \ (assert(!FL_TEST((ary), ELTS_SHARED) || !FL_TEST((ary), RARRAY_EMBED_FLAG)), \ @@ -56,17 +44,21 @@ memfill(register VALUE *mem, register long size, register VALUE val) #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_HEAP_CAPA(a) (assert(!ARY_EMBED_P(a)), RARRAY(a)->as.heap.aux.capa) + #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_HEAP_SIZE(a) (assert(!ARY_EMBED_P(a)), assert(ARY_OWNS_HEAP_P(a)), ARY_HEAP_CAPA(a) * sizeof(VALUE)) #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); \ + RARY_TRANSIENT_UNSET(a); \ + ary_verify(a); \ } while (0) #define FL_UNSET_EMBED(ary) FL_UNSET((ary), RARRAY_EMBED_FLAG|RARRAY_EMBED_LEN_MASK) #define FL_SET_SHARED(ary) do { \ @@ -116,7 +108,7 @@ memfill(register VALUE *mem, register long size, register VALUE val) } while (0) #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) + ARY_SHARED_ROOT_P(ary) ? RARRAY_LEN(ary) : ARY_HEAP_CAPA(ary)) #define ARY_SET_CAPA(ary, n) do { \ assert(!ARY_EMBED_P(ary)); \ assert(!ARY_SHARED_P(ary)); \ @@ -126,55 +118,329 @@ memfill(register VALUE *mem, register long size, register VALUE val) #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)); \ - assert(ARY_SHARED_ROOT_P(value)); \ - RARRAY(ary)->as.heap.aux.shared = (value); \ + const VALUE _ary_ = (ary); \ + const VALUE _value_ = (value); \ + assert(!ARY_EMBED_P(_ary_)); \ + assert(ARY_SHARED_P(_ary_)); \ + assert(ARY_SHARED_ROOT_P(_value_)); \ + RB_OBJ_WRITE(_ary_, &RARRAY(_ary_)->as.heap.aux.shared, _value_); \ } while (0) #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_SHARED_OCCUPIED(ary) (ARY_SHARED_NUM(ary) == 1) #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)); \ + assert(!RARRAY_TRANSIENT_P(ary)); \ FL_SET((ary), RARRAY_SHARED_ROOT_FLAG); \ } while (0) +#define ARY_SET(a, i, v) RARRAY_ASET((assert(!ARY_SHARED_P(a)), (a)), (i), (v)) + + +#if ARRAY_DEBUG +#define ary_verify(ary) ary_verify_(ary, __FILE__, __LINE__) + +static VALUE +ary_verify_(VALUE ary, const char *file, int line) +{ + assert(RB_TYPE_P(ary, T_ARRAY)); + + if (FL_TEST(ary, ELTS_SHARED)) { + VALUE root = RARRAY(ary)->as.heap.aux.shared; + const VALUE *ptr = ARY_HEAP_PTR(ary); + const VALUE *root_ptr = RARRAY_CONST_PTR_TRANSIENT(root); + long len = ARY_HEAP_LEN(ary), root_len = RARRAY_LEN(root); + assert(FL_TEST(root, RARRAY_SHARED_ROOT_FLAG)); + assert(root_ptr <= ptr && ptr + len <= root_ptr + root_len); + ary_verify(root); + } + else if (ARY_EMBED_P(ary)) { + assert(!RARRAY_TRANSIENT_P(ary)); + assert(!ARY_SHARED_P(ary)); + assert(RARRAY_LEN(ary) <= RARRAY_EMBED_LEN_MAX); + } + else { +#if 1 + const VALUE *ptr = RARRAY_CONST_PTR_TRANSIENT(ary); + long i, len = RARRAY_LEN(ary); + volatile VALUE v; + if (len > 1) len = 1; /* check only HEAD */ + for (i=0; i<len; i++) { + v = ptr[i]; /* access check */ + } + v = v; +#endif + } + + if (RARRAY_TRANSIENT_P(ary)) { + assert(rb_transient_heap_managed_ptr_p(RARRAY_CONST_PTR_TRANSIENT(ary))); + } + + rb_transient_heap_verify(); + + return ary; +} + +void +rb_ary_verify(VALUE ary){ + ary_verify(ary); +} +#else +#define ary_verify(ary) ((void)0) +#endif + +VALUE * +rb_ary_ptr_use_start(VALUE ary) +{ +#if ARRAY_DEBUG + FL_SET_RAW(ary, RARRAY_PTR_IN_USE_FLAG); +#endif + return (VALUE *)RARRAY_CONST_PTR_TRANSIENT(ary); +} + +void +rb_ary_ptr_use_end(VALUE ary) +{ +#if ARRAY_DEBUG + FL_UNSET_RAW(ary, RARRAY_PTR_IN_USE_FLAG); +#endif +} + +void +rb_mem_clear(register VALUE *mem, register long size) +{ + while (size--) { + *mem++ = Qnil; + } +} + +static void +ary_mem_clear(VALUE ary, long beg, long size) +{ + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { + rb_mem_clear(ptr + beg, size); + }); +} + +static inline void +memfill(register VALUE *mem, register long size, register VALUE val) +{ + while (size--) { + *mem++ = val; + } +} + +static void +ary_memfill(VALUE ary, long beg, long size, VALUE val) +{ + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { + memfill(ptr + beg, size, val); + RB_OBJ_WRITTEN(ary, Qundef, val); + }); +} + +static void +ary_memcpy0(VALUE ary, long beg, long argc, const VALUE *argv, VALUE buff_owner_ary) +{ + assert(!ARY_SHARED_P(buff_owner_ary)); + + if (argc > (int)(128/sizeof(VALUE)) /* is magic number (cache line size) */) { + rb_gc_writebarrier_remember(buff_owner_ary); + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { + MEMCPY(ptr+beg, argv, VALUE, argc); + }); + } + else { + int i; + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { + for (i=0; i<argc; i++) { + RB_OBJ_WRITE(buff_owner_ary, &ptr[i+beg], argv[i]); + } + }); + } +} + +static void +ary_memcpy(VALUE ary, long beg, long argc, const VALUE *argv) +{ + ary_memcpy0(ary, beg, argc, argv, ary); +} + +static VALUE * +ary_heap_alloc(VALUE ary, size_t capa) +{ + VALUE *ptr = rb_transient_heap_alloc(ary, sizeof(VALUE) * capa); + + if (ptr != NULL) { + RARY_TRANSIENT_SET(ary); + } + else { + RARY_TRANSIENT_UNSET(ary); + ptr = ALLOC_N(VALUE, capa); + } + + return ptr; +} + +static void +ary_heap_free_ptr(VALUE ary, const VALUE *ptr, long size) +{ + if (RARRAY_TRANSIENT_P(ary)) { + /* ignore it */ + } + else { + ruby_sized_xfree((void *)ptr, size); + } +} + +static void +ary_heap_free(VALUE ary) +{ + if (RARRAY_TRANSIENT_P(ary)) { + RARY_TRANSIENT_UNSET(ary); + } + else { + ary_heap_free_ptr(ary, ARY_HEAP_PTR(ary), ARY_HEAP_SIZE(ary)); + } +} + +static void +ary_heap_realloc(VALUE ary, size_t new_capa) +{ + size_t old_capa = ARY_HEAP_CAPA(ary); + + if (RARRAY_TRANSIENT_P(ary)) { + if (new_capa <= old_capa) { + /* do nothing */ + } + else { + VALUE *new_ptr = rb_transient_heap_alloc(ary, sizeof(VALUE) * new_capa); + + if (new_ptr == NULL) { + new_ptr = ALLOC_N(VALUE, new_capa); + RARY_TRANSIENT_UNSET(ary); + } + + MEMCPY(new_ptr, ARY_HEAP_PTR(ary), VALUE, old_capa); + ARY_SET_PTR(ary, new_ptr); + } + } + else { + SIZED_REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, new_capa, old_capa); + } + ary_verify(ary); +} + +#if USE_TRANSIENT_HEAP +static inline void +rb_ary_transient_heap_evacuate_(VALUE ary, int transient, int promote) +{ + if (transient) { + VALUE *new_ptr; + const VALUE *old_ptr = ARY_HEAP_PTR(ary); + long capa = ARY_HEAP_CAPA(ary); + long len = ARY_HEAP_LEN(ary); + + if (ARY_SHARED_ROOT_P(ary)) { + capa = len; + } + + assert(ARY_OWNS_HEAP_P(ary)); + assert(RARRAY_TRANSIENT_P(ary)); + assert(!ARY_PTR_USING_P(ary)); + + if (promote) { + new_ptr = ALLOC_N(VALUE, capa); + RARY_TRANSIENT_UNSET(ary); + } + else { + new_ptr = ary_heap_alloc(ary, capa); + } + + MEMCPY(new_ptr, old_ptr, VALUE, capa); + /* do not use ARY_SET_PTR() because they assert !frozen */ + RARRAY(ary)->as.heap.ptr = new_ptr; + } + + ary_verify(ary); +} + +void +rb_ary_transient_heap_evacuate(VALUE ary, int promote) +{ + rb_ary_transient_heap_evacuate_(ary, RARRAY_TRANSIENT_P(ary), promote); +} + +void +rb_ary_detransient(VALUE ary) +{ + assert(RARRAY_TRANSIENT_P(ary)); + rb_ary_transient_heap_evacuate_(ary, TRUE, TRUE); +} +#else +void +rb_ary_detransient(VALUE ary) +{ + /* do nothing */ +} +#endif + static void ary_resize_capa(VALUE ary, long capacity) { assert(RARRAY_LEN(ary) <= capacity); 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)); + VALUE *ptr = ary_heap_alloc(ary, 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_heap_realloc(ary, capacity); } - ARY_SET_CAPA(ary, (capacity)); + ARY_SET_CAPA(ary, capacity); } else { if (!ARY_EMBED_P(ary)) { - long len = RARRAY_LEN(ary); - VALUE *ptr = RARRAY_PTR(ary); + long len = ARY_HEAP_LEN(ary); + long old_capa = ARY_HEAP_CAPA(ary); + const VALUE *ptr = ARY_HEAP_PTR(ary); + if (len > capacity) len = capacity; - MEMCPY(RARRAY(ary)->as.ary, ptr, VALUE, len); + MEMCPY((VALUE *)RARRAY(ary)->as.ary, ptr, VALUE, len); + ary_heap_free_ptr(ary, ptr, old_capa); + FL_SET_EMBED(ary); ARY_SET_LEN(ary, len); - xfree(ptr); } } + + ary_verify(ary); +} + +static inline void +ary_shrink_capa(VALUE ary) +{ + long capacity = ARY_HEAP_LEN(ary); + long old_capa = ARY_HEAP_CAPA(ary); + assert(!ARY_SHARED_P(ary)); + assert(old_capa >= capacity); + if (old_capa > capacity) ary_heap_realloc(ary, capacity); + + ary_verify(ary); } static void @@ -190,6 +456,8 @@ ary_double_capa(VALUE ary, long min) } new_capa += min; ary_resize_capa(ary, new_capa); + + ary_verify(ary); } static void @@ -245,8 +513,7 @@ static inline void rb_ary_modify_check(VALUE ary) { rb_check_frozen(ary); - if (!OBJ_UNTRUSTED(ary) && rb_safe_level() >= 4) - rb_raise(rb_eSecurityError, "Insecure: can't modify array"); + ary_verify(ary); } void @@ -254,24 +521,89 @@ rb_ary_modify(VALUE ary) { rb_ary_modify_check(ary); if (ARY_SHARED_P(ary)) { - long len = RARRAY_LEN(ary); + long shared_len, len = RARRAY_LEN(ary); + VALUE shared = ARY_SHARED(ary); + + ary_verify(shared); + if (len <= RARRAY_EMBED_LEN_MAX) { - VALUE *ptr = ARY_HEAP_PTR(ary); - VALUE shared = ARY_SHARED(ary); + const VALUE *ptr = ARY_HEAP_PTR(ary); FL_UNSET_SHARED(ary); FL_SET_EMBED(ary); - MEMCPY(ARY_EMBED_PTR(ary), ptr, VALUE, len); + MEMCPY((VALUE *)ARY_EMBED_PTR(ary), ptr, VALUE, len); rb_ary_decrement_share(shared); ARY_SET_EMBED_LEN(ary, len); } + else if (ARY_SHARED_OCCUPIED(shared) && len > ((shared_len = RARRAY_LEN(shared))>>1)) { + long shift = RARRAY_CONST_PTR_TRANSIENT(ary) - RARRAY_CONST_PTR_TRANSIENT(shared); + FL_UNSET_SHARED(ary); + ARY_SET_PTR(ary, RARRAY_CONST_PTR_TRANSIENT(shared)); + ARY_SET_CAPA(ary, shared_len); + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { + MEMMOVE(ptr, ptr+shift, VALUE, len); + }); + FL_SET_EMBED(shared); + rb_ary_decrement_share(shared); + } else { - VALUE *ptr = ALLOC_N(VALUE, len); - MEMCPY(ptr, RARRAY_PTR(ary), VALUE, len); + VALUE *ptr = ary_heap_alloc(ary, len); + MEMCPY(ptr, ARY_HEAP_PTR(ary), VALUE, len); rb_ary_unshare(ary); ARY_SET_CAPA(ary, len); ARY_SET_PTR(ary, ptr); } + + rb_gc_writebarrier_remember(ary); + } + ary_verify(ary); +} + +static VALUE +ary_ensure_room_for_push(VALUE ary, long add_len) +{ + long old_len = RARRAY_LEN(ary); + long new_len = old_len + add_len; + long capa; + + if (old_len > ARY_MAX_SIZE - add_len) { + rb_raise(rb_eIndexError, "index %ld too big", new_len); + } + if (ARY_SHARED_P(ary)) { + if (new_len > RARRAY_EMBED_LEN_MAX) { + VALUE shared = ARY_SHARED(ary); + if (ARY_SHARED_OCCUPIED(shared)) { + if (ARY_HEAP_PTR(ary) - RARRAY_CONST_PTR_TRANSIENT(shared) + new_len <= RARRAY_LEN(shared)) { + rb_ary_modify_check(ary); + + ary_verify(ary); + ary_verify(shared); + return shared; + } + else { + /* if array is shared, then it is likely it participate in push/shift pattern */ + rb_ary_modify(ary); + capa = ARY_CAPA(ary); + if (new_len > capa - (capa >> 6)) { + ary_double_capa(ary, new_len); + } + ary_verify(ary); + return ary; + } + } + } + ary_verify(ary); + rb_ary_modify(ary); } + else { + rb_ary_modify_check(ary); + } + capa = ARY_CAPA(ary); + if (new_len > capa) { + ary_double_capa(ary, new_len); + } + + ary_verify(ary); + return ary; } /* @@ -290,35 +622,47 @@ rb_ary_freeze(VALUE ary) return rb_obj_freeze(ary); } -/* - * call-seq: - * ary.frozen? -> true or false - * - * Return +true+ if this array is frozen (or temporarily frozen - * while being sorted). See also Object#frozen? - */ - -static VALUE -rb_ary_frozen_p(VALUE ary) +/* This can be used to take a snapshot of an array (with + e.g. rb_ary_replace) and check later whether the array has been + modified from the snapshot. The snapshot is cheap, though if + something does modify the array it will pay the cost of copying + it. If Array#pop or Array#shift has been called, the array will + be still shared with the snapshot, but the array length will + differ. */ +VALUE +rb_ary_shared_with_p(VALUE ary1, VALUE ary2) { - if (OBJ_FROZEN(ary)) return Qtrue; + if (!ARY_EMBED_P(ary1) && ARY_SHARED_P(ary1) && + !ARY_EMBED_P(ary2) && ARY_SHARED_P(ary2) && + RARRAY(ary1)->as.heap.aux.shared == RARRAY(ary2)->as.heap.aux.shared && + RARRAY(ary1)->as.heap.len == RARRAY(ary2)->as.heap.len) { + return Qtrue; + } return Qfalse; } static VALUE ary_alloc(VALUE klass) { - NEWOBJ_OF(ary, struct RArray, klass, T_ARRAY); - FL_SET_EMBED((VALUE)ary); - ARY_SET_EMBED_LEN((VALUE)ary, 0); - + NEWOBJ_OF(ary, struct RArray, klass, T_ARRAY | RARRAY_EMBED_FLAG | (RGENGC_WB_PROTECTED_ARRAY ? FL_WB_PROTECTED : 0)); + /* Created array is: + * FL_SET_EMBED((VALUE)ary); + * ARY_SET_EMBED_LEN((VALUE)ary, 0); + */ return (VALUE)ary; } static VALUE +empty_ary_alloc(VALUE klass) +{ + RUBY_DTRACE_CREATE_HOOK(ARRAY, 0); + return ary_alloc(klass); +} + +static VALUE ary_new(VALUE klass, long capa) { - VALUE ary; + VALUE ary,*ptr; if (capa < 0) { rb_raise(rb_eArgError, "negative array size (or size too big)"); @@ -326,10 +670,14 @@ ary_new(VALUE klass, long capa) if (capa > ARY_MAX_SIZE) { rb_raise(rb_eArgError, "array size too big"); } + + RUBY_DTRACE_CREATE_HOOK(ARRAY, capa); + ary = ary_alloc(klass); if (capa > RARRAY_EMBED_LEN_MAX) { + ptr = ary_heap_alloc(ary, capa); FL_UNSET_EMBED(ary); - ARY_SET_PTR(ary, ALLOC_N(VALUE, capa)); + ARY_SET_PTR(ary, ptr); ARY_SET_CAPA(ary, capa); ARY_SET_HEAP_LEN(ary, 0); } @@ -338,22 +686,19 @@ ary_new(VALUE klass, long capa) } VALUE -rb_ary_new2(long capa) +rb_ary_new_capa(long capa) { return ary_new(rb_cArray, capa); } - VALUE rb_ary_new(void) { return rb_ary_new2(RARRAY_EMBED_LEN_MAX); } -#include <stdarg.h> - VALUE -rb_ary_new3(long n, ...) +(rb_ary_new_from_args)(long n, ...) { va_list ar; VALUE ary; @@ -363,7 +708,7 @@ rb_ary_new3(long n, ...) va_start(ar, n); for (i=0; i<n; i++) { - RARRAY_PTR(ary)[i] = va_arg(ar, VALUE); + ARY_SET(ary, i, va_arg(ar, VALUE)); } va_end(ar); @@ -371,14 +716,14 @@ rb_ary_new3(long n, ...) return ary; } -VALUE -rb_ary_new4(long n, const VALUE *elts) +MJIT_FUNC_EXPORTED VALUE +rb_ary_tmp_new_from_values(VALUE klass, long n, const VALUE *elts) { VALUE ary; - ary = rb_ary_new2(n); + ary = ary_new(klass, n); if (n > 0 && elts) { - MEMCPY(RARRAY_PTR(ary), elts, VALUE, n); + ary_memcpy(ary, 0, n, elts); ARY_SET_LEN(ary, n); } @@ -386,16 +731,43 @@ rb_ary_new4(long n, const VALUE *elts) } VALUE +rb_ary_new_from_values(long n, const VALUE *elts) +{ + return rb_ary_tmp_new_from_values(rb_cArray, n, elts); +} + +VALUE rb_ary_tmp_new(long capa) { - return ary_new(0, capa); + VALUE ary = ary_new(0, capa); + rb_ary_transient_heap_evacuate(ary, TRUE); + return ary; +} + +VALUE +rb_ary_tmp_new_fill(long capa) +{ + VALUE ary = ary_new(0, capa); + ary_memfill(ary, 0, capa, Qnil); + ARY_SET_LEN(ary, capa); + rb_ary_transient_heap_evacuate(ary, TRUE); + return ary; } void rb_ary_free(VALUE ary) { if (ARY_OWNS_HEAP_P(ary)) { - xfree(ARY_HEAP_PTR(ary)); + if (RARRAY_TRANSIENT_P(ary)) { + RB_DEBUG_COUNTER_INC(obj_ary_transient); + } + else { + RB_DEBUG_COUNTER_INC(obj_ary_ptr); + ary_heap_free(ary); + } + } + else { + RB_DEBUG_COUNTER_INC(obj_ary_embed); } } @@ -403,7 +775,7 @@ RUBY_FUNC_EXPORTED size_t rb_ary_memsize(VALUE ary) { if (ARY_OWNS_HEAP_P(ary)) { - return RARRAY(ary)->as.heap.aux.capa * sizeof(VALUE); + return ARY_CAPA(ary) * sizeof(VALUE); } else { return 0; @@ -415,13 +787,15 @@ ary_discard(VALUE ary) { rb_ary_free(ary); RBASIC(ary)->flags |= RARRAY_EMBED_FLAG; - RBASIC(ary)->flags &= ~RARRAY_EMBED_LEN_MASK; + RBASIC(ary)->flags &= ~(RARRAY_EMBED_LEN_MASK | RARRAY_TRANSIENT_FLAG); } static VALUE ary_make_shared(VALUE ary) { assert(!ARY_EMBED_P(ary)); + ary_verify(ary); + if (ARY_SHARED_P(ary)) { return ARY_SHARED(ary); } @@ -429,34 +803,45 @@ ary_make_shared(VALUE ary) return ary; } else if (OBJ_FROZEN(ary)) { - ary_resize_capa(ary, ARY_HEAP_LEN(ary)); + rb_ary_transient_heap_evacuate(ary, TRUE); + ary_shrink_capa(ary); FL_SET_SHARED_ROOT(ary); ARY_SET_SHARED_NUM(ary, 1); return ary; } else { - NEWOBJ_OF(shared, struct RArray, 0, T_ARRAY); - FL_UNSET_EMBED(shared); + long capa = ARY_CAPA(ary), len = RARRAY_LEN(ary); + const VALUE *ptr; + NEWOBJ_OF(shared, struct RArray, 0, T_ARRAY | (RGENGC_WB_PROTECTED_ARRAY ? FL_WB_PROTECTED : 0)); + + rb_ary_transient_heap_evacuate(ary, TRUE); + ptr = ARY_HEAP_PTR(ary); - ARY_SET_LEN((VALUE)shared, RARRAY_LEN(ary)); - ARY_SET_PTR((VALUE)shared, RARRAY_PTR(ary)); + FL_UNSET_EMBED(shared); + ARY_SET_LEN((VALUE)shared, capa); + ARY_SET_PTR((VALUE)shared, ptr); + ary_mem_clear((VALUE)shared, len, capa - len); FL_SET_SHARED_ROOT(shared); ARY_SET_SHARED_NUM((VALUE)shared, 1); FL_SET_SHARED(ary); ARY_SET_SHARED(ary, (VALUE)shared); OBJ_FREEZE(shared); - return (VALUE)shared; + + ary_verify((VALUE)shared); + ary_verify(ary); + return (VALUE)shared; } } - 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)); + long len = RARRAY_LEN(ary); + + if (len <= RARRAY_EMBED_LEN_MAX) { + VALUE subst = rb_ary_new2(len); + ary_memcpy(subst, 0, len, RARRAY_CONST_PTR_TRANSIENT(ary)); + ARY_SET_EMBED_LEN(subst, len); return subst; } else { @@ -470,16 +855,23 @@ rb_assoc_new(VALUE car, VALUE cdr) return rb_ary_new3(2, car, cdr); } -static VALUE -to_ary(VALUE ary) +VALUE +rb_to_array_type(VALUE ary) { - return rb_convert_type(ary, T_ARRAY, "Array", "to_ary"); + return rb_convert_type_with_id(ary, T_ARRAY, "Array", idTo_ary); } +#define to_ary rb_to_array_type VALUE rb_check_array_type(VALUE ary) { - return rb_check_convert_type(ary, T_ARRAY, "Array", "to_ary"); + return rb_check_convert_type_with_id(ary, T_ARRAY, "Array", idTo_ary); +} + +MJIT_FUNC_EXPORTED VALUE +rb_check_to_array(VALUE ary) +{ + return rb_check_convert_type_with_id(ary, T_ARRAY, "Array", idTo_a); } /* @@ -509,16 +901,16 @@ rb_ary_s_try_convert(VALUE dummy, VALUE ary) /* * call-seq: - * Array.new(size=0, obj=nil) + * Array.new(size=0, default=nil) * Array.new(array) * Array.new(size) {|index| block } * * Returns a new array. * * In the first form, if no arguments are sent, the new array will be empty. - * When a +size+ and an optional +obj+ are sent, an array is created with - * +size+ copies of +obj+. Take notice that all elements will reference the - * same object +obj+. + * When a +size+ and an optional +default+ are sent, an array is created with + * +size+ copies of +default+. Take notice that all elements will reference the + * same object +default+. * * The second form creates a copy of the array passed as a parameter (the * array is generated by calling to_ary on the parameter). @@ -533,7 +925,7 @@ rb_ary_s_try_convert(VALUE dummy, VALUE ary) * this array is created by passing the element's index to the given block * and storing the return value. * - * Array.new(3){ |index| index ** 2 } + * Array.new(3) {|index| index ** 2} * # => [0, 1, 4] * * == Common gotchas @@ -557,7 +949,7 @@ rb_ary_s_try_convert(VALUE dummy, VALUE ary) * version which uses the result of that block each time an element * of the array needs to be initialized: * - * a = Array.new(2) { Hash.new } + * a = Array.new(2) {Hash.new} * a[0]['cat'] = 'feline' * a # => [{"cat"=>"feline"}, {}] * @@ -571,8 +963,8 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary) rb_ary_modify(ary); if (argc == 0) { - if (ARY_OWNS_HEAP_P(ary) && RARRAY_PTR(ary)) { - xfree(RARRAY_PTR(ary)); + if (ARY_OWNS_HEAP_P(ary) && ARY_HEAP_PTR(ary) != NULL) { + ary_heap_free(ary); } rb_ary_unshare_safe(ary); FL_SET_EMBED(ary); @@ -592,12 +984,14 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary) } len = NUM2LONG(size); + /* NUM2LONG() may call size.to_int, ary can be frozen, modified, etc */ if (len < 0) { rb_raise(rb_eArgError, "negative array size"); } if (len > ARY_MAX_SIZE) { rb_raise(rb_eArgError, "array size too big"); } + /* recheck after argument conversion */ rb_ary_modify(ary); ary_resize_capa(ary, len); if (rb_block_given_p()) { @@ -612,7 +1006,7 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary) } } else { - memfill(RARRAY_PTR(ary), len, val); + ary_memfill(ary, 0, len, val); ARY_SET_LEN(ary, len); } return ary; @@ -621,7 +1015,7 @@ rb_ary_initialize(int argc, VALUE *argv, VALUE ary) /* * Returns a new array populated with the given objects. * - * Array.[]( 1, 'a', /^A/ ) # => [1, "a", /^A/] + * Array.[]( 1, 'a', /^A/) # => [1, "a", /^A/] * Array[ 1, 'a', /^A/ ] # => [1, "a", /^A/] * [ 1, 'a', /^A/ ] # => [1, "a", /^A/] */ @@ -631,7 +1025,7 @@ rb_ary_s_create(int argc, VALUE *argv, VALUE klass) { VALUE ary = ary_new(klass, argc); if (argc > 0 && argv) { - MEMCPY(RARRAY_PTR(ary), argv, VALUE, argc); + ary_memcpy(ary, 0, argc, argv); ARY_SET_LEN(ary, argc); } @@ -641,11 +1035,13 @@ rb_ary_s_create(int argc, VALUE *argv, VALUE klass) void rb_ary_store(VALUE ary, long idx, VALUE val) { + long len = RARRAY_LEN(ary); + if (idx < 0) { - idx += RARRAY_LEN(ary); + idx += len; if (idx < 0) { rb_raise(rb_eIndexError, "index %ld too small for array; minimum: %ld", - idx - RARRAY_LEN(ary), -RARRAY_LEN(ary)); + idx - len, -len); } } else if (idx >= ARY_MAX_SIZE) { @@ -656,15 +1052,14 @@ rb_ary_store(VALUE ary, long idx, VALUE val) if (idx >= ARY_CAPA(ary)) { ary_double_capa(ary, idx); } - if (idx > RARRAY_LEN(ary)) { - rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary), - idx-RARRAY_LEN(ary) + 1); + if (idx > len) { + ary_mem_clear(ary, len, idx - len + 1); } - if (idx >= RARRAY_LEN(ary)) { + if (idx >= len) { ARY_SET_LEN(ary, idx + 1); } - RARRAY_PTR(ary)[idx] = val; + ARY_SET(ary, idx, val); } static VALUE @@ -676,7 +1071,7 @@ ary_make_partial(VALUE ary, VALUE klass, long offset, long len) if (len <= RARRAY_EMBED_LEN_MAX) { VALUE result = ary_alloc(klass); - MEMCPY(ARY_EMBED_PTR(result), RARRAY_PTR(ary) + offset, VALUE, len); + ary_memcpy(result, 0, len, RARRAY_CONST_PTR_TRANSIENT(ary) + offset); ARY_SET_EMBED_LEN(result, len); return result; } @@ -685,12 +1080,15 @@ ary_make_partial(VALUE ary, VALUE klass, long offset, long len) FL_UNSET_EMBED(result); shared = ary_make_shared(ary); - ARY_SET_PTR(result, RARRAY_PTR(ary)); + ARY_SET_PTR(result, RARRAY_CONST_PTR_TRANSIENT(ary)); ARY_SET_LEN(result, RARRAY_LEN(ary)); rb_ary_set_shared(result, shared); ARY_INCREASE_PTR(result, offset); ARY_SET_LEN(result, len); + + ary_verify(shared); + ary_verify(result); return result; } } @@ -708,28 +1106,32 @@ enum ary_take_pos_flags }; static VALUE -ary_take_first_or_last(int argc, VALUE *argv, VALUE ary, enum ary_take_pos_flags last) +ary_take_first_or_last(int argc, const VALUE *argv, VALUE ary, enum ary_take_pos_flags last) { - VALUE nv; long n; + long len; long offset = 0; - rb_scan_args(argc, argv, "1", &nv); - n = NUM2LONG(nv); - if (n > RARRAY_LEN(ary)) { - n = RARRAY_LEN(ary); + argc = rb_check_arity(argc, 0, 1); + /* the case optional argument is ommited should be handled in + * callers of this function. if another arity case is added, + * this arity check needs to rewrite. */ + RUBY_ASSERT_WHEN(TRUE, argc == 1); + + n = NUM2LONG(argv[0]); + len = RARRAY_LEN(ary); + if (n > len) { + n = len; } else if (n < 0) { rb_raise(rb_eArgError, "negative array size"); } if (last) { - offset = RARRAY_LEN(ary) - n; + offset = len - n; } return ary_make_partial(ary, rb_cArray, offset, n); } -static VALUE rb_ary_push_1(VALUE ary, VALUE item); - /* * call-seq: * ary << obj -> ary @@ -738,7 +1140,10 @@ static VALUE rb_ary_push_1(VALUE ary, VALUE item); * expression returns the array itself, so several appends * may be chained together. * - * [ 1, 2 ] << "c" << "d" << [ 3, 4 ] + * a = [ 1, 2 ] + * a << "c" << "d" << [ 3, 4 ] + * #=> [ 1, 2, "c", "d", [ 3, 4 ] ] + * a * #=> [ 1, 2, "c", "d", [ 3, 4 ] ] * */ @@ -746,39 +1151,30 @@ static VALUE rb_ary_push_1(VALUE ary, VALUE item); VALUE rb_ary_push(VALUE ary, VALUE item) { - rb_ary_modify(ary); - return rb_ary_push_1(ary, item); -} - -static VALUE -rb_ary_push_1(VALUE ary, VALUE item) -{ - long idx = RARRAY_LEN(ary); - - if (idx >= ARY_CAPA(ary)) { - ary_double_capa(ary, idx); - } - RARRAY_PTR(ary)[idx] = item; + long idx = RARRAY_LEN((ary_verify(ary), ary)); + VALUE target_ary = ary_ensure_room_for_push(ary, 1); + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { + RB_OBJ_WRITE(target_ary, &ptr[idx], item); + }); ARY_SET_LEN(ary, idx + 1); + ary_verify(ary); return ary; } VALUE -rb_ary_cat(VALUE ary, const VALUE *ptr, long len) +rb_ary_cat(VALUE ary, const VALUE *argv, long len) { - long oldlen; - - rb_ary_modify(ary); - oldlen = RARRAY_LEN(ary); - ary_resize_capa(ary, oldlen + len); - MEMCPY(RARRAY_PTR(ary) + oldlen, ptr, VALUE, len); + long oldlen = RARRAY_LEN(ary); + VALUE target_ary = ary_ensure_room_for_push(ary, len); + ary_memcpy0(ary, oldlen, len, argv, target_ary); ARY_SET_LEN(ary, oldlen + len); return ary; } /* * call-seq: - * ary.push(obj, ... ) -> ary + * ary.push(obj, ...) -> ary + * ary.append(obj, ...) -> ary * * Append --- Pushes the given object(s) on to the end of this array. This * expression returns the array itself, so several appends @@ -788,7 +1184,7 @@ rb_ary_cat(VALUE ary, const VALUE *ptr, long len) * a = [ "a", "b", "c" ] * a.push("d", "e", "f") * #=> ["a", "b", "c", "d", "e", "f"] - * [1, 2, 3,].push(4).push(5) + * [1, 2, 3].push(4).push(5) * #=> [1, 2, 3, 4, 5] */ @@ -803,16 +1199,18 @@ rb_ary_pop(VALUE ary) { long n; rb_ary_modify_check(ary); - if (RARRAY_LEN(ary) == 0) return Qnil; + n = RARRAY_LEN(ary); + if (n == 0) return Qnil; if (ARY_OWNS_HEAP_P(ary) && - RARRAY_LEN(ary) * 3 < ARY_CAPA(ary) && + n * 3 < ARY_CAPA(ary) && ARY_CAPA(ary) > ARY_DEFAULT_SIZE) { - ary_resize_capa(ary, RARRAY_LEN(ary) * 2); + ary_resize_capa(ary, n * 2); } - n = RARRAY_LEN(ary)-1; + --n; ARY_SET_LEN(ary, n); - return RARRAY_PTR(ary)[n]; + ary_verify(ary); + return RARRAY_AREF(ary, n); } /* @@ -845,6 +1243,7 @@ rb_ary_pop_m(int argc, VALUE *argv, VALUE ary) rb_ary_modify_check(ary); result = ary_take_first_or_last(argc, argv, ary, ARY_TAKE_LAST); ARY_INCREASE_LEN(ary, -RARRAY_LEN(result)); + ary_verify(ary); return result; } @@ -852,27 +1251,33 @@ VALUE rb_ary_shift(VALUE ary) { VALUE top; + long len = RARRAY_LEN(ary); rb_ary_modify_check(ary); - if (RARRAY_LEN(ary) == 0) return Qnil; - top = RARRAY_PTR(ary)[0]; + if (len == 0) return Qnil; + top = RARRAY_AREF(ary, 0); if (!ARY_SHARED_P(ary)) { - if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE) { - MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+1, VALUE, RARRAY_LEN(ary)-1); + if (len < ARY_DEFAULT_SIZE) { + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { + MEMMOVE(ptr, ptr+1, VALUE, len-1); + }); /* WB: no new reference */ ARY_INCREASE_LEN(ary, -1); + ary_verify(ary); return top; } assert(!ARY_EMBED_P(ary)); /* ARY_EMBED_LEN_MAX < ARY_DEFAULT_SIZE */ - RARRAY_PTR(ary)[0] = Qnil; + ARY_SET(ary, 0, Qnil); ary_make_shared(ary); } - else if (ARY_SHARED_NUM(ARY_SHARED(ary)) == 1) { - RARRAY_PTR(ary)[0] = Qnil; + else if (ARY_SHARED_OCCUPIED(ARY_SHARED(ary))) { + RARRAY_PTR_USE_TRANSIENT(ary, ptr, ptr[0] = Qnil); } ARY_INCREASE_PTR(ary, 1); /* shift ptr */ ARY_INCREASE_LEN(ary, -1); + ary_verify(ary); + return top; } @@ -912,23 +1317,110 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary) rb_ary_modify_check(ary); result = ary_take_first_or_last(argc, argv, ary, ARY_TAKE_FIRST); n = RARRAY_LEN(result); + rb_ary_behead(ary,n); + + return result; +} + +MJIT_FUNC_EXPORTED VALUE +rb_ary_behead(VALUE ary, long n) +{ + if(n<=0) return ary; + + rb_ary_modify_check(ary); if (ARY_SHARED_P(ary)) { - if (ARY_SHARED_NUM(ARY_SHARED(ary)) == 1) { - rb_mem_clear(RARRAY_PTR(ary), n); + if (ARY_SHARED_OCCUPIED(ARY_SHARED(ary))) { + setup_occupied_shared: + ary_mem_clear(ary, 0, n); } ARY_INCREASE_PTR(ary, n); } else { - MEMMOVE(RARRAY_PTR(ary), RARRAY_PTR(ary)+n, VALUE, RARRAY_LEN(ary)-n); + if (RARRAY_LEN(ary) < ARY_DEFAULT_SIZE) { + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { + MEMMOVE(ptr, ptr+n, VALUE, RARRAY_LEN(ary)-n); + }); /* WB: no new reference */ + } + else { + ary_make_shared(ary); + goto setup_occupied_shared; + } } ARY_INCREASE_LEN(ary, -n); - return result; + ary_verify(ary); + return ary; +} + +static VALUE +ary_ensure_room_for_unshift(VALUE ary, int argc) +{ + long len = RARRAY_LEN(ary); + long new_len = len + argc; + long capa; + const VALUE *head, *sharedp; + + if (len > ARY_MAX_SIZE - argc) { + rb_raise(rb_eIndexError, "index %ld too big", new_len); + } + + if (ARY_SHARED_P(ary)) { + VALUE shared = ARY_SHARED(ary); + capa = RARRAY_LEN(shared); + if (ARY_SHARED_OCCUPIED(shared) && capa > new_len) { + rb_ary_modify_check(ary); + head = RARRAY_CONST_PTR_TRANSIENT(ary); + sharedp = RARRAY_CONST_PTR_TRANSIENT(shared); + goto makeroom_if_need; + } + } + + rb_ary_modify(ary); + capa = ARY_CAPA(ary); + if (capa - (capa >> 6) <= new_len) { + ary_double_capa(ary, new_len); + } + + /* use shared array for big "queues" */ + if (new_len > ARY_DEFAULT_SIZE * 4) { + ary_verify(ary); + + /* make a room for unshifted items */ + capa = ARY_CAPA(ary); + ary_make_shared(ary); + + head = sharedp = RARRAY_CONST_PTR_TRANSIENT(ary); + goto makeroom; + makeroom_if_need: + if (head - sharedp < argc) { + long room; + makeroom: + room = capa - new_len; + room -= room >> 4; + MEMMOVE((VALUE *)sharedp + argc + room, head, VALUE, len); + head = sharedp + argc + room; + } + ARY_SET_PTR(ary, head - argc); + assert(ARY_SHARED_OCCUPIED(ARY_SHARED(ary))); + + ary_verify(ary); + return ARY_SHARED(ary); + } + else { + /* sliding items */ + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { + MEMMOVE(ptr + argc, ptr, VALUE, len); + }); + + ary_verify(ary); + return ary; + } } /* * call-seq: * ary.unshift(obj, ...) -> ary + * ary.prepend(obj, ...) -> ary * * Prepends objects to the front of +self+, moving other elements upwards. * See also Array#shift for the opposite effect. @@ -941,19 +1433,17 @@ rb_ary_shift_m(int argc, VALUE *argv, VALUE ary) static VALUE rb_ary_unshift_m(int argc, VALUE *argv, VALUE ary) { - long len; + long len = RARRAY_LEN(ary); + VALUE target_ary; - rb_ary_modify(ary); - if (argc == 0) return ary; - if (ARY_CAPA(ary) <= (len = RARRAY_LEN(ary)) + argc) { - ary_double_capa(ary, len + argc); + if (argc == 0) { + rb_ary_modify_check(ary); + return ary; } - /* sliding items */ - MEMMOVE(RARRAY_PTR(ary) + argc, RARRAY_PTR(ary), VALUE, len); - MEMCPY(RARRAY_PTR(ary), argv, VALUE, argc); - ARY_INCREASE_LEN(ary, argc); - + target_ary = ary_ensure_room_for_unshift(ary, argc); + ary_memcpy0(ary, 0, argc, argv, target_ary); + ARY_SET_LEN(ary, len + argc); return ary; } @@ -967,32 +1457,31 @@ rb_ary_unshift(VALUE ary, VALUE item) static inline VALUE rb_ary_elt(VALUE ary, long offset) { - if (RARRAY_LEN(ary) == 0) return Qnil; - if (offset < 0 || RARRAY_LEN(ary) <= offset) { + long len = RARRAY_LEN(ary); + if (len == 0) return Qnil; + if (offset < 0 || len <= offset) { return Qnil; } - return RARRAY_PTR(ary)[offset]; + return RARRAY_AREF(ary, offset); } VALUE rb_ary_entry(VALUE ary, long offset) { - if (offset < 0) { - offset += RARRAY_LEN(ary); - } - return rb_ary_elt(ary, offset); + return rb_ary_entry_internal(ary, offset); } VALUE rb_ary_subseq(VALUE ary, long beg, long len) { VALUE klass; + long alen = RARRAY_LEN(ary); - if (beg > RARRAY_LEN(ary)) return Qnil; + if (beg > alen) return Qnil; if (beg < 0 || len < 0) return Qnil; - if (RARRAY_LEN(ary) < len || RARRAY_LEN(ary) < beg + len) { - len = RARRAY_LEN(ary) - beg; + if (alen < len || alen < beg + len) { + len = alen - beg; } klass = rb_obj_class(ary); if (len == 0) return ary_new(klass, 0); @@ -1037,23 +1526,31 @@ rb_ary_subseq(VALUE ary, long beg, long len) */ VALUE -rb_ary_aref(int argc, VALUE *argv, VALUE ary) +rb_ary_aref(int argc, const VALUE *argv, VALUE ary) { - VALUE arg; - long beg, len; - + rb_check_arity(argc, 1, 2); if (argc == 2) { - beg = NUM2LONG(argv[0]); - len = NUM2LONG(argv[1]); - if (beg < 0) { - beg += RARRAY_LEN(ary); - } - return rb_ary_subseq(ary, beg, len); + return rb_ary_aref2(ary, argv[0], argv[1]); } - if (argc != 1) { - rb_scan_args(argc, argv, "11", 0, 0); + return rb_ary_aref1(ary, argv[0]); +} + +VALUE +rb_ary_aref2(VALUE ary, VALUE b, VALUE e) +{ + long beg = NUM2LONG(b); + long len = NUM2LONG(e); + if (beg < 0) { + beg += RARRAY_LEN(ary); } - arg = argv[0]; + return rb_ary_subseq(ary, beg, len); +} + +MJIT_FUNC_EXPORTED VALUE +rb_ary_aref1(VALUE ary, VALUE arg) +{ + long beg, len; + /* special case - speeding up */ if (FIXNUM_P(arg)) { return rb_ary_entry(ary, FIX2LONG(arg)); @@ -1083,7 +1580,7 @@ rb_ary_aref(int argc, VALUE *argv, VALUE ary) * a.at(-1) #=> "e" */ -static VALUE +VALUE rb_ary_at(VALUE ary, VALUE pos) { return rb_ary_entry(ary, NUM2LONG(pos)); @@ -1109,7 +1606,7 @@ rb_ary_first(int argc, VALUE *argv, VALUE ary) { if (argc == 0) { if (RARRAY_LEN(ary) == 0) return Qnil; - return RARRAY_PTR(ary)[0]; + return RARRAY_AREF(ary, 0); } else { return ary_take_first_or_last(argc, argv, ary, ARY_TAKE_FIRST); @@ -1132,11 +1629,12 @@ rb_ary_first(int argc, VALUE *argv, VALUE ary) */ VALUE -rb_ary_last(int argc, VALUE *argv, VALUE ary) +rb_ary_last(int argc, const VALUE *argv, VALUE ary) { if (argc == 0) { - if (RARRAY_LEN(ary) == 0) return Qnil; - return RARRAY_PTR(ary)[RARRAY_LEN(ary)-1]; + long len = RARRAY_LEN(ary); + if (len == 0) return Qnil; + return RARRAY_AREF(ary, len-1); } else { return ary_take_first_or_last(argc, argv, ary, ARY_TAKE_LAST); @@ -1147,7 +1645,7 @@ rb_ary_last(int argc, VALUE *argv, VALUE ary) * call-seq: * ary.fetch(index) -> obj * ary.fetch(index, default) -> obj - * ary.fetch(index) { |index| block } -> obj + * ary.fetch(index) {|index| block} -> obj * * Tries to return the element at position +index+, but throws an IndexError * exception if the referenced +index+ lies outside of the array bounds. This @@ -1155,14 +1653,15 @@ rb_ary_last(int argc, VALUE *argv, VALUE ary) * +default+ value. * * Alternatively, if a block is given it will only be executed when an - * invalid +index+ is referenced. Negative values of +index+ count from the - * end of the array. + * invalid +index+ is referenced. + * + * Negative values of +index+ 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(100) { |i| puts "#{i} is out of bounds" } + * a.fetch(100) {|i| puts "#{i} is out of bounds"} * #=> "100 is out of bounds" */ @@ -1191,21 +1690,24 @@ rb_ary_fetch(int argc, VALUE *argv, VALUE ary) } return ifnone; } - return RARRAY_PTR(ary)[idx]; + return RARRAY_AREF(ary, idx); } /* * call-seq: + * ary.find_index(obj) -> int or nil + * ary.find_index {|item| block} -> int or nil + * ary.find_index -> Enumerator * ary.index(obj) -> int or nil - * ary.index { |item| block } -> int or nil + * ary.index {|item| block} -> int or nil * ary.index -> Enumerator * * Returns the _index_ of the first object in +ary+ such that the object is * <code>==</code> to +obj+. * - * If a block is given instead of an argument, returns the _index_ of first - * the object for which the block returns +true+. Returns +nil+ if no match - * is found. + * If a block is given instead of an argument, returns the _index_ of the + * first object for which the block returns +true+. Returns +nil+ if no + * match is found. * * See also Array#rindex. * @@ -1214,9 +1716,7 @@ rb_ary_fetch(int argc, VALUE *argv, VALUE ary) * a = [ "a", "b", "c" ] * a.index("b") #=> 1 * a.index("z") #=> nil - * a.index { |x| x == "b" } #=> 1 - * - * This is an alias of Array#find_index. + * a.index {|x| x == "b"} #=> 1 */ static VALUE @@ -1228,18 +1728,21 @@ rb_ary_index(int argc, VALUE *argv, VALUE ary) if (argc == 0) { RETURN_ENUMERATOR(ary, 0, 0); for (i=0; i<RARRAY_LEN(ary); i++) { - if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) { + if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) { return LONG2NUM(i); } } return Qnil; } - rb_scan_args(argc, argv, "1", &val); + rb_check_arity(argc, 0, 1); + val = argv[0]; if (rb_block_given_p()) rb_warn("given block not used"); for (i=0; i<RARRAY_LEN(ary); i++) { - if (rb_equal(RARRAY_PTR(ary)[i], val)) + VALUE e = RARRAY_AREF(ary, i); + if (rb_equal(e, val)) { return LONG2NUM(i); + } } return Qnil; } @@ -1247,13 +1750,14 @@ rb_ary_index(int argc, VALUE *argv, VALUE ary) /* * call-seq: * ary.rindex(obj) -> int or nil - * ary.rindex { |item| block } -> int or nil + * ary.rindex {|item| block} -> int or nil * ary.rindex -> Enumerator * * Returns the _index_ of the last object in +self+ <code>==</code> to +obj+. * - * If a block is given instead of an argument, returns _index_ of first object - * for which block returns +true+, starting from the last object. + * If a block is given instead of an argument, returns the _index_ of the + * first object for which the block returns +true+, starting from the last + * object. * * Returns +nil+ if no match is found. * @@ -1264,34 +1768,34 @@ rb_ary_index(int argc, VALUE *argv, VALUE ary) * a = [ "a", "b", "b", "b", "c" ] * a.rindex("b") #=> 3 * a.rindex("z") #=> nil - * a.rindex { |x| x == "b" } #=> 3 + * a.rindex {|x| x == "b"} #=> 3 */ static VALUE rb_ary_rindex(int argc, VALUE *argv, VALUE ary) { VALUE val; - long i = RARRAY_LEN(ary); + long i = RARRAY_LEN(ary), len; if (argc == 0) { RETURN_ENUMERATOR(ary, 0, 0); while (i--) { - if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) + if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) return LONG2NUM(i); - if (i > RARRAY_LEN(ary)) { - i = RARRAY_LEN(ary); + if (i > (len = RARRAY_LEN(ary))) { + i = len; } } return Qnil; } - rb_scan_args(argc, argv, "1", &val); + rb_check_arity(argc, 0, 1); + val = argv[0]; if (rb_block_given_p()) rb_warn("given block not used"); while (i--) { - if (rb_equal(RARRAY_PTR(ary)[i], val)) + VALUE e = RARRAY_AREF(ary, i); + if (rb_equal(e, val)) { return LONG2NUM(i); - if (i > RARRAY_LEN(ary)) { - i = RARRAY_LEN(ary); } } return Qnil; @@ -1307,59 +1811,71 @@ rb_ary_to_ary(VALUE obj) } static void -rb_ary_splice(VALUE ary, long beg, long len, VALUE rpl) +rb_ary_splice(VALUE ary, long beg, long len, const VALUE *rptr, long rlen) { - long rlen; + long olen; + long rofs; if (len < 0) rb_raise(rb_eIndexError, "negative length (%ld)", len); + olen = RARRAY_LEN(ary); if (beg < 0) { - beg += RARRAY_LEN(ary); + beg += olen; if (beg < 0) { rb_raise(rb_eIndexError, "index %ld too small for array; minimum: %ld", - beg - RARRAY_LEN(ary), -RARRAY_LEN(ary)); + beg - olen, -olen); } } - if (RARRAY_LEN(ary) < len || RARRAY_LEN(ary) < beg + len) { - len = RARRAY_LEN(ary) - beg; + if (olen < len || olen < beg + len) { + len = olen - beg; } - if (rpl == Qundef) { - rlen = 0; - } - else { - rpl = rb_ary_to_ary(rpl); - rlen = RARRAY_LEN(rpl); + { + const VALUE *optr = RARRAY_CONST_PTR_TRANSIENT(ary); + rofs = (rptr >= optr && rptr < optr + olen) ? rptr - optr : -1; } - rb_ary_modify(ary); - if (beg >= RARRAY_LEN(ary)) { + + if (beg >= olen) { + VALUE target_ary; if (beg > ARY_MAX_SIZE - rlen) { rb_raise(rb_eIndexError, "index %ld too big", beg); } + target_ary = ary_ensure_room_for_push(ary, rlen-len); /* len is 0 or negative */ len = beg + rlen; - if (len >= ARY_CAPA(ary)) { - ary_double_capa(ary, len); - } - rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary), beg - RARRAY_LEN(ary)); + ary_mem_clear(ary, olen, beg - olen); if (rlen > 0) { - MEMCPY(RARRAY_PTR(ary) + beg, RARRAY_PTR(rpl), VALUE, rlen); + if (rofs != -1) rptr = RARRAY_CONST_PTR_TRANSIENT(ary) + rofs; + ary_memcpy0(ary, beg, rlen, rptr, target_ary); } ARY_SET_LEN(ary, len); } else { long alen; - alen = RARRAY_LEN(ary) + rlen - len; + if (olen - len > ARY_MAX_SIZE - rlen) { + rb_raise(rb_eIndexError, "index %ld too big", olen + rlen - len); + } + rb_ary_modify(ary); + alen = olen + rlen - len; if (alen >= ARY_CAPA(ary)) { ary_double_capa(ary, alen); } if (len != rlen) { - MEMMOVE(RARRAY_PTR(ary) + beg + rlen, RARRAY_PTR(ary) + beg + len, - VALUE, RARRAY_LEN(ary) - (beg + len)); + RARRAY_PTR_USE_TRANSIENT(ary, ptr, + MEMMOVE(ptr + beg + rlen, ptr + beg + len, + VALUE, olen - (beg + len))); ARY_SET_LEN(ary, alen); } if (rlen > 0) { - MEMMOVE(RARRAY_PTR(ary) + beg, RARRAY_PTR(rpl), VALUE, rlen); + if (rofs != -1) rptr = RARRAY_CONST_PTR_TRANSIENT(ary) + rofs; + /* give up wb-protected ary */ + RB_OBJ_WB_UNPROTECT_FOR(ARRAY, ary); + + /* do not use RARRAY_PTR() because it can causes GC. + * ary can contain T_NONE object because it is not cleared. + */ + RARRAY_PTR_USE_TRANSIENT(ary, ptr, + MEMMOVE(ptr + beg, rptr, VALUE, rlen)); } } } @@ -1402,8 +1918,8 @@ rb_ary_resize(VALUE ary, long len) if (len >= ARY_CAPA(ary)) { ary_double_capa(ary, len); } - rb_mem_clear(RARRAY_PTR(ary) + olen, len - olen); - ARY_SET_LEN(ary, len); + ary_mem_clear(ary, olen, len - olen); + ARY_SET_LEN(ary, len); } else if (ARY_EMBED_P(ary)) { ARY_SET_EMBED_LEN(ary, len); @@ -1412,16 +1928,17 @@ rb_ary_resize(VALUE ary, long len) VALUE tmp[RARRAY_EMBED_LEN_MAX]; MEMCPY(tmp, ARY_HEAP_PTR(ary), VALUE, len); ary_discard(ary); - MEMCPY(ARY_EMBED_PTR(ary), tmp, VALUE, len); + MEMCPY((VALUE *)ARY_EMBED_PTR(ary), tmp, VALUE, len); /* WB: no new reference */ ARY_SET_EMBED_LEN(ary, len); } else { if (olen > len + ARY_DEFAULT_SIZE) { - REALLOC_N(RARRAY(ary)->as.heap.ptr, VALUE, len); + ary_heap_realloc(ary, len); ARY_SET_CAPA(ary, len); } ARY_SET_HEAP_LEN(ary, len); } + ary_verify(ary); return ary; } @@ -1464,13 +1981,13 @@ static VALUE rb_ary_aset(int argc, VALUE *argv, VALUE ary) { long offset, beg, len; + VALUE rpl; if (argc == 3) { rb_ary_modify_check(ary); beg = NUM2LONG(argv[0]); len = NUM2LONG(argv[1]); - rb_ary_splice(ary, beg, len, argv[2]); - return argv[2]; + goto range; } rb_check_arity(argc, 2, 2); rb_ary_modify_check(ary); @@ -1480,8 +1997,11 @@ rb_ary_aset(int argc, VALUE *argv, VALUE ary) } if (rb_range_beg_len(argv[0], &beg, &len, RARRAY_LEN(ary), 1)) { /* check if idx is Range */ - rb_ary_splice(ary, beg, len, argv[1]); - return argv[1]; + range: + rpl = rb_ary_to_ary(argv[argc-1]); + rb_ary_splice(ary, beg, len, RARRAY_CONST_PTR_TRANSIENT(rpl), RARRAY_LEN(rpl)); + RB_GC_GUARD(rpl); + return argv[argc-1]; } offset = NUM2LONG(argv[0]); @@ -1497,7 +2017,9 @@ fixnum: * Inserts the given values before the element with the given +index+. * * Negative indices count backwards from the end of the array, where +-1+ is - * the last element. + * the last element. If a negative index is used, the given values will be + * inserted after that element, so using an index of +-1+ will insert the + * values at the end of the array. * * a = %w{ a b c d } * a.insert(2, 99) #=> ["a", "b", 99, "c", "d"] @@ -1511,27 +2033,41 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary) rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS); rb_ary_modify_check(ary); - if (argc == 1) return ary; pos = NUM2LONG(argv[0]); + if (argc == 1) return ary; if (pos == -1) { pos = RARRAY_LEN(ary); } - if (pos < 0) { + else if (pos < 0) { + long minpos = -RARRAY_LEN(ary) - 1; + if (pos < minpos) { + rb_raise(rb_eIndexError, "index %ld too small for array; minimum: %ld", + pos, minpos); + } pos++; } - rb_ary_splice(ary, pos, 0, rb_ary_new4(argc - 1, argv + 1)); + rb_ary_splice(ary, pos, 0, argv + 1, argc - 1); return ary; } +static VALUE +rb_ary_length(VALUE ary); + +static VALUE +ary_enum_length(VALUE ary, VALUE args, VALUE eobj) +{ + return rb_ary_length(ary); +} + /* * call-seq: - * ary.each { |item| block } -> ary + * ary.each {|item| block} -> ary * ary.each -> Enumerator * * Calls the given block once for each element in +self+, passing that element - * as a parameter. + * as a parameter. Returns the array itself. * - * An Enumerator is returned if no block is given. + * If no block is given, an Enumerator is returned. * * a = [ "a", "b", "c" ] * a.each {|x| print x, " -- " } @@ -1542,21 +2078,20 @@ rb_ary_insert(int argc, VALUE *argv, VALUE ary) */ VALUE -rb_ary_each(VALUE array) +rb_ary_each(VALUE ary) { long i; - volatile VALUE ary = array; - - RETURN_ENUMERATOR(ary, 0, 0); + ary_verify(ary); + RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length); for (i=0; i<RARRAY_LEN(ary); i++) { - rb_yield(RARRAY_PTR(ary)[i]); + rb_yield(RARRAY_AREF(ary, i)); } return ary; } /* * call-seq: - * ary.each_index { |index| block } -> ary + * ary.each_index {|index| block} -> ary * ary.each_index -> Enumerator * * Same as Array#each, but passes the +index+ of the element instead of the @@ -1576,7 +2111,7 @@ static VALUE rb_ary_each_index(VALUE ary) { long i; - RETURN_ENUMERATOR(ary, 0, 0); + RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length); for (i=0; i<RARRAY_LEN(ary); i++) { rb_yield(LONG2NUM(i)); @@ -1586,7 +2121,7 @@ rb_ary_each_index(VALUE ary) /* * call-seq: - * ary.reverse_each { |item| block } -> ary + * ary.reverse_each {|item| block} -> ary * ary.reverse_each -> Enumerator * * Same as Array#each, but traverses +self+ in reverse order. @@ -1604,12 +2139,14 @@ rb_ary_reverse_each(VALUE ary) { long len; - RETURN_ENUMERATOR(ary, 0, 0); + RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length); len = RARRAY_LEN(ary); while (len--) { - rb_yield(RARRAY_PTR(ary)[len]); - if (RARRAY_LEN(ary) < len) { - len = RARRAY_LEN(ary); + long nlen; + rb_yield(RARRAY_AREF(ary, len)); + nlen = RARRAY_LEN(ary); + if (nlen < len) { + len = nlen; } } return ary; @@ -1652,16 +2189,20 @@ rb_ary_empty_p(VALUE ary) VALUE rb_ary_dup(VALUE ary) { - VALUE dup = rb_ary_new2(RARRAY_LEN(ary)); - MEMCPY(RARRAY_PTR(dup), RARRAY_PTR(ary), VALUE, RARRAY_LEN(ary)); - ARY_SET_LEN(dup, RARRAY_LEN(ary)); + long len = RARRAY_LEN(ary); + VALUE dup = rb_ary_new2(len); + ary_memcpy(dup, 0, len, RARRAY_CONST_PTR_TRANSIENT(ary)); + ARY_SET_LEN(dup, len); + + ary_verify(ary); + ary_verify(dup); return dup; } VALUE rb_ary_resurrect(VALUE ary) { - return rb_ary_new4(RARRAY_LEN(ary), RARRAY_PTR(ary)); + return ary_make_partial(ary, rb_cArray, 0, RARRAY_LEN(ary)); } extern VALUE rb_output_fs; @@ -1692,14 +2233,13 @@ ary_join_0(VALUE ary, VALUE sep, long max, VALUE result) long i; VALUE val; - if (max > 0) rb_enc_copy(result, RARRAY_PTR(ary)[0]); + if (max > 0) rb_enc_copy(result, RARRAY_AREF(ary, 0)); for (i=0; i<max; i++) { - val = RARRAY_PTR(ary)[i]; + val = RARRAY_AREF(ary, i); if (i > 0 && !NIL_P(sep)) rb_str_buf_append(result, sep); rb_str_buf_append(result, val); if (OBJ_TAINTED(val)) OBJ_TAINT(result); - if (OBJ_UNTRUSTED(val)) OBJ_TAINT(result); } } @@ -1712,14 +2252,16 @@ ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first) if (i > 0 && !NIL_P(sep)) rb_str_buf_append(result, sep); - val = RARRAY_PTR(ary)[i]; - switch (TYPE(val)) { - case T_STRING: + val = RARRAY_AREF(ary, i); + if (RB_TYPE_P(val, T_STRING)) { str_join: rb_str_buf_append(result, val); - *first = FALSE; - break; - case T_ARRAY: + if (*first) { + rb_enc_copy(result, val); + *first = FALSE; + } + } + else if (RB_TYPE_P(val, T_ARRAY)) { obj = val; ary_join: if (val == ary) { @@ -1728,30 +2270,27 @@ ary_join_1(VALUE obj, VALUE ary, VALUE sep, long i, VALUE result, int *first) else { VALUE args[4]; + *first = FALSE; args[0] = val; args[1] = sep; args[2] = result; args[3] = (VALUE)first; rb_exec_recursive(recursive_join, obj, (VALUE)args); } - break; - default: + } + else { tmp = rb_check_string_type(val); if (!NIL_P(tmp)) { val = tmp; goto str_join; } - tmp = rb_check_convert_type(val, T_ARRAY, "Array", "to_ary"); + tmp = rb_check_array_type(val); if (!NIL_P(tmp)) { obj = val; val = tmp; goto ary_join; } val = rb_obj_as_string(val); - if (*first) { - rb_enc_copy(result, val); - *first = FALSE; - } goto str_join; } } @@ -1762,19 +2301,17 @@ rb_ary_join(VALUE ary, VALUE sep) { long len = 1, i; int taint = FALSE; - int untrust = FALSE; VALUE val, tmp, result; if (RARRAY_LEN(ary) == 0) return rb_usascii_str_new(0, 0); if (OBJ_TAINTED(ary)) taint = TRUE; - if (OBJ_UNTRUSTED(ary)) untrust = TRUE; if (!NIL_P(sep)) { StringValue(sep); len += RSTRING_LEN(sep) * (RARRAY_LEN(ary) - 1); } for (i=0; i<RARRAY_LEN(ary); i++) { - val = RARRAY_PTR(ary)[i]; + val = RARRAY_AREF(ary, i); tmp = rb_check_string_type(val); if (NIL_P(tmp) || tmp != val) { @@ -1782,7 +2319,6 @@ rb_ary_join(VALUE ary, VALUE sep) result = rb_str_buf_new(len + (RARRAY_LEN(ary)-i)*10); rb_enc_associate(result, rb_usascii_encoding()); if (taint) OBJ_TAINT(result); - if (untrust) OBJ_UNTRUST(result); ary_join_0(ary, sep, i, result); first = i == 0; ary_join_1(ary, ary, sep, i, result, &first); @@ -1794,7 +2330,6 @@ rb_ary_join(VALUE ary, VALUE sep) result = rb_str_buf_new(len); if (taint) OBJ_TAINT(result); - if (untrust) OBJ_UNTRUST(result); ary_join_0(ary, sep, RARRAY_LEN(ary), result); return result; @@ -1806,11 +2341,16 @@ rb_ary_join(VALUE ary, VALUE sep) * * Returns a string created by converting each element of the array to * a string, separated by the given +separator+. - * If the +separator+ is +nil+, it uses current $,. - * If both the +separator+ and $, are nil, it uses empty string. + * If the +separator+ is +nil+, it uses current <code>$,</code>. + * If both the +separator+ and <code>$,</code> are +nil+, + * it uses an empty string. * * [ "a", "b", "c" ].join #=> "abc" * [ "a", "b", "c" ].join("-") #=> "a-b-c" + * + * For nested arrays, join is applied recursively: + * + * [ "a", [1, 2, [:x, :y]], "b" ].join("-") #=> "a-1-2-x-y-b" */ static VALUE @@ -1818,8 +2358,12 @@ rb_ary_join_m(int argc, VALUE *argv, VALUE ary) { VALUE sep; - rb_scan_args(argc, argv, "01", &sep); - if (NIL_P(sep)) sep = rb_output_fs; + if (rb_check_arity(argc, 0, 1) == 0) { + sep = rb_output_fs; + } + else if (NIL_P(sep = argv[0])) { + sep = rb_output_fs; + } return rb_ary_join(ary, sep); } @@ -1828,23 +2372,20 @@ static VALUE inspect_ary(VALUE ary, VALUE dummy, int recur) { int tainted = OBJ_TAINTED(ary); - int untrust = OBJ_UNTRUSTED(ary); long i; VALUE s, str; if (recur) return rb_usascii_str_new_cstr("[...]"); str = rb_str_buf_new2("["); for (i=0; i<RARRAY_LEN(ary); i++) { - s = rb_inspect(RARRAY_PTR(ary)[i]); + s = rb_inspect(RARRAY_AREF(ary, i)); if (OBJ_TAINTED(s)) tainted = TRUE; - if (OBJ_UNTRUSTED(s)) untrust = TRUE; if (i > 0) rb_str_buf_cat2(str, ", "); else rb_enc_copy(str, s); rb_str_buf_append(str, s); } rb_str_buf_cat2(str, "]"); if (tainted) OBJ_TAINT(str); - if (untrust) OBJ_UNTRUST(str); return str; } @@ -1893,6 +2434,48 @@ rb_ary_to_a(VALUE ary) /* * call-seq: + * ary.to_h -> hash + * ary.to_h { block } -> hash + * + * Returns the result of interpreting <i>ary</i> as an array of + * <tt>[key, value]</tt> pairs. + * + * [[:foo, :bar], [1, 2]].to_h + * # => {:foo => :bar, 1 => 2} + * + * If a block is given, the results of the block on each element of + * the array will be used as pairs. + * + * ["foo", "bar"].to_h {|s| [s.ord, s]} + * # => {102=>"foo", 98=>"bar"} + */ + +static VALUE +rb_ary_to_h(VALUE ary) +{ + long i; + VALUE hash = rb_hash_new_with_size(RARRAY_LEN(ary)); + int block_given = rb_block_given_p(); + + for (i=0; i<RARRAY_LEN(ary); i++) { + const VALUE e = rb_ary_elt(ary, i); + const VALUE elt = block_given ? rb_yield_force_blockarg(e) : e; + const VALUE key_value_pair = rb_check_array_type(elt); + if (NIL_P(key_value_pair)) { + rb_raise(rb_eTypeError, "wrong element type %"PRIsVALUE" at %ld (expected array)", + rb_obj_class(elt), i); + } + if (RARRAY_LEN(key_value_pair) != 2) { + rb_raise(rb_eArgError, "wrong array length at %ld (expected 2, was %ld)", + i, RARRAY_LEN(key_value_pair)); + } + rb_hash_aset(hash, RARRAY_AREF(key_value_pair, 0), RARRAY_AREF(key_value_pair, 1)); + } + return hash; +} + +/* + * call-seq: * ary.to_ary -> ary * * Returns +self+. @@ -1917,13 +2500,15 @@ ary_reverse(VALUE *p1, VALUE *p2) VALUE rb_ary_reverse(VALUE ary) { - VALUE *p1, *p2; + VALUE *p2; + long len = RARRAY_LEN(ary); rb_ary_modify(ary); - if (RARRAY_LEN(ary) > 1) { - p1 = RARRAY_PTR(ary); - p2 = p1 + RARRAY_LEN(ary) - 1; /* points last item */ - ary_reverse(p1, p2); + if (len > 1) { + RARRAY_PTR_USE_TRANSIENT(ary, p1, { + p2 = p1 + len - 1; /* points last item */ + ary_reverse(p1, p2); + }); /* WB: no new reference */ } return ary; } @@ -1962,8 +2547,8 @@ rb_ary_reverse_m(VALUE ary) VALUE dup = rb_ary_new2(len); if (len > 0) { - VALUE *p1 = RARRAY_PTR(ary); - VALUE *p2 = RARRAY_PTR(dup) + len - 1; + const VALUE *p1 = RARRAY_CONST_PTR_TRANSIENT(ary); + VALUE *p2 = (VALUE *)RARRAY_CONST_PTR_TRANSIENT(dup) + len - 1; do *p2-- = *p1++; while (--len > 0); } ARY_SET_LEN(dup, RARRAY_LEN(ary)); @@ -1976,24 +2561,27 @@ rotate_count(long cnt, long len) return (cnt < 0) ? (len - (~cnt % len) - 1) : (cnt % len); } +static void +ary_rotate_ptr(VALUE *ptr, long len, long cnt) +{ + --len; + if (cnt < len) ary_reverse(ptr + cnt, ptr + len); + if (--cnt > 0) ary_reverse(ptr, ptr + cnt); + if (len > 0) ary_reverse(ptr, ptr + len); +} + VALUE rb_ary_rotate(VALUE ary, long cnt) { rb_ary_modify(ary); if (cnt != 0) { - VALUE *ptr = RARRAY_PTR(ary); - long len = RARRAY_LEN(ary); - - if (len > 0 && (cnt = rotate_count(cnt, len)) > 0) { - --len; - if (cnt < len) ary_reverse(ptr + cnt, ptr + len); - if (--cnt > 0) ary_reverse(ptr, ptr + cnt); - if (len > 0) ary_reverse(ptr, ptr + len); - return ary; - } + long len = RARRAY_LEN(ary); + if (len > 0 && (cnt = rotate_count(cnt, len)) > 0) { + RARRAY_PTR_USE_TRANSIENT(ary, ptr, ary_rotate_ptr(ptr, len, cnt)); + return ary; + } } - return Qnil; } @@ -2017,13 +2605,7 @@ rb_ary_rotate(VALUE ary, long cnt) static VALUE rb_ary_rotate_bang(int argc, VALUE *argv, VALUE ary) { - long n = 1; - - switch (argc) { - case 1: n = NUM2LONG(argv[0]); - case 0: break; - default: rb_scan_args(argc, argv, "01", NULL); - } + long n = (rb_check_arity(argc, 0, 1) ? NUM2LONG(argv[0]) : 1); rb_ary_rotate(ary, n); return ary; } @@ -2032,8 +2614,8 @@ rb_ary_rotate_bang(int argc, VALUE *argv, VALUE ary) * call-seq: * ary.rotate(count=1) -> new_ary * - * Returns new array by rotating +self+ so that the element at +count+ is the - * first element of the new array. + * Returns a new array by rotating +self+ so that the element at +count+ is + * the first element of the new array. * * If +count+ is negative then it rotates in the opposite direction, starting * from the end of +self+ where +-1+ is the last element. @@ -2048,24 +2630,19 @@ rb_ary_rotate_bang(int argc, VALUE *argv, VALUE ary) static VALUE rb_ary_rotate_m(int argc, VALUE *argv, VALUE ary) { - VALUE rotated, *ptr, *ptr2; - long len, cnt = 1; - - switch (argc) { - case 1: cnt = NUM2LONG(argv[0]); - case 0: break; - default: rb_scan_args(argc, argv, "01", NULL); - } + VALUE rotated; + const VALUE *ptr; + long len; + long cnt = (rb_check_arity(argc, 0, 1) ? NUM2LONG(argv[0]) : 1); len = RARRAY_LEN(ary); rotated = rb_ary_new2(len); if (len > 0) { cnt = rotate_count(cnt, len); - ptr = RARRAY_PTR(ary); - ptr2 = RARRAY_PTR(rotated); + ptr = RARRAY_CONST_PTR_TRANSIENT(ary); len -= cnt; - MEMCPY(ptr2, ptr + cnt, VALUE, len); - MEMCPY(ptr2 + len, ptr, VALUE, cnt); + ary_memcpy(rotated, 0, len, ptr + cnt); + ary_memcpy(rotated, len, cnt, ptr); } ARY_SET_LEN(rotated, RARRAY_LEN(ary)); return rotated; @@ -2073,26 +2650,9 @@ rb_ary_rotate_m(int argc, VALUE *argv, VALUE ary) struct ary_sort_data { VALUE ary; - int opt_methods; - int opt_inited; -}; - -enum { - sort_opt_Fixnum, - sort_opt_String, - sort_optimizable_count + struct cmp_opt_data cmp_opt; }; -#define STRING_P(s) (RB_TYPE_P((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)))) - static VALUE sort_reentered(VALUE ary) { @@ -2108,9 +2668,12 @@ sort_1(const void *ap, const void *bp, void *dummy) struct ary_sort_data *data = dummy; VALUE retval = sort_reentered(data->ary); VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp; + VALUE args[2]; int n; - retval = rb_yield_values(2, a, b); + args[0] = a; + args[1] = b; + retval = rb_yield_values2(2, args); n = rb_cmpint(retval, a, b); sort_reentered(data->ary); return n; @@ -2124,16 +2687,19 @@ sort_2(const void *ap, const void *bp, void *dummy) VALUE a = *(const VALUE *)ap, b = *(const VALUE *)bp; int n; - if (FIXNUM_P(a) && FIXNUM_P(b) && SORT_OPTIMIZABLE(data, Fixnum)) { + if (FIXNUM_P(a) && FIXNUM_P(b) && CMP_OPTIMIZABLE(data->cmp_opt, Fixnum)) { if ((long)a > (long)b) return 1; if ((long)a < (long)b) return -1; return 0; } - if (STRING_P(a) && STRING_P(b) && SORT_OPTIMIZABLE(data, String)) { + if (STRING_P(a) && STRING_P(b) && CMP_OPTIMIZABLE(data->cmp_opt, String)) { return rb_str_cmp(a, b); } + if (RB_FLOAT_TYPE_P(a) && CMP_OPTIMIZABLE(data->cmp_opt, Float)) { + return rb_float_cmp(a, b); + } - retval = rb_funcall(a, id_cmp, 1, b); + retval = rb_funcallv(a, id_cmp, 1, &b); n = rb_cmpint(retval, a, b); sort_reentered(data->ary); @@ -2143,22 +2709,25 @@ sort_2(const void *ap, const void *bp, void *dummy) /* * call-seq: * ary.sort! -> ary - * ary.sort! { |a, b| block } -> ary + * ary.sort! {|a, b| block} -> ary * * Sorts +self+ in place. * * Comparisons for the sort will be done using the <code><=></code> operator * or using an optional code block. * - * The block must implement a comparison between +a+ and +b+, and return - * +-1+, when +a+ follows +b+, +0+ when +a+ and +b+ are equivalent, or ++1+ - * if +b+ follows +a+. + * The block must implement a comparison between +a+ and +b+ and return + * an integer less than 0 when +b+ follows +a+, +0+ when +a+ and +b+ + * are equivalent, or an integer greater than 0 when +a+ follows +b+. * - * See also Enumerable#sort_by. + * The result is not guaranteed to be stable. When the comparison of two + * elements returns +0+, the order of the elements is unpredictable. + * + * ary = [ "d", "a", "e", "c", "b" ] + * ary.sort! #=> ["a", "b", "c", "d", "e"] + * ary.sort! {|a, b| b <=> a} #=> ["e", "d", "c", "b", "a"] * - * a = [ "d", "a", "e", "c", "b" ] - * a.sort! #=> ["a", "b", "c", "d", "e"] - * a.sort! { |x,y| y <=> x } #=> ["e", "d", "c", "b", "a"] + * See also Enumerable#sort_by. */ VALUE @@ -2169,29 +2738,28 @@ rb_ary_sort_bang(VALUE ary) if (RARRAY_LEN(ary) > 1) { VALUE tmp = ary_make_substitution(ary); /* only ary refers tmp */ struct ary_sort_data data; - - RBASIC(tmp)->klass = 0; + long len = RARRAY_LEN(ary); + RBASIC_CLEAR_CLASS(tmp); data.ary = tmp; - data.opt_methods = 0; - data.opt_inited = 0; - ruby_qsort(RARRAY_PTR(tmp), RARRAY_LEN(tmp), sizeof(VALUE), - rb_block_given_p()?sort_1:sort_2, &data); - + data.cmp_opt.opt_methods = 0; + data.cmp_opt.opt_inited = 0; + RARRAY_PTR_USE(tmp, ptr, { + ruby_qsort(ptr, len, sizeof(VALUE), + rb_block_given_p()?sort_1:sort_2, &data); + }); /* WB: no new reference */ + rb_ary_modify(ary); if (ARY_EMBED_P(tmp)) { - assert(ARY_EMBED_P(tmp)); if (ARY_SHARED_P(ary)) { /* ary might be destructively operated in the given block */ rb_ary_unshare(ary); + FL_SET_EMBED(ary); } - FL_SET_EMBED(ary); - MEMCPY(RARRAY_PTR(ary), ARY_EMBED_PTR(tmp), VALUE, ARY_EMBED_LEN(tmp)); + ary_memcpy(ary, 0, ARY_EMBED_LEN(tmp), ARY_EMBED_PTR(tmp)); ARY_SET_LEN(ary, ARY_EMBED_LEN(tmp)); } else { - assert(!ARY_EMBED_P(tmp)); - if (ARY_HEAP_PTR(ary) == ARY_HEAP_PTR(tmp)) { - assert(!ARY_EMBED_P(ary)); + if (!ARY_EMBED_P(ary) && ARY_HEAP_PTR(ary) == ARY_HEAP_PTR(tmp)) { FL_UNSET_SHARED(ary); - ARY_SET_CAPA(ary, ARY_CAPA(tmp)); + ARY_SET_CAPA(ary, RARRAY_LEN(tmp)); } else { assert(!ARY_SHARED_P(tmp)); @@ -2203,44 +2771,47 @@ rb_ary_sort_bang(VALUE ary) rb_ary_unshare(ary); } else { - xfree(ARY_HEAP_PTR(ary)); + ary_heap_free(ary); } - ARY_SET_PTR(ary, RARRAY_PTR(tmp)); - ARY_SET_HEAP_LEN(ary, RARRAY_LEN(tmp)); - ARY_SET_CAPA(ary, ARY_CAPA(tmp)); + ARY_SET_PTR(ary, ARY_HEAP_PTR(tmp)); + ARY_SET_HEAP_LEN(ary, len); + ARY_SET_CAPA(ary, ARY_HEAP_LEN(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; + RBASIC_SET_CLASS_RAW(tmp, rb_cArray); /* rb_cArray must be marked */ } + ary_verify(ary); return ary; } /* * call-seq: * ary.sort -> new_ary - * ary.sort { |a, b| block } -> new_ary + * ary.sort {|a, b| block} -> new_ary * * Returns a new array created by sorting +self+. * * Comparisons for the sort will be done using the <code><=></code> operator * or using an optional code block. * - * The block must implement a comparison between +a+ and +b+, and return - * +-1+, when +a+ follows +b+, +0+ when +a+ and +b+ are equivalent, or ++1+ - * if +b+ follows +a+. + * The block must implement a comparison between +a+ and +b+ and return + * an integer less than 0 when +b+ follows +a+, +0+ when +a+ and +b+ + * are equivalent, or an integer greater than 0 when +a+ follows +b+. * + * The result is not guaranteed to be stable. When the comparison of two + * elements returns +0+, the order of the elements is unpredictable. * - * See also Enumerable#sort_by. + * ary = [ "d", "a", "e", "c", "b" ] + * ary.sort #=> ["a", "b", "c", "d", "e"] + * ary.sort {|a, b| b <=> a} #=> ["e", "d", "c", "b", "a"] * - * a = [ "d", "a", "e", "c", "b" ] - * a.sort #=> ["a", "b", "c", "d", "e"] - * a.sort { |x,y| y <=> x } #=> ["e", "d", "c", "b", "a"] + * See also Enumerable#sort_by. */ VALUE @@ -2251,23 +2822,153 @@ rb_ary_sort(VALUE ary) return ary; } +static VALUE rb_ary_bsearch_index(VALUE ary); + +/* + * call-seq: + * ary.bsearch {|x| block } -> elem + * + * By using binary search, finds a value from this array which meets + * the given condition in O(log n) where n is the size of the array. + * + * You can use this method in two modes: a find-minimum mode and + * a find-any mode. In either case, the elements of the array must be + * monotone (or sorted) with respect to the block. + * + * In find-minimum mode (this is a good choice for typical use cases), + * the block must always return true or false, and there must be an index i + * (0 <= i <= ary.size) so that: + * + * - the block returns false for any element whose index is less than + * i, and + * - the block returns true for any element whose index is greater + * than or equal to i. + * + * This method returns the i-th element. If i is equal to ary.size, + * it returns nil. + * + * ary = [0, 4, 7, 10, 12] + * ary.bsearch {|x| x >= 4 } #=> 4 + * ary.bsearch {|x| x >= 6 } #=> 7 + * ary.bsearch {|x| x >= -1 } #=> 0 + * ary.bsearch {|x| x >= 100 } #=> nil + * + * In find-any mode (this behaves like libc's bsearch(3)), the block + * must always return a number, and there must be two indices i and j + * (0 <= i <= j <= ary.size) so that: + * + * - the block returns a positive number for ary[k] if 0 <= k < i, + * - the block returns zero for ary[k] if i <= k < j, and + * - the block returns a negative number for ary[k] if + * j <= k < ary.size. + * + * Under this condition, this method returns any element whose index + * is within i...j. If i is equal to j (i.e., there is no element + * that satisfies the block), this method returns nil. + * + * ary = [0, 4, 7, 10, 12] + * # try to find v such that 4 <= v < 8 + * ary.bsearch {|x| 1 - x / 4 } #=> 4 or 7 + * # try to find v such that 8 <= v < 10 + * ary.bsearch {|x| 4 - x / 2 } #=> nil + * + * You must not mix the two modes at a time; the block must always + * return either true/false, or always return a number. It is + * undefined which value is actually picked up at each iteration. + */ + +static VALUE +rb_ary_bsearch(VALUE ary) +{ + VALUE index_result = rb_ary_bsearch_index(ary); + + if (FIXNUM_P(index_result)) { + return rb_ary_entry(ary, FIX2LONG(index_result)); + } + return index_result; +} + +/* + * call-seq: + * ary.bsearch_index {|x| block } -> int or nil + * + * By using binary search, finds an index of a value from this array which + * meets the given condition in O(log n) where n is the size of the array. + * + * It supports two modes, depending on the nature of the block. They are + * exactly the same as in the case of the #bsearch method, with the only difference + * being that this method returns the index of the element instead of the + * element itself. For more details consult the documentation for #bsearch. + */ + +static VALUE +rb_ary_bsearch_index(VALUE ary) +{ + long low = 0, high = RARRAY_LEN(ary), mid; + int smaller = 0, satisfied = 0; + VALUE v, val; + + RETURN_ENUMERATOR(ary, 0, 0); + while (low < high) { + mid = low + ((high - low) / 2); + val = rb_ary_entry(ary, mid); + v = rb_yield(val); + if (FIXNUM_P(v)) { + if (v == INT2FIX(0)) return INT2FIX(mid); + smaller = (SIGNED_VALUE)v < 0; /* Fixnum preserves its sign-bit */ + } + else if (v == Qtrue) { + satisfied = 1; + smaller = 1; + } + else if (v == Qfalse || v == Qnil) { + smaller = 0; + } + else if (rb_obj_is_kind_of(v, rb_cNumeric)) { + const VALUE zero = INT2FIX(0); + switch (rb_cmpint(rb_funcallv(v, id_cmp, 1, &zero), v, zero)) { + case 0: return INT2FIX(mid); + case 1: smaller = 1; break; + case -1: smaller = 0; + } + } + else { + rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE + " (must be numeric, true, false or nil)", + rb_obj_class(v)); + } + if (smaller) { + high = mid; + } + else { + low = mid + 1; + } + } + if (!satisfied) return Qnil; + return INT2FIX(low); +} + static VALUE -sort_by_i(VALUE i) +sort_by_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, dummy)) { return rb_yield(i); } /* * call-seq: - * ary.sort_by! { |obj| block } -> ary + * ary.sort_by! {|obj| block} -> ary * ary.sort_by! -> Enumerator * * Sorts +self+ in place using a set of keys generated by mapping the * values in +self+ through the given block. * + * The result is not guaranteed to be stable. When two keys are equal, + * the order of the corresponding elements is unpredictable. + * * If no block is given, an Enumerator is returned instead. * + * See also Enumerable#sort_by. */ static VALUE @@ -2275,7 +2976,7 @@ rb_ary_sort_by_bang(VALUE ary) { VALUE sorted; - RETURN_ENUMERATOR(ary, 0, 0); + RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length); rb_ary_modify(ary); sorted = rb_block_call(ary, rb_intern("sort_by"), 0, 0, sort_by_i, 0); rb_ary_replace(ary, sorted); @@ -2285,8 +2986,8 @@ rb_ary_sort_by_bang(VALUE ary) /* * call-seq: - * ary.collect { |item| block } -> new_ary - * ary.map { |item| block } -> new_ary + * ary.collect {|item| block} -> new_ary + * ary.map {|item| block} -> new_ary * ary.collect -> Enumerator * ary.map -> Enumerator * @@ -2299,8 +3000,9 @@ rb_ary_sort_by_bang(VALUE ary) * If no block is given, an Enumerator is returned instead. * * a = [ "a", "b", "c", "d" ] - * a.map { |x| x + "!" } #=> ["a!", "b!", "c!", "d!"] - * a #=> ["a", "b", "c", "d"] + * a.collect {|x| x + "!"} #=> ["a!", "b!", "c!", "d!"] + * a.map.with_index {|x, i| x * i} #=> ["", "b", "cc", "ddd"] + * a #=> ["a", "b", "c", "d"] */ static VALUE @@ -2309,10 +3011,10 @@ rb_ary_collect(VALUE ary) long i; VALUE collect; - RETURN_ENUMERATOR(ary, 0, 0); + RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length); collect = rb_ary_new2(RARRAY_LEN(ary)); for (i = 0; i < RARRAY_LEN(ary); i++) { - rb_ary_push(collect, rb_yield(RARRAY_PTR(ary)[i])); + rb_ary_push(collect, rb_yield(RARRAY_AREF(ary, i))); } return collect; } @@ -2335,6 +3037,8 @@ rb_ary_collect(VALUE ary) * a = [ "a", "b", "c", "d" ] * a.map! {|x| x + "!" } * a #=> [ "a!", "b!", "c!", "d!" ] + * a.collect!.with_index {|x, i| x[0...i] } + * a #=> ["", "b", "c!", "d!"] */ static VALUE @@ -2342,16 +3046,16 @@ rb_ary_collect_bang(VALUE ary) { long i; - RETURN_ENUMERATOR(ary, 0, 0); + RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length); rb_ary_modify(ary); for (i = 0; i < RARRAY_LEN(ary); i++) { - rb_ary_store(ary, i, rb_yield(RARRAY_PTR(ary)[i])); + rb_ary_store(ary, i, rb_yield(RARRAY_AREF(ary, i))); } return ary; } VALUE -rb_get_values_at(VALUE obj, long olen, int argc, VALUE *argv, VALUE (*func) (VALUE, long)) +rb_get_values_at(VALUE obj, long olen, int argc, const VALUE *argv, VALUE (*func) (VALUE, long)) { VALUE result = rb_ary_new2(argc); long beg, len, i, j; @@ -2376,6 +3080,34 @@ rb_get_values_at(VALUE obj, long olen, int argc, VALUE *argv, VALUE (*func) (VAL return result; } +static VALUE +append_values_at_single(VALUE result, VALUE ary, long olen, VALUE idx) +{ + long beg, len; + if (FIXNUM_P(idx)) { + beg = FIX2LONG(idx); + } + /* check if idx is Range */ + else if (rb_range_beg_len(idx, &beg, &len, olen, 1)) { + if (len > 0) { + const VALUE *const src = RARRAY_CONST_PTR_TRANSIENT(ary); + const long end = beg + len; + const long prevlen = RARRAY_LEN(result); + if (beg < olen) { + rb_ary_cat(result, src + beg, end > olen ? olen-beg : len); + } + if (end > olen) { + rb_ary_store(result, prevlen + len - 1, Qnil); + } + } + return result; + } + else { + beg = NUM2LONG(idx); + } + return rb_ary_push(result, rb_ary_entry(ary, beg)); +} + /* * call-seq: * ary.values_at(selector, ...) -> new_ary @@ -2388,35 +3120,45 @@ rb_get_values_at(VALUE obj, long olen, int argc, VALUE *argv, VALUE (*func) (VAL * See also Array#select. * * 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) + * a.values_at(1, 3, 5) # => ["b", "d", "f"] + * a.values_at(1, 3, 5, 7) # => ["b", "d", "f", nil] + * a.values_at(-1, -2, -2, -7) # => ["f", "e", "e", nil] + * a.values_at(4..6, 3...6) # => ["e", "f", nil, "d", "e", "f"] */ static VALUE rb_ary_values_at(int argc, VALUE *argv, VALUE ary) { - return rb_get_values_at(ary, RARRAY_LEN(ary), argc, argv, rb_ary_entry); + long i, olen = RARRAY_LEN(ary); + VALUE result = rb_ary_new_capa(argc); + for (i = 0; i < argc; ++i) { + append_values_at_single(result, ary, olen, argv[i]); + } + RB_GC_GUARD(ary); + return result; } /* * call-seq: - * ary.select { |item| block } -> new_ary + * ary.select {|item| block} -> new_ary * ary.select -> Enumerator + * ary.filter {|item| block} -> new_ary + * ary.filter -> Enumerator * * Returns a new array containing all elements of +ary+ * for which the given +block+ returns a true value. * * If no block is given, an Enumerator is returned instead. * - * [1,2,3,4,5].select { |num| num.even? } #=> [2, 4] + * [1,2,3,4,5].select {|num| num.even? } #=> [2, 4] * - * a = %w{ a b c d e f } - * a.select { |v| v =~ /[aeiou]/ } #=> ["a", "e"] + * a = %w[ a b c d e f ] + * a.select {|v| v =~ /[aeiou]/ } #=> ["a", "e"] * * See also Enumerable#select. + * + * Array#filter is an alias for Array#select. */ static VALUE @@ -2425,86 +3167,140 @@ rb_ary_select(VALUE ary) VALUE result; long i; - RETURN_ENUMERATOR(ary, 0, 0); + RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length); result = rb_ary_new2(RARRAY_LEN(ary)); for (i = 0; i < RARRAY_LEN(ary); i++) { - if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) { + if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) { rb_ary_push(result, rb_ary_elt(ary, i)); } } return result; } +struct select_bang_arg { + VALUE ary; + long len[2]; +}; + +static VALUE +select_bang_i(VALUE a) +{ + volatile struct select_bang_arg *arg = (void *)a; + VALUE ary = arg->ary; + long i1, i2; + + for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); arg->len[0] = ++i1) { + VALUE v = RARRAY_AREF(ary, i1); + if (!RTEST(rb_yield(v))) continue; + if (i1 != i2) { + rb_ary_store(ary, i2, v); + } + arg->len[1] = ++i2; + } + return (i1 == i2) ? Qnil : ary; +} + +static VALUE +select_bang_ensure(VALUE a) +{ + volatile struct select_bang_arg *arg = (void *)a; + VALUE ary = arg->ary; + long len = RARRAY_LEN(ary); + long i1 = arg->len[0], i2 = arg->len[1]; + + if (i2 < len && i2 < i1) { + long tail = 0; + if (i1 < len) { + tail = len - i1; + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { + MEMMOVE(ptr + i2, ptr + i1, VALUE, tail); + }); + } + ARY_SET_LEN(ary, i2 + tail); + } + return ary; +} + /* * call-seq: - * ary.select! {|item| block } -> ary or nil - * ary.select! -> Enumerator + * ary.select! {|item| block } -> ary or nil + * ary.select! -> Enumerator + * ary.filter! {|item| block } -> ary or nil + * ary.filter! -> Enumerator * * Invokes the given block passing in successive elements from +self+, * deleting elements for which the block returns a +false+ value. * - * If changes were made, it will return +self+, otherwise it returns +nil+. + * The array may not be changed instantly every time the block is called. * - * See also Array#keep_if + * If changes were made, it will return +self+, otherwise it returns +nil+. * * If no block is given, an Enumerator is returned instead. * + * See also Array#keep_if. + * + * Array#filter! is an alias for Array#select!. */ static VALUE rb_ary_select_bang(VALUE ary) { - long i1, i2; + struct select_bang_arg args; - RETURN_ENUMERATOR(ary, 0, 0); + RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length); rb_ary_modify(ary); - for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) { - VALUE v = RARRAY_PTR(ary)[i1]; - if (!RTEST(rb_yield(v))) continue; - if (i1 != i2) { - rb_ary_store(ary, i2, v); - } - i2++; - } - if (RARRAY_LEN(ary) == i2) return Qnil; - if (i2 < RARRAY_LEN(ary)) - ARY_SET_LEN(ary, i2); - return ary; + args.ary = ary; + args.len[0] = args.len[1] = 0; + return rb_ensure(select_bang_i, (VALUE)&args, select_bang_ensure, (VALUE)&args); } /* * call-seq: - * ary.keep_if { |item| block } -> ary + * ary.keep_if {|item| block} -> ary * ary.keep_if -> Enumerator * * Deletes every element of +self+ for which the given block evaluates to - * +false+. - * - * See also Array#select! + * +false+, and returns +self+. * * If no block is given, an Enumerator is returned instead. * - * a = %w{ a b c d e f } - * a.keep_if { |v| v =~ /[aeiou]/ } #=> ["a", "e"] + * a = %w[ a b c d e f ] + * a.keep_if {|v| v =~ /[aeiou]/ } #=> ["a", "e"] + * a #=> ["a", "e"] + * + * See also Array#select!. */ static VALUE rb_ary_keep_if(VALUE ary) { - RETURN_ENUMERATOR(ary, 0, 0); + RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length); rb_ary_select_bang(ary); return ary; } +static void +ary_resize_smaller(VALUE ary, long len) +{ + rb_ary_modify(ary); + if (RARRAY_LEN(ary) > len) { + ARY_SET_LEN(ary, len); + if (len * 2 < ARY_CAPA(ary) && + ARY_CAPA(ary) > ARY_DEFAULT_SIZE) { + ary_resize_capa(ary, len * 2); + } + } +} + /* * call-seq: - * ary.delete(obj) -> obj or nil - * ary.delete(obj) { block } -> obj or nil + * ary.delete(obj) -> item or nil + * ary.delete(obj) {block} -> item or result of block * * Deletes all items from +self+ that are equal to +obj+. * - * If any items are found, returns +obj+, otherwise +nil+ is returned instead. + * Returns the last deleted item, or +nil+ if no matching item is found. * * If the optional code block is given, the result of the block is returned if * the item is not found. (To remove +nil+ elements and get an informative @@ -2514,7 +3310,7 @@ rb_ary_keep_if(VALUE ary) * a.delete("b") #=> "b" * a #=> ["a", "c"] * a.delete("z") #=> nil - * a.delete("z") { "not found" } #=> "not found" + * a.delete("z") {"not found"} #=> "not found" */ VALUE @@ -2524,7 +3320,7 @@ rb_ary_delete(VALUE ary, VALUE item) long i1, i2; for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) { - VALUE e = RARRAY_PTR(ary)[i1]; + VALUE e = RARRAY_AREF(ary, i1); if (rb_equal(e, item)) { v = e; @@ -2542,16 +3338,33 @@ rb_ary_delete(VALUE ary, VALUE item) return Qnil; } - rb_ary_modify(ary); - if (RARRAY_LEN(ary) > i2) { - ARY_SET_LEN(ary, i2); - if (i2 * 2 < ARY_CAPA(ary) && - ARY_CAPA(ary) > ARY_DEFAULT_SIZE) { - ary_resize_capa(ary, i2*2); + ary_resize_smaller(ary, i2); + + ary_verify(ary); + return v; +} + +void +rb_ary_delete_same(VALUE ary, VALUE item) +{ + long i1, i2; + + for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) { + VALUE e = RARRAY_AREF(ary, i1); + + if (e == item) { + continue; + } + if (i1 != i2) { + rb_ary_store(ary, i2, e); } + i2++; + } + if (RARRAY_LEN(ary) == i2) { + return; } - return v; + ary_resize_smaller(ary, i2); } VALUE @@ -2567,11 +3380,12 @@ rb_ary_delete_at(VALUE ary, long pos) } rb_ary_modify(ary); - del = RARRAY_PTR(ary)[pos]; - MEMMOVE(RARRAY_PTR(ary)+pos, RARRAY_PTR(ary)+pos+1, VALUE, - RARRAY_LEN(ary)-pos-1); + del = RARRAY_AREF(ary, pos); + RARRAY_PTR_USE_TRANSIENT(ary, ptr, { + MEMMOVE(ptr+pos, ptr+pos+1, VALUE, len-pos-1); + }); ARY_INCREASE_LEN(ary, -1); - + ary_verify(ary); return del; } @@ -2639,16 +3453,13 @@ rb_ary_slice_bang(int argc, VALUE *argv, VALUE ary) len = orig_len - pos; } if (len == 0) return rb_ary_new2(0); - arg2 = rb_ary_new4(len, RARRAY_PTR(ary)+pos); - RBASIC(arg2)->klass = rb_obj_class(ary); - rb_ary_splice(ary, pos, len, Qundef); + arg2 = rb_ary_new4(len, RARRAY_CONST_PTR_TRANSIENT(ary)+pos); + RBASIC_SET_CLASS(arg2, rb_obj_class(ary)); + rb_ary_splice(ary, pos, len, 0, 0); return arg2; } - if (argc != 1) { - /* error report */ - rb_scan_args(argc, argv, "11", NULL, NULL); - } + rb_check_arity(argc, 1, 2); arg1 = argv[0]; if (!FIXNUM_P(arg1)) { @@ -2674,44 +3485,52 @@ ary_reject(VALUE orig, VALUE result) long i; for (i = 0; i < RARRAY_LEN(orig); i++) { - VALUE v = RARRAY_PTR(orig)[i]; - if (!RTEST(rb_yield(v))) { - rb_ary_push_1(result, v); + VALUE v = RARRAY_AREF(orig, i); + + if (!RTEST(rb_yield(v))) { + rb_ary_push(result, v); } } return result; } static VALUE -ary_reject_bang(VALUE ary) +reject_bang_i(VALUE a) { - long i; - VALUE result = Qnil; + volatile struct select_bang_arg *arg = (void *)a; + VALUE ary = arg->ary; + long i1, i2; - rb_ary_modify_check(ary); - for (i = 0; i < RARRAY_LEN(ary); ) { - VALUE v = RARRAY_PTR(ary)[i]; - if (RTEST(rb_yield(v))) { - rb_ary_delete_at(ary, i); - result = ary; - } - else { - i++; + for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); arg->len[0] = ++i1) { + VALUE v = RARRAY_AREF(ary, i1); + if (RTEST(rb_yield(v))) continue; + if (i1 != i2) { + rb_ary_store(ary, i2, v); } + arg->len[1] = ++i2; } - return result; + return (i1 == i2) ? Qnil : ary; +} + +static VALUE +ary_reject_bang(VALUE ary) +{ + struct select_bang_arg args; + rb_ary_modify_check(ary); + args.ary = ary; + args.len[0] = args.len[1] = 0; + return rb_ensure(reject_bang_i, (VALUE)&args, select_bang_ensure, (VALUE)&args); } /* * call-seq: - * ary.reject! { |item| block } -> ary or nil + * ary.reject! {|item| block} -> ary or nil * ary.reject! -> Enumerator * - * Equivalent to Array#delete_if, deleting elements from +self+ for which the - * block evaluates to +true+, but returns +nil+ if no changes were made. + * Deletes every element of +self+ for which the block evaluates to +true+, + * if no changes were made returns +nil+. * - * The array is changed instantly every time the block is called, not after - * the iteration is over. + * The array may not be changed instantly every time the block is called. * * See also Enumerable#reject and Array#delete_if. * @@ -2721,7 +3540,8 @@ ary_reject_bang(VALUE ary) static VALUE rb_ary_reject_bang(VALUE ary) { - RETURN_ENUMERATOR(ary, 0, 0); + RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length); + rb_ary_modify(ary); return ary_reject_bang(ary); } @@ -2731,7 +3551,7 @@ rb_ary_reject_bang(VALUE ary) * ary.reject -> Enumerator * * Returns a new array containing the items in +self+ for which the given - * block is not +true+. + * block is not +true+. The ordering of non-rejected elements is maintained. * * See also Array#delete_if * @@ -2743,7 +3563,7 @@ rb_ary_reject(VALUE ary) { VALUE rejected_ary; - RETURN_ENUMERATOR(ary, 0, 0); + RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length); rejected_ary = rb_ary_new(); ary_reject(ary, rejected_ary); return rejected_ary; @@ -2751,7 +3571,7 @@ rb_ary_reject(VALUE ary) /* * call-seq: - * ary.delete_if { |item| block } -> ary + * ary.delete_if {|item| block} -> ary * ary.delete_if -> Enumerator * * Deletes every element of +self+ for which block evaluates to +true+. @@ -2763,22 +3583,25 @@ rb_ary_reject(VALUE ary) * * If no block is given, an Enumerator is returned instead. * - * a = [ "a", "b", "c" ] - * a.delete_if {|x| x >= "b" } #=> ["a"] + * scores = [ 97, 42, 75 ] + * scores.delete_if {|score| score < 80 } #=> [97] */ static VALUE rb_ary_delete_if(VALUE ary) { - RETURN_ENUMERATOR(ary, 0, 0); + ary_verify(ary); + RETURN_SIZED_ENUMERATOR(ary, 0, 0, ary_enum_length); ary_reject_bang(ary); return ary; } static VALUE -take_i(VALUE val, VALUE *args, int argc, VALUE *argv) +take_i(RB_BLOCK_CALL_FUNC_ARGLIST(val, cbarg)) { - if (args[1]-- == 0) rb_iter_break(); + VALUE *args = (VALUE *)cbarg; + if (args[1] == 0) rb_iter_break(); + else args[1]--; if (argc > 1) val = rb_ary_new4(argc, argv); rb_ary_push(args[0], val); return Qnil; @@ -2793,8 +3616,9 @@ take_items(VALUE obj, long n) if (!NIL_P(result)) return rb_ary_subseq(result, 0, n); result = rb_ary_new2(n); args[0] = result; args[1] = (VALUE)n; - if (rb_check_block_call(obj, rb_intern("each"), 0, 0, take_i, (VALUE)args) == Qundef) - Check_Type(obj, T_ARRAY); + if (rb_check_block_call(obj, idEach, 0, 0, take_i, (VALUE)args) == Qundef) + rb_raise(rb_eTypeError, "wrong argument type %"PRIsVALUE" (must respond to :each)", + rb_obj_class(obj)); return result; } @@ -2802,13 +3626,13 @@ take_items(VALUE obj, long n) /* * call-seq: * ary.zip(arg, ...) -> new_ary - * ary.zip(arg, ...) { |arr| block } -> nil + * ary.zip(arg, ...) {|arr| block} -> nil * * Converts any arguments to arrays, then merges elements of +self+ with * corresponding elements from each argument. * * This generates a sequence of <code>ary.size</code> _n_-element arrays, - * where _n_ is one more that the count of arguments. + * where _n_ is one more than the count of arguments. * * If the size of any argument is less than the size of the initial array, * +nil+ values are supplied. @@ -2827,31 +3651,57 @@ static VALUE rb_ary_zip(int argc, VALUE *argv, VALUE ary) { int i, j; - long len; + long len = RARRAY_LEN(ary); 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); + if (rb_block_given_p()) { + int arity = rb_block_arity(); - 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); + if (arity > 1) { + VALUE work, *tmp; + + tmp = ALLOCV_N(VALUE, work, argc+1); + + for (i=0; i<RARRAY_LEN(ary); i++) { + tmp[0] = RARRAY_AREF(ary, i); + for (j=0; j<argc; j++) { + tmp[j+1] = rb_ary_elt(argv[j], i); + } + rb_yield_values2(argc+1, tmp); + } + + if (work) ALLOCV_END(work); } else { + for (i=0; i<RARRAY_LEN(ary); i++) { + VALUE tmp = rb_ary_new2(argc+1); + + rb_ary_push(tmp, RARRAY_AREF(ary, i)); + for (j=0; j<argc; j++) { + rb_ary_push(tmp, rb_ary_elt(argv[j], i)); + } + rb_yield(tmp); + } + } + } + else { + result = rb_ary_new_capa(len); + + for (i=0; i<len; i++) { + VALUE tmp = rb_ary_new_capa(argc+1); + + rb_ary_push(tmp, RARRAY_AREF(ary, i)); + for (j=0; j<argc; j++) { + rb_ary_push(tmp, rb_ary_elt(argv[j], i)); + } rb_ary_push(result, tmp); } } + return result; } @@ -2899,6 +3749,7 @@ rb_ary_transpose(VALUE ary) /* * call-seq: * ary.replace(other_ary) -> ary + * ary.initialize_copy(other_ary) -> ary * * Replaces the contents of +self+ with the contents of +other_ary+, * truncating or expanding if necessary. @@ -2916,19 +3767,17 @@ rb_ary_replace(VALUE copy, VALUE orig) if (copy == orig) return copy; if (RARRAY_LEN(orig) <= RARRAY_EMBED_LEN_MAX) { - VALUE *ptr; VALUE shared = 0; if (ARY_OWNS_HEAP_P(copy)) { - xfree(RARRAY_PTR(copy)); - } + ary_heap_free(copy); + } else if (ARY_SHARED_P(copy)) { shared = ARY_SHARED(copy); FL_UNSET_SHARED(copy); } FL_SET_EMBED(copy); - ptr = RARRAY_PTR(orig); - MEMCPY(RARRAY_PTR(copy), ptr, VALUE, RARRAY_LEN(orig)); + ary_memcpy(copy, 0, RARRAY_LEN(orig), RARRAY_CONST_PTR_TRANSIENT(orig)); if (shared) { rb_ary_decrement_share(shared); } @@ -2937,16 +3786,17 @@ rb_ary_replace(VALUE copy, VALUE orig) else { VALUE shared = ary_make_shared(orig); if (ARY_OWNS_HEAP_P(copy)) { - xfree(RARRAY_PTR(copy)); + ary_heap_free(copy); } else { rb_ary_unshare_safe(copy); } FL_UNSET_EMBED(copy); - ARY_SET_PTR(copy, RARRAY_PTR(orig)); - ARY_SET_LEN(copy, RARRAY_LEN(orig)); + ARY_SET_PTR(copy, ARY_HEAP_PTR(orig)); + ARY_SET_LEN(copy, ARY_HEAP_LEN(orig)); rb_ary_set_shared(copy, shared); } + ary_verify(copy); return copy; } @@ -2964,16 +3814,20 @@ VALUE rb_ary_clear(VALUE ary) { rb_ary_modify_check(ary); - ARY_SET_LEN(ary, 0); if (ARY_SHARED_P(ary)) { if (!ARY_EMBED_P(ary)) { rb_ary_unshare(ary); FL_SET_EMBED(ary); + ARY_SET_EMBED_LEN(ary, 0); } } - else if (ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) { - ary_resize_capa(ary, ARY_DEFAULT_SIZE * 2); + else { + ARY_SET_LEN(ary, 0); + if (ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) { + ary_resize_capa(ary, ARY_DEFAULT_SIZE * 2); + } } + ary_verify(ary); return ary; } @@ -2981,10 +3835,10 @@ rb_ary_clear(VALUE ary) * call-seq: * ary.fill(obj) -> ary * ary.fill(obj, start [, length]) -> ary - * ary.fill(obj, range ) -> ary - * ary.fill { |index| block } -> ary - * ary.fill(start [, length] ) { |index| block } -> ary - * ary.fill(range) { |index| block } -> ary + * ary.fill(obj, range) -> ary + * ary.fill {|index| block} -> ary + * ary.fill(start [, length]) {|index| block} -> ary + * ary.fill(range) {|index| block} -> ary * * The first three forms set the selected elements of +self+ (which * may be the entire array) to +obj+. @@ -3003,20 +3857,17 @@ rb_ary_clear(VALUE ary) * 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] + * a.fill {|i| i*i} #=> [0, 1, 4, 9] + * a.fill(-2) {|i| i*i*i} #=> [0, 1, 8, 27] */ static VALUE rb_ary_fill(int argc, VALUE *argv, VALUE ary) { - VALUE item, arg1, arg2; + VALUE item = Qundef, arg1, arg2; long beg = 0, end = 0, len = 0; - VALUE *p, *pend; - int block_p = FALSE; if (rb_block_given_p()) { - block_p = TRUE; rb_scan_args(argc, argv, "02", &arg1, &arg2); argc += 1; /* hackish */ } @@ -3054,26 +3905,22 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary) if (end >= ARY_CAPA(ary)) { ary_resize_capa(ary, end); } - rb_mem_clear(RARRAY_PTR(ary) + RARRAY_LEN(ary), end - RARRAY_LEN(ary)); + ary_mem_clear(ary, RARRAY_LEN(ary), end - RARRAY_LEN(ary)); ARY_SET_LEN(ary, end); } - if (block_p) { + if (item == Qundef) { VALUE v; long i; for (i=beg; i<end; i++) { v = rb_yield(LONG2NUM(i)); if (i>=RARRAY_LEN(ary)) break; - RARRAY_PTR(ary)[i] = v; + ARY_SET(ary, i, v); } } else { - p = RARRAY_PTR(ary) + beg; - pend = p + len; - while (p < pend) { - *p++ = item; - } + ary_memfill(ary, beg, len, item); } return ary; } @@ -3087,8 +3934,16 @@ rb_ary_fill(int argc, VALUE *argv, VALUE ary) * * [ 1, 2, 3 ] + [ 4, 5 ] #=> [ 1, 2, 3, 4, 5 ] * a = [ "a", "b", "c" ] - * a + [ "d", "e", "f" ] - * a #=> [ "a", "b", "c", "d", "e", "f" ] + * c = a + [ "d", "e", "f" ] + * c #=> [ "a", "b", "c", "d", "e", "f" ] + * a #=> [ "a", "b", "c" ] + * + * Note that + * x += y + * is the same as + * x = x + y + * This means that it produces a new array. As a consequence, + * repeated use of <code>+=</code> on arrays can be quite inefficient. * * See also Array#concat. */ @@ -3097,42 +3952,76 @@ VALUE rb_ary_plus(VALUE x, VALUE y) { VALUE z; - long len; + long len, xlen, ylen; y = to_ary(y); - len = RARRAY_LEN(x) + RARRAY_LEN(y); + xlen = RARRAY_LEN(x); + ylen = RARRAY_LEN(y); + len = xlen + ylen; z = rb_ary_new2(len); - 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)); + + ary_memcpy(z, 0, xlen, RARRAY_CONST_PTR_TRANSIENT(x)); + ary_memcpy(z, xlen, ylen, RARRAY_CONST_PTR_TRANSIENT(y)); ARY_SET_LEN(z, len); return z; } +static VALUE +ary_append(VALUE x, VALUE y) +{ + long n = RARRAY_LEN(y); + if (n > 0) { + rb_ary_splice(x, RARRAY_LEN(x), 0, RARRAY_CONST_PTR_TRANSIENT(y), n); + } + return x; +} + /* * call-seq: - * ary.concat(other_ary) -> ary + * ary.concat(other_ary1, other_ary2, ...) -> ary * - * Appends the elements of +other_ary+ to +self+. + * Appends the elements of <code>other_ary</code>s to +self+. + * + * [ "a", "b" ].concat( ["c", "d"]) #=> [ "a", "b", "c", "d" ] + * [ "a" ].concat( ["b"], ["c", "d"]) #=> [ "a", "b", "c", "d" ] + * [ "a" ].concat #=> [ "a" ] * - * [ "a", "b" ].concat( ["c", "d"] ) #=> [ "a", "b", "c", "d" ] * a = [ 1, 2, 3 ] - * a.concat( [ 4, 5 ] ) + * a.concat( [ 4, 5 ]) * a #=> [ 1, 2, 3, 4, 5 ] * + * a = [ 1, 2 ] + * a.concat(a, a) #=> [1, 2, 1, 2, 1, 2] + * * See also Array#+. */ -VALUE -rb_ary_concat(VALUE x, VALUE y) +static VALUE +rb_ary_concat_multi(int argc, VALUE *argv, VALUE ary) { - rb_ary_modify_check(x); - y = to_ary(y); - if (RARRAY_LEN(y) > 0) { - rb_ary_splice(x, RARRAY_LEN(x), 0, y); + rb_ary_modify_check(ary); + + if (argc == 1) { + rb_ary_concat(ary, argv[0]); } - return x; + else if (argc > 1) { + int i; + VALUE args = rb_ary_tmp_new(argc); + for (i = 0; i < argc; i++) { + rb_ary_concat(args, argv[i]); + } + ary_append(ary, args); + } + + ary_verify(ary); + return ary; } +VALUE +rb_ary_concat(VALUE x, VALUE y) +{ + return ary_append(x, to_ary(y)); +} /* * call-seq: @@ -3154,7 +4043,8 @@ rb_ary_concat(VALUE x, VALUE y) static VALUE rb_ary_times(VALUE ary, VALUE times) { - VALUE ary2, tmp, *ptr, *ptr2; + VALUE ary2, tmp; + const VALUE *ptr; long t, len; tmp = rb_check_string_type(times); @@ -3178,17 +4068,16 @@ rb_ary_times(VALUE ary, VALUE times) ary2 = ary_new(rb_obj_class(ary), len); ARY_SET_LEN(ary2, len); - ptr = RARRAY_PTR(ary); - ptr2 = RARRAY_PTR(ary2); + ptr = RARRAY_CONST_PTR_TRANSIENT(ary); t = RARRAY_LEN(ary); if (0 < t) { - MEMCPY(ptr2, ptr, VALUE, t); - while (t <= len/2) { - MEMCPY(ptr2+t, ptr2, VALUE, t); + ary_memcpy(ary2, 0, t, ptr); + while (t <= len/2) { + ary_memcpy(ary2, t, t, RARRAY_CONST_PTR_TRANSIENT(ary2)); t *= 2; } if (t < len) { - MEMCPY(ptr2+t, ptr2, VALUE, len-t); + ary_memcpy(ary2, t, len-t, RARRAY_CONST_PTR_TRANSIENT(ary2)); } } out: @@ -3199,7 +4088,7 @@ rb_ary_times(VALUE ary, VALUE times) /* * call-seq: - * ary.assoc(obj) -> new_ary or nil + * ary.assoc(obj) -> element_ary or nil * * Searches through an array whose elements are also arrays comparing +obj+ * with the first element of each contained array using <code>obj.==</code>. @@ -3224,9 +4113,9 @@ rb_ary_assoc(VALUE ary, VALUE key) VALUE v; for (i = 0; i < RARRAY_LEN(ary); ++i) { - v = rb_check_array_type(RARRAY_PTR(ary)[i]); + v = rb_check_array_type(RARRAY_AREF(ary, i)); if (!NIL_P(v) && RARRAY_LEN(v) > 0 && - rb_equal(RARRAY_PTR(v)[0], key)) + rb_equal(RARRAY_AREF(v, 0), key)) return v; } return Qnil; @@ -3234,7 +4123,7 @@ rb_ary_assoc(VALUE ary, VALUE key) /* * call-seq: - * ary.rassoc(obj) -> new_ary or nil + * ary.rassoc(obj) -> element_ary or nil * * Searches through the array whose elements are also arrays. * @@ -3257,10 +4146,10 @@ rb_ary_rassoc(VALUE ary, VALUE value) VALUE v; for (i = 0; i < RARRAY_LEN(ary); ++i) { - v = RARRAY_PTR(ary)[i]; + v = RARRAY_AREF(ary, i); if (RB_TYPE_P(v, T_ARRAY) && RARRAY_LEN(v) > 1 && - rb_equal(RARRAY_PTR(v)[1], value)) + rb_equal(RARRAY_AREF(v, 1), value)) return v; } return Qnil; @@ -3270,22 +4159,25 @@ static VALUE recursive_equal(VALUE ary1, VALUE ary2, int recur) { long i, len1; - VALUE *p1, *p2; + const VALUE *p1, *p2; if (recur) return Qtrue; /* Subtle! */ - p1 = RARRAY_PTR(ary1); - p2 = RARRAY_PTR(ary2); + /* rb_equal() can evacuate ptrs */ + p1 = RARRAY_CONST_PTR(ary1); + p2 = RARRAY_CONST_PTR(ary2); len1 = RARRAY_LEN(ary1); for (i = 0; i < len1; i++) { if (*p1 != *p2) { if (rb_equal(*p1, *p2)) { len1 = RARRAY_LEN(ary1); - if (len1 != RARRAY_LEN(ary2) || len1 < i) + if (len1 != RARRAY_LEN(ary2)) return Qfalse; - p1 = RARRAY_PTR(ary1) + i; - p2 = RARRAY_PTR(ary2) + i; + if (len1 < i) + return Qtrue; + p1 = RARRAY_CONST_PTR(ary1) + i; + p2 = RARRAY_CONST_PTR(ary2) + i; } else { return Qfalse; @@ -3316,12 +4208,13 @@ rb_ary_equal(VALUE ary1, VALUE ary2) { if (ary1 == ary2) return Qtrue; if (!RB_TYPE_P(ary2, T_ARRAY)) { - if (!rb_respond_to(ary2, rb_intern("to_ary"))) { + if (!rb_respond_to(ary2, idTo_ary)) { return Qfalse; } return rb_equal(ary2, ary1); } if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse; + if (RARRAY_CONST_PTR_TRANSIENT(ary1) == RARRAY_CONST_PTR_TRANSIENT(ary2)) return Qtrue; return rb_exec_recursive_paired(recursive_equal, ary1, ary2, ary2); } @@ -3343,7 +4236,7 @@ recursive_eql(VALUE ary1, VALUE ary2, int recur) * ary.eql?(other) -> true or false * * Returns +true+ if +self+ and +other+ are the same object, - * or are both arrays with the same content. + * or are both arrays with the same content (according to Object#eql?). */ static VALUE @@ -3352,44 +4245,37 @@ rb_ary_eql(VALUE ary1, VALUE ary2) if (ary1 == ary2) return Qtrue; if (!RB_TYPE_P(ary2, T_ARRAY)) return Qfalse; if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse; + if (RARRAY_CONST_PTR_TRANSIENT(ary1) == RARRAY_CONST_PTR_TRANSIENT(ary2)) return Qtrue; return rb_exec_recursive_paired(recursive_eql, ary1, ary2, ary2); } -static VALUE -recursive_hash(VALUE ary, VALUE dummy, int recur) -{ - long i; - st_index_t h; - VALUE n; - - h = rb_hash_start(RARRAY_LEN(ary)); - if (recur) { - h = rb_hash_uint(h, NUM2LONG(rb_hash(rb_cArray))); - } - else { - for (i=0; i<RARRAY_LEN(ary); i++) { - n = rb_hash(RARRAY_PTR(ary)[i]); - h = rb_hash_uint(h, NUM2LONG(n)); - } - } - h = rb_hash_end(h); - return LONG2FIX(h); -} - /* * call-seq: - * ary.hash -> fixnum + * ary.hash -> integer * * Compute a hash-code for this array. * * Two arrays with the same content will have the same hash code (and will * compare using #eql?). + * + * See also Object#hash. */ static VALUE rb_ary_hash(VALUE ary) { - return rb_exec_recursive_outer(recursive_hash, ary, 0); + long i; + st_index_t h; + VALUE n; + + h = rb_hash_start(RARRAY_LEN(ary)); + h = rb_hash_uint(h, (st_index_t)rb_ary_hash); + for (i=0; i<RARRAY_LEN(ary); i++) { + n = rb_hash(RARRAY_AREF(ary, i)); + h = rb_hash_uint(h, NUM2LONG(n)); + } + h = rb_hash_end(h); + return ST2FIX(h); } /* @@ -3397,7 +4283,7 @@ rb_ary_hash(VALUE ary) * ary.include?(object) -> true or false * * Returns +true+ if the given +object+ is present in +self+ (that is, if any - * object <code>==</code> +object+), otherwise returns +false+. + * element <code>==</code> +object+), otherwise returns +false+. * * a = [ "a", "b", "c" ] * a.include?("b") #=> true @@ -3408,15 +4294,31 @@ VALUE rb_ary_includes(VALUE ary, VALUE item) { long i; + VALUE e; for (i=0; i<RARRAY_LEN(ary); i++) { - if (rb_equal(RARRAY_PTR(ary)[i], item)) { + e = RARRAY_AREF(ary, i); + if (rb_equal(e, item)) { return Qtrue; } } return Qfalse; } +static VALUE +rb_ary_includes_by_eql(VALUE ary, VALUE item) +{ + long i; + VALUE e; + + for (i=0; i<RARRAY_LEN(ary); i++) { + e = RARRAY_AREF(ary, i); + if (rb_eql(item, e)) { + return Qtrue; + } + } + return Qfalse; +} static VALUE recursive_cmp(VALUE ary1, VALUE ary2, int recur) @@ -3429,7 +4331,8 @@ recursive_cmp(VALUE ary1, VALUE ary2, int recur) len = RARRAY_LEN(ary2); } for (i=0; i<len; i++) { - VALUE v = rb_funcall(rb_ary_elt(ary1, i), id_cmp, 1, rb_ary_elt(ary2, i)); + VALUE e1 = rb_ary_elt(ary1, i), e2 = rb_ary_elt(ary2, i); + VALUE v = rb_funcallv(e1, id_cmp, 1, &e2); if (v != INT2FIX(0)) { return v; } @@ -3446,17 +4349,24 @@ recursive_cmp(VALUE ary1, VALUE ary2, int recur) * * Each object in each array is compared (using the <=> operator). * - * Arrays are compared in an "element-wise" manner; the first two elements - * that are not equal will determine the return value for the whole - * comparison. + * Arrays are compared in an "element-wise" manner; the first element of +ary+ + * is compared with the first one of +other_ary+ using the <=> operator, then + * each of the second elements, etc... + * As soon as the result of any such comparison is non zero (i.e. the two + * corresponding elements are not equal), that result is returned for the + * whole array comparison. * - * If all the values are equal, then the return is based on a comparison of + * If all the elements are equal, then the result is based on a comparison of * the array lengths. Thus, two arrays are "equal" according to Array#<=> 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. * + * +nil+ is returned if the +other_ary+ is not an array or if the comparison + * of two elements returned +nil+. + * * [ "a", "a", "c" ] <=> [ "a", "b", "c" ] #=> -1 * [ 1, 2, 3, 4, 5, 6 ] <=> [ 1, 2 ] #=> +1 + * [ 1, 2 ] <=> [ 1, :two ] #=> nil * */ @@ -3483,24 +4393,26 @@ ary_add_hash(VALUE hash, VALUE ary) long i; for (i=0; i<RARRAY_LEN(ary); i++) { - rb_hash_aset(hash, RARRAY_PTR(ary)[i], Qtrue); + VALUE elt = RARRAY_AREF(ary, i); + rb_hash_add_new_element(hash, elt, elt); } return hash; } static inline VALUE -ary_tmp_hash_new(void) +ary_tmp_hash_new(VALUE ary) { - VALUE hash = rb_hash_new(); + long size = RARRAY_LEN(ary); + VALUE hash = rb_hash_new_with_size(size); - RBASIC(hash)->klass = 0; + RBASIC_CLEAR_CLASS(hash); return hash; } static VALUE ary_make_hash(VALUE ary) { - VALUE hash = ary_tmp_hash_new(); + VALUE hash = ary_tmp_hash_new(ary); return ary_add_hash(hash, ary); } @@ -3511,9 +4423,7 @@ ary_add_hash_by(VALUE hash, VALUE ary) for (i = 0; i < RARRAY_LEN(ary); ++i) { VALUE v = rb_ary_elt(ary, i), k = rb_yield(v); - if (rb_hash_lookup2(hash, k, Qundef) == Qundef) { - rb_hash_aset(hash, k, v); - } + rb_hash_add_new_element(hash, k, v); } return hash; } @@ -3521,17 +4431,18 @@ ary_add_hash_by(VALUE hash, VALUE ary) static VALUE ary_make_hash_by(VALUE ary) { - VALUE hash = ary_tmp_hash_new(); + VALUE hash = ary_tmp_hash_new(ary); return ary_add_hash_by(hash, ary); } static inline void ary_recycle_hash(VALUE hash) { - if (RHASH(hash)->ntbl) { - st_table *tbl = RHASH(hash)->ntbl; - RHASH(hash)->ntbl = 0; + assert(RBASIC_CLASS(hash) == 0); + if (RHASH_ST_TABLE_P(hash)) { + st_table *tbl = RHASH_ST_TABLE(hash); st_free_table(tbl); + RHASH_ST_CLEAR(hash); } } @@ -3542,27 +4453,40 @@ ary_recycle_hash(VALUE hash) * Array Difference * * Returns a new array that is a copy of the original array, removing any - * items that also appear in +other_ary+. + * items that also appear in +other_ary+. The order is preserved from the + * original array. * - * It compares elements using their hash (returned by the Object#hash method). + * It compares elements using their #hash and #eql? methods for efficiency. * * [ 1, 1, 2, 2, 3, 3, 4, 5 ] - [ 1, 2, 4 ] #=> [ 3, 3, 5 ] * * If you need set-like behavior, see the library class Set. + * + * See also Array#difference. */ static VALUE rb_ary_diff(VALUE ary1, VALUE ary2) { VALUE ary3; - volatile VALUE hash; + VALUE hash; long i; - hash = ary_make_hash(to_ary(ary2)); + ary2 = to_ary(ary2); ary3 = rb_ary_new(); + if (RARRAY_LEN(ary1) <= SMALL_ARRAY_LEN || RARRAY_LEN(ary2) <= SMALL_ARRAY_LEN) { + for (i=0; i<RARRAY_LEN(ary1); i++) { + VALUE elt = rb_ary_elt(ary1, i); + if (rb_ary_includes_by_eql(ary2, elt)) continue; + rb_ary_push(ary3, elt); + } + return ary3; + } + + hash = ary_make_hash(ary2); for (i=0; i<RARRAY_LEN(ary1); i++) { - if (st_lookup(RHASH_TBL(hash), RARRAY_PTR(ary1)[i], 0)) continue; + if (rb_hash_stlike_lookup(hash, RARRAY_AREF(ary1, i), NULL)) continue; rb_ary_push(ary3, rb_ary_elt(ary1, i)); } ary_recycle_hash(hash); @@ -3571,12 +4495,71 @@ rb_ary_diff(VALUE ary1, VALUE ary2) /* * call-seq: + * ary.difference(other_ary1, other_ary2, ...) -> ary + * + * Array Difference + * + * Returns a new array that is a copy of the receiver, removing any items + * that also appear in any of the arrays given as arguments. + * The order is preserved from the original array. + * + * It compares elements using their #hash and #eql? methods for efficiency. + * + * [ 1, 1, 2, 2, 3, 3, 4, 5 ].difference([ 1, 2, 4 ]) #=> [ 3, 3, 5 ] + * [ 1, 'c', :s, 'yep' ].difference([ 1 ], [ 'a', 'c' ]) #=> [ :s, "yep" ] + * + * If you need set-like behavior, see the library class Set. + * + * See also Array#-. + */ + +static VALUE +rb_ary_difference_multi(int argc, VALUE *argv, VALUE ary) +{ + VALUE ary_diff; + long i, length; + volatile VALUE t0; + bool *is_hash = ALLOCV_N(bool, t0, argc); + ary_diff = rb_ary_new(); + length = RARRAY_LEN(ary); + + for (i = 0; i < argc; i++) { + argv[i] = to_ary(argv[i]); + is_hash[i] = (length > SMALL_ARRAY_LEN && RARRAY_LEN(argv[i]) > SMALL_ARRAY_LEN); + if (is_hash[i]) argv[i] = ary_make_hash(argv[i]); + } + + for (i = 0; i < RARRAY_LEN(ary); i++) { + int j; + VALUE elt = rb_ary_elt(ary, i); + for (j = 0; j < argc; j++){ + if (is_hash[j]) { + if (rb_hash_stlike_lookup(argv[j], RARRAY_AREF(ary, i), NULL)) + break; + } + else { + if (rb_ary_includes_by_eql(argv[j], elt)) break; + } + } + if (j == argc) rb_ary_push(ary_diff, elt); + } + + ALLOCV_END(t0); + + return ary_diff; +} + + +/* + * call-seq: * ary & other_ary -> new_ary * - * Set Intersection --- Returns a new array containing elements common to the - * two arrays, excluding any duplicates. + * Set Intersection --- Returns a new array containing unique elements common to the + * two arrays. The order is preserved from the original array. + * + * It compares elements using their #hash and #eql? methods for efficiency. * - * [ 1, 1, 3, 5 ] & [ 1, 2, 3 ] #=> [ 1, 3 ] + * [ 1, 1, 3, 5 ] & [ 3, 2, 1 ] #=> [ 1, 3 ] * [ 'a', 'b', 'b', 'z' ] & [ 'a', 'b', 'c' ] #=> [ 'a', 'b' ] * * See also Array#uniq. @@ -3591,16 +4574,25 @@ rb_ary_and(VALUE ary1, VALUE ary2) long i; ary2 = to_ary(ary2); - ary3 = rb_ary_new2(RARRAY_LEN(ary1) < RARRAY_LEN(ary2) ? - RARRAY_LEN(ary1) : RARRAY_LEN(ary2)); - hash = ary_make_hash(ary2); + ary3 = rb_ary_new(); + if (RARRAY_LEN(ary1) == 0 || RARRAY_LEN(ary2) == 0) return ary3; + + if (RARRAY_LEN(ary1) <= SMALL_ARRAY_LEN && RARRAY_LEN(ary2) <= SMALL_ARRAY_LEN) { + for (i=0; i<RARRAY_LEN(ary1); i++) { + v = RARRAY_AREF(ary1, i); + if (!rb_ary_includes_by_eql(ary2, v)) continue; + if (rb_ary_includes_by_eql(ary3, v)) continue; + rb_ary_push(ary3, v); + } + return ary3; + } - if (RHASH_EMPTY_P(hash)) - return ary3; + hash = ary_make_hash(ary2); for (i=0; i<RARRAY_LEN(ary1); i++) { - vv = (st_data_t)(v = rb_ary_elt(ary1, i)); - if (st_delete(RHASH_TBL(hash), &vv, 0)) { + v = RARRAY_AREF(ary1, i); + vv = (st_data_t)v; + if (rb_hash_stlike_delete(hash, &vv, 0)) { rb_ary_push(ary3, v); } } @@ -3609,43 +4601,223 @@ rb_ary_and(VALUE ary1, VALUE ary2) return ary3; } +static int +ary_hash_orset(st_data_t *key, st_data_t *value, st_data_t arg, int existing) +{ + if (existing) return ST_STOP; + *key = *value = (VALUE)arg; + return ST_CONTINUE; +} + +static void +rb_ary_union(VALUE ary_union, VALUE ary) +{ + long i; + for (i = 0; i < RARRAY_LEN(ary); i++) { + VALUE elt = rb_ary_elt(ary, i); + if (rb_ary_includes_by_eql(ary_union, elt)) continue; + rb_ary_push(ary_union, elt); + } +} + +static void +rb_ary_union_hash(VALUE hash, VALUE ary2) +{ + long i; + for (i = 0; i < RARRAY_LEN(ary2); i++) { + VALUE elt = RARRAY_AREF(ary2, i); + if (!rb_hash_stlike_update(hash, (st_data_t)elt, ary_hash_orset, (st_data_t)elt)) { + RB_OBJ_WRITTEN(hash, Qundef, elt); + } + } +} + /* * call-seq: * ary | other_ary -> new_ary * * Set Union --- Returns a new array by joining +ary+ with +other_ary+, - * excluding any duplicates. + * excluding any duplicates and preserving the order from the given arrays. + * + * It compares elements using their #hash and #eql? methods for efficiency. * * [ "a", "b", "c" ] | [ "c", "d", "a" ] #=> [ "a", "b", "c", "d" ] + * [ "c", "d", "a" ] | [ "a", "b", "c" ] #=> [ "c", "d", "a", "b" ] * - * See also Array#uniq. + * See also Array#union. */ static VALUE rb_ary_or(VALUE ary1, VALUE ary2) { - VALUE hash, ary3, v; - st_data_t vv; - long i; + VALUE hash, ary3; ary2 = to_ary(ary2); - ary3 = rb_ary_new2(RARRAY_LEN(ary1)+RARRAY_LEN(ary2)); - hash = ary_add_hash(ary_make_hash(ary1), ary2); + if (RARRAY_LEN(ary1) + RARRAY_LEN(ary2) <= SMALL_ARRAY_LEN) { + ary3 = rb_ary_new(); + rb_ary_union(ary3, ary1); + rb_ary_union(ary3, ary2); + return ary3; + } - for (i=0; i<RARRAY_LEN(ary1); i++) { - vv = (st_data_t)(v = rb_ary_elt(ary1, i)); - if (st_delete(RHASH_TBL(hash), &vv, 0)) { - rb_ary_push(ary3, v); + hash = ary_make_hash(ary1); + rb_ary_union_hash(hash, ary2); + + ary3 = rb_hash_values(hash); + ary_recycle_hash(hash); + return ary3; +} + +/* + * call-seq: + * ary.union(other_ary1, other_ary2, ...) -> ary + * + * Set Union --- Returns a new array by joining <code>other_ary</code>s with +self+, + * excluding any duplicates and preserving the order from the given arrays. + * + * It compares elements using their #hash and #eql? methods for efficiency. + * + * [ "a", "b", "c" ].union( [ "c", "d", "a" ] ) #=> [ "a", "b", "c", "d" ] + * [ "a" ].union( ["e", "b"], ["a", "c", "b"] ) #=> [ "a", "e", "b", "c" ] + * [ "a" ].union #=> [ "a" ] + * + * See also Array#|. + */ + +static VALUE +rb_ary_union_multi(int argc, VALUE *argv, VALUE ary) +{ + int i; + long sum; + VALUE hash, ary_union; + + sum = RARRAY_LEN(ary); + for (i = 0; i < argc; i++){ + argv[i] = to_ary(argv[i]); + sum += RARRAY_LEN(argv[i]); + } + + if (sum <= SMALL_ARRAY_LEN) { + ary_union = rb_ary_new(); + + rb_ary_union(ary_union, ary); + for (i = 0; i < argc; i++) rb_ary_union(ary_union, argv[i]); + + return ary_union; + } + + hash = ary_make_hash(ary); + for (i = 0; i < argc; i++) rb_ary_union_hash(hash, argv[i]); + + ary_union = rb_hash_values(hash); + ary_recycle_hash(hash); + return ary_union; +} + +/* + * call-seq: + * ary.max -> obj + * ary.max {|a, b| block} -> obj + * ary.max(n) -> array + * ary.max(n) {|a, b| block} -> array + * + * Returns the object in _ary_ with the maximum value. The + * first form assumes all objects implement <code>Comparable</code>; + * the second uses the block to return <em>a <=> b</em>. + * + * ary = %w(albatross dog horse) + * ary.max #=> "horse" + * ary.max {|a, b| a.length <=> b.length} #=> "albatross" + * + * If the +n+ argument is given, maximum +n+ elements are returned + * as an array. + * + * ary = %w[albatross dog horse] + * ary.max(2) #=> ["horse", "dog"] + * ary.max(2) {|a, b| a.length <=> b.length } #=> ["albatross", "horse"] + */ +static VALUE +rb_ary_max(int argc, VALUE *argv, VALUE ary) +{ + struct cmp_opt_data cmp_opt = { 0, 0 }; + VALUE result = Qundef, v; + VALUE num; + long i; + + if (rb_check_arity(argc, 0, 1) && !NIL_P(num = argv[0])) + return rb_nmin_run(ary, num, 0, 1, 1); + + if (rb_block_given_p()) { + for (i = 0; i < RARRAY_LEN(ary); i++) { + v = RARRAY_AREF(ary, i); + if (result == Qundef || rb_cmpint(rb_yield_values(2, v, result), v, result) > 0) { + result = v; + } } } - for (i=0; i<RARRAY_LEN(ary2); i++) { - vv = (st_data_t)(v = rb_ary_elt(ary2, i)); - if (st_delete(RHASH_TBL(hash), &vv, 0)) { - rb_ary_push(ary3, v); + else { + for (i = 0; i < RARRAY_LEN(ary); i++) { + v = RARRAY_AREF(ary, i); + if (result == Qundef || OPTIMIZED_CMP(v, result, cmp_opt) > 0) { + result = v; + } } } - ary_recycle_hash(hash); - return ary3; + if (result == Qundef) return Qnil; + return result; +} + +/* + * call-seq: + * ary.min -> obj + * ary.min {| a,b | block } -> obj + * ary.min(n) -> array + * ary.min(n) {| a,b | block } -> array + * + * Returns the object in _ary_ with the minimum value. The + * first form assumes all objects implement <code>Comparable</code>; + * the second uses the block to return <em>a <=> b</em>. + * + * ary = %w(albatross dog horse) + * ary.min #=> "albatross" + * ary.min {|a, b| a.length <=> b.length} #=> "dog" + * + * If the +n+ argument is given, minimum +n+ elements are returned + * as an array. + * + * ary = %w[albatross dog horse] + * ary.min(2) #=> ["albatross", "dog"] + * ary.min(2) {|a, b| a.length <=> b.length } #=> ["dog", "horse"] + */ +static VALUE +rb_ary_min(int argc, VALUE *argv, VALUE ary) +{ + struct cmp_opt_data cmp_opt = { 0, 0 }; + VALUE result = Qundef, v; + VALUE num; + long i; + + if (rb_check_arity(argc, 0, 1) && !NIL_P(num = argv[0])) + return rb_nmin_run(ary, num, 0, 0, 1); + + if (rb_block_given_p()) { + for (i = 0; i < RARRAY_LEN(ary); i++) { + v = RARRAY_AREF(ary, i); + if (result == Qundef || rb_cmpint(rb_yield_values(2, v, result), v, result) < 0) { + result = v; + } + } + } + else { + for (i = 0; i < RARRAY_LEN(ary); i++) { + v = RARRAY_AREF(ary, i); + if (result == Qundef || OPTIMIZED_CMP(v, result, cmp_opt) < 0) { + result = v; + } + } + } + if (result == Qundef) return Qnil; + return result; } static int @@ -3658,13 +4830,17 @@ push_value(st_data_t key, st_data_t val, st_data_t ary) /* * call-seq: * ary.uniq! -> ary or nil - * ary.uniq! { |item| ... } -> ary or nil + * ary.uniq! {|item| ...} -> ary or nil * * Removes duplicate elements from +self+. * * If a block is given, it will use the return value of the block for * comparison. * + * It compares values using their #hash and #eql? methods for efficiency. + * + * +self+ is traversed in order, and the first occurrence is kept. + * * Returns +nil+ if no changes are made (that is, no duplicates are found). * * a = [ "a", "a", "b", "b", "c" ] @@ -3674,45 +4850,36 @@ push_value(st_data_t key, st_data_t val, st_data_t ary) * b.uniq! # => nil * * c = [["student","sam"], ["student","george"], ["teacher","matz"]] - * c.uniq! { |s| s.first } # => [["student", "sam"], ["teacher", "matz"]] + * c.uniq! {|s| s.first} # => [["student", "sam"], ["teacher", "matz"]] * */ static VALUE rb_ary_uniq_bang(VALUE ary) { - VALUE hash, v; - long i, j; + VALUE hash; + long hash_size; rb_ary_modify_check(ary); if (RARRAY_LEN(ary) <= 1) return Qnil; - if (rb_block_given_p()) { + if (rb_block_given_p()) hash = ary_make_hash_by(ary); - if (RARRAY_LEN(ary) == (i = RHASH_SIZE(hash))) { - return Qnil; - } - ARY_SET_LEN(ary, 0); - if (ARY_SHARED_P(ary) && !ARY_EMBED_P(ary)) { - rb_ary_unshare(ary); - FL_SET_EMBED(ary); - } - ary_resize_capa(ary, i); - st_foreach(RHASH_TBL(hash), push_value, ary); - } - else { + else hash = ary_make_hash(ary); - if (RARRAY_LEN(ary) == (long)RHASH_SIZE(hash)) { - return Qnil; - } - for (i=j=0; i<RARRAY_LEN(ary); i++) { - st_data_t vv = (st_data_t)(v = rb_ary_elt(ary, i)); - if (st_delete(RHASH_TBL(hash), &vv, 0)) { - rb_ary_store(ary, j++, v); - } - } - ARY_SET_LEN(ary, j); + + hash_size = RHASH_SIZE(hash); + if (RARRAY_LEN(ary) == hash_size) { + return Qnil; + } + rb_ary_modify_check(ary); + ARY_SET_LEN(ary, 0); + if (ARY_SHARED_P(ary) && !ARY_EMBED_P(ary)) { + rb_ary_unshare(ary); + FL_SET_EMBED(ary); } + ary_resize_capa(ary, hash_size); + rb_hash_foreach(hash, push_value, ary); ary_recycle_hash(hash); return ary; @@ -3720,47 +4887,41 @@ rb_ary_uniq_bang(VALUE ary) /* * call-seq: - * ary.uniq -> ary or nil - * ary.uniq { |item| ... } -> ary or nil + * ary.uniq -> new_ary + * ary.uniq {|item| ...} -> new_ary * * Returns a new array by removing duplicate values in +self+. * * If a block is given, it will use the return value of the block for comparison. * - * It compares elements using their hash (provided by the Object#hash method) - * then compares hashes with Object#eql?. + * It compares values using their #hash and #eql? methods for efficiency. + * + * +self+ is traversed in order, and the first occurrence is kept. * * a = [ "a", "a", "b", "b", "c" ] * a.uniq # => ["a", "b", "c"] * * b = [["student","sam"], ["student","george"], ["teacher","matz"]] - * b.uniq { |s| s.first } # => [["student", "sam"], ["teacher", "matz"]] + * b.uniq {|s| s.first} # => [["student", "sam"], ["teacher", "matz"]] * */ static VALUE rb_ary_uniq(VALUE ary) { - VALUE hash, uniq, v; - long i; + VALUE hash, uniq; if (RARRAY_LEN(ary) <= 1) return rb_ary_dup(ary); if (rb_block_given_p()) { hash = ary_make_hash_by(ary); - uniq = ary_new(rb_obj_class(ary), RHASH_SIZE(hash)); - st_foreach(RHASH_TBL(hash), push_value, uniq); + uniq = rb_hash_values(hash); } else { hash = ary_make_hash(ary); - uniq = ary_new(rb_obj_class(ary), RHASH_SIZE(hash)); - for (i=0; i<RARRAY_LEN(ary); i++) { - st_data_t vv = (st_data_t)(v = rb_ary_elt(ary, i)); - if (st_delete(RHASH_TBL(hash), &vv, 0)) { - rb_ary_push(uniq, v); - } - } + uniq = rb_hash_values(hash); } + RBASIC_SET_CLASS(uniq, rb_obj_class(ary)); ary_recycle_hash(hash); return uniq; @@ -3785,21 +4946,18 @@ rb_ary_compact_bang(VALUE ary) long n; rb_ary_modify(ary); - p = t = RARRAY_PTR(ary); + p = t = (VALUE *)RARRAY_CONST_PTR_TRANSIENT(ary); /* WB: no new reference */ end = p + RARRAY_LEN(ary); while (t < end) { if (NIL_P(*t)) t++; else *p++ = *t++; } - n = p - RARRAY_PTR(ary); + n = p - RARRAY_CONST_PTR_TRANSIENT(ary); if (RARRAY_LEN(ary) == n) { return Qnil; } - ARY_SET_LEN(ary, n); - if (n * 2 < ARY_CAPA(ary) && ARY_DEFAULT_SIZE * 2 < ARY_CAPA(ary)) { - ary_resize_capa(ary, n * 2); - } + ary_resize_smaller(ary, n); return ary; } @@ -3826,12 +4984,12 @@ rb_ary_compact(VALUE ary) * call-seq: * ary.count -> int * ary.count(obj) -> int - * ary.count { |item| block } -> int + * ary.count {|item| block} -> int * * Returns the number of elements. * * If an argument is given, counts the number of elements which equal +obj+ - * using <code>===</code>. + * using <code>==</code>. * * If a block is given, counts the number of elements for which the block * returns a true value. @@ -3839,34 +4997,34 @@ rb_ary_compact(VALUE ary) * ary = [1, 2, 4, 2] * ary.count #=> 4 * ary.count(2) #=> 2 - * ary.count { |x| x%2 == 0 } #=> 3 + * ary.count {|x| x%2 == 0} #=> 3 * */ static VALUE rb_ary_count(int argc, VALUE *argv, VALUE ary) { - long n = 0; + long i, n = 0; - if (argc == 0) { - VALUE *p, *pend; + if (rb_check_arity(argc, 0, 1) == 0) { + VALUE v; if (!rb_block_given_p()) return LONG2NUM(RARRAY_LEN(ary)); - for (p = RARRAY_PTR(ary), pend = p + RARRAY_LEN(ary); p < pend; p++) { - if (RTEST(rb_yield(*p))) n++; + for (i = 0; i < RARRAY_LEN(ary); i++) { + v = RARRAY_AREF(ary, i); + if (RTEST(rb_yield(v))) n++; } } else { - VALUE obj, *p, *pend; + VALUE obj = argv[0]; - 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++; + for (i = 0; i < RARRAY_LEN(ary); i++) { + if (rb_equal(RARRAY_AREF(ary, i), obj)) n++; } } @@ -3889,12 +5047,16 @@ flatten(VALUE ary, int level, int *modified) while (1) { while (i < RARRAY_LEN(ary)) { - elt = RARRAY_PTR(ary)[i++]; + elt = RARRAY_AREF(ary, i++); + if (level >= 0 && RARRAY_LEN(stack) / 2 >= level) { + rb_ary_push(result, elt); + continue; + } tmp = rb_check_array_type(elt); if (RBASIC(result)->klass) { rb_raise(rb_eRuntimeError, "flatten reentered"); } - if (NIL_P(tmp) || (level >= 0 && RARRAY_LEN(stack) / 2 >= level)) { + if (NIL_P(tmp)) { rb_ary_push(result, elt); } else { @@ -3923,14 +5085,14 @@ flatten(VALUE ary, int level, int *modified) st_free_table(memo); - RBASIC(result)->klass = rb_class_of(ary); + RBASIC_SET_CLASS(result, rb_obj_class(ary)); return result; } /* * call-seq: - * ary.flatten! -> Array or nil - * ary.flatten!(level) -> Array or nil + * ary.flatten! -> ary or nil + * ary.flatten!(level) -> ary or nil * * Flattens +self+ in place. * @@ -3953,7 +5115,7 @@ rb_ary_flatten_bang(int argc, VALUE *argv, VALUE ary) int mod = 0, level = -1; VALUE result, lv; - rb_scan_args(argc, argv, "01", &lv); + lv = (rb_check_arity(argc, 0, 1) ? argv[0] : Qnil); rb_ary_modify_check(ary); if (!NIL_P(lv)) level = NUM2INT(lv); if (level == 0) return Qnil; @@ -3996,11 +5158,12 @@ static VALUE rb_ary_flatten(int argc, VALUE *argv, VALUE ary) { int mod = 0, level = -1; - VALUE result, lv; + VALUE result; - rb_scan_args(argc, argv, "01", &lv); - if (!NIL_P(lv)) level = NUM2INT(lv); - if (level == 0) return ary_make_shared_copy(ary); + if (rb_check_arity(argc, 0, 1) && !NIL_P(argv[0])) { + level = NUM2INT(argv[0]); + if (level == 0) return ary_make_shared_copy(ary); + } result = flatten(ary, level, &mod); OBJ_INFECT(result, ary); @@ -4010,7 +5173,7 @@ rb_ary_flatten(int argc, VALUE *argv, VALUE ary) #define OPTHASH_GIVEN_P(opts) \ (argc > 0 && !NIL_P((opts) = rb_check_hash_type(argv[argc-1])) && (--argc, 1)) -static VALUE sym_random; +static ID id_random; #define RAND_UPTO(max) (long)rb_random_ulong_limited((randgen), (max)-1) @@ -4021,34 +5184,46 @@ static VALUE sym_random; * * Shuffles elements in +self+ in place. * - * The optional +rng+ argument will be used as random number generator. + * a = [ 1, 2, 3 ] #=> [1, 2, 3] + * a.shuffle! #=> [2, 3, 1] + * a #=> [2, 3, 1] + * + * The optional +rng+ argument will be used as the random number generator. + * + * a.shuffle!(random: Random.new(1)) #=> [1, 3, 2] */ static VALUE rb_ary_shuffle_bang(int argc, VALUE *argv, VALUE ary) { - VALUE *ptr, opts, *snap_ptr, randgen = rb_cRandom; - long i, snap_len; + VALUE opts, randgen = rb_cRandom; + long i, len; if (OPTHASH_GIVEN_P(opts)) { - randgen = rb_hash_lookup2(opts, sym_random, randgen); + VALUE rnd; + ID keyword_ids[1]; + + keyword_ids[0] = id_random; + rb_get_kwargs(opts, keyword_ids, 0, 1, &rnd); + if (rnd != Qundef) { + randgen = rnd; + } } rb_check_arity(argc, 0, 0); rb_ary_modify(ary); - i = RARRAY_LEN(ary); - ptr = RARRAY_PTR(ary); - snap_len = i; - snap_ptr = ptr; - while (i) { - long j = RAND_UPTO(i); - VALUE tmp; - if (snap_len != RARRAY_LEN(ary) || snap_ptr != RARRAY_PTR(ary)) { - rb_raise(rb_eRuntimeError, "modified during shuffle"); + i = len = RARRAY_LEN(ary); + RARRAY_PTR_USE(ary, ptr, { + while (i) { + long j = RAND_UPTO(i); + VALUE tmp; + if (len != RARRAY_LEN(ary) || ptr != RARRAY_CONST_PTR_TRANSIENT(ary)) { + rb_raise(rb_eRuntimeError, "modified during shuffle"); + } + tmp = ptr[--i]; + ptr[i] = ptr[j]; + ptr[j] = tmp; } - tmp = ptr[--i]; - ptr[i] = ptr[j]; - ptr[j] = tmp; - } + }); /* WB: no new reference */ return ary; } @@ -4062,6 +5237,7 @@ rb_ary_shuffle_bang(int argc, VALUE *argv, VALUE ary) * * a = [ 1, 2, 3 ] #=> [1, 2, 3] * a.shuffle #=> [2, 3, 1] + * a #=> [1, 2, 3] * * The optional +rng+ argument will be used as the random number generator. * @@ -4093,40 +5269,46 @@ rb_ary_shuffle(int argc, VALUE *argv, VALUE ary) * If the array is empty the first form returns +nil+ and the second form * returns an empty array. * - * The optional +rng+ argument will be used as the random number generator. - * * a = [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ] * a.sample #=> 7 * a.sample(4) #=> [6, 4, 2, 5] + * + * The optional +rng+ argument will be used as the random number generator. + * + * a.sample(random: Random.new(1)) #=> 6 + * a.sample(4, random: Random.new(1)) #=> [6, 10, 9, 2] */ static VALUE rb_ary_sample(int argc, VALUE *argv, VALUE ary) { - VALUE nv, result, *ptr; + VALUE nv, result; VALUE opts, randgen = rb_cRandom; long n, len, i, j, k, idx[10]; long rnds[numberof(idx)]; + long memo_threshold; if (OPTHASH_GIVEN_P(opts)) { - randgen = rb_hash_lookup2(opts, sym_random, randgen); + VALUE rnd; + ID keyword_ids[1]; + + keyword_ids[0] = id_random; + rb_get_kwargs(opts, keyword_ids, 0, 1, &rnd); + if (rnd != Qundef) { + randgen = rnd; + } } - ptr = RARRAY_PTR(ary); len = RARRAY_LEN(ary); - if (argc == 0) { - if (len == 0) return Qnil; - if (len == 1) { + if (rb_check_arity(argc, 0, 1) == 0) { + if (len < 2) i = 0; - } - else { + else i = RAND_UPTO(len); - if ((len = RARRAY_LEN(ary)) <= i) return Qnil; - ptr = RARRAY_PTR(ary); - } - return ptr[i]; + + return rb_ary_elt(ary, i); } - rb_scan_args(argc, argv, "1", &nv); + nv = argv[0]; n = NUM2LONG(nv); if (n < 0) rb_raise(rb_eArgError, "negative sample number"); if (n > len) n = len; @@ -4137,28 +5319,23 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary) } k = len; len = RARRAY_LEN(ary); - ptr = RARRAY_PTR(ary); - if (len < k) { - if (n <= numberof(idx)) { - for (i = 0; i < n; ++i) { - if (rnds[i] >= len) { - return rb_ary_new2(0); - } - } + if (len < k && n <= numberof(idx)) { + for (i = 0; i < n; ++i) { + if (rnds[i] >= len) return rb_ary_new_capa(0); } } if (n > len) n = len; switch (n) { case 0: - return rb_ary_new2(0); + return rb_ary_new_capa(0); case 1: i = rnds[0]; - return rb_ary_new4(1, &ptr[i]); + return rb_ary_new_from_values(1, &RARRAY_AREF(ary, i)); case 2: i = rnds[0]; j = rnds[1]; if (j >= i) j++; - return rb_ary_new3(2, ptr[i], ptr[j]); + return rb_ary_new_from_args(2, RARRAY_AREF(ary, i), RARRAY_AREF(ary, j)); case 3: i = rnds[0]; j = rnds[1]; @@ -4168,10 +5345,14 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary) if (j >= i) l = i, g = ++j; if (k >= l && (++k >= g)) ++k; } - return rb_ary_new3(3, ptr[i], ptr[j], ptr[k]); + return rb_ary_new_from_args(3, RARRAY_AREF(ary, i), RARRAY_AREF(ary, j), RARRAY_AREF(ary, k)); } + memo_threshold = + len < 2560 ? len / 128 : + len < 5120 ? len / 64 : + len < 10240 ? len / 32 : + len / 16; if (n <= numberof(idx)) { - VALUE *ptr_result; long sorted[numberof(idx)]; sorted[0] = idx[0] = rnds[0]; for (i=1; i<n; i++) { @@ -4183,35 +5364,83 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary) memmove(&sorted[j+1], &sorted[j], sizeof(sorted[0])*(i-j)); sorted[j] = idx[i] = k; } - result = rb_ary_new2(n); - ptr_result = RARRAY_PTR(result); - for (i=0; i<n; i++) { - ptr_result[i] = ptr[idx[i]]; - } + result = rb_ary_new_capa(n); + RARRAY_PTR_USE_TRANSIENT(result, ptr_result, { + for (i=0; i<n; i++) { + ptr_result[i] = RARRAY_AREF(ary, idx[i]); + } + }); + } + else if (n <= memo_threshold / 2) { + long max_idx = 0; +#undef RUBY_UNTYPED_DATA_WARNING +#define RUBY_UNTYPED_DATA_WARNING 0 + VALUE vmemo = Data_Wrap_Struct(0, 0, st_free_table, 0); + st_table *memo = st_init_numtable_with_size(n); + DATA_PTR(vmemo) = memo; + result = rb_ary_new_capa(n); + RARRAY_PTR_USE(result, ptr_result, { + for (i=0; i<n; i++) { + long r = RAND_UPTO(len-i) + i; + ptr_result[i] = r; + if (r > max_idx) max_idx = r; + } + len = RARRAY_LEN(ary); + if (len <= max_idx) n = 0; + else if (n > len) n = len; + RARRAY_PTR_USE_TRANSIENT(ary, ptr_ary, { + for (i=0; i<n; i++) { + long j2 = j = ptr_result[i]; + long i2 = i; + st_data_t value; + if (st_lookup(memo, (st_data_t)i, &value)) i2 = (long)value; + if (st_lookup(memo, (st_data_t)j, &value)) j2 = (long)value; + st_insert(memo, (st_data_t)j, (st_data_t)i2); + ptr_result[i] = ptr_ary[j2]; + } + }); + }); + DATA_PTR(vmemo) = 0; + st_free_table(memo); } else { - VALUE *ptr_result; - result = rb_ary_new4(len, ptr); - RBASIC(result)->klass = 0; - ptr_result = RARRAY_PTR(result); + result = rb_ary_dup(ary); + RBASIC_CLEAR_CLASS(result); RB_GC_GUARD(ary); - for (i=0; i<n; i++) { - j = RAND_UPTO(len-i) + i; - nv = ptr_result[j]; - ptr_result[j] = ptr_result[i]; - ptr_result[i] = nv; - } - RBASIC(result)->klass = rb_cArray; + RARRAY_PTR_USE(result, ptr_result, { + for (i=0; i<n; i++) { + j = RAND_UPTO(len-i) + i; + nv = ptr_result[j]; + ptr_result[j] = ptr_result[i]; + ptr_result[i] = nv; + } + }); + RBASIC_SET_CLASS_RAW(result, rb_cArray); } ARY_SET_LEN(result, n); return result; } +static VALUE +rb_ary_cycle_size(VALUE self, VALUE args, VALUE eobj) +{ + long mul; + VALUE n = Qnil; + if (args && (RARRAY_LEN(args) > 0)) { + n = RARRAY_AREF(args, 0); + } + if (RARRAY_LEN(self) == 0) return INT2FIX(0); + if (n == Qnil) return DBL2NUM(HUGE_VAL); + mul = NUM2LONG(n); + if (mul <= 0) return INT2FIX(0); + n = LONG2FIX(mul); + return rb_fix_mul_fix(rb_ary_length(self), n); +} /* * call-seq: - * ary.cycle(n=nil) { |obj| block } -> nil + * ary.cycle(n=nil) {|obj| block} -> nil * ary.cycle(n=nil) -> Enumerator * * Calls the given block for each element +n+ times or forever if +nil+ is @@ -4224,8 +5453,8 @@ rb_ary_sample(int argc, VALUE *argv, VALUE ary) * If no block is given, an Enumerator is returned instead. * * a = ["a", "b", "c"] - * a.cycle { |x| puts x } # print, a, b, c, a, b, c,.. forever. - * a.cycle(2) { |x| puts x } # print, a, b, c, a, b, c. + * a.cycle {|x| puts x} # print, a, b, c, a, b, c,.. forever. + * a.cycle(2) {|x| puts x} # print, a, b, c, a, b, c. * */ @@ -4233,83 +5462,150 @@ static VALUE rb_ary_cycle(int argc, VALUE *argv, VALUE ary) { long n, i; - VALUE nv = Qnil; - rb_scan_args(argc, argv, "01", &nv); + rb_check_arity(argc, 0, 1); - RETURN_ENUMERATOR(ary, argc, argv); - if (NIL_P(nv)) { + RETURN_SIZED_ENUMERATOR(ary, argc, argv, rb_ary_cycle_size); + if (argc == 0 || NIL_P(argv[0])) { n = -1; } else { - n = NUM2LONG(nv); + n = NUM2LONG(argv[0]); 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]); + rb_yield(RARRAY_AREF(ary, i)); } } return Qnil; } -#define tmpbuf(n, size) rb_str_tmp_new((n)*(size)) -#define tmpbuf_discard(s) (rb_str_resize((s), 0L), RBASIC(s)->klass = rb_cString) #define tmpary(n) rb_ary_tmp_new(n) -#define tmpary_discard(a) (ary_discard(a), RBASIC(a)->klass = rb_cArray) +#define tmpary_discard(a) (ary_discard(a), RBASIC_SET_CLASS_RAW(a, rb_cArray)) /* - * Recursively compute permutations of +r+ elements of the set - * <code>[0..n-1]</code>. + * Build a ruby array of the corresponding values and yield it to the + * associated block. + * Return the class of +values+ for reentry check. + */ +static int +yield_indexed_values(const VALUE values, const long r, const long *const p) +{ + const VALUE result = rb_ary_new2(r); + long i; + + for (i = 0; i < r; i++) RARRAY_ASET(result, i, RARRAY_AREF(values, p[i])); + ARY_SET_LEN(result, r); + rb_yield(result); + return !RBASIC(values)->klass; +} + +/* + * Compute permutations of +r+ elements of the set <code>[0..n-1]</code>. * - * When we have a complete permutation of array indexes, copy the values - * at those indexes into a new array and yield that array. + * When we have a complete permutation of array indices, copy the values + * at those indices 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 -permute0(long n, long r, long *p, long index, char *used, VALUE values) +permute0(const long n, const long r, long *const p, char *const used, const VALUE values) { - long i,j; - for (i = 0; i < n; i++) { - if (used[i] == 0) { + long i = 0, index = 0; + + for (;;) { + const char *const unused = memchr(&used[i], 0, n-i); + if (!unused) { + if (!index) break; + i = p[--index]; /* pop index */ + used[i++] = 0; /* index unused */ + } + else { + i = unused - used; p[index] = i; + used[i] = 1; /* mark index used */ + ++index; if (index < r-1) { /* if not done yet */ - used[i] = 1; /* mark index used */ - permute0(n, r, p, index+1, /* recurse */ - used, values); - used[i] = 0; /* index unused */ + p[index] = i = 0; + continue; } - 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); - const VALUE *values_array = RARRAY_PTR(values); - - for (j = 0; j < r; j++) result_array[j] = values_array[p[j]]; - ARY_SET_LEN(result, r); - rb_yield(result); - if (RBASIC(values)->klass) { + for (i = 0; i < n; ++i) { + if (used[i]) continue; + p[index] = i; + if (!yield_indexed_values(values, r, p)) { rb_raise(rb_eRuntimeError, "permute reentered"); } } + i = p[--index]; /* pop index */ + used[i] = 0; /* index unused */ + p[index] = ++i; } } } /* + * Returns the product of from, from-1, ..., from - how_many + 1. + * http://en.wikipedia.org/wiki/Pochhammer_symbol + */ +static VALUE +descending_factorial(long from, long how_many) +{ + VALUE cnt; + if (how_many > 0) { + cnt = LONG2FIX(from); + while (--how_many > 0) { + long v = --from; + cnt = rb_int_mul(cnt, LONG2FIX(v)); + } + } + else { + cnt = LONG2FIX(how_many == 0); + } + return cnt; +} + +static VALUE +binomial_coefficient(long comb, long size) +{ + VALUE r; + long i; + if (comb > size-comb) { + comb = size-comb; + } + if (comb < 0) { + return LONG2FIX(0); + } + else if (comb == 0) { + return LONG2FIX(1); + } + r = LONG2FIX(size); + for (i = 1; i < comb; ++i) { + r = rb_int_mul(r, LONG2FIX(size - i)); + r = rb_int_idiv(r, LONG2FIX(i + 1)); + } + return r; +} + +static VALUE +rb_ary_permutation_size(VALUE ary, VALUE args, VALUE eobj) +{ + long n = RARRAY_LEN(ary); + long k = (args && (RARRAY_LEN(args) > 0)) ? NUM2LONG(RARRAY_AREF(args, 0)) : n; + + return descending_factorial(n, k); +} + +/* * call-seq: - * ary.permutation { |p| block } -> ary + * ary.permutation {|p| block} -> ary * ary.permutation -> Enumerator - * ary.permutation(n) { |p| block } -> ary + * ary.permutation(n) {|p| block} -> ary * ary.permutation(n) -> Enumerator * * When invoked with a block, yield all permutations of length +n+ of the @@ -4336,13 +5632,13 @@ permute0(long n, long r, long *p, long index, char *used, VALUE values) static VALUE rb_ary_permutation(int argc, VALUE *argv, VALUE ary) { - VALUE num; long r, n, i; n = RARRAY_LEN(ary); /* Array length */ - RETURN_ENUMERATOR(ary, argc, argv); /* Return Enumerator if no block */ - rb_scan_args(argc, argv, "01", &num); - r = NIL_P(num) ? n : NUM2LONG(num); /* Permutation size from argument */ + RETURN_SIZED_ENUMERATOR(ary, argc, argv, rb_ary_permutation_size); /* Return enumerator if no block */ + r = n; + if (rb_check_arity(argc, 0, 1) && !NIL_P(argv[0])) + r = NUM2LONG(argv[0]); /* Permutation size from argument */ if (r < 0 || n < r) { /* no permutations: yield nothing */ @@ -4352,30 +5648,58 @@ rb_ary_permutation(int argc, VALUE *argv, VALUE ary) } 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])); + rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i))); } } else { /* this is the general case */ - volatile VALUE t0 = tmpbuf(n,sizeof(long)); - long *p = (long*)RSTRING_PTR(t0); - volatile VALUE t1 = tmpbuf(n,sizeof(char)); - char *used = (char*)RSTRING_PTR(t1); + volatile VALUE t0; + long *p = ALLOCV_N(long, t0, r+roomof(n, sizeof(long))); + char *used = (char*)(p + r); VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */ - RBASIC(ary0)->klass = 0; + RBASIC_CLEAR_CLASS(ary0); MEMZERO(used, char, n); /* initialize array */ - permute0(n, r, p, 0, used, ary0); /* compute and yield permutations */ - tmpbuf_discard(t0); - tmpbuf_discard(t1); - RBASIC(ary0)->klass = rb_cArray; + permute0(n, r, p, used, ary0); /* compute and yield permutations */ + ALLOCV_END(t0); + RBASIC_SET_CLASS_RAW(ary0, rb_cArray); } return ary; } +static void +combinate0(const long len, const long n, long *const stack, const VALUE values) +{ + long lev = 0; + + MEMZERO(stack+1, long, n); + stack[0] = -1; + for (;;) { + for (lev++; lev < n; lev++) { + stack[lev+1] = stack[lev]+1; + } + if (!yield_indexed_values(values, n, stack+1)) { + rb_raise(rb_eRuntimeError, "combination reentered"); + } + do { + if (lev == 0) return; + stack[lev--]++; + } while (stack[lev+1]+n == len+lev+1); + } +} + +static VALUE +rb_ary_combination_size(VALUE ary, VALUE args, VALUE eobj) +{ + long n = RARRAY_LEN(ary); + long k = NUM2LONG(RARRAY_AREF(args, 0)); + + return binomial_coefficient(k, n); +} + /* * call-seq: - * ary.combination(n) { |c| block } -> ary + * ary.combination(n) {|c| block} -> ary * ary.combination(n) -> Enumerator * * When invoked with a block, yields all combinations of length +n+ of elements @@ -4401,10 +5725,10 @@ rb_ary_permutation(int argc, VALUE *argv, VALUE ary) static VALUE rb_ary_combination(VALUE ary, VALUE num) { - long n, i, len; + long i, n, len; n = NUM2LONG(num); - RETURN_ENUMERATOR(ary, 1, &num); + RETURN_SIZED_ENUMERATOR(ary, 1, &num, rb_ary_combination_size); len = RARRAY_LEN(ary); if (n < 0 || len < n) { /* yield nothing */ @@ -4413,83 +5737,76 @@ rb_ary_combination(VALUE ary, VALUE num) rb_yield(rb_ary_new2(0)); } else if (n == 1) { - for (i = 0; i < len; i++) { - rb_yield(rb_ary_new3(1, RARRAY_PTR(ary)[i])); + for (i = 0; i < RARRAY_LEN(ary); i++) { + rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i))); } } else { - volatile VALUE t0 = tmpbuf(n+1, sizeof(long)); - long *stack = (long*)RSTRING_PTR(t0); - volatile VALUE cc = tmpary(n); - VALUE *chosen = RARRAY_PTR(cc); - long lev = 0; - - MEMZERO(stack, long, n); - stack[0] = -1; - for (;;) { - 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)); - if (RBASIC(t0)->klass) { - rb_raise(rb_eRuntimeError, "combination reentered"); - } - do { - if (lev == 0) goto done; - stack[lev--]++; - } while (stack[lev+1]+n == len+lev+1); - } - done: - tmpbuf_discard(t0); - tmpary_discard(cc); + VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */ + volatile VALUE t0; + long *stack = ALLOCV_N(long, t0, n+1); + + RBASIC_CLEAR_CLASS(ary0); + combinate0(len, n, stack, ary0); + ALLOCV_END(t0); + RBASIC_SET_CLASS_RAW(ary0, rb_cArray); } return ary; } /* - * Recursively compute repeated permutations of +r+ elements of the set + * Compute repeated permutations of +r+ elements of the set * <code>[0..n-1]</code>. * - * When we have a complete repeated permutation of array indexes, copy the - * values at those indexes into a new array and yield that array. + * When we have a complete repeated permutation of array indices, copy the + * values at those indices 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 * values: the Ruby array that holds the actual values to permute */ static void -rpermute0(long n, long r, long *p, long index, VALUE values) +rpermute0(const long n, const long r, long *const p, const VALUE values) { - long i, j; - for (i = 0; i < n; i++) { - p[index] = i; - if (index < r-1) { /* if not done yet */ - rpermute0(n, r, p, index+1, values); /* recurse */ + long i = 0, index = 0; + + p[index] = i; + for (;;) { + if (++index < r-1) { + p[index] = i = 0; + continue; } - 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); - const VALUE *values_array = RARRAY_PTR(values); - - for (j = 0; j < r; j++) result_array[j] = values_array[p[j]]; - ARY_SET_LEN(result, r); - rb_yield(result); - if (RBASIC(values)->klass) { + for (i = 0; i < n; ++i) { + p[index] = i; + if (!yield_indexed_values(values, r, p)) { rb_raise(rb_eRuntimeError, "repeated permute reentered"); } } + do { + if (index <= 0) return; + } while ((i = ++p[--index]) >= n); } } +static VALUE +rb_ary_repeated_permutation_size(VALUE ary, VALUE args, VALUE eobj) +{ + long n = RARRAY_LEN(ary); + long k = NUM2LONG(RARRAY_AREF(args, 0)); + + if (k < 0) { + return LONG2FIX(0); + } + if (n <= 0) { + return LONG2FIX(!k); + } + return rb_int_positive_pow(n, (unsigned long)k); +} + /* * call-seq: - * ary.repeated_permutation(n) { |p| block } -> ary + * ary.repeated_permutation(n) {|p| block} -> ary * ary.repeated_permutation(n) -> Enumerator * * When invoked with a block, yield all repeated permutations of length +n+ of @@ -4516,7 +5833,7 @@ rb_ary_repeated_permutation(VALUE ary, VALUE num) long r, n, i; n = RARRAY_LEN(ary); /* Array length */ - RETURN_ENUMERATOR(ary, 1, &num); /* Return Enumerator if no block */ + RETURN_SIZED_ENUMERATOR(ary, 1, &num, rb_ary_repeated_permutation_size); /* Return Enumerator if no block */ r = NUM2LONG(num); /* Permutation size from argument */ if (r < 0) { @@ -4527,49 +5844,59 @@ rb_ary_repeated_permutation(VALUE ary, VALUE num) } 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])); + rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i))); } } else { /* this is the general case */ - volatile VALUE t0 = tmpbuf(r, sizeof(long)); - long *p = (long*)RSTRING_PTR(t0); + volatile VALUE t0; + long *p = ALLOCV_N(long, t0, r); VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */ - RBASIC(ary0)->klass = 0; + RBASIC_CLEAR_CLASS(ary0); - rpermute0(n, r, p, 0, ary0); /* compute and yield repeated permutations */ - tmpbuf_discard(t0); - RBASIC(ary0)->klass = rb_cArray; + rpermute0(n, r, p, ary0); /* compute and yield repeated permutations */ + ALLOCV_END(t0); + RBASIC_SET_CLASS_RAW(ary0, rb_cArray); } return ary; } static void -rcombinate0(long n, long r, long *p, long index, long rest, VALUE values) +rcombinate0(const long n, const long r, long *const p, const long rest, const VALUE values) { - long j; - if (rest > 0) { - for (; index < n; ++index) { - p[r-rest] = index; - rcombinate0(n, r, p, index, rest-1, values); + long i = 0, index = 0; + + p[index] = i; + for (;;) { + if (++index < r-1) { + p[index] = i; + continue; } - } - else { - VALUE result = rb_ary_new2(r); - VALUE *result_array = RARRAY_PTR(result); - const VALUE *values_array = RARRAY_PTR(values); - - for (j = 0; j < r; ++j) result_array[j] = values_array[p[j]]; - ARY_SET_LEN(result, r); - rb_yield(result); - if (RBASIC(values)->klass) { - rb_raise(rb_eRuntimeError, "repeated combination reentered"); + for (; i < n; ++i) { + p[index] = i; + if (!yield_indexed_values(values, r, p)) { + rb_raise(rb_eRuntimeError, "repeated combination reentered"); + } } + do { + if (index <= 0) return; + } while ((i = ++p[--index]) >= n); + } +} + +static VALUE +rb_ary_repeated_combination_size(VALUE ary, VALUE args, VALUE eobj) +{ + long n = RARRAY_LEN(ary); + long k = NUM2LONG(RARRAY_AREF(args, 0)); + if (k == 0) { + return LONG2FIX(1); } + return binomial_coefficient(k, n + k - 1); } /* * call-seq: - * ary.repeated_combination(n) { |c| block } -> ary + * ary.repeated_combination(n) {|c| block} -> ary * ary.repeated_combination(n) -> Enumerator * * When invoked with a block, yields all repeated combinations of length +n+ of @@ -4600,7 +5927,7 @@ rb_ary_repeated_combination(VALUE ary, VALUE num) long n, i, len; n = NUM2LONG(num); /* Combination size from argument */ - RETURN_ENUMERATOR(ary, 1, &num); /* Return Enumerator if no block */ + RETURN_SIZED_ENUMERATOR(ary, 1, &num, rb_ary_repeated_combination_size); /* Return enumerator if no block */ len = RARRAY_LEN(ary); if (n < 0) { /* yield nothing */ @@ -4609,22 +5936,22 @@ rb_ary_repeated_combination(VALUE ary, VALUE num) rb_yield(rb_ary_new2(0)); } else if (n == 1) { - for (i = 0; i < len; i++) { - rb_yield(rb_ary_new3(1, RARRAY_PTR(ary)[i])); + for (i = 0; i < RARRAY_LEN(ary); i++) { + rb_yield(rb_ary_new3(1, RARRAY_AREF(ary, i))); } } else if (len == 0) { /* yield nothing */ } else { - volatile VALUE t0 = tmpbuf(n, sizeof(long)); - long *p = (long*)RSTRING_PTR(t0); + volatile VALUE t0; + long *p = ALLOCV_N(long, t0, n); VALUE ary0 = ary_make_shared_copy(ary); /* private defensive copy of ary */ - RBASIC(ary0)->klass = 0; + RBASIC_CLEAR_CLASS(ary0); - rcombinate0(len, n, p, 0, n, ary0); /* compute and yield repeated combinations */ - tmpbuf_discard(t0); - RBASIC(ary0)->klass = rb_cArray; + rcombinate0(len, n, p, n, ary0); /* compute and yield repeated combinations */ + ALLOCV_END(t0); + RBASIC_SET_CLASS_RAW(ary0, rb_cArray); } return ary; } @@ -4632,7 +5959,7 @@ rb_ary_repeated_combination(VALUE ary, VALUE num) /* * call-seq: * ary.product(other_ary, ...) -> new_ary - * ary.product(other_ary, ...) { |p| block } -> ary + * ary.product(other_ary, ...) {|p| block} -> ary * * Returns an array of all combinations of elements from all arrays. * @@ -4655,15 +5982,14 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary) { int n = argc+1; /* How many arrays we're operating on */ volatile VALUE t0 = tmpary(n); - volatile VALUE t1 = tmpbuf(n, sizeof(int)); + volatile VALUE t1 = Qundef; VALUE *arrays = RARRAY_PTR(t0); /* The arrays we're computing the product of */ - int *counters = (int*)RSTRING_PTR(t1); /* The current position in each one */ + int *counters = ALLOCV_N(int, t1, n); /* The current position in each one */ VALUE result = Qnil; /* The array we'll be returning, when no block given */ long i,j; long resultlen = 1; - RBASIC(t0)->klass = 0; - RBASIC(t1)->klass = 0; + RBASIC_CLEAR_CLASS(t0); /* initialize the arrays of arrays */ ARY_SET_LEN(t0, n); @@ -4685,15 +6011,14 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary) else { /* Compute the length of the result array; return [] if any is empty */ for (i = 0; i < n; i++) { - long k = RARRAY_LEN(arrays[i]), l = resultlen; + long k = RARRAY_LEN(arrays[i]); if (k == 0) { result = rb_ary_new2(0); goto done; } - resultlen *= k; - if (resultlen < k || resultlen < l || resultlen / k != l) { + if (MUL_OVERFLOW_LONG_P(resultlen, k)) rb_raise(rb_eRangeError, "too big to product"); - } + resultlen *= k; } result = rb_ary_new2(resultlen); } @@ -4706,7 +6031,7 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary) } /* put it on the result array */ - if(NIL_P(result)) { + if (NIL_P(result)) { FL_SET(t0, FL_USER5); rb_yield(subarray); if (! FL_TEST(t0, FL_USER5)) { @@ -4735,7 +6060,7 @@ rb_ary_product(int argc, VALUE *argv, VALUE ary) } done: tmpary_discard(t0); - tmpbuf_discard(t1); + ALLOCV_END(t1); return NIL_P(result) ? ary : result; } @@ -4746,7 +6071,7 @@ done: * * Returns first +n+ elements from the array. * - * If a non-positive number is given, raises an ArgumentError. + * If a negative number is given, raises an ArgumentError. * * See also Array#drop * @@ -4767,7 +6092,7 @@ rb_ary_take(VALUE obj, VALUE n) /* * call-seq: - * ary.take_while { |arr| block } -> new_ary + * ary.take_while {|obj| block} -> new_ary * ary.take_while -> Enumerator * * Passes elements to the block until the block returns +nil+ or +false+, then @@ -4778,7 +6103,7 @@ rb_ary_take(VALUE obj, VALUE n) * See also Array#drop_while * * a = [1, 2, 3, 4, 5, 0] - * a.take_while { |i| i < 3 } #=> [1, 2] + * a.take_while {|i| i < 3} #=> [1, 2] * */ @@ -4789,7 +6114,7 @@ rb_ary_take_while(VALUE ary) RETURN_ENUMERATOR(ary, 0, 0); for (i = 0; i < RARRAY_LEN(ary); i++) { - if (!RTEST(rb_yield(RARRAY_PTR(ary)[i]))) break; + if (!RTEST(rb_yield(RARRAY_AREF(ary, i)))) break; } return rb_ary_take(ary, LONG2FIX(i)); } @@ -4801,7 +6126,7 @@ rb_ary_take_while(VALUE ary) * Drops first +n+ elements from +ary+ and returns the rest of the elements in * an array. * - * If a non-positive number is given, raises an ArgumentError. + * If a negative number is given, raises an ArgumentError. * * See also Array#take * @@ -4826,7 +6151,7 @@ rb_ary_drop(VALUE ary, VALUE n) /* * call-seq: - * ary.drop_while { |arr| block } -> new_ary + * ary.drop_while {|obj| block} -> new_ary * ary.drop_while -> Enumerator * * Drops elements up to, but not including, the first element for which the @@ -4849,12 +6174,364 @@ rb_ary_drop_while(VALUE ary) RETURN_ENUMERATOR(ary, 0, 0); for (i = 0; i < RARRAY_LEN(ary); i++) { - if (!RTEST(rb_yield(RARRAY_PTR(ary)[i]))) break; + if (!RTEST(rb_yield(RARRAY_AREF(ary, i)))) break; } return rb_ary_drop(ary, LONG2FIX(i)); } /* + * call-seq: + * ary.any? [{|obj| block} ] -> true or false + * ary.any?(pattern) -> true or false + * + * See also Enumerable#any? + */ + +static VALUE +rb_ary_any_p(int argc, VALUE *argv, VALUE ary) +{ + long i, len = RARRAY_LEN(ary); + + rb_check_arity(argc, 0, 1); + if (!len) return Qfalse; + if (argc) { + if (rb_block_given_p()) { + rb_warn("given block not used"); + } + for (i = 0; i < RARRAY_LEN(ary); ++i) { + if (RTEST(rb_funcall(argv[0], idEqq, 1, RARRAY_AREF(ary, i)))) return Qtrue; + } + } + else if (!rb_block_given_p()) { + for (i = 0; i < len; ++i) { + if (RTEST(RARRAY_AREF(ary, i))) return Qtrue; + } + } + else { + for (i = 0; i < RARRAY_LEN(ary); ++i) { + if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) return Qtrue; + } + } + return Qfalse; +} + +/* + * call-seq: + * ary.all? [{|obj| block} ] -> true or false + * ary.all?(pattern) -> true or false + * + * See also Enumerable#all? + */ + +static VALUE +rb_ary_all_p(int argc, VALUE *argv, VALUE ary) +{ + long i, len = RARRAY_LEN(ary); + + rb_check_arity(argc, 0, 1); + if (!len) return Qtrue; + if (argc) { + if (rb_block_given_p()) { + rb_warn("given block not used"); + } + for (i = 0; i < RARRAY_LEN(ary); ++i) { + if (!RTEST(rb_funcall(argv[0], idEqq, 1, RARRAY_AREF(ary, i)))) return Qfalse; + } + } + else if (!rb_block_given_p()) { + for (i = 0; i < len; ++i) { + if (!RTEST(RARRAY_AREF(ary, i))) return Qfalse; + } + } + else { + for (i = 0; i < RARRAY_LEN(ary); ++i) { + if (!RTEST(rb_yield(RARRAY_AREF(ary, i)))) return Qfalse; + } + } + return Qtrue; +} + +/* + * call-seq: + * ary.none? [{|obj| block} ] -> true or false + * ary.none?(pattern) -> true or false + * + * See also Enumerable#none? + */ + +static VALUE +rb_ary_none_p(int argc, VALUE *argv, VALUE ary) +{ + long i, len = RARRAY_LEN(ary); + + rb_check_arity(argc, 0, 1); + if (!len) return Qtrue; + if (argc) { + if (rb_block_given_p()) { + rb_warn("given block not used"); + } + for (i = 0; i < RARRAY_LEN(ary); ++i) { + if (RTEST(rb_funcall(argv[0], idEqq, 1, RARRAY_AREF(ary, i)))) return Qfalse; + } + } + else if (!rb_block_given_p()) { + for (i = 0; i < len; ++i) { + if (RTEST(RARRAY_AREF(ary, i))) return Qfalse; + } + } + else { + for (i = 0; i < RARRAY_LEN(ary); ++i) { + if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) return Qfalse; + } + } + return Qtrue; +} + +/* + * call-seq: + * ary.one? [{|obj| block} ] -> true or false + * ary.one?(pattern) -> true or false + * + * See also Enumerable#one? + */ + +static VALUE +rb_ary_one_p(int argc, VALUE *argv, VALUE ary) +{ + long i, len = RARRAY_LEN(ary); + VALUE result = Qfalse; + + rb_check_arity(argc, 0, 1); + if (!len) return Qfalse; + if (argc) { + if (rb_block_given_p()) { + rb_warn("given block not used"); + } + for (i = 0; i < RARRAY_LEN(ary); ++i) { + if (RTEST(rb_funcall(argv[0], idEqq, 1, RARRAY_AREF(ary, i)))) { + if (result) return Qfalse; + result = Qtrue; + } + } + } + else if (!rb_block_given_p()) { + for (i = 0; i < len; ++i) { + if (RTEST(RARRAY_AREF(ary, i))) { + if (result) return Qfalse; + result = Qtrue; + } + } + } + else { + for (i = 0; i < RARRAY_LEN(ary); ++i) { + if (RTEST(rb_yield(RARRAY_AREF(ary, i)))) { + if (result) return Qfalse; + result = Qtrue; + } + } + } + return result; +} + +/* + * call-seq: + * ary.dig(idx, ...) -> object + * + * Extracts the nested value specified by the sequence of <i>idx</i> + * objects by calling +dig+ at each step, returning +nil+ if any + * intermediate step is +nil+. + * + * a = [[1, [2, 3]]] + * + * a.dig(0, 1, 1) #=> 3 + * a.dig(1, 2, 3) #=> nil + * a.dig(0, 0, 0) #=> TypeError: Integer does not have #dig method + * [42, {foo: :bar}].dig(1, :foo) #=> :bar + */ + +static VALUE +rb_ary_dig(int argc, VALUE *argv, VALUE self) +{ + rb_check_arity(argc, 1, UNLIMITED_ARGUMENTS); + self = rb_ary_at(self, *argv); + if (!--argc) return self; + ++argv; + return rb_obj_dig(argc, argv, self, Qnil); +} + +static inline VALUE +finish_exact_sum(long n, VALUE r, VALUE v, int z) +{ + if (n != 0) + v = rb_fix_plus(LONG2FIX(n), v); + if (r != Qundef) { + /* r can be an Integer when mathn is loaded */ + if (FIXNUM_P(r)) + v = rb_fix_plus(r, v); + else if (RB_TYPE_P(r, T_BIGNUM)) + v = rb_big_plus(r, v); + else + v = rb_rational_plus(r, v); + } + else if (!n && z) { + v = rb_fix_plus(LONG2FIX(0), v); + } + return v; +} + +/* + * call-seq: + * ary.sum(init=0) -> number + * ary.sum(init=0) {|e| expr } -> number + * + * Returns the sum of elements. + * For example, [e1, e2, e3].sum returns init + e1 + e2 + e3. + * + * If a block is given, the block is applied to each element + * before addition. + * + * If <i>ary</i> is empty, it returns <i>init</i>. + * + * [].sum #=> 0 + * [].sum(0.0) #=> 0.0 + * [1, 2, 3].sum #=> 6 + * [3, 5.5].sum #=> 8.5 + * [2.5, 3.0].sum(0.0) {|e| e * e } #=> 15.25 + * [Object.new].sum #=> TypeError + * + * The (arithmetic) mean value of an array can be obtained as follows. + * + * mean = ary.sum(0.0) / ary.length + * + * This method can be used for non-numeric objects by + * explicit <i>init</i> argument. + * + * ["a", "b", "c"].sum("") #=> "abc" + * [[1], [[2]], [3]].sum([]) #=> [1, [2], 3] + * + * However, Array#join and Array#flatten is faster than Array#sum for + * array of strings and array of arrays. + * + * ["a", "b", "c"].join #=> "abc" + * [[1], [[2]], [3]].flatten(1) #=> [1, [2], 3] + * + * + * Array#sum method may not respect method redefinition of "+" methods + * such as Integer#+. + * + */ + +static VALUE +rb_ary_sum(int argc, VALUE *argv, VALUE ary) +{ + VALUE e, v, r; + long i, n; + int block_given; + + v = (rb_check_arity(argc, 0, 1) ? argv[0] : LONG2FIX(0)); + + block_given = rb_block_given_p(); + + if (RARRAY_LEN(ary) == 0) + return v; + + n = 0; + r = Qundef; + for (i = 0; i < RARRAY_LEN(ary); i++) { + e = RARRAY_AREF(ary, i); + if (block_given) + e = rb_yield(e); + if (FIXNUM_P(e)) { + n += FIX2LONG(e); /* should not overflow long type */ + if (!FIXABLE(n)) { + v = rb_big_plus(LONG2NUM(n), v); + n = 0; + } + } + else if (RB_TYPE_P(e, T_BIGNUM)) + v = rb_big_plus(e, v); + else if (RB_TYPE_P(e, T_RATIONAL)) { + if (r == Qundef) + r = e; + else + r = rb_rational_plus(r, e); + } + else + goto not_exact; + } + v = finish_exact_sum(n, r, v, argc!=0); + return v; + + not_exact: + v = finish_exact_sum(n, r, v, i!=0); + + if (RB_FLOAT_TYPE_P(e)) { + /* + * Kahan-Babuska balancing compensated summation algorithm + * See http://link.springer.com/article/10.1007/s00607-005-0139-x + */ + double f, c; + + f = NUM2DBL(v); + c = 0.0; + goto has_float_value; + for (; i < RARRAY_LEN(ary); i++) { + double x, t; + e = RARRAY_AREF(ary, i); + if (block_given) + e = rb_yield(e); + if (RB_FLOAT_TYPE_P(e)) + has_float_value: + x = RFLOAT_VALUE(e); + else if (FIXNUM_P(e)) + x = FIX2LONG(e); + else if (RB_TYPE_P(e, T_BIGNUM)) + x = rb_big2dbl(e); + else if (RB_TYPE_P(e, T_RATIONAL)) + x = rb_num2dbl(e); + else + goto not_float; + + if (isnan(f)) continue; + if (isnan(x)) { + f = x; + continue; + } + if (isinf(x)) { + if (isinf(f) && signbit(x) != signbit(f)) + f = NAN; + else + f = x; + continue; + } + if (isinf(f)) continue; + + t = f + x; + if (fabs(f) >= fabs(x)) + c += ((f - t) + x); + else + c += ((x - t) + f); + f = t; + } + f += c; + return DBL2NUM(f); + + not_float: + v = DBL2NUM(f); + } + + goto has_some_value; + for (; i < RARRAY_LEN(ary); i++) { + e = RARRAY_AREF(ary, i); + if (block_given) + e = rb_yield(e); + has_some_value: + v = rb_funcall(v, idPLUS, 1, e); + } + return v; +} + +/* * Arrays are ordered, integer-indexed collections of any object. * * Array indexing starts at 0, as in C or Java. A negative index is assumed @@ -4876,24 +6553,30 @@ rb_ary_drop_while(VALUE ary) * * ary = Array.new #=> [] * Array.new(3) #=> [nil, nil, nil] - * Array.new(3, true) #=> [0, 0, 0] + * Array.new(3, true) #=> [true, true, true] * - * Note that the second argument populates the array with references the same - * object. Therefore, it is only recommended in cases when you need to - * instantiate arrays with natively immutable objects such Symbols, numbers, - * true or false. + * Note that the second argument populates the array with references to the + * same object. Therefore, it is only recommended in cases when you need to + * instantiate arrays with natively immutable objects such as Symbols, + * numbers, true or false. * * To create an array with separate objects a block can be passed instead. * This method is safe to use with mutable objects such as hashes, strings or * other arrays: * - * Array.new(4) { Hash.new } #=> [{}, {}, {}, {}] + * Array.new(4) {Hash.new} #=> [{}, {}, {}, {}] + * Array.new(4) {|i| i.to_s } #=> ["0", "1", "2", "3"] * * This is also a quick way to build up multi-dimensional arrays: * - * empty_table = Array.new(3) { Array.new(3) } + * empty_table = Array.new(3) {Array.new(3)} * #=> [[nil, nil, nil], [nil, nil, nil], [nil, nil, nil]] * + * An array can also be created by using the Array() method, provided by + * Kernel, which tries to call #to_ary, then #to_a on its argument. + * + * Array({:a => "a", :b => "b"}) #=> [[:a, "a"], [:b, "b"]] + * * == Example Usage * * In addition to the methods it mixes in through the Enumerable module, the @@ -4906,7 +6589,8 @@ rb_ary_drop_while(VALUE ary) * * Elements in an array can be retrieved using the Array#[] method. It can * take a single integer argument (a numeric index), a pair of arguments - * (start and length) or a range. + * (start and length) or a range. Negative indices start counting from the end, + * with -1 being the last element. * * arr = [1, 2, 3, 4, 5, 6] * arr[2] #=> 3 @@ -4914,6 +6598,7 @@ rb_ary_drop_while(VALUE ary) * arr[-3] #=> 4 * arr[2, 3] #=> [3, 4, 5] * arr[1..4] #=> [2, 3, 4, 5] + * arr[1..-3] #=> [2, 3, 4] * * Another way to access a particular array element is by using the #at method * @@ -5002,7 +6687,8 @@ rb_ary_drop_while(VALUE ary) * To delete a particular element anywhere in an array, use #delete: * * arr = [1, 2, 2, 3] - * arr.delete(2) #=> [1, 3] + * arr.delete(2) #=> 2 + * arr #=> [1,3] * * A useful method if you need to remove +nil+ values from an array is * #compact: @@ -5030,24 +6716,24 @@ rb_ary_drop_while(VALUE ary) * Note that this operation leaves the array unchanged. * * arr = [1, 2, 3, 4, 5] - * arr.each { |a| print a -= 10, " " } + * arr.each {|a| print a -= 10, " "} * # prints: -9 -8 -7 -6 -5 * #=> [1, 2, 3, 4, 5] * * Another sometimes useful iterator is #reverse_each which will iterate over * the elements in the array in reverse order. * - * words = %w[rats live on no evil star] + * words = %w[first second third fourth fifth sixth] * str = "" - * words.reverse_each { |word| str += "#{word.reverse} " } - * str #=> "rats live on no evil star " + * words.reverse_each {|word| str += "#{word} "} + * p str #=> "sixth fifth fourth third second first " * * The #map method can be used to create a new array based on the original * array, but with the values modified by the supplied block: * - * arr.map { |a| 2*a } #=> [2, 4, 6, 8, 10] + * arr.map {|a| 2*a} #=> [2, 4, 6, 8, 10] * arr #=> [1, 2, 3, 4, 5] - * arr.map! { |a| a**2 } #=> [1, 4, 9, 16, 25] + * arr.map! {|a| a**2} #=> [1, 4, 9, 16, 25] * arr #=> [1, 4, 9, 16, 25] * * == Selecting Items from an Array @@ -5061,9 +6747,9 @@ rb_ary_drop_while(VALUE ary) * === Non-destructive Selection * * arr = [1, 2, 3, 4, 5, 6] - * arr.select { |a| a > 3 } #=> [4, 5, 6] - * arr.reject { |a| a < 3 } #=> [4, 5, 6] - * arr.drop_while { |a| a < 4 } #=> [4, 5, 6] + * arr.select {|a| a > 3} #=> [4, 5, 6] + * arr.reject {|a| a < 3} #=> [3, 4, 5, 6] + * arr.drop_while {|a| a < 4} #=> [4, 5, 6] * arr #=> [1, 2, 3, 4, 5, 6] * * === Destructive Selection @@ -5074,11 +6760,11 @@ rb_ary_drop_while(VALUE ary) * Similar to #select vs. #reject, #delete_if and #keep_if have the exact * opposite result when supplied with the same block: * - * arr.delete_if { |a| a < 4 } #=> [4, 5, 6] + * arr.delete_if {|a| a < 4} #=> [4, 5, 6] * arr #=> [4, 5, 6] * * arr = [1, 2, 3, 4, 5, 6] - * arr.keep_if { |a| a < 4 } #=> [1, 2, 3] + * arr.keep_if {|a| a < 4} #=> [1, 2, 3] * arr #=> [1, 2, 3] * */ @@ -5092,7 +6778,7 @@ Init_Array(void) rb_cArray = rb_define_class("Array", rb_cObject); rb_include_module(rb_cArray, rb_mEnumerable); - rb_define_alloc_func(rb_cArray, ary_alloc); + rb_define_alloc_func(rb_cArray, empty_ary_alloc); rb_define_singleton_method(rb_cArray, "[]", rb_ary_s_create, -1); rb_define_singleton_method(rb_cArray, "try_convert", rb_ary_s_try_convert, 1); rb_define_method(rb_cArray, "initialize", rb_ary_initialize, -1); @@ -5101,8 +6787,8 @@ Init_Array(void) rb_define_method(rb_cArray, "inspect", rb_ary_inspect, 0); rb_define_alias(rb_cArray, "to_s", "inspect"); rb_define_method(rb_cArray, "to_a", rb_ary_to_a, 0); + rb_define_method(rb_cArray, "to_h", rb_ary_to_h, 0); rb_define_method(rb_cArray, "to_ary", rb_ary_to_ary_m, 0); - 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); @@ -5114,12 +6800,16 @@ Init_Array(void) rb_define_method(rb_cArray, "fetch", rb_ary_fetch, -1); rb_define_method(rb_cArray, "first", rb_ary_first, -1); rb_define_method(rb_cArray, "last", rb_ary_last, -1); - rb_define_method(rb_cArray, "concat", rb_ary_concat, 1); + rb_define_method(rb_cArray, "concat", rb_ary_concat_multi, -1); + rb_define_method(rb_cArray, "union", rb_ary_union_multi, -1); + rb_define_method(rb_cArray, "difference", rb_ary_difference_multi, -1); rb_define_method(rb_cArray, "<<", rb_ary_push, 1); rb_define_method(rb_cArray, "push", rb_ary_push_m, -1); + rb_define_alias(rb_cArray, "append", "push"); rb_define_method(rb_cArray, "pop", rb_ary_pop_m, -1); rb_define_method(rb_cArray, "shift", rb_ary_shift_m, -1); rb_define_method(rb_cArray, "unshift", rb_ary_unshift_m, -1); + rb_define_alias(rb_cArray, "prepend", "unshift"); rb_define_method(rb_cArray, "insert", rb_ary_insert, -1); rb_define_method(rb_cArray, "each", rb_ary_each, 0); rb_define_method(rb_cArray, "each_index", rb_ary_each_index, 0); @@ -5144,6 +6834,8 @@ Init_Array(void) rb_define_method(rb_cArray, "map!", rb_ary_collect_bang, 0); rb_define_method(rb_cArray, "select", rb_ary_select, 0); rb_define_method(rb_cArray, "select!", rb_ary_select_bang, 0); + rb_define_method(rb_cArray, "filter", rb_ary_select, 0); + rb_define_method(rb_cArray, "filter!", rb_ary_select_bang, 0); rb_define_method(rb_cArray, "keep_if", rb_ary_keep_if, 0); rb_define_method(rb_cArray, "values_at", rb_ary_values_at, -1); rb_define_method(rb_cArray, "delete", rb_ary_delete, 1); @@ -5172,6 +6864,9 @@ Init_Array(void) rb_define_method(rb_cArray, "&", rb_ary_and, 1); rb_define_method(rb_cArray, "|", rb_ary_or, 1); + rb_define_method(rb_cArray, "max", rb_ary_max, -1); + rb_define_method(rb_cArray, "min", rb_ary_min, -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); @@ -5193,7 +6888,14 @@ Init_Array(void) 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); - - id_cmp = rb_intern("<=>"); - sym_random = ID2SYM(rb_intern("random")); + rb_define_method(rb_cArray, "bsearch", rb_ary_bsearch, 0); + rb_define_method(rb_cArray, "bsearch_index", rb_ary_bsearch_index, 0); + rb_define_method(rb_cArray, "any?", rb_ary_any_p, -1); + rb_define_method(rb_cArray, "all?", rb_ary_all_p, -1); + rb_define_method(rb_cArray, "none?", rb_ary_none_p, -1); + rb_define_method(rb_cArray, "one?", rb_ary_one_p, -1); + rb_define_method(rb_cArray, "dig", rb_ary_dig, -1); + rb_define_method(rb_cArray, "sum", rb_ary_sum, -1); + + id_random = rb_intern("random"); } |