From 210367ec889f5910e270d6ea2c7ddb8a8d939e61 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 20 Jan 1999 04:59:39 +0000
Subject: This commit was generated by cvs2svn to compensate for changes in
 r372, which included commits to RCS files with non-trunk default branches.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@373 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/date.rb | 91 +++++++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 61 insertions(+), 30 deletions(-)

(limited to 'lib/date.rb')

diff --git a/lib/date.rb b/lib/date.rb
index 998c2e8152..9de49bcbc7 100644
--- a/lib/date.rb
+++ b/lib/date.rb
@@ -1,8 +1,8 @@
 #
 #               Date.rb - 
 #                       $Release Version: $
-#                       $Revision: 1.2 $
-#                       $Date: 1997/02/14 11:05:29 $
+#                       $Revision: 1.1.1.1.4.5 $
+#                       $Date: 1998/03/03 02:39:34 $
 #                       by Yasuo OHBA(SHL Japan Inc. Technology Dept.)
 #
 # --
@@ -17,15 +17,34 @@
 class Date
   include Comparable
   
+  Weektag = [
+    "Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"
+  ]
+
+  Monthtag = [
+    "January","February","March","April", "May", "June","July",
+    "August", "September", "October", "November", "December"
+  ]
+
+  Monthtab = {
+    "jan"=>1, "feb"=>2, "mar"=>3, "apr"=>4, "may"=>5, "jun"=>6,
+    "jul"=>7, "aug"=>8, "sep"=>9, "oct"=>10, "nov"=>11, "dec"=>12
+  }
+
   def initialize(y = 1, m = 1, d = 1)
-    if y.kind_of?(String) && y.size == 8
-      @year = y[0,4].to_i
-      @month = y[4,2].to_i
-      @day = y[6,2].to_i
+    if y.kind_of?(String)
+      case y
+      when /(\d\d\d\d)-?(?:(\d\d)-?(\d\d)?)?/
+	@year = $1.to_i
+	@month = if $2 then $2.to_i else 1 end
+	@day = if $3 then $3.to_i else 1 end
+      else
+	require 'parsedate'
+	@year, @month, @day = ParseDate.parsedate(y)
+      end
     else
       if m.kind_of?(String)
-        ml = {"jan"=>1, "feb"=>2, "mar"=>3, "apr"=>4, "may"=>5, "jun"=>6, "jul"=>7, "aug"=>8, "sep"=>9, "oct"=>10, "nov"=>11, "dec"=>12}
-        m = ml[m.downcase]
+        m = Monthtab[m.downcase]
         if m.nil?
           raise ArgumentError, "Wrong argument. (month)"
         end
@@ -53,25 +72,35 @@ class Date
   def period
     return Date.period!(@year, @month, @day)
   end
-  
+
+  def jd
+    return period + 1721423
+  end
+
+  def mjd
+    return jd - 2400000.5
+  end
+
+  def to_s
+    format("%.3s, %.3s %2d %4d", name_of_week, name_of_month, @day, @year)
+  end
+
+  def inspect
+    to_s
+  end
+
   def day_of_week
-    dl = Date.daylist(@year)
-    d = Date.jan1!(@year)
-    for m in 1..(@month - 1)
-      d += dl[m]
-    end
-    d += @day - 1
-    if @year == 1752 && @month == 9 && @day >= 14
-      d -= (14 - 3)
-    end
-    return (d % 7)
+    return (period + 5) % 7
   end
   
-  Weektag = ["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"]
   def name_of_week
     return Weektag[self.day_of_week]
   end
   
+  def name_of_month
+    return Monthtag[@month-1]
+  end
+  
   def +(o)
     if o.kind_of?(Numeric)
       d = Integer(self.period + o)
@@ -80,6 +109,9 @@ class Date
     else
       raise TypeError, "Illegal type. (Integer or Date)"
     end
+    if d <= 0
+      raise ArgumentError, "argument out of range. (self > other)"
+    end
     return Date.at(d)
   end
   
@@ -117,14 +149,13 @@ class Date
   end
   
   def leapyear?
-    if Date.leapyear(@year) == 1
-      return FALSE
-    else
-      return TRUE
-    end
+    Date.leapyear(@year) != 1
   end
 
   def _check_date
+    if @year == nil or @month == nil or @day == nil
+      raise ArgumentError, "argument contains nil"
+    end
     m = Date.daylist(@year)
     if @month < 1 || @month > 12
       raise ArgumentError, "argument(month) out of range."
@@ -151,7 +182,7 @@ end
 
 def Date.at(d)
   if d.kind_of? Time
-    return Date.new(1900+d.year, d.mon+1, d.mday)
+    return Date.new(d.year, d.mon, d.mday)
   end
   if d.kind_of? Date
     return Date.at(d.period)
@@ -189,10 +220,10 @@ def Date.period!(y, m, d)
     p += dl[mm]
   end
   p += (y - 1) * 365 + ((y - 1) / 4.0).to_i
-  if (y - 1) > 1752
-    p -= ((y - 1 - 1752) / 100.0).to_i
-    p += ((y - 1 - 1752) / 400.0).to_i
-    p -= (14 - 3)
+  if y > 1752
+    p -= ((y - 1) / 100.0).to_i
+    p += ((y - 1) / 400.0).to_i
+    p += 2
   elsif y == 1752 && m == 9 && d >= 14 && d <= 30
     p -= (14 - 3)
   end
-- 
cgit v1.2.3