From 7567fbf080552e04df4b5d2af9d601cf1d345b11 Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 15 Jun 2007 03:27:33 +0000
Subject: * vm.c (th_yield_setup_args): |v| should work as |v,|.   ex) def
 m;yield 1, 2; end; m{|v| p v} #=> 1 * parse.y: apply above change for "for"
 statement. * test/ruby/test_assignment.rb: ditto *
 test/ruby/test_basicinstructions.rb: ditto. * test/ruby/test_iterator.rb:
 ditto. * test/ruby/test_yield.rb: ditto. * compile.c (iseq_compile_each): fix
 debug.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12544 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/ruby/test_assignment.rb        | 26 +++++++++++++-------------
 test/ruby/test_basicinstructions.rb |  4 ++--
 test/ruby/test_iterator.rb          |  3 ++-
 test/ruby/test_yield.rb             |  4 ++--
 4 files changed, 19 insertions(+), 18 deletions(-)

(limited to 'test')

diff --git a/test/ruby/test_assignment.rb b/test/ruby/test_assignment.rb
index 69db708187..966757bc98 100644
--- a/test/ruby/test_assignment.rb
+++ b/test/ruby/test_assignment.rb
@@ -90,22 +90,22 @@ class TestAssignment < Test::Unit::TestCase
     def f; yield([*[1]]); end; f {|a| assert_equal([1], a)}; undef f
     def f; yield([*[1,2]]); end; f {|a| assert_equal([1,2], a)}; undef f
 
-    def f; yield(*[1]); end; f {|a| assert_equal([1], a)}; undef f
-    def f; yield(*[nil]); end; f {|a| assert_equal([nil], a)}; undef f
-    def f; yield(*[[]]); end; f {|a| assert_equal([[]], a)}; undef f
-    def f; yield(*[*[1]]); end; f {|a| assert_equal([1], a)}; undef f
+    def f; yield(*[1]); end; f {|a| assert_equal(1, a)}; undef f
+    def f; yield(*[nil]); end; f {|a| assert_equal(nil, a)}; undef f
+    def f; yield(*[[]]); end; f {|a| assert_equal([], a)}; undef f
+    def f; yield(*[*[1]]); end; f {|a| assert_equal(1, a)}; undef f
 
     def f; yield; end; f {|*a| assert_equal([], a)}; undef f
     def f; yield(nil); end; f {|*a| assert_equal([nil], a)}; undef f
     def f; yield(1); end; f {|*a| assert_equal([1], a)}; undef f
-    def f; yield([]); end; f {|*a| assert_equal([], a)}; undef f
-    def f; yield([1]); end; f {|*a| assert_equal([1], a)}; undef f
-    def f; yield([nil]); end; f {|*a| assert_equal([nil], a)}; undef f
-    def f; yield([[]]); end; f {|*a| assert_equal([[]], a)}; undef f
-    def f; yield([1,2]); end; f {|*a| assert_equal([1,2], a)}; undef f
-    def f; yield([*[]]); end; f {|*a| assert_equal([], a)}; undef f
-    def f; yield([*[1]]); end; f {|*a| assert_equal([1], a)}; undef f
-    def f; yield([*[1,2]]); end; f {|*a| assert_equal([1,2], a)}; undef f
+    def f; yield([]); end; f {|*a| assert_equal([[]], a)}; undef f
+    def f; yield([1]); end; f {|*a| assert_equal([[1]], a)}; undef f
+    def f; yield([nil]); end; f {|*a| assert_equal([[nil]], a)}; undef f
+    def f; yield([[]]); end; f {|*a| assert_equal([[[]]], a)}; undef f
+    def f; yield([1,2]); end; f {|*a| assert_equal([[1,2]], a)}; undef f
+    def f; yield([*[]]); end; f {|*a| assert_equal([[]], a)}; undef f
+    def f; yield([*[1]]); end; f {|*a| assert_equal([[1]], a)}; undef f
+    def f; yield([*[1,2]]); end; f {|*a| assert_equal([[1,2]], a)}; undef f
 
     def f; yield(*[]); end; f {|*a| assert_equal([], a)}; undef f
     def f; yield(*[1]); end; f {|*a| assert_equal([1], a)}; undef f
@@ -129,7 +129,7 @@ class TestAssignment < Test::Unit::TestCase
     def f; yield(*[]); end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])}; undef f
     def f; yield(*[1]); end; f {|a,b,*c| assert_equal([1,nil,[]], [a,b,c])}; undef f
     def f; yield(*[nil]); end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])}; undef f
-    def f; yield(*[[]]); end; f {|a,b,*c| assert_equal([[],nil,[]], [a,b,c])}; undef f
+    def f; yield(*[[]]); end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])}; undef f
     def f; yield(*[*[]]); end; f {|a,b,*c| assert_equal([nil,nil,[]], [a,b,c])}; undef f
     def f; yield(*[*[1]]); end; f {|a,b,*c| assert_equal([1,nil,[]], [a,b,c])}; undef f
     def f; yield(*[*[1,2]]); end; f {|a,b,*c| assert_equal([1,2,[]], [a,b,c])}; undef f
diff --git a/test/ruby/test_basicinstructions.rb b/test/ruby/test_basicinstructions.rb
index 3e52ef62d3..4d3f03049f 100644
--- a/test/ruby/test_basicinstructions.rb
+++ b/test/ruby/test_basicinstructions.rb
@@ -621,8 +621,8 @@ class TestBasicInstructions < Test::Unit::TestCase
     assert_equal [1, 2, 3], [1, *a]
 
     a = nil
-    assert_equal [nil], [*a]       # FIXME: []? [nil]?  error?
-    assert_equal [1], [1, *a]   # FIXME: [1, nil]?  error?
+    assert_equal [], [*a]
+    assert_equal [1], [1, *a]
   end
 
 end
diff --git a/test/ruby/test_iterator.rb b/test/ruby/test_iterator.rb
index cc0fe76d7b..19677a4fd9 100644
--- a/test/ruby/test_iterator.rb
+++ b/test/ruby/test_iterator.rb
@@ -365,7 +365,7 @@ class TestIterator < Test::Unit::TestCase
 
   def test_assoc_yield
     [{:key=>:value}, H.new].each {|h|
-      h.each{|a| assert_equal([:key, :value], a)}
+      h.each{|a| assert_equal(:key, a)} # changed at 1.9
       h.each{|*a| assert_equal([:key, :value], a)}
       h.each{|k,v| assert_equal([:key, :value], [k,v])}
     }
@@ -480,3 +480,4 @@ class TestIterator < Test::Unit::TestCase
     assert_equal(["b"], ["a", "b", "c"].grep(IterString.new("b")) {|s| s})
   end
 end
+GC.stress=true
diff --git a/test/ruby/test_yield.rb b/test/ruby/test_yield.rb
index bc00407e4d..e5e288be1a 100644
--- a/test/ruby/test_yield.rb
+++ b/test/ruby/test_yield.rb
@@ -16,8 +16,8 @@ class TestRubyYield < Test::Unit::TestCase
       assert_equal :a, k
       assert_equal 1, v
     end
-    h.each do |kv|
-      assert_equal [:a, 1], kv
+    h.each do |k|
+      assert_equal :a, k # changed at 1.9
     end
   end
 
-- 
cgit v1.2.3