Changeset 14 for Include

Timestamp:

Nov 27, 2006, 1:20:38 AM (18 years ago)

Author:

イグトランス (egtra)

Message:

bug fix

File:

• Include/Classes/System/Math.ab (modified) (11 diffs)

Include/Classes/System/Math.ab

@@ -1 @@
-' Math.ab
+' Classes/System/Math.ab
 
 #ifndef __SYSTEM_MATH_AB__
@@ -104 +104 @@
         For i = _System_Atan_N To 1 Step -1
             Dim t As Double
-            t = i * number
+            t = i * x
             dbl = (t * t) / (2 * i + 1 + dbl)
         Next
@@ -128 +128 @@
     End Function
 
-    Static Function BigMul(value1 As Long, value2 As Long) As Int64
-        Return (value1 As Int64) * value2
+    Static Function BigMul(x As Long, y As Long) As Int64
+        Return (x As Int64) * y
     End Function
 
@@ -140 +140 @@
     End Function
 
-    Static Function Cos(value As Double) As Double
-        If IsNaN(number) Then
-            Return number
-        ElseIf IsInf(number) Then
+    Static Function Cos(x As Double) As Double
+        If IsNaN(x) Then
+            Return x
+                ElseIf IsInf(x) Then
             Return _System_GetNaN()
         End If
 
-        Return Sin(_System_HalfPI - Abs(number))
+        Return Sin(_System_HalfPI - Abs(x))
     End Function
 
@@ -156 +156 @@
     End Function
 
-    Static Function DivRem(value1 As Long, value2 As Long, ByRef ret As Long) As Long
-        ret = value1 Mod value2
-        return value1 \ value2
-    End Function
-
-    Static Function DivRem(value1 As Int64, value2 As Int64, ByRef ret As Int64) As Int64
-        ret = value1 - (value1 \ value2) * value2
-        return value1 \ value2
+    Static Function DivRem(x As Long, y As Long, ByRef ret As Long) As Long
+        ret = x Mod y
+        return x \ y
+    End Function
+
+    Static Function DivRem(x As Int64, y As Int64, ByRef ret As Int64) As Int64
+        ret = x - (x \ y) * y
+        return x \ y
     End Function
 
     'Equals
 
-    Static Function Exp(value As Double) As Double
+    Static Function Exp(x As Double) As Double
         If IsNaN(x) Then
             Return x
@@ -182 +182 @@
 
         If x >= 0 Then
-            k= Fix(x / _System_LOG2 + 0.5)
-        Else
-            k= Fix(x / _System_LOG2 - 0.5)
+            k = Fix(x / _System_LOG2 + 0.5)
+        Else
+            k = Fix(x / _System_LOG2 - 0.5)
         End If
 
@@ -423 +423 @@
     End Function
 
-    Static Function Pow(value1 As Double, value2 As Double) As Double
-        return value1 ^ value2
+    Static Function Pow(x As Double, y As Double) As Double
+        return pow(x, y)
     End Function
 
@@ -532 +532 @@
         Dim s As Double, last As Double
         Dim i As *Word, j As Long, jj As Long, k As Long
-        If number > 0 Then
-            If IsInf(number) Then
+        If x > 0 Then
+            If IsInf(x) Then
                 Sqrt = x
             Else
@@ -548 +548 @@
                 Loop While s <> last
             End If
-        If x < 0 Then
+        ElseIf x < 0 Then
             Sqr = _System_GetNaN()
         Else
@@ -556 +556 @@
     End Function
 
-    Static Function Tan(value As Double) As Double
-        If IsNaN(number) Then
-            Tan = number
+    Static Function Tan(x As Double) As Double
+        If IsNaN(x) Then
+            Tan = x
             Exit Function
-        ElseIf IsInf(number) Then
+        ElseIf IsInf(x) Then
             Tan = _System_GetNaN()
             Exit Function
@@ -593 +593 @@
     End Function
 
-Private
+'Private
     Static Function urTan(x As Double, ByRef k As Long) As Double
         Dim i As Long