* 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, 12 insertions, 0 deletions

diff --git a/test/ruby/test_iterator.rb b/test/ruby/test_iterator.rb
index 638916309..2cd48b29a 100644
--- a/test/ruby/test_iterator.rb
+++ b/test/ruby/test_iterator.rb
@@ -462,4 +462,16 @@ class TestIterator < Test::Unit::TestCase
     assert_equal(ok, result)
     return
   end
+
+  class IterString < ::String
+    def ===(other)
+      super if !block_given?
+    end
+  end
+
+  # Check that the block passed to an iterator
+  # does not get propagated inappropriately
+  def test_block_given_within_iterator
+    assert_equal(["b"], ["a", "b", "c"].grep(IterString.new("b")) {|s| s})
+  end
 end