Changeset 335 for trunk/Include/com/currency.ab

Timestamp:

Sep 18, 2007, 12:10:41 AM (17 years ago)

Author:

イグトランス (egtra)

Message:

SPrintF関連の追加。関数FloatToChars, FormatFloatE, FormatIntegerUと列挙体FormatFlags。

File:

• trunk/Include/com/currency.ab (modified) (4 diffs)

trunk/Include/com/currency.ab

@@ -28 +28 @@
     End Sub
 */
+/*
     Const Function Operator +() As Currency
         Return New Currency(This)
     End Function
-
+*/
     Const Function Operator -() As Currency
         Dim ret = New Currency
@@ -58 +59 @@
     Const Function Operator /(y As Variant) As Double
         Dim vx = New Variant(This)
-        Dim ret= vx / y
+        Dim ret = vx / y
         Return ret.ValR4
     End Function
 
     Const Function Operator /(y As Currency) As Double
-        Return This / New Varinat(y)
+        Dim vx = New Variant(This)
+        Dim vy = New Variant(y)
+        Dim ret = vx / vy
+        Return ret.ValR4
     End Function
 
@@ -79 +83 @@
 
     Static Function Compare(x As Currency, y As Currency) As HRESULT
-        Return VarCyCmp(x, y)
+        Return VarCyCmp(x.cy, y.cy)
     End Function
 
     Static Function Compare(x As Currency, y As Double) As HRESULT
-        Return VarCyCmpR8(x, y)
+        Return VarCyCmpR8(x.cy, y)
     End Function
 
     Static Function Compare(x As Double, y As Currency) As HRESULT
-        Dim ret = VarCyCmpR8(y, x)
+        Dim ret = VarCyCmpR8(y.cy, x)
         Select Case ret
             Case VARCMP_LT
@@ -140 +144 @@
     Const Function Operator <=(y As Currency) As Boolean
         Dim c = Compare(This, y)
-        Return result = VARCMP_LT Or result = VARCMP_EQ
+        Return c = VARCMP_LT Or c = VARCMP_EQ
     End Function
 
     Const Function Operator <=(y As Double) As Boolean
         Dim c = Compare(This, y)
-        Return result = VARCMP_LT Or result = VARCMP_EQ
+        Return c = VARCMP_LT Or c = VARCMP_EQ
     End Function
 
     Const Function Operator >=(y As Currency) As Boolean
         Dim c = Compare(This, y)
-        Return result = VARCMP_GT Or result = VARCMP_EQ
+        Return c = VARCMP_GT Or c = VARCMP_EQ
     End Function
 
     Const Function Operator >=(y As Double) As Boolean
         Dim c = Compare(This, y)
-        Return result = VARCMP_GT Or result = VARCMP_EQ
+        Return c = VARCMP_GT Or c = VARCMP_EQ
     End Function