mirror of
https://github.com/ruby/ruby.git
synced 2025-09-15 08:33:58 +02:00
* compile.c (iseq_compile_each): remove "retry" in block.
("iter{retry}" cause syntax error) Currently, "begin; ...; rescue; iter{retry}; end" cause syntax error too. * bootstraptest/test_jump.rb: ditto. * lib/drb/invokemethod.rb: ditto. * sample/drb/darrayc.rb: ditto. * sample/test.rb: ditto. * test/drb/drbtest.rb: ditto. * test/ruby/test_iterator.rb: ditto. * sample/test.rb: add a 'test' directory on the SYSTEM test. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14326 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
def4a99af2
commit
860b40fd63
8 changed files with 45 additions and 62 deletions
|
@ -305,18 +305,19 @@ module DRbAry
|
|||
assert_equal([1, 2, 'III', 'III', 4, 'five', 6], ary)
|
||||
end
|
||||
|
||||
def test_04_retry
|
||||
retried = false
|
||||
ary = []
|
||||
@there.each do |x|
|
||||
ary.push x
|
||||
if x == 4 && !retried
|
||||
retried = true
|
||||
retry
|
||||
end
|
||||
end
|
||||
assert_equal([1, 2, 'III', 4, 1, 2, 'III', 4, 'five', 6], ary)
|
||||
end
|
||||
# retry in block is not supported on ruby 1.9
|
||||
#def test_04_retry
|
||||
# retried = false
|
||||
# ary = []
|
||||
# @there.each do |x|
|
||||
# ary.push x
|
||||
# if x == 4 && !retried
|
||||
# retried = true
|
||||
# retry
|
||||
# end
|
||||
# end
|
||||
# assert_equal([1, 2, 'III', 4, 1, 2, 'III', 4, 'five', 6], ary)
|
||||
#end
|
||||
|
||||
def test_05_break
|
||||
ary = []
|
||||
|
|
|
@ -69,7 +69,7 @@ class TestIterator < Test::Unit::TestCase
|
|||
end
|
||||
end
|
||||
|
||||
# iterator break/redo/next/retry
|
||||
# iterator break/redo/next
|
||||
def test_break
|
||||
done = true
|
||||
loop{
|
||||
|
@ -104,18 +104,6 @@ class TestIterator < Test::Unit::TestCase
|
|||
end
|
||||
assert_equal(7, $x.size)
|
||||
assert_equal([1, 2, 3, 4, 5, 6, 7], $x)
|
||||
|
||||
$done = false
|
||||
$x = []
|
||||
for i in 1 .. 7 # see how retry works in iterator loop
|
||||
if i == 4 and not $done
|
||||
$done = true
|
||||
retry
|
||||
end
|
||||
$x.push(i)
|
||||
end
|
||||
assert_equal(10, $x.size)
|
||||
assert_equal([1, 2, 3, 1, 2, 3, 4, 5, 6, 7], $x)
|
||||
end
|
||||
|
||||
def test_append_method_to_built_in_class
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue