kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/date.rb (Date::Infinity#<=>): didn't work. A patch from

Browse source 
Dirkjan Bussink <d.bussink AT gmail.com> [ruby-core:15098].
	  This is a bug obviously.  However it didn't affect the library's
	  functions.

	* lib/date.rb, lib/date/format.rb: some trivial changes.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15083 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2008-01-17 12:05:43 +00:00
parent 85e6dff165
commit 49622de368
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,3 +1,12 @@
Thu Jan 17 21:01:25 2008 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb (Date::Infinity#<=>): didn't work. A patch from
Dirkjan Bussink <d.bussink AT gmail.com> [ruby-core:15098].
This is a bug obviously. However it didn't affect the library's
functions.
* lib/date.rb, lib/date/format.rb: some trivial changes.
Wed Jan 16 22:45:27 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (enc_register_at): make own copy. [ruby-dev:33136]

8
lib/date.rb
View file

@ -6,7 +6,7 @@
# Documentation: William Webber <william@williamwebber.com>
#
#--
# $Id: date.rb,v 2.36 2008-01-12 10:54:29+09 tadf Exp $
# $Id: date.rb,v 2.37 2008-01-17 20:16:31+09 tadf Exp $
#++
#
# == Overview
@ -275,8 +275,8 @@ class Date
def <=> (other)
case other
when Infinity; d <=> other.d
when Numeric; d
when Infinity; return d <=> other.d
when Numeric; return d
else
begin
l, r = other.coerce(self)
@ -535,7 +535,7 @@ class Date
if Integer === h && Integer === min && Integer === s
Rational(h * 3600 + min * 60 + s, 86400) # 4p
else
h.to_r/24 + min.to_r/1440 + s.to_r/86400
(h * 3600 + min * 60 + s).to_r/86400 # 4p
end
end
end

6
lib/date/format.rb
View file

@ -1,5 +1,5 @@
# format.rb: Written by Tadayoshi Funaba 1999-2008
# $Id: format.rb,v 2.42 2008-01-12 10:54:29+09 tadf Exp $
# $Id: format.rb,v 2.43 2008-01-17 20:16:31+09 tadf Exp $
require 'rational'
@ -257,12 +257,12 @@ class Date
when 'j'; emit_n(yday, 3, f)
when 'k'; emit_a(hour, 2, f)
when 'L'
emit_n((sec_fraction / MILLISECONDS_IN_SECOND).round, 3, f)
emit_n((sec_fraction / MILLISECONDS_IN_SECOND).floor, 3, f)
when 'l'; emit_a((hour % 12).nonzero? || 12, 2, f)
when 'M', 'OM'; emit_n(min, 2, f)
when 'm', 'Om'; emit_n(mon, 2, f)
when 'N'
emit_n((sec_fraction / NANOSECONDS_IN_SECOND).round, 9, f)
emit_n((sec_fraction / NANOSECONDS_IN_SECOND).floor, 9, f)
when 'n'; "\n"
when 'P'; emit_ad(strftime('%p').downcase, 0, f)
when 'p'; emit_au(if hour < 12 then 'AM' else 'PM' end, 0, f)