aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--test/ruby/test_iterator.rb9
2 files changed, 11 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 59e513b0a4..8c6fcf5927 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Fri Nov 9 13:45:05 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * test/ruby/test_iterator.rb (TestIterator::IterTest::each):
+ #each_pair is now alias to #each. [ruby-dev:32192]
+
+ * test/ruby/test_iterator.rb (TestIterator::test_assoc_yield):
+ ditto
+
Fri Nov 9 12:56:36 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval_load.c (loaded_feature_path): check with type of given feature.
diff --git a/test/ruby/test_iterator.rb b/test/ruby/test_iterator.rb
index 9d99731a3c..067dd69b80 100644
--- a/test/ruby/test_iterator.rb
+++ b/test/ruby/test_iterator.rb
@@ -361,10 +361,7 @@ class TestIterator < Test::Unit::TestCase
def each
yield [:key, :value]
end
-
- def each_pair
- yield :key, :value
- end
+ alias each_pair each
end
def test_assoc_yield
@@ -373,9 +370,9 @@ class TestIterator < Test::Unit::TestCase
h.each{|a,| assert_equal(:key, a)}
h.each{|*a| assert_equal([[:key, :value]], a)}
h.each{|k,v| assert_equal([:key, :value], [k,v])}
- h.each_pair{|a| assert_equal(:key, a)}
+ h.each_pair{|a| assert_equal([:key, :value], a)}
h.each_pair{|a,| assert_equal(:key, a)}
- h.each_pair{|*a| assert_equal([:key, :value], a)}
+ h.each_pair{|*a| assert_equal([[:key, :value]], a)}
h.each_pair{|k,v| assert_equal([:key, :value], [k,v])}
}
end