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

synchronized with date2 3.6.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5980 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
tadf 2004-03-20 00:48:19 +00:00
parent 610b5d7975
commit f2d983cb8d
3 changed files with 41 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sat Mar 20 09:33:36 2004 Tadayoshi Funaba <tadf@dotrb.org>
* lib/date.rb, lib/date/format.rb: _parse() now accepts fractional
part of second minute that follows a comma or a full stop.
Fri Mar 19 15:15:15 2004 Yukihiro Matsumoto <matz@ruby-lang.org> Fri Mar 19 15:15:15 2004 Yukihiro Matsumoto <matz@ruby-lang.org>
* variable.c (rb_cvar_set): class variables become private to the * variable.c (rb_cvar_set): class variables become private to the

10
lib/date.rb
View file

@ -6,7 +6,7 @@
# Documentation: William Webber <william@williamwebber.com> # Documentation: William Webber <william@williamwebber.com>
# #
#-- #--
# $Id: date.rb,v 2.11 2004-01-19 04:56:12+09 tadf Exp $ # $Id: date.rb,v 2.12 2004-03-20 08:05:13+09 tadf Exp $
#++ #++
# #
# == Overview # == Overview
@ -1196,16 +1196,18 @@ class DateTime < Date
def self.new_with_hash(elem, sg) def self.new_with_hash(elem, sg)
elem ||= {} elem ||= {}
y, m, d, h, min, s, of = y, m, d, h, min, s, fr, of =
elem.values_at(:year, :mon, :mday, :hour, :min, :sec, :offset) elem.values_at(:year, :mon, :mday,
:hour, :min, :sec, :sec_fraction, :offset)
h ||= 0 h ||= 0
min ||= 0 min ||= 0
s ||= 0 s ||= 0
fr ||= 0
of ||= 0 of ||= 0
if [y, m, d].include? nil if [y, m, d].include? nil
raise ArgumentError, 'invalid date' raise ArgumentError, 'invalid date'
else else
civil(y, m, d, h, min, s, of.to_r/86400, sg) civil(y, m, d, h, min, s, of.to_r/86400, sg) + (fr/86400)
end end
end end

38
lib/date/format.rb
View file

@ -1,5 +1,7 @@
# format.rb: Written by Tadayoshi Funaba 1999-2004 # format.rb: Written by Tadayoshi Funaba 1999-2004
# $Id: format.rb,v 2.12 2004-01-19 05:43:28+09 tadf Exp $ # $Id: format.rb,v 2.13 2004-03-20 08:05:13+09 tadf Exp $
require 'rational'
class Date class Date
@ -182,6 +184,12 @@ class Date
return unless str.sub!(/\A%/o, '') return unless str.sub!(/\A%/o, '')
when '%+' when '%+'
return unless __strptime(str, '%a %b %e %H:%M:%S %Z %Y', elem) return unless __strptime(str, '%a %b %e %H:%M:%S %Z %Y', elem)
=begin
when '%.'
return unless str.sub!(/\A(\d+)/o, '')
val = $1.to_i.to_r / (10**$1.size)
elem[:sec_fraction] = val
=end
when '%1' when '%1'
return unless str.sub!(/\A(\d+)/o, '') return unless str.sub!(/\A(\d+)/o, '')
val = $1.to_i val = $1.to_i
@ -227,7 +235,7 @@ class Date
def self._parse(str, comp=false) def self._parse(str, comp=false)
str = str.dup str = str.dup
str.gsub!(/[^-+.\/:0-9a-z]+/ino, ' ') str.gsub!(/[^-+,.\/:0-9a-z]+/ino, ' ')
# day # day
if str.sub!(/(#{PARSE_DAYPAT})\S*/ino, ' ') if str.sub!(/(#{PARSE_DAYPAT})\S*/ino, ' ')
@ -236,7 +244,10 @@ class Date
# time # time
if str.sub!( if str.sub!(
/(\d+):(\d+)(?::(\d+))? /(\d+):(\d+)
(?:
:(\d+)(?:[,.](\d*))?
)?
(?: (?:
\s* \s*
([ap])(?:m\b|\.m\.) ([ap])(?:m\b|\.m\.)
@ -254,15 +265,18 @@ class Date
hour = $1.to_i hour = $1.to_i
min = $2.to_i min = $2.to_i
sec = $3.to_i if $3 sec = $3.to_i if $3
if $4 if $4
sec_fraction = $4.to_i.to_r / (10**$4.size)
end
if $5
hour %= 12 hour %= 12
if $4.downcase == 'p' if $5.downcase == 'p'
hour += 12 hour += 12
end end
end end
zone = $5 zone = $6
end end
# eu # eu
@ -368,7 +382,7 @@ class Date
\s* \s*
T? T?
\s* \s*
(\d{2,6}) (\d{2,6})(?:[,.](\d*))?
)? )?
(?: (?:
\s* \s*
@ -406,7 +420,10 @@ class Date
sec = $3[ 4, 2].to_i if $3.size >= 6 sec = $3[ 4, 2].to_i if $3.size >= 6
end end
end end
zone = $4 if $4
sec_fraction = $4.to_i.to_r / (10**$4.size)
end
zone = $5
end end
if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/ino, ' ') if str.sub!(/\b(bc\b|bce\b|b\.c\.|b\.c\.e\.)/ino, ' ')
@ -432,6 +449,7 @@ class Date
elem[:hour] = hour if hour elem[:hour] = hour if hour
elem[:min] = min if min elem[:min] = min if min
elem[:sec] = sec if sec elem[:sec] = sec if sec
elem[:sec_fraction] = sec_fraction if sec_fraction
elem[:zone] = zone if zone elem[:zone] = zone if zone
offset = zone_to_diff(zone) if zone offset = zone_to_diff(zone) if zone
elem[:offset] = offset if offset elem[:offset] = offset if offset
@ -511,6 +529,10 @@ class Date
o << '%02d' % mm o << '%02d' % mm
when '%%'; o << '%' when '%%'; o << '%'
when '%+'; o << strftime('%a %b %e %H:%M:%S %Z %Y') # TZ when '%+'; o << strftime('%a %b %e %H:%M:%S %Z %Y') # TZ
=begin
when '%.'
o << '%06d' % (sec_fraction / (1.to_r/86400/(10**6)))
=end
when '%1'; o << '%d' % jd when '%1'; o << '%d' % jd
when '%2'; o << strftime('%Y-%j') when '%2'; o << strftime('%Y-%j')
when '%3'; o << strftime('%Y-%m-%d') when '%3'; o << strftime('%Y-%m-%d')