diff options
| author | tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-06 05:16:02 +0000 |
|---|---|---|
| committer | tadf <tadf@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-02-06 05:16:02 +0000 |
| commit | 441ff04d9465867f4260f9bbdccfe46e0c031a88 (patch) | |
| tree | 8c4f0ac07bed6fa247ad2e77885694965970dd90 /lib/date.rb | |
| parent | bdcfa77b17df62f4b4096c0d4843e377bf7ad8d3 (diff) | |
| download | ruby-441ff04d9465867f4260f9bbdccfe46e0c031a88.tar.gz ruby-441ff04d9465867f4260f9bbdccfe46e0c031a88.tar.xz ruby-441ff04d9465867f4260f9bbdccfe46e0c031a88.zip | |
synchronized with date2 3.6.3
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7896 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/date.rb')
| -rw-r--r-- | lib/date.rb | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/date.rb b/lib/date.rb index 79a2df113..0ae368fb9 100644 --- a/lib/date.rb +++ b/lib/date.rb @@ -1,12 +1,12 @@ # # date.rb - date and time library # -# Author: Tadayoshi Funaba 1998-2004 +# Author: Tadayoshi Funaba 1998-2005 # # Documentation: William Webber <william@williamwebber.com> # #-- -# $Id: date.rb,v 2.12 2004-03-20 08:05:13+09 tadf Exp $ +# $Id: date.rb,v 2.15 2005-02-06 11:09:53+09 tadf Exp $ #++ # # == Overview @@ -647,7 +647,7 @@ class Date elem ||= {} y, m, d = elem.values_at(:year, :mon, :mday) if [y, m, d].include? nil - raise ArgumentError, 'invalid date' + raise ArgumentError, '3 elements of civil date are necessary' else civil(y, m, d, sg) end @@ -1211,7 +1211,7 @@ class DateTime < Date fr ||= 0 of ||= 0 if [y, m, d].include? nil - raise ArgumentError, 'invalid date' + raise ArgumentError, '3 elements of civil date are necessary' else civil(y, m, d, h, min, s, of.to_r/86400, sg) + (fr/86400) end |