Changeset 211 for Include/com

Timestamp:

Apr 11, 2007, 9:49:17 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

Decimalを追加、OAIdl.abの一応の完成など

Location:

Include/com

Files:

• currency.ab (modified) (2 diffs)
• decimal.ab (added)
• index.ab (modified) (1 diff)
• variant.ab (modified) (3 diffs)

Include/com/currency.ab

@@ -8 +8 @@
 Class Currency
 Public
+    Sub Currency()
+        cy = 0
+    End Sub
+
 /*
     Sub Currency(x As CY)
@@ -201 +205 @@
         Return HIDWORD(cy) Xor LODWORD(cy)
     End Function
+
+    Function Equals(y As Currency) As Boolean
+        Dim c = Compare(This, y)
+        Return c = VARCMP_EQ
+    End Function
 Private
     cy As CY

Include/com/index.ab

@@ -5 +5 @@
 #require <com/vbobject.ab>
 #require <com/currency.ab>
+#require <com/decimal.ab>

Include/com/variant.ab

@@ -519 +519 @@
 
     Const Function ValCy() As Currency
+        Dim r = ChangeType(VT_CY)
+        ValCy = New Currency
+        ValCy.Cy = GetQWord(VarPtr(r.val))
     End Function
 
     Sub ValCy(x As Currency)
+        Clear()
+        SetQWord(VarPtr(v.val), x.Cy)
+        v.vt = VT_CY
     End Sub
     
@@ -570 +576 @@
     'ValArray
 
-    'ValDecimal
+    Const Function ValDecimal() As Decimal
+        Dim p = VarPtr(v) As *Decimal
+        Return New Deciaml(p[0])
+    End Function
+
+    Sub ValDecimal(x As Decimal)
+        Clear()
+        Dim p = VarPtr(v) As *Decimal
+        p[0] = x.Dec
+        v.vt = VT_DECIMAL '念の為
+    End Sub
+    
 
     Function PtrToVariant() As *VARIANT
@@ -591 +608 @@
     End Sub
 
-
     Static Sub Move(ByRef dst As VARIANT, ByRef src As VARIANT)
         dst = src