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

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

File:

• trunk/Include/com/decimal.ab (modified) (7 diffs)

trunk/Include/com/decimal.ab

@@ -1 +1 @@
 ' com/decimal.ab
 
-#require <oleauto.ab>
+'#require <oleauto.ab>
 #require <com/variant.ab>
 #require <com/currency.ab>
@@ -14 +14 @@
 
     Sub Decimal(d As Decimal)
-        dec = d
+'       dec = d なぜかコンパイルできない
+        memcpy(VarPtr(dec), VarPtr(d), Len(dec))
     End Sub
 
@@ -56 +57 @@
         VarDecFromR8(x, dec)
     End Sub
-
+/*
     Const Function Operator() As Variant
         Return New Variant(This)
@@ -195 +196 @@
     End Function
 */
+/*
     Const Function Operator +() As Decimal
         Return New Decimal(dec)
     End Function
-
+*/
     Const Function Operator -() As Decimal
         Dim ret = New Decimal
@@ -211 +213 @@
     End Function
 
-    Const Function Operator *(y As Long) As Decimal
-        Dim ret = New Decimal
-        VarDecMulI4(This.dec, y, ret.dec)
-        Return ret
-    End Function
-
-    Const Function Operator *(y As Int64) As Decimal
-        Dim ret = New Decimal
-        VarDecMulI8(This.dec, y, ret.dec)
-        Return ret
-    End Function
-
     Const Function Operator /(y As Decimal) As Decimal
         Dim ret = New Decimal
@@ -242 +232 @@
 
     Static Function Compare(x As Decimal, y As Decimal) As HRESULT
-        Return VarDecCmp(x, y)
+        Return VarDecCmp(x.dec, y.dec)
     End Function
 
     Static Function Compare(x As Decimal, y As Double) As HRESULT
-        Return VarDecCmpR8(x, y)
+        Return VarDecCmpR8(x.dec, y)
     End Function
 
     Static Function Compare(x As Double, y As Decimal) As HRESULT
-        Dim ret = VarDecCmpR8(y, x)
+        Dim ret = VarDecCmpR8(y.dec, x)
         Select Case ret
             Case VARCMP_LT
@@ -303 +293 @@
     Const Function Operator <=(y As Decimal) 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 Decimal) 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