* eval.c (rb_iterate): need to PUSH_ITER in proper order.

  [ruby-core:10125]

* test/ruby/test_iterator.rb (TestIterator::test_block_given_within_iterator):
  add new test.  [ruby-core:10125]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@11606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 2 insertions, 2 deletions

diff --git a/eval.c b/eval.c
index a1ca15958..19d3b0489 100644
--- a/eval.c
+++ b/eval.c
@@ -5284,9 +5284,9 @@ rb_iterate(it_proc, data1, bl_proc, data2)
     NODE *node = NEW_IFUNC(bl_proc, data2);
     VALUE self = ruby_top_self;
 
-    PUSH_ITER(ITER_PRE);
     PUSH_TAG(PROT_LOOP);
     PUSH_BLOCK(0, node);
+    PUSH_ITER(ITER_PRE);
     state = EXEC_TAG();
     if (state == 0) {
   iter_retry:
@@ -5300,9 +5300,9 @@ rb_iterate(it_proc, data1, bl_proc, data2)
 	state = 0;
 	goto iter_retry;
     }
+    POP_ITER();
     POP_BLOCK();
     POP_TAG();
-    POP_ITER();
 
     switch (state) {
       case 0: