Changeset 263

Timestamp:

May 30, 2007, 9:25:47 PM (17 years ago)

Author:

OverTaker

Message:

#116のバグを修整。

File:

• Include/Classes/System/DateTime.ab (modified) (8 diffs)

Include/Classes/System/DateTime.ab

@@ -133 +133 @@
 
     Function Day() As Long
-        Return DayOfYear - totalDaysOfMonths(Year, Month - 1)
+        Return DayOfYear - totalDaysOfMonth(Year, Month - 1)
     End Function
 
@@ -140 +140 @@
         Dim day = DayOfYear As Long
         Dim i = 1 As Long
-        While day > totalDaysOfMonths(year, i)
+        While day > totalDaysOfMonth(year, i)
             i++
         Wend
@@ -148 +148 @@
     Function Year() As Long
         Dim day = (Ticks \ TimeSpan.TicksPerDay) As Long
-        Dim year = Int((day + day \ 36524 - day \ 146097) / 365.25) As Long
-        If day - totalDaysOfYears(year) + 1 = 366 Then
+        Dim year = Int((day + day \ 36524 - day \ 146097) / 365.25) + 1 As Long
+        If day - yearToDay(year - 1) + 1 = 366 Then
             Return year + 1
         Else
@@ -157 +157 @@
 
     Function DayOfWeek() As Long 'As DayOfWeek
-        Return ((Ticks \ TimeSpan.TicksPerDay) Mod 7) As Long - 1
+        Return ((Ticks \ TimeSpan.TicksPerDay) Mod 7) As Long + 1
     End Function
 
@@ -165 +165 @@
 
     Function DayOfYear() As Long
-        Return ((Ticks \ TimeSpan.TicksPerDay) - totalDaysOfYears(Year) + 1) As Long
+        Return ((Ticks \ TimeSpan.TicksPerDay) - yearToDay(Year) + 1) As Long
     End Function
 
@@ -244 +244 @@
 
     Function AddYears(value As Double) As DateTime
-        Dim additionYear = Year + Int(value)
-        Dim ticks = totalDaysOfYears(additionYear) * TimeSpan.TicksPerDay + DayOfYear() * TimeSpan.TicksPerDay
-
-        If IsLeapYear(additionYear) Then
+        Dim date = New DateTime(Year + Int(value), Month, Day, Hour, Minute, Second, Millisecond, Kind)
+        Dim ticks = Ticks _
+                - (yearToDay(Year) + totalDaysOfMonth(Year, Month - 1) + Day - 1) * TimeSpan.TicksPerDay _
+                - Hour * TimeSpan.TicksPerHour _
+                - Minute * TimeSpan.TicksPerMinute _
+                - Second * TimeSpan.TicksPerSecond _
+                - Millisecond * TimeSpan.TicksPerMillisecond As Int64
+        If IsLeapYear(Year + Int(value)) Then
             ticks += (value - Int(value)) * 366 * TimeSpan.TicksPerDay
         Else
             ticks += (value - Int(value)) * 365 * TimeSpan.TicksPerDay
         End If
-    
-        Return New DateTime(ticks, Kind)
+        Return date.AddTicks(ticks)
     End Function
 
@@ -389 +392 @@
 
         initialize(
-            totalDaysOfYears(year) * TimeSpan.TicksPerDay _
-            + totalDaysOfMonths(year, month - 1) * TimeSpan.TicksPerDay _
+            yearToDay(year) * TimeSpan.TicksPerDay _
+            + totalDaysOfMonth(year, month - 1) * TimeSpan.TicksPerDay _
             + (day - 1) * TimeSpan.TicksPerDay _
             + hour * TimeSpan.TicksPerHour _
@@ -446 +449 @@
     End Function
 
-    Static Function totalDaysOfYears(year As Long) As Long
+    Static Function yearToDay(year As Long) As Long
+        year--
         Return (Int(year * 365.25) - Int(year * 0.01) + Int(year * 0.0025))
     End Function
 
-    Static Function totalDaysOfMonths(year As Long, month As Long) As Long
+    Static Function totalDaysOfMonth(year As Long, month As Long) As Long
         Dim days As Long
         Dim i As Long