[ruby-dev:27394] Re: fail on test/rss

なかだです。

At Wed, 21 Sep 2005 02:11:44 +0900,
Yukihiro Matsumoto wrote in [ruby-dev:27240]:
> |> 考えた挙げ句、以下のようにするのが良いのではないかと思いました。
> |> 
> |>   * nil.to_aをなくす(Object#to_aもなくなったし、あんまり意味
> |>     がない)
> |>   * splatの変換はto_aを使う
> |>   * to_aのないオブジェクトの変換はエラー
> |
> |to_aryは使わずにto_aだけ、ということでしょうか。それとも以前の
> |ようにto_aryがなければto_aを使う?
> 
> 最初からto_aだけです。nil.to_aはなくさなくてもいいかもしれま
> せん。

nil.to_aはなくなってしまったようですが、いくつか依存しているものがあり
ます。


Index: lib/scanf.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/lib/scanf.rb,v
retrieving revision 1.7
diff -U2 -p -r1.7 scanf.rb
--- lib/scanf.rb	6 Mar 2004 02:14:33 -0000	1.7
+++ lib/scanf.rb	6 Oct 2005 01:28:37 -0000
@@ -468,9 +468,9 @@ module Scanf
 
     def letter
-      /%\*?\d*([a-z\[])/.match(@spec_string).to_a[1]
+      @spec_string[/%\*?\d*([a-z\[])/, 1]
     end
 
     def width
-      w = /%\*?(\d+)/.match(@spec_string).to_a[1]
+      w = @spec_string[/%\*?(\d+)/, 1]
       w && w.to_i
     end
Index: ext/nkf/lib/kconv.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/ext/nkf/lib/kconv.rb,v
retrieving revision 1.12
diff -U2 -p -r1.12 kconv.rb
--- ext/nkf/lib/kconv.rb	17 Aug 2005 12:59:57 -0000	1.12
+++ ext/nkf/lib/kconv.rb	6 Oct 2005 01:32:18 -0000
@@ -114,5 +114,5 @@ module Kconv
     to = symbol_to_option(option[0])
     from = symbol_to_option(option[1]).to_s.sub(/(-[jesw])/o){$1.upcase}
-    opt = option[2..-1].to_a.flatten.map{|x|symbol_to_option(x)}.compact.join(' ')
+    opt = option[2..-1] and opt = opt.flatten.map{|x|symbol_to_option(x)}.compact.join(' ')
     
     nkf_opt = '-x -m0 %s %s %s' % [to, from, opt]
Index: test/ruby/test_assignment.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/test/ruby/test_assignment.rb,v
retrieving revision 1.7
diff -U2 -p -r1.7 test_assignment.rb
--- test/ruby/test_assignment.rb	3 Mar 2004 23:08:45 -0000	1.7
+++ test/ruby/test_assignment.rb	6 Oct 2005 02:15:25 -0000
@@ -30,6 +30,4 @@ class TestAssignment < Test::Unit::TestC
     a = [*[1,2]]; assert_equal([1,2], a)
 
-    a = *nil; assert_nil(a)
-    a = *1; assert_equal(1, a)
     a = *[]; assert_nil(a)
     a = *[1]; assert_equal(1, a)
@@ -52,6 +50,4 @@ class TestAssignment < Test::Unit::TestC
     *a = [*[1,2]]; assert_equal([[1,2]], a)
 
-    *a = *nil; assert_equal([nil], a)
-    *a = *1; assert_equal([1], a)
     *a = *[]; assert_equal([], a)
     *a = *[1]; assert_equal([1], a)
@@ -74,6 +70,4 @@ class TestAssignment < Test::Unit::TestC
     a,b,*c = [*[1,2]]; assert_equal([1,2,[]], [a,b,c])
 
-    a,b,*c = *nil; assert_equal([nil,nil,[]], [a,b,c])
-    a,b,*c = *1; assert_equal([1,nil,[]], [a,b,c])
     a,b,*c = *[]; assert_equal([nil,nil,[]], [a,b,c])
     a,b,*c = *[1]; assert_equal([1,nil,[]], [a,b,c])
@@ -97,6 +91,4 @@ class TestAssignment < Test::Unit::TestC
     def f; yield([*[1,2]]); end; f {|a| assert_equal([1,2], a)}; undef f
 
-    def f; yield(*nil); end; f {|a| assert_nil(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_nil(a)}; undef f
@@ -116,6 +108,4 @@ class TestAssignment < Test::Unit::TestC
     def f; yield([*[1,2]]); end; f {|*a| assert_equal([[1,2]], 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
@@ -137,6 +127,4 @@ class TestAssignment < Test::Unit::TestC
     def f; yield([*[1,2]]); end; f {|a,b,*c| assert_equal([1,2,[]], [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(*1); end; f {|a,b,*c| assert_equal([1,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
@@ -160,6 +148,4 @@ class TestAssignment < Test::Unit::TestC
     def r; return [*[1,2]]; end; a = r(); assert_equal([1,2], a); undef r
 
-    def r; return *nil; end; a = r(); assert_nil(a); undef r
-    def r; return *1; end; a = r(); assert_equal(1, a); undef r
     def r; return *[]; end; a = r(); assert_nil(a); undef r
     def r; return *[1]; end; a = r(); assert_equal(1, a); undef r
@@ -170,12 +156,5 @@ class TestAssignment < Test::Unit::TestC
     def r; return *[*[1,2]]; end; a = r(); assert_equal([1,2], a); undef r
 
-    def r; return *nil; end; a = *r(); assert_nil(a); undef r
-    def r; return *1; end; a = *r(); assert_equal(1, a); undef r
-    def r; return *[]; end; a = *r(); assert_nil(a); undef r
-    def r; return *[1]; end; a = *r(); assert_equal(1, a); undef r
-    def r; return *[nil]; end; a = *r(); assert_nil(a); undef r
     def r; return *[[]]; end; a = *r(); assert_nil(a); undef r
-    def r; return *[*[]]; end; a = *r(); assert_nil(a); undef r
-    def r; return *[*[1]]; end; a = *r(); assert_equal(1, a); undef r
     def r; return *[*[1,2]]; end; a = *r(); assert_equal([1,2], a); undef r
 
@@ -192,6 +171,4 @@ class TestAssignment < Test::Unit::TestC
     def r; return [*[1,2]]; end; *a = r(); assert_equal([[1,2]], a); undef r
 
-    def r; return *nil; end; *a = r(); assert_equal([nil], a); undef r
-    def r; return *1; end; *a = r(); assert_equal([1], a); undef r
     def r; return *[]; end; *a = r(); assert_equal([nil], a); undef r
     def r; return *[1]; end; *a = r(); assert_equal([1], a); undef r
@@ -203,13 +180,6 @@ class TestAssignment < Test::Unit::TestC
     def r; return *[*[1,2]]; end; *a = r(); assert_equal([[1,2]], a); undef r
 
-    def r; return *nil; end; *a = *r(); assert_equal([nil], a); undef r
-    def r; return *1; end; *a = *r(); assert_equal([1], a); undef r
-    def r; return *[]; end; *a = *r(); assert_equal([nil], a); undef r
-    def r; return *[1]; end; *a = *r(); assert_equal([1], a); undef r
-    def r; return *[nil]; end; *a = *r(); assert_equal([nil], a); undef r
     def r; return *[[]]; end; *a = *r(); assert_equal([], a); undef r
     def r; return *[1,2]; end; *a = *r(); assert_equal([1,2], a); undef r
-    def r; return *[*[]]; end; *a = *r(); assert_equal([nil], a); undef r
-    def r; return *[*[1]]; end; *a = *r(); assert_equal([1], a); undef r
     def r; return *[*[1,2]]; end; *a = *r(); assert_equal([1,2], a); undef r
 
@@ -226,6 +196,4 @@ class TestAssignment < Test::Unit::TestC
     def r; return [*[1,2]]; end; a,b,*c = r(); assert_equal([1,2,[]], [a,b,c]); undef r
 
-    def r; return *nil; end; a,b,*c = r(); assert_equal([nil,nil,[]], [a,b,c]); undef r
-    def r; return *1; end; a,b,*c = r(); assert_equal([1,nil,[]], [a,b,c]); undef r
     def r; return *[]; end; a,b,*c = r(); assert_equal([nil,nil,[]], [a,b,c]); undef r
     def r; return *[1]; end; a,b,*c = r(); assert_equal([1,nil,[]], [a,b,c]); undef r
@@ -293,6 +261,4 @@ class TestAssignment < Test::Unit::TestC
     a = loop do break [*[1,2]]; end; assert_equal([1,2], a)
 
-    a = loop do break *nil; end; assert_nil(a)
-    a = loop do break *1; end; assert_equal(1, a)
     a = loop do break *[]; end; assert_nil(a)
     a = loop do break *[1]; end; assert_equal(1, a)
@@ -315,6 +281,4 @@ class TestAssignment < Test::Unit::TestC
     *a = loop do break [*[1,2]]; end; assert_equal([[1,2]], a)
 
-    *a = loop do break *nil; end; assert_equal([nil], a)
-    *a = loop do break *1; end; assert_equal([1], a)
     *a = loop do break *[]; end; assert_equal([nil], a)
     *a = loop do break *[1]; end; assert_equal([1], a)
@@ -326,13 +290,6 @@ class TestAssignment < Test::Unit::TestC
     *a = loop do break *[*[1,2]]; end; assert_equal([[1,2]], a)
 
-    *a = *loop do break *nil; end; assert_equal([nil], a)
-    *a = *loop do break *1; end; assert_equal([1], a)
-    *a = *loop do break *[]; end; assert_equal([nil], a)
-    *a = *loop do break *[1]; end; assert_equal([1], a)
-    *a = *loop do break *[nil]; end; assert_equal([nil], a)
     *a = *loop do break *[[]]; end; assert_equal([], a)
     *a = *loop do break *[1,2]; end; assert_equal([1,2], a)
-    *a = *loop do break *[*[]]; end; assert_equal([nil], a)
-    *a = *loop do break *[*[1]]; end; assert_equal([1], a)
     *a = *loop do break *[*[1,2]]; end; assert_equal([1,2], a)
 
@@ -349,6 +306,4 @@ class TestAssignment < Test::Unit::TestC
     a,b,*c = loop do break [*[1,2]]; end; assert_equal([1,2,[]], [a,b,c])
 
-    a,b,*c = loop do break *nil; end; assert_equal([nil,nil,[]], [a,b,c])
-    a,b,*c = loop do break *1; end; assert_equal([1,nil,[]], [a,b,c])
     a,b,*c = loop do break *[]; end; assert_equal([nil,nil,[]], [a,b,c])
     a,b,*c = loop do break *[1]; end; assert_equal([1,nil,[]], [a,b,c])
@@ -374,6 +329,4 @@ class TestAssignment < Test::Unit::TestC
     r([1,2]){next [*[1,2]]}
 
-    r(nil){next *nil}
-    r(1){next *1}
     r(nil){next *[]}
     r(1){next *[1]}
@@ -400,13 +353,6 @@ class TestAssignment < Test::Unit::TestC
 
     def r(val); *a = *yield(); assert_equal(val, a); end
-    r([nil]){next *nil}
-    r([1]){next *1}
-    r([nil]){next *[]}
-    r([1]){next *[1]}
-    r([nil]){next *[nil]}
     r([]){next *[[]]}
     r([1,2]){next *[1,2]}
-    r([nil]){next *[*[]]}
-    r([1]){next *[*[1]]}
     r([1,2]){next *[*[1,2]]}
     undef r
@@ -427,13 +373,6 @@ class TestAssignment < Test::Unit::TestC
 
     def r(val); a,b,*c = *yield(); assert_equal(val, [a,b,c]); end
-    r([nil,nil,[]]){next *nil}
-    r([1,nil,[]]){next *1}
-    r([nil,nil,[]]){next *[]}
-    r([1,nil,[]]){next *[1]}
-    r([nil,nil,[]]){next *[nil]}
     r([nil,nil,[]]){next *[[]]}
     r([1,2,[]]){next *[1,2]}
-    r([nil,nil,[]]){next *[*[]]}
-    r([1,nil,[]]){next *[*[1]]}
     r([1,2,[]]){next *[*[1,2]]}
     undef r
Index: test/ruby/test_iterator.rb
===================================================================
RCS file: /cvs/ruby/src/ruby/test/ruby/test_iterator.rb,v
retrieving revision 1.18
diff -U2 -p -r1.18 test_iterator.rb
--- test/ruby/test_iterator.rb	17 Aug 2005 12:35:50 -0000	1.18
+++ test/ruby/test_iterator.rb	6 Oct 2005 02:23:00 -0000
@@ -150,9 +150,7 @@ class TestIterator < Test::Unit::TestCas
     IterTest.new([1]).each1 {|x| assert_equal(1, x)}
     IterTest.new([2]).each2 {|x| assert_equal([2], x)}
-    IterTest.new([3]).each3 {|x| assert_equal(3, x)}
     IterTest.new([4]).each4 {|x| assert_equal(4, x)}
     IterTest.new([5]).each5 {|x| assert_equal(5, x)}
     IterTest.new([6]).each6 {|x| assert_equal([6], x)}
-    IterTest.new([7]).each7 {|x| assert_equal(7, x)}
     IterTest.new([8]).each8 {|x| assert_equal(8, x)}
 


-- 
--- 僕の前にBugはない。
--- 僕の後ろにBugはできる。
    中田 伸悦