mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
9b383bd6cf
string (e.g. ?x). * lib/tempfile.rb (Tempfile::make_tmpname): put dot between basename and pid. [ruby-talk:196272] * parse.y (do_block): remove -> style block. * parse.y (parser_yylex): remove tLAMBDA_ARG. * eval.c (rb_call0): binding for the return event hook should have consistent scope. [ruby-core:07928] * eval.c (proc_invoke): return behavior should depend whether it is surrounded by a lambda or a mere block. * eval.c (formal_assign): handles post splat arguments. * eval.c (rb_call0): ditto. * st.c (strhash): use FNV-1a hash. * parse.y (parser_yylex): removed experimental ';;' terminator. * eval.c (rb_node_arity): should be aware of post splat arguments. * eval.c (rb_proc_arity): ditto. * parse.y (f_args): syntax rule enhanced to support arguments after the splat. * parse.y (block_param): ditto for block parameters. * parse.y (f_post_arg): mandatory formal arguments after the splat argument. * parse.y (new_args_gen): generate nodes for mandatory formal arguments after the splat argument. * eval.c (rb_eval): dispatch mandatory formal arguments after the splat argument. * parse.y (args): allow more than one splat in the argument list. * parse.y (method_call): allow aref [] to accept all kind of method argument, including assocs, splat, and block argument. * eval.c (SETUP_ARGS0): prepare block argument as well. * lib/mathn.rb (Integer): remove Integer#gcd2. [ruby-core:07931] * eval.c (error_line): print receivers true/false/nil specially. * eval.c (rb_proc_yield): handles parameters in yield semantics. * eval.c (nil_yield): gives LocalJumpError to denote no block error. * io.c (rb_io_getc): now takes one-character string. * string.c (rb_str_hash): use FNV-1a hash from Fowler/Noll/Vo hashing algorithm. * string.c (rb_str_aref): str[0] now returns 1 character string, instead of a fixnum. [Ruby2] * parse.y (parser_yylex): ?c now returns 1 character string, instead of a fixnum. [Ruby2] * string.c (rb_str_aset): no longer support fixnum insertion. * eval.c (umethod_bind): should not update original class. [ruby-dev:28636] * eval.c (ev_const_get): should support constant access from within instance_eval(). [ruby-dev:28327] * time.c (time_timeval): should round for usec floating number. [ruby-core:07896] * time.c (time_add): ditto. * dir.c (sys_warning): should not call a vararg function rb_sys_warning() indirectly. [ruby-core:07886] * numeric.c (flo_divmod): the first element of Float#divmod should be an integer. [ruby-dev:28589] * test/ruby/test_float.rb: add tests for divmod, div, modulo and remainder. * re.c (rb_reg_initialize): should not allow modifying literal regexps. frozen check moved from rb_reg_initialize_m as well. * re.c (rb_reg_initialize): should not modify untainted objects in safe levels higher than 3. * re.c (rb_memcmp): type change from char* to const void*. * dir.c (dir_close): should not close untainted dir stream. * dir.c (GetDIR): add tainted/frozen check for each dir operation. * lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_symbol_arg): typo fixed. a patch from Florian Gross <florg at florg.net>. * eval.c (EXEC_EVENT_HOOK): trace_func may remove itself from event_hooks. no guarantee for arbitrary hook deletion. [ruby-dev:28632] * util.c (ruby_strtod): differ addition to minimize error. [ruby-dev:28619] * util.c (ruby_strtod): should not raise ERANGE when the input string does not have any digits. [ruby-dev:28629] * eval.c (proc_invoke): should restore old ruby_frame->block. thanks to ts <decoux at moulon.inra.fr>. [ruby-core:07833] also fix [ruby-dev:28614] as well. * signal.c (trap): sig should be less then NSIG. Coverity found this bug. a patch from Kevin Tew <tewk at tewk.com>. [ruby-core:07823] * math.c (math_log2): add new method inspired by [ruby-talk:191237]. * math.c (math_log): add optional base argument to Math::log(). [ruby-talk:191308] * ext/syck/emitter.c (syck_scan_scalar): avoid accessing uninitialized array element. a patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07809] * array.c (rb_ary_fill): initialize local variables first. a patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07810] * ext/syck/yaml2byte.c (syck_yaml2byte_handler): need to free type_tag. a patch from Pat Eyler <rubypate at gmail.com>. [ruby-core:07808] * ext/socket/socket.c (make_hostent_internal): accept ai_family check from Sam Roberts <sroberts at uniserve.com>. [ruby-core:07691] * util.c (ruby_strtod): should not cut off 18 digits for no reason. [ruby-core:07796] * array.c (rb_ary_fill): internalize local variable "beg" to pacify Coverity. [ruby-core:07770] * pack.c (pack_unpack): now supports CRLF newlines. a patch from <tommy at tmtm.org>. [ruby-dev:28601] * applied code clean-up patch from Stefan Huehner <stefan at huehner.org>. [ruby-core:07764] * lib/jcode.rb (String::tr_s): should have translated non squeezing character sequence (i.e. a character) as well. thanks to Hiroshi Ichikawa <gimite at gimite.ddo.jp> [ruby-list:42090] * ext/socket/socket.c: document update patch from Sam Roberts <sroberts at uniserve.com>. [ruby-core:07701] * lib/mathn.rb (Integer): need not to remove gcd2. a patch from NARUSE, Yui <naruse at airemix.com>. [ruby-dev:28570] * parse.y (arg): too much NEW_LIST() * eval.c (SETUP_ARGS0): remove unnecessary access to nd_alen. * eval.c (rb_eval): use ARGSCAT for NODE_OP_ASGN1. [ruby-dev:28585] * parse.y (arg): use NODE_ARGSCAT for placeholder. * lib/getoptlong.rb (GetoptLong::get): RDoc update patch from mathew <meta at pobox.com>. [ruby-core:07738] * variable.c (rb_const_set): raise error when no target klass is supplied. [ruby-dev:28582] * prec.c (prec_prec_f): documentation patch from <gerardo.santana at gmail.com>. [ruby-core:07689] * bignum.c (rb_big_pow): second operand may be too big even if it's a Fixnum. [ruby-talk:187984] * README.EXT: update symbol description. [ruby-talk:188104] * COPYING: explicitly note GPLv2. [ruby-talk:187922] * parse.y: remove some obsolete syntax rules (unparenthesized method calls in argument list). * eval.c (rb_call0): insecure calling should be checked for non NODE_SCOPE method invocations too. * eval.c (rb_alias): should preserve the current safe level as well as method definition. * process.c (rb_f_sleep): remove RDoc description about SIGALRM which is not valid on the current implementation. [ruby-dev:28464] Thu Mar 23 21:40:47 2006 K.Kosako <sndgk393 AT ybb.ne.jp> * eval.c (method_missing): should support argument splat in super. a bug in combination of super, splat and method_missing. [ruby-talk:185438] * configure.in: Solaris SunPro compiler -rapth patch from <kuwa at labs.fujitsu.com>. [ruby-dev:28443] * configure.in: remove enable_rpath=no for Solaris. [ruby-dev:28440] * ext/win32ole/win32ole.c (ole_val2olevariantdata): change behavior of converting OLE Variant object with VT_ARRAY|VT_UI1 and Ruby String object. * ruby.1: a clarification patch from David Lutterkort <dlutter at redhat.com>. [ruby-core:7508] * lib/rdoc/ri/ri_paths.rb (RI::Paths): adding paths from rubygems directories. a patch from Eric Hodel <drbrain at segment7.net>. [ruby-core:07423] * eval.c (rb_clear_cache_by_class): clearing wrong cache. * ext/extmk.rb: use :remove_destination to install extension libraries to avoid SEGV. [ruby-dev:28417] * eval.c (rb_thread_fd_writable): should not re-schedule output from KILLED thread (must be error printing). * array.c (rb_ary_flatten_bang): allow specifying recursion level. [ruby-talk:182170] * array.c (rb_ary_flatten): ditto. * gc.c (add_heap): a heap_slots may overflow. a patch from Stefan Weil <weil at mail.berlios.de>. * eval.c (rb_call): use separate cache for fcall/vcall invocation. * eval.c (rb_eval): NODE_FCALL, NODE_VCALL can call local functions. * eval.c (rb_mod_local): a new method to specify newly added visibility "local". * eval.c (search_method): search for local methods which are visible only from the current class. * class.c (rb_class_local_methods): a method to list local methods. * object.c (Init_Object): add BasicObject class as a top level BlankSlate class. * ruby.h (SYM2ID): should not cast to signed long. [ruby-core:07414] * class.c (rb_include_module): allow module duplication. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
388 lines
8.4 KiB
C
388 lines
8.4 KiB
C
/************************************************
|
|
|
|
enumerator.c - provides Enumerator class
|
|
|
|
$Author$
|
|
|
|
Copyright (C) 2001-2003 Akinori MUSHA
|
|
|
|
$Idaemons: /home/cvs/rb/enumerator/enumerator.c,v 1.1.1.1 2001/07/15 10:12:48 knu Exp $
|
|
$RoughId: enumerator.c,v 1.6 2003/07/27 11:03:24 nobu Exp $
|
|
$Id$
|
|
|
|
************************************************/
|
|
|
|
#include "ruby.h"
|
|
|
|
/*
|
|
* Document-class: Enumerable::Enumerator
|
|
*
|
|
* A class which provides a method `each' to be used as an Enumerable
|
|
* object.
|
|
*/
|
|
static VALUE rb_cEnumerator;
|
|
static VALUE sym_each, sym_each_with_index, sym_each_slice, sym_each_cons;
|
|
|
|
static VALUE
|
|
proc_call(VALUE proc, VALUE args)
|
|
{
|
|
if (TYPE(args) != T_ARRAY) {
|
|
args = rb_ary_new3(1, args);
|
|
}
|
|
return rb_proc_call(proc, args);
|
|
}
|
|
|
|
struct enumerator {
|
|
VALUE method;
|
|
VALUE proc;
|
|
VALUE args;
|
|
VALUE (*iter)(VALUE, struct enumerator *);
|
|
};
|
|
|
|
static void
|
|
enumerator_mark(void *p)
|
|
{
|
|
struct enumerator *ptr = p;
|
|
rb_gc_mark(ptr->method);
|
|
rb_gc_mark(ptr->proc);
|
|
rb_gc_mark(ptr->args);
|
|
}
|
|
|
|
static struct enumerator *
|
|
enumerator_ptr(VALUE obj)
|
|
{
|
|
struct enumerator *ptr;
|
|
|
|
Data_Get_Struct(obj, struct enumerator, ptr);
|
|
if (RDATA(obj)->dmark != enumerator_mark) {
|
|
rb_raise(rb_eTypeError,
|
|
"wrong argument type %s (expected Enumerable::Enumerator)",
|
|
rb_obj_classname(obj));
|
|
}
|
|
if (!ptr) {
|
|
rb_raise(rb_eArgError, "uninitialized enumerator");
|
|
}
|
|
return ptr;
|
|
}
|
|
|
|
static VALUE
|
|
enumerator_iter_i(VALUE i, struct enumerator *e)
|
|
{
|
|
return rb_yield(proc_call(e->proc, i));
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* obj.to_enum(method = :each, *args)
|
|
* obj.enum_for(method = :each, *args)
|
|
*
|
|
* Returns Enumerable::Enumerator.new(self, method, *args).
|
|
*
|
|
* e.g.:
|
|
* str = "xyz"
|
|
*
|
|
* enum = str.enum_for(:each_byte)
|
|
* a = enum.map {|b| '%02x' % b } #=> ["78", "79", "7a"]
|
|
*
|
|
* # protects an array from being modified
|
|
* a = [1, 2, 3]
|
|
* some_method(a.to_enum)
|
|
*
|
|
*/
|
|
static VALUE
|
|
obj_to_enum(int argc, VALUE *argv, VALUE obj)
|
|
{
|
|
VALUE meth = sym_each;
|
|
|
|
if (argc > 0) {
|
|
--argc;
|
|
meth = *argv++;
|
|
}
|
|
return rb_enumeratorize(obj, meth, argc, argv);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* enum_with_index
|
|
*
|
|
* Returns Enumerable::Enumerator.new(self, :each_with_index).
|
|
*
|
|
*/
|
|
static VALUE
|
|
enumerator_enum_with_index(VALUE obj)
|
|
{
|
|
return rb_enumeratorize(obj, sym_each_with_index, 0, 0);
|
|
}
|
|
|
|
static VALUE
|
|
each_slice_i(VALUE val, VALUE *memo)
|
|
{
|
|
VALUE ary = memo[0];
|
|
long size = (long)memo[1];
|
|
|
|
rb_ary_push(ary, val);
|
|
|
|
if (RARRAY(ary)->len == size) {
|
|
rb_yield(ary);
|
|
memo[0] = rb_ary_new2(size);
|
|
}
|
|
|
|
return Qnil;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* e.each_slice(n) {...}
|
|
*
|
|
* Iterates the given block for each slice of <n> elements.
|
|
*
|
|
* e.g.:
|
|
* (1..10).each_slice(3) {|a| p a}
|
|
* # outputs below
|
|
* [1, 2, 3]
|
|
* [4, 5, 6]
|
|
* [7, 8, 9]
|
|
* [10]
|
|
*
|
|
*/
|
|
static VALUE
|
|
enum_each_slice(VALUE obj, VALUE n)
|
|
{
|
|
long size = NUM2LONG(n);
|
|
VALUE args[2], ary;
|
|
|
|
if (size <= 0) rb_raise(rb_eArgError, "invalid slice size");
|
|
|
|
args[0] = rb_ary_new2(size);
|
|
args[1] = (VALUE)size;
|
|
|
|
rb_block_call(obj, rb_intern("each"), 0, 0, each_slice_i, (VALUE)args);
|
|
|
|
ary = args[0];
|
|
if (RARRAY(ary)->len > 0) rb_yield(ary);
|
|
|
|
return Qnil;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* e.enum_slice(n)
|
|
*
|
|
* Returns Enumerable::Enumerator.new(self, :each_slice, n).
|
|
*
|
|
*/
|
|
static VALUE
|
|
enumerator_enum_slice(VALUE obj, VALUE n)
|
|
{
|
|
return rb_enumeratorize(obj, sym_each_slice, 1, &n);
|
|
}
|
|
|
|
static VALUE
|
|
each_cons_i(VALUE val, VALUE *memo)
|
|
{
|
|
VALUE ary = memo[0];
|
|
long size = (long)memo[1];
|
|
|
|
if (RARRAY(ary)->len == size) {
|
|
rb_ary_shift(ary);
|
|
}
|
|
rb_ary_push(ary, val);
|
|
if (RARRAY(ary)->len == size) {
|
|
rb_yield(rb_ary_dup(ary));
|
|
}
|
|
return Qnil;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* each_cons(n) {...}
|
|
*
|
|
* Iterates the given block for each array of consecutive <n>
|
|
* elements.
|
|
*
|
|
* e.g.:
|
|
* (1..10).each_cons(3) {|a| p a}
|
|
* # outputs below
|
|
* [1, 2, 3]
|
|
* [2, 3, 4]
|
|
* [3, 4, 5]
|
|
* [4, 5, 6]
|
|
* [5, 6, 7]
|
|
* [6, 7, 8]
|
|
* [7, 8, 9]
|
|
* [8, 9, 10]
|
|
*
|
|
*/
|
|
static VALUE
|
|
enum_each_cons(VALUE obj, VALUE n)
|
|
{
|
|
long size = NUM2LONG(n);
|
|
VALUE args[2];
|
|
|
|
if (size <= 0) rb_raise(rb_eArgError, "invalid size");
|
|
args[0] = rb_ary_new2(size);
|
|
args[1] = (VALUE)size;
|
|
|
|
rb_block_call(obj, rb_intern("each"), 0, 0, each_cons_i, (VALUE)args);
|
|
|
|
return Qnil;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* e.enum_cons(n)
|
|
*
|
|
* Returns Enumerable::Enumerator.new(self, :each_cons, n).
|
|
*
|
|
*/
|
|
static VALUE
|
|
enumerator_enum_cons(VALUE obj, VALUE n)
|
|
{
|
|
return rb_enumeratorize(obj, sym_each_cons, 1, &n);
|
|
}
|
|
|
|
static VALUE
|
|
enumerator_allocate(VALUE klass)
|
|
{
|
|
struct enumerator *ptr;
|
|
return Data_Make_Struct(klass, struct enumerator,
|
|
enumerator_mark, -1, ptr);
|
|
}
|
|
|
|
static VALUE
|
|
enumerator_init(VALUE enum_obj, VALUE obj, VALUE meth, int argc, VALUE *argv)
|
|
{
|
|
struct enumerator *ptr = enumerator_ptr(enum_obj);
|
|
|
|
ptr->method = rb_obj_method(obj, meth);
|
|
if (rb_block_given_p()) {
|
|
ptr->proc = rb_block_proc();
|
|
ptr->iter = enumerator_iter_i;
|
|
}
|
|
else {
|
|
ptr->iter = (VALUE (*)(VALUE, struct enumerator *))rb_yield;
|
|
}
|
|
if (argc) ptr->args = rb_ary_new4(argc, argv);
|
|
|
|
return enum_obj;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* Enumerable::Enumerator.new(obj, method = :each, *args)
|
|
*
|
|
* Creates a new Enumerable::Enumerator object, which is to be
|
|
* used as an Enumerable object using the given object's given
|
|
* method with the given arguments.
|
|
*
|
|
* e.g.:
|
|
* str = "xyz"
|
|
*
|
|
* enum = Enumerable::Enumerator.new(str, :each_byte)
|
|
* a = enum.map {|b| '%02x' % b } #=> ["78", "79", "7a"]
|
|
*
|
|
*/
|
|
static VALUE
|
|
enumerator_initialize(int argc, VALUE *argv, VALUE obj)
|
|
{
|
|
VALUE recv, meth = sym_each;
|
|
|
|
if (argc == 0)
|
|
rb_raise(rb_eArgError, "wrong number of argument (0 for 1)");
|
|
recv = *argv++;
|
|
if (--argc) {
|
|
meth = *argv++;
|
|
--argc;
|
|
}
|
|
return enumerator_init(obj, recv, meth, argc, argv);
|
|
}
|
|
|
|
VALUE
|
|
rb_enumeratorize(VALUE obj, VALUE meth, int argc, VALUE *argv)
|
|
{
|
|
return enumerator_init(enumerator_allocate(rb_cEnumerator), obj, meth, argc, argv);
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* enum.each {...}
|
|
*
|
|
* Iterates the given block using the object and the method specified
|
|
* in the first place.
|
|
*
|
|
*/
|
|
static VALUE
|
|
enumerator_each(VALUE obj)
|
|
{
|
|
struct enumerator *e;
|
|
int argc = 0;
|
|
VALUE *argv = 0;
|
|
|
|
if (!rb_block_given_p()) return obj;
|
|
e = enumerator_ptr(obj);
|
|
if (e->args) {
|
|
argc = RARRAY(e->args)->len;
|
|
argv = RARRAY(e->args)->ptr;
|
|
}
|
|
return rb_block_call(e->method, rb_intern("call"), argc, argv, e->iter, (VALUE)e);
|
|
}
|
|
|
|
static VALUE
|
|
enumerator_with_index_i(VALUE val, VALUE *memo)
|
|
{
|
|
val = rb_yield_values(2, val, INT2FIX(*memo));
|
|
++*memo;
|
|
return val;
|
|
}
|
|
|
|
/*
|
|
* call-seq:
|
|
* e.with_index {|(*args), idx| ... }
|
|
*
|
|
* Iterates the given block for each elements with an index, which
|
|
* start from 0.
|
|
*
|
|
*/
|
|
static VALUE
|
|
enumerator_with_index(VALUE obj)
|
|
{
|
|
struct enumerator *e = enumerator_ptr(obj);
|
|
VALUE memo = 0;
|
|
int argc = 0;
|
|
VALUE *argv = 0;
|
|
|
|
if (e->args) {
|
|
argc = RARRAY(e->args)->len;
|
|
argv = RARRAY(e->args)->ptr;
|
|
}
|
|
return rb_block_call(e->method, rb_intern("call"), argc, argv,
|
|
enumerator_with_index_i, (VALUE)&memo);
|
|
}
|
|
|
|
void
|
|
Init_Enumerator(void)
|
|
{
|
|
rb_define_method(rb_mKernel, "to_enum", obj_to_enum, -1);
|
|
rb_define_method(rb_mKernel, "enum_for", obj_to_enum, -1);
|
|
|
|
rb_define_method(rb_mEnumerable, "enum_with_index", enumerator_enum_with_index, 0);
|
|
rb_define_method(rb_mEnumerable, "each_slice", enum_each_slice, 1);
|
|
rb_define_method(rb_mEnumerable, "enum_slice", enumerator_enum_slice, 1);
|
|
rb_define_method(rb_mEnumerable, "each_cons", enum_each_cons, 1);
|
|
rb_define_method(rb_mEnumerable, "enum_cons", enumerator_enum_cons, 1);
|
|
|
|
rb_cEnumerator = rb_define_class_under(rb_mEnumerable, "Enumerator", rb_cObject);
|
|
rb_include_module(rb_cEnumerator, rb_mEnumerable);
|
|
|
|
rb_define_alloc_func(rb_cEnumerator, enumerator_allocate);
|
|
rb_define_method(rb_cEnumerator, "initialize", enumerator_initialize, -1);
|
|
rb_define_method(rb_cEnumerator, "each", enumerator_each, 0);
|
|
rb_define_method(rb_cEnumerator, "with_index", enumerator_with_index, 0);
|
|
|
|
sym_each = ID2SYM(rb_intern("each"));
|
|
sym_each_with_index = ID2SYM(rb_intern("each_with_index"));
|
|
sym_each_slice = ID2SYM(rb_intern("each_slice"));
|
|
sym_each_cons = ID2SYM(rb_intern("each_cons"));
|
|
|
|
rb_provide("enumerator.so"); /* for backward compatibility */
|
|
}
|