Changeset 92

Timestamp:

Feb 12, 2007, 11:47:19 AM (17 years ago)

Author:

konisi

Message:

basicフォルダ内の整備、掲示板にエラーを報告したもの以外は型チェック終了しました。

Location:

Include

Files:

• Classes/System/Math.ab (modified) (4 diffs)
• basic/function.sbp (modified) (4 diffs)

Include/Classes/System/Math.ab

@@ -147 +147 @@
         End If
 
-        Return Sin(_System_HalfPI - Abs(x))
+        Return Math.Sin((_System_HalfPI - Abs(x)) As Double)
     End Function
 
@@ -510 +510 @@
         Dim t As Double
 
-        t = urTan(value * 0.5, k)
+        t = urTan((value * 0.5) As Double, k)
         t = 2 * t / (1 + t * t)
         If (k And 1) = 0 Then 'k mod 2 = 0 Then
@@ -587 +587 @@
     End Function
 
+    'ToString
+
     Static Function Truncate(x As Double) As Double
         return Fix(x)
     End Function
 
-Private
+'Private
     Static Function urTan(x As Double, ByRef k As Long) As Double
         Dim i As Long
@@ -597 +599 @@
 
         If x >= 0 Then
-            k = ( ( Fix(x * _System_InverseHalfPI) As Double ) + 0.5 ) As Long
-        Else
-            k = ( ( Fix(x * _System_InverseHalfPI) As Double ) - 0.5 ) As Long
+            k = Fix(x * _System_InverseHalfPI) + 0.5
+        Else
+            k = Fix(x * _System_InverseHalfPI) - 0.5
         End If
         x = (x - (3217.0 / 2048.0) * k) + _System_D * k

Include/basic/function.sbp

@@ -139 +139 @@
 Function _System_SetSign(x As Double, isNegative As Long) As Double
 #ifdef _WIN64
-    SetQWord(VarPtr(CopySign), (GetQWord(VarPtr(x)) And &h7fffffffffffffff) Or (isNegative << 63))
+    SetQWord(AddressOf(CopySign), (GetQWord(VarPtr(x)) And &h7fffffffffffffff) Or (isNegative << 63))
 #else
-    SetDWord(VarPtr(CopySign), GetDWord(VarPtr(x)))
-    SetDWord(VarPtr(CopySign) + SizeOf (DWord), GetQWord(VarPtr(x) + SizeOf (DWord)) And &h7fffffff Or (isNegative << 31))
+    SetDWord(AddressOf(CopySign), GetDWord(VarPtr(x)))
+    SetDWord(AddressOf(CopySign) + SizeOf (DWord), GetQWord(VarPtr(x) + SizeOf (DWord)) And &h7fffffff Or (isNegative << 31))
 #endif
 End Function
@@ -175 +175 @@
 
 Function CDWord(num As Double) As DWord
-    CDWord=num
+    CDWord=num As DWord
 End Function
 
 Function CInt(number As Double) As Long
-    CInt=number
+    CInt=number As Long
 End Function
 
 Function CSng(number As Double) As Single
-    CSng=number
+    CSng=number As Single
 End Function
 
@@ -279 +279 @@
 
 Function Sin(number As Double) As Double
-    Sin = Math.Sin(number)
+    Sin = Math.Sign(number)
 End Function
 
@@ -322 +322 @@
     p[0] = 0
     nan = _System_GetInf(/*x,*/ FALSE)
-    IsNaNOrInf = (memcmp(p, VarPtr(nan), SizeOf (Double)) = 0)
+    IsNaNOrInf = (memcmp(p As BytePtr, VarPtr(nan), SizeOf (Double)) = 0)
 End Function