From 87beea44969367180d255f56c4001348cf41d210 Mon Sep 17 00:00:00 2001 From: matz Date: Tue, 9 Jan 2001 07:26:21 +0000 Subject: * enum.c (enum_inject): new method. * gc.c (rb_gc_call_finalizer_at_exit): clear klass member of terminating object. * eval.c (rb_call): raise exception for terminated object. * bignum.c (bigdivrem): t2 might be too big for signed long; do not use rb_int2big(), but rb_uint2big(). * error.c (rb_load_fail): new func to report LoadError. * ruby.c (load_file): use rb_load_fail. * eval.c (ruby_finalize): should enclosed by PUSH_TAG/POP_TAG. * gc.c (rb_gc_mark): link 2 of NODE_IFUNC should not be explicitly marked. it may contain non object pointer. * re.c (reg_s_last_match): Regexp::last_match(nth) returns nth substring of the match (alternative for $& and $). * eval.c (rb_mod_define_method): wrong comparison for blocks. * gc.c (id2ref): should handle Symbol too. * gc.c (id2ref): should print original ptr value * eval.c (rb_iterate): NODE_CFUNC does not protect its data (nd_tval), so create new node NODE_IFUNC for iteration C function. * eval.c (rb_yield_0): use NODE_IFUNC. * gc.c (rb_gc_mark): support NODE_IFUNC. * gc.c (mem_error): prohibit recursive mem_error(). (ruby-bugs-ja:PR#36) * eval.c (rb_thread_fd_writable): should not switch context if rb_thread_critical is set. * eval.c (rb_thread_wait_fd): ditto. * eval.c (rb_thread_wait_for): ditto. * eval.c (rb_thread_select): ditto. * eval.c (rb_thread_join): join during critical section causes deadlock. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1090 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enum.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'enum.c') diff --git a/enum.c b/enum.c index 4a97811384..11f42c48d7 100644 --- a/enum.c +++ b/enum.c @@ -178,6 +178,24 @@ enum_collect(obj) return tmp; } +static VALUE +inject_i(i, np) + VALUE i; + VALUE *np; +{ + *np = rb_yield(rb_assoc_new(*np, i)); + return Qnil; +} + +static VALUE +enum_inject(obj, n) + VALUE obj, n; +{ + rb_iterate(rb_each, obj, inject_i, (VALUE)&n); + + return n; +} + static VALUE enum_sort(obj) VALUE obj; @@ -339,6 +357,7 @@ Init_Enumerable() rb_define_method(rb_mEnumerable,"reject", enum_reject, 0); rb_define_method(rb_mEnumerable,"collect", enum_collect, 0); rb_define_method(rb_mEnumerable,"map", enum_collect, 0); + rb_define_method(rb_mEnumerable,"inject", enum_inject, 1); rb_define_method(rb_mEnumerable,"min", enum_min, 0); rb_define_method(rb_mEnumerable,"max", enum_max, 0); rb_define_method(rb_mEnumerable,"member?", enum_member, 1); -- cgit v1.2.3