From b65e3629dad9fba8f37202d3dc0103d9d08c1396 Mon Sep 17 00:00:00 2001 From: eban Date: Mon, 5 May 2003 10:05:11 +0000 Subject: * sample/test.rb: substitute 'select' with 'values_at'. * lib/date.rb: ditto. * lib/parsedate.rb: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3756 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++++++++ lib/date.rb | 4 ++-- lib/parsedate.rb | 2 +- sample/test.rb | 2 +- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 036f198a7d..bb08d23d84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon May 5 18:59:45 2003 WATANABE Hirofumi + + * sample/test.rb: substitute 'select' with 'values_at'. + + * lib/date.rb: ditto. + + * lib/parsedate.rb: ditto. + Mon May 5 00:46:10 2003 Yukihiro Matsumoto * array.c (rb_ary_values_at): new method to replace select(index..). diff --git a/lib/date.rb b/lib/date.rb index e04f0b01b0..b3641516cf 100644 --- a/lib/date.rb +++ b/lib/date.rb @@ -218,7 +218,7 @@ class Date def self.new_with_hash(elem, sg) elem ||= {} - y, m, d = elem.select(:year, :mon, :mday) + y, m, d = elem.values_at(:year, :mon, :mday) if [y, m, d].include? nil raise ArgumentError, 'invalid date' else @@ -476,7 +476,7 @@ class DateTime < Date def self.new_with_hash(elem, sg) elem ||= {} y, m, d, h, min, s, of = - elem.select(:year, :mon, :mday, :hour, :min, :sec, :offset) + elem.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset) h ||= 0 min ||= 0 s ||= 0 diff --git a/lib/parsedate.rb b/lib/parsedate.rb index 7068da40f4..405ab46907 100644 --- a/lib/parsedate.rb +++ b/lib/parsedate.rb @@ -7,7 +7,7 @@ module ParseDate def parsedate(str, comp=false) Date._parse(str, comp). - select(:year, :mon, :mday, :hour, :min, :sec, :zone, :wday) + values_at(:year, :mon, :mday, :hour, :min, :sec, :zone, :wday) end module_function :parsedate diff --git a/sample/test.rb b/sample/test.rb index b37178f96b..32b79a61f6 100644 --- a/sample/test.rb +++ b/sample/test.rb @@ -758,7 +758,7 @@ test_ok(begin test_ok($x.length == 3) test_ok($x.has_key?(1)) test_ok($x.has_value?(4)) -test_ok($x.select(2,3) == [4,6]) +test_ok($x.values_at(2,3) == [4,6]) test_ok($x == {1=>2, 2=>4, 3=>6}) $z = $y.keys.join(":") -- cgit v1.2.3