Changeset 103

Timestamp:

Feb 16, 2007, 6:58:51 PM (18 years ago)

Author:

OverTaker

Message:

列挙体をタイプセーフにしました。

File:

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

Include/Classes/System/DateTime.ab

@@ -13 +13 @@
     Sub DateTime(ticks As Int64)
         Ticks = ticks
-        Kind = Unspecified
+        Kind = DateTimeKind.Unspecified
     End Sub
 
@@ -54 +54 @@
     End Sub
 
-/*  Sub DateTime(year As Long, month As Long, day As Long, hour As Long, minute As Long, second As Long, kind As DateTimeKind)
+    Sub DateTime(year As Long, month As Long, day As Long, hour As Long, minute As Long, second As Long, kind As DateTimeKind)
         DateTime(year, month, day, hour, minute, second)
         Kind = kind
-    End Sub*/
+    End Sub
 
     Sub DateTime(year As Long, month As Long, day As Long, hour As Long, minute As Long, second As Long, millisecond As Long)
@@ -199 +199 @@
         Dim time As SYSTEMTIME
         GetLocalTime(time)
-        Dim date As DateTime(time, Local)
+        Dim date As DateTime(time, DateTimeKind.Local)
         Return date
     End Function
@@ -206 +206 @@
         Dim time As SYSTEMTIME
         GetLocalTime(time)
-        Dim date As DateTime(time.wYear, time.wMonth, time.wDay, Local)
+        Dim date As DateTime(time.wYear, time.wMonth, time.wDay, DateTimeKind.Local)
         Return date
     End Function
@@ -213 +213 @@
         Dim time As SYSTEMTIME
         GetSystemTime(time)
-        Dim date As DateTime(time, Utc)
+        Dim date As DateTime(time, DateTimeKind.Utc)
         Return date
     End Function
@@ -304 +304 @@
         If (year Mod 100) = 0 Then Return False
         If (year Mod 4) = 0 Then Return True
+        Return False
     End Function
 
@@ -357 +358 @@
         FileTimeToSystemTime(localTime, time)
 
-        Dim date As DateTime(time, Local)
+        Dim date As DateTime(time, DateTimeKind.Local)
         Return date
     End Function
@@ -382 +383 @@
         FileTimeToSystemTime(fileTime, time)
 
-        Dim date As DateTime(time, Utc)
+        Dim date As DateTime(time, DateTimeKind.Utc)
         Return date
     End Function
@@ -389 +390 @@
         Dim fileTime As FILETIME
         fileTime = ToFileTime()
-        If Kind = Utc Then
+        If Kind = DateTimeKind.Utc Then
             ToFileTimeUtc = fileTime
         Else
@@ -397 +398 @@
 
     Function ToLocalTime() As DateTime
-        If Kind = Local Then
+        If Kind = DateTimeKind.Local Then
             ToLocalTime = This
         Else
             ToLocalTime = DateTime.FromFileTime(ToFileTime())
-            ToLocalTime.Kind = Local
+            ToLocalTime.Kind = DateTimeKind.Local
         End If
     End Function
 
     Function ToUniversalTime() As DateTime
-        If Kind = Utc Then
+        If Kind = DateTimeKind.Utc Then
             ToUniversalTime = This
         Else
             ToUniversalTime = DateTime.FromFileTimeUtc(ToFileTimeUtc())
-            ToUniversalTime.Kind = Utc
+            ToUniversalTime.Kind = DateTimeKind.Utc
         End If
     End Function
@@ -432 +433 @@
     End Function
 
-    Function kindFromBinary(dateData As Int64) As Long
+    Function kindFromBinary(dateData As Int64) As DateTimeKind
         dateData = (dateData >> 62) And &H03
         If dateData = &H01 Then
-            Return Local
+            Return DateTimeKind.Local
         ElseIf dateData = &H02 Then
-            Return Unspecified
+            Return DateTimeKind.Unspecified
         ElseIf dateData = &H03 Then
-            Return Utc
+            Return DateTimeKind.Utc
         End If
     End Function
 End Class
 
-Const Enum DateTimeKind
+Enum DateTimeKind
     Local
     Unspecified
@@ -450 +451 @@
 End Enum
 
-Const Enum DayOfWeek
+Enum DayOfWeek
     Sunday = 0
     Monday