kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

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

Browse source 
[ruby-core:10125]

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


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@11606 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-01-31 05:59:23 +00:00
parent 3079f72f42
commit ff46ec3a43
3 changed files with 22 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Wed Jan 31 14:52:09 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* 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]
Tue Jan 30 14:58:51 2007 NAKAMURA Usaku <usa@ruby-lang.org>
* string.c (rb_str_sub_bang): calling rb_str_modify() should be just

4
eval.c
View file

@ -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:

12
test/ruby/test_iterator.rb
View file

@ -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