diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/enumerator/enumerator.c | 13 |
2 files changed, 10 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Tue Nov 2 16:35:57 2004 Yukihiro Matsumoto <matz@ruby-lang.org> + + * ext/enumerator/enumerator.c (each_cons_i): pass copy of an + internal consequent array. [ruby-talk:118691] + Tue Nov 2 14:54:02 2004 NAKAMURA Usaku <usa@ruby-lang.org> * io.c (pipe_open): need to set cmd if argc == 0 (win32). diff --git a/ext/enumerator/enumerator.c b/ext/enumerator/enumerator.c index 6e47330cef..74785569e7 100644 --- a/ext/enumerator/enumerator.c +++ b/ext/enumerator/enumerator.c @@ -87,15 +87,13 @@ each_cons_i(val, memo) { VALUE ary = memo->u1.value; long size = memo->u3.cnt; - long len = RARRAY(ary)->len; - if (len == size) { + if (RARRAY(ary)->len == size) { rb_ary_shift(ary); - rb_ary_push(ary, val); - rb_yield(ary); - } else { - rb_ary_push(ary, val); - if (len + 1 == size) rb_yield(ary); + } + rb_ary_push(ary, val); + if (RARRAY(ary)->len == size) { + rb_yield(rb_ary_dup(ary)); } return Qnil; } @@ -106,7 +104,6 @@ enum_each_cons(obj, n) { long size = NUM2LONG(n); NODE *memo; - VALUE ary; if (size <= 0) rb_raise(rb_eArgError, "invalid size"); memo = rb_node_newnode(NODE_MEMO, rb_ary_new2(size), 0, size); |