diff options
| -rw-r--r-- | enumerator.c | 16 | ||||
| -rw-r--r-- | test/ruby/test_enumerator.rb | 10 |
2 files changed, 24 insertions, 2 deletions
diff --git a/enumerator.c b/enumerator.c index 252333f303..0e010c14c2 100644 --- a/enumerator.c +++ b/enumerator.c @@ -85,12 +85,16 @@ * puts e.next # => 3 * puts e.next # raises StopIteration * - * +next+, +next_values+, +peek+ and +peek_values+ are the only methods - * which use external iteration (and Array#zip(Enumerable-not-Array) which uses +next+). + * +next+, +next_values+, +peek+, and +peek_values+ are the only methods + * which use external iteration (and Array#zip(Enumerable-not-Array) which uses +next+ internally). * * These methods do not affect other internal enumeration methods, * unless the underlying iteration method itself has side-effect, e.g. IO#each_line. * + * FrozenError will be raised if these methods are called against a frozen enumerator. + * Since +rewind+ and +feed+ also change state for external iteration, + * these methods may raise FrozenError too. + * * External iteration differs *significantly* from internal iteration * due to using a Fiber: * - The Fiber adds some overhead compared to internal enumeration. @@ -869,6 +873,8 @@ enumerator_next_values(VALUE obj) struct enumerator *e = enumerator_ptr(obj); VALUE vs; + rb_check_frozen(obj); + if (!UNDEF_P(e->lookahead)) { vs = e->lookahead; e->lookahead = Qundef; @@ -930,6 +936,8 @@ enumerator_peek_values(VALUE obj) { struct enumerator *e = enumerator_ptr(obj); + rb_check_frozen(obj); + if (UNDEF_P(e->lookahead)) { e->lookahead = get_next_values(obj, e); } @@ -1054,6 +1062,8 @@ enumerator_feed(VALUE obj, VALUE v) { struct enumerator *e = enumerator_ptr(obj); + rb_check_frozen(obj); + if (!UNDEF_P(e->feedvalue)) { rb_raise(rb_eTypeError, "feed value already set"); } @@ -1076,6 +1086,8 @@ enumerator_rewind(VALUE obj) { struct enumerator *e = enumerator_ptr(obj); + rb_check_frozen(obj); + rb_check_funcall(e->obj, id_rewind, 0, 0); e->fib = 0; diff --git a/test/ruby/test_enumerator.rb b/test/ruby/test_enumerator.rb index bbaa91b703..d0dc3a8bc4 100644 --- a/test/ruby/test_enumerator.rb +++ b/test/ruby/test_enumerator.rb @@ -1008,4 +1008,14 @@ class TestEnumerator < Test::Unit::TestCase Enumerator.product(1..3, foo: 1, bar: 2) } end + + def test_freeze + e = 3.times.freeze + assert_raise(FrozenError) { e.next } + assert_raise(FrozenError) { e.next_values } + assert_raise(FrozenError) { e.peek } + assert_raise(FrozenError) { e.peek_values } + assert_raise(FrozenError) { e.feed 1 } + assert_raise(FrozenError) { e.rewind } + end end |