Changeset 233 for Include

Timestamp:

May 6, 2007, 8:37:57 PM (18 years ago)

Author:

dai

Message:

タスプミスを修正。

Location:

Include

Files:

• Classes/System/Collections/ArrayList.ab (modified) (2 diffs)
• Classes/System/Environment.ab (modified) (1 diff)
• Classes/System/Math.ab (modified) (6 diffs)
• Classes/System/OperatingSystem.ab (modified) (2 diffs)
• Classes/System/Runtime/InteropServices/GCHandle.ab (modified) (1 diff)
• Classes/System/TimeSpan.ab (modified) (1 diff)
• Classes/System/Version.ab (modified) (6 diffs)
• WinNT.ab (modified) (1 diff)
• system/string.sbp (modified) (2 diffs)

Include/Classes/System/Collections/ArrayList.ab

@@ -319 +319 @@
 
     Static Function FixedSize(l As IList) As IList
-        Return FixedSize(Adapter(VarPtr(i)))
+        Return FixedSize(Adapter(VarPtr(l)))
     End Function
 
@@ -327 +327 @@
 
     Static Function ReadOnly(l As IList) As IList
-        Return ReadOnly(Adapter(VarPtr(i)))
+        Return ReadOnly(Adapter(VarPtr(l)))
     End Function
 

Include/Classes/System/Environment.ab

@@ -53 +53 @@
         If osVer = Nothing Then
             Dim vi As OSVERSIONINFO
-            GetVersionInfoEx(vi)
+            GetVersionEx(vi)
             osVer = New OperatingSystem(vi)
         End If

Include/Classes/System/Math.ab

@@ -68 +68 @@
             Asin = _System_GetNaN()
         Else
-            Asin = ATan(x / Sqrt(1 - x * x))
+            Asin = Math.Atan(x / Sqrt(1 - x * x))
         End If
     End Function
@@ -126 +126 @@
     Static Function Ceiling(x As Double) As Long
         If Floor(x) = x then
-            Return x
+            Return x As Long
         Else
             Return Floor(x) + 1
@@ -144 +144 @@
     Static Function Cosh(value As Double) As Double
         Dim t As Double
-        t = Exp(value)
+        t = Math.Exp(value)
         return (t + 1 / t) * 0.5
     End Function
@@ -514 +514 @@
         If Math.Abs(x) > _System_EPS5 Then
             Dim t As Double
-            t = Exp(x)
+            t = Math.Exp(x)
             Return (t - 1 / t) * 0.5
         Else
@@ -571 +571 @@
     Static Function Tanh(x As Double) As Double
         If x > _System_EPS5 Then
-            Return 2 / (1 + Exp(-2 * x)) - 1
+            Return 2 / (1 + Math.Exp(-2 * x)) - 1
         ElseIf x < -_System_EPS5 Then
-            Return 1 - 2 / (Exp(2 * x) + 1)
+            Return 1 - 2 / (Math.Exp(2 * x) + 1)
         Else
             Return x * (1 - x * x * 0.333333333333333) 'x * (1 - x * x / 3)
@@ -591 +591 @@
 
         If x >= 0 Then
-            k = Fix(x * _System_InverseHalfPI) + 0.5
-        Else
-            k = Fix(x * _System_InverseHalfPI) - 0.5
+            k = ( Fix(x * _System_InverseHalfPI) + 0.5 ) As Long
+        Else
+            k = ( Fix(x * _System_InverseHalfPI) - 0.5 ) As Long
         End If
         x = (x - (3217.0 / 2048.0) * k) + _System_D * k

Include/Classes/System/OperatingSystem.ab

@@ -18 +18 @@
     Sub OperatingSystem(vi As OSVERSIONINFOA)
         pf = vi.dwPlatformId As PlatformID,
-        ver = New Version(vi.dwMajorVersion, vi.MinorVersion, vi.BuildNumber)
+        ver = New Version(vi.dwMajorVersion, vi.dwMinorVersion, vi.dwBuildNumber)
         sp = vi.szCSDVersion
     End Sub
