diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ext/readline/README.ja | 2 | ||||
| -rw-r--r-- | golf_prelude.rb | 4 | ||||
| -rw-r--r-- | lib/rinda/tuplespace.rb | 2 | ||||
| -rw-r--r-- | lib/set.rb | 2 | ||||
| -rw-r--r-- | test/readline/test_readline_history.rb | 2 | ||||
| -rw-r--r-- | test/ruby/test_array.rb | 2 | ||||
| -rw-r--r-- | test/ruby/test_enumerator.rb | 4 |
8 files changed, 20 insertions, 9 deletions
@@ -1,3 +1,14 @@ +Wed Aug 13 17:01:36 2008 Akinori MUSHA <knu@iDaemons.org> + + * golf_prelude.rb, lib/set.rb (TC_Set#test_each), + test/readline/test_readline_history.rb (Readline#test_each__enumerator), + test/ruby/test_array.rb (TestArray#test_collect), + test/ruby/test_enumerator.rb (TestEnumerator#test_initialize): + Enumerable::Enumerator is now called Enumerator. + + * lib/rinda/tuplespace.rb (Rinda::TupleBag#initialize): Use + enum_for instead of hardcoding Enumerable::Enumerator. + Wed Aug 13 16:40:57 2008 Koichi Sasada <ko1@atdot.net> * thread.c, vm_core.h: add manual priority support diff --git a/ext/readline/README.ja b/ext/readline/README.ja index fda469d07a..3c6c6f3d33 100644 --- a/ext/readline/README.ja +++ b/ext/readline/README.ja @@ -385,7 +385,7 @@ HISTORY * HISTORY << string -> self * HISTORY.pop -> string * HISTORY.shift -> string - * HISTORY.each -> Enumerable::Enumerator + * HISTORY.each -> Enumerator * HISTORY.each { |i| } -> [string] * HISTORY.length -> Integer * HISTORY.empty? -> true or false diff --git a/golf_prelude.rb b/golf_prelude.rb index a224a5a6c7..15c1832a39 100644 --- a/golf_prelude.rb +++ b/golf_prelude.rb @@ -84,7 +84,7 @@ class String replace(a.join) if result.class == Array Integer===result[0] ? result.pack('c*') : result.join - elsif result.class == Enumerable::Enumerator + elsif result.class == Enumerator result.map(&:join).to_enum else result @@ -93,7 +93,7 @@ class String } end -class Enumerable::Enumerator +class Enumerator alias old_to_s to_s (Array.instance_methods-instance_methods-[:replace]+[:to_s]).each{|meth| eval"def #{meth}(*args, &block) diff --git a/lib/rinda/tuplespace.rb b/lib/rinda/tuplespace.rb index b0409dde3b..6ca30a7b4b 100644 --- a/lib/rinda/tuplespace.rb +++ b/lib/rinda/tuplespace.rb @@ -315,7 +315,7 @@ module Rinda def initialize # :nodoc: @hash = {} - @enum = Enumerable::Enumerator.new(self, :each_entry) + @enum = enum_for(:each_entry) end ## diff --git a/lib/set.rb b/lib/set.rb index 1a36b9cc01..f930c5e4a9 100644 --- a/lib/set.rb +++ b/lib/set.rb @@ -941,7 +941,7 @@ class TC_Set < Test::Unit::TestCase assert_same(set, ret) e = set.each - assert_instance_of(Enumerable::Enumerator, e) + assert_instance_of(Enumerator, e) assert_nothing_raised { set.each { |o| diff --git a/test/readline/test_readline_history.rb b/test/readline/test_readline_history.rb index 0235a4ec90..8033a9a827 100644 --- a/test/readline/test_readline_history.rb +++ b/test/readline/test_readline_history.rb @@ -219,7 +219,7 @@ class Readline::TestHistory < Test::Unit::TestCase def test_each__enumerator e = HISTORY.each - assert_instance_of(Enumerable::Enumerator, e) + assert_instance_of(Enumerator, e) end def test_length diff --git a/test/ruby/test_array.rb b/test/ruby/test_array.rb index 1139e36900..234fb238a2 100644 --- a/test/ruby/test_array.rb +++ b/test/ruby/test_array.rb @@ -479,7 +479,7 @@ class TestArray < Test::Unit::TestCase # Ruby 1.9 feature change: # Enumerable#collect without block returns an Enumerator. #assert_equal([1, 2, 3], @cls[1, 2, 3].collect) - assert_kind_of Enumerable::Enumerator, @cls[1, 2, 3].collect + assert_kind_of Enumerator, @cls[1, 2, 3].collect end # also update map! diff --git a/test/ruby/test_enumerator.rb b/test/ruby/test_enumerator.rb index 07a54e8233..d1e75208f8 100644 --- a/test/ruby/test_enumerator.rb +++ b/test/ruby/test_enumerator.rb @@ -57,8 +57,8 @@ class TestEnumerator < Test::Unit::TestCase def test_initialize assert_equal([1, 2, 3], @obj.to_enum(:foo, 1, 2, 3).to_a) - assert_equal([1, 2, 3], Enumerable::Enumerator.new(@obj, :foo, 1, 2, 3).to_a) - assert_raise(ArgumentError) { Enumerable::Enumerator.new } + assert_equal([1, 2, 3], Enumerator.new(@obj, :foo, 1, 2, 3).to_a) + assert_raise(ArgumentError) { Enumerator.new } end def test_initialize_copy |