From dfe8fa1bbcb8f4afb4123a8cf317663e9dd53d6c Mon Sep 17 00:00:00 2001 From: yugui Date: Sat, 13 Dec 2008 01:59:42 +0000 Subject: [PATCH] merges r20607 from trunk into ruby_1_9_1. [ruby-dev:37407] * enumerator.c (enumerator_rewind): If the enclosed object responds to a "rewind" method, call it; cf. [ruby-dev:37268] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20712 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ enumerator.c | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/ChangeLog b/ChangeLog index 14a9a11ca3..13d08af37d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Wed Dec 10 12:56:32 2008 Akinori MUSHA + + * enumerator.c (enumerator_rewind): If the enclosed object + responds to a "rewind" method, call it; cf. [ruby-dev:37268] + Sat Dec 13 09:17:33 2008 Ryan Davis * lib/minitest/*.rb: Imported minitest 1.3.2 r4503. diff --git a/enumerator.c b/enumerator.c index 38b6791503..5dc6eee23a 100644 --- a/enumerator.c +++ b/enumerator.c @@ -22,6 +22,7 @@ */ VALUE rb_cEnumerator; static VALUE sym_each; +static ID id_rewind; VALUE rb_eStopIteration; @@ -532,6 +533,8 @@ enumerator_next(VALUE obj) * e.rewind => e * * Rewinds the enumeration sequence by the next method. + * + * If the enclosed object responds to a "rewind" method, it is called. */ static VALUE @@ -539,6 +542,9 @@ enumerator_rewind(VALUE obj) { struct enumerator *e = enumerator_ptr(obj); + if (rb_respond_to(e->obj, id_rewind)) + rb_funcall(e->obj, id_rewind, 0); + e->fib = 0; e->dst = Qnil; e->no_next = Qfalse; @@ -798,6 +804,7 @@ Init_Enumerator(void) rb_define_method(rb_cYielder, "<<", yielder_yield, -2); sym_each = ID2SYM(rb_intern("each")); + id_rewind = rb_intern("rewind"); rb_provide("enumerator.so"); /* for backward compatibility */ }