Changeset 208 for Include/com/currency.ab

Timestamp:

Apr 7, 2007, 10:20:40 PM (18 years ago)

Author:

イグトランス (egtra)

Message:

[207]参照型変数のNothing初期化に対応する修正

File:

• Include/com/currency.ab (modified) (1 diff)

Include/com/currency.ab

@@ -71 +71 @@
     End Function
 
+    Static Function Compare(x As Currency, y As Currency) As HRESULT
+        Return VarCyCmp(x, y)
+    End Function
+
+    Static Function Compare(x As Currency, y As Double) As HRESULT
+        Return VarCyCmpR8(x, y)
+    End Function
+
+    Static Function Compare(x As Double, y As Currency) As HRESULT
+        Dim ret = VarCyCmpR8(y, x)
+        Select Case ret
+            Case VARCMP_LT
+                Return VARCMP_GT
+            Case VARCMP_GT
+                Return VARCMP_LT
+            Case Else
+                Return ret
+        End Select
+    End Function
+
+    Const Function Operator ==(y As Currency) As Boolean
+        Dim c = Compare(This, y)
+        Return c = VARCMP_EQ
+    End Function
+
+    Const Function Operator ==(y As Double) As Boolean
+        Dim c = Compare(This, y)
+        Return c = VARCMP_EQ
+    End Function
+
+    Const Function Operator <>(y As Currency) As Boolean
+        Dim c = Compare(This, y)
+        Return c <> VARCMP_EQ
+    End Function
+
+    Const Function Operator <>(y As Double) As Boolean
+        Dim c = Compare(This, y)
+        Return c <> VARCMP_EQ
+    End Function
+
+    Const Function Operator <(y As Currency) As Boolean
+        Dim c = Compare(This, y)
+        Return c = VARCMP_LT
+    End Function
+
+    Const Function Operator <(y As Double) As Boolean
+        Dim c = Compare(This, y)
+        Return c = VARCMP_LT
+    End Function
+/*
+    Const Function Operator >(y As Currency) As Boolean
+        Dim c = Compare(This, y)
+        Return c = VARCMP_GT
+    End Function
+
+    Const Function Operator >(y As Double) As Boolean
+        Dim c = Compare(This, y)
+        Return c = VARCMP_GT
+    End Function
+*/
+    Const Function Operator <=(y As Currency) As Boolean
+        Dim c = Compare(This, y)
+        Return result = VARCMP_LT Or result = 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
+    End Function
+
+    Const Function Operator >=(y As Currency) As Boolean
+        Dim c = Compare(This, y)
+        Return result = VARCMP_GT Or result = 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
+    End Function
+
     Const Function Abs() As Currency
+        Abs = New Currency
         VarCyAbs(This.cy, Abs.cy)
     End Function
 
     Const Function Fix() As Currency
+        Fix = New Currency
         VarCyFix(This.cy, Fix.cy)
     End Function
 
     Const Function Int() As Currency
+        Int = New Currency
         VarCyInt(This.cy, Int.cy)
     End Function
 
     Const Function Round(c = 0 As Long) As Currency
+        Round = New Currency
         VarCyRound(This.cy, c, Round.cy)
     End Function