@@ -24 +24 @@
     Sub OperatingSystem(vi As OSVERSIONINFOW)
         pf = vi.dwPlatformId As PlatformID,
-        ver = New Version(vi.dwMajorVersion, vi.MinorVersion, vi.BuildNumber)
+        ver = New Version(vi.dwMajorVersion, vi.dwMinorVersion, vi.dwBuildNumber)
         sp = vi.szCSDVersion
     End Sub

Include/Classes/System/Runtime/InteropServices/GCHandle.ab

@@ -16 +16 @@
 
     Const Function IsAllocated() As Boolean
-        Retrun handle <> 0
+        Return handle <> 0
     End Function
 

Include/Classes/System/TimeSpan.ab

@@ -40 +40 @@
 
     Function Operator/ (value As Long) As TimeSpan
-        Return FromTicks(m_Value \ value)
+        Return FromTicks(m_Time \ value)
     End Function
 

Include/Classes/System/Version.ab

@@ -57 +57 @@
     End Function
 
-    Const Function MajorRivision() As Integer
+    Const Function MajorRevision() As Integer
         Return HIWORD(revision) As Integer
     End Function
 
-    Const Function MinorRivision() As Integer
+    Const Function MinorRevision() As Integer
         Return LOWORD(revision) As Integer
     End Function
@@ -72 +72 @@
         CompareTo = build - v.build
         If CompareTo <> 0 Then Exit Function
-        CompareTo = rivision - v.rivision
+        CompareTo = revision - v.revision
     End Function
 
@@ -80 +80 @@
 
     Override Function GetHashCode() As Long
-        Return _System_BSwap(major As DWord) Xor minor Xor build Xor _System_BSwap(rivision As DWord)
+        Return _System_BSwap(major As DWord) Xor minor Xor build Xor _System_BSwap(revision As DWord)
     End Function
 
@@ -111 +111 @@
         If build >= 0 Then
             ToString = ToString + "." + Str$(build)
-            If rivision >= 0 Then
-                ToString = ToString + "." + Str$(rivision)
+            If revision >= 0 Then
+                ToString = ToString + "." + Str$(revision)
             End If
         End If
@@ -136 +136 @@
         If fieldCount = 3 Then Exit Function
 
-        If rivision < 0 Then
+        If revision < 0 Then
             ' Throw ArgumentException
             Debug
         End If
-        ToString = ToString + "." + Str$(rivision)
+        ToString = ToString + "." + Str$(revision)
     End Function
 Private
@@ -146 +146 @@
     minor As Long
     build As Long
-    rivision As Long
+    revision As Long
 End Class
 

Include/WinNT.ab

@@ -6358 +6358 @@
 Sub /*FORCEINLINE*/ TpInitializeCallbackEnviron(ByRef CallbackEnviron As TP_CALLBACK_ENVIRON)
     With CallbackEnviron
-        Version = 1
-        Pool = NULL
-        CleanupGroup = NULL
-        CleanupGroupCancelCallback = NULL
-        RaceDll = NULL
-        ActivationContext = NULL
-        FinalizationCallback = NULL
-        Flags = 0
+        .Version = 1
+        .Pool = NULL
+        .CleanupGroup = NULL
+        .CleanupGroupCancelCallback = NULL
+        .RaceDll = NULL
+        .ActivationContext = NULL
+        .FinalizationCallback = NULL
+        .Flags = 0
     End With
 End Sub

Include/system/string.sbp

@@ -157 +157 @@
 
 Function GetTCStr(ByRef s As String, ByRef wcs As PCTSTR) As SIZE_T
-    Return GetStr(s.Chars, s.Length As SIZE_T, tcs)
+    Return GetStr(s.Chars, s.Length As SIZE_T, wcs)
 End Function
 
@@ -177 +177 @@
 
 Function GetSCStr(ByRef s As String, ByRef wcs As *StrChar) As SIZE_T
-    Return GetStr(s.Chars, s.Length As SIZE_T, ss)
+    Return GetStr(s.Chars, s.Length As SIZE_T, wcs)
 End Function