Changeset 313 for trunk

Timestamp:

Aug 27, 2007, 12:50:51 AM (17 years ago)

Author:

イグトランス (egtra)

Message:

Itemの戻り値型をTにできた

File:

• trunk/Include/Classes/System/Collections/Generic/Dictionary.ab (modified) (8 diffs)

trunk/Include/Classes/System/Collections/Generic/Dictionary.ab

@@ -8 +8 @@
 
 Namespace Detail
-    Class Pair<TKey, T>
+    Class Pair
     Public
-        Sub Pair(key As TKey, value As T)
+        Sub Pair(key As Object, value As Object)
             Key = key
             Value = value
         End Sub
 
-        Key As TKey
-        Value As T
+        Key As Object
+        Value As Object
     End Class
 End Namespace 'Detail
@@ -53 +53 @@
             Dim i As Long
             For i = 0 To ELM(a.Count)
-                Dim pair = a[i] As Pair<T, Key>
+                Dim pair = a[i] As Pair
                 If pair.Key.Equals(key) Then
                     Return pair.Value
@@ -81 +81 @@
             Dim i As Long
             For i = 0 To ELM(a.Count)
-                Dim pair = a[i] As Pair<T, Key>
+                Dim pair = a[i] As Pair
                 If pair.Key.Equals(key) Then
                     pair.Value = value
@@ -88 +88 @@
         End If
 
-        a.Add(New Pair<T, Key>(key, value))
+        a.Add(New Pair(key, value))
     End Sub
 
@@ -95 +95 @@
 /*
     'Operators
-    Function Operator [](key As Key) As T
+'   Function Operator [](key As Key) As T
+    Function Operator [](key As Key) As Object
         Return Item[key]
     End Function
@@ -121 +122 @@
             Dim i As Long
             For i = 0 To ELM(a.Count)
-                Dim pair = a[i] As Pair<T, Key>
+                Dim pair = a[i] As Pair
                 If pair.Key.Equals(key) Then
                     'Throw ArgumentError
@@ -128 +129 @@
         End If
 
-        a.Add(New Pair<T, Key>(key, value))
+        a.Add(New Pair(key, value))
     End Sub
 
@@ -161 +162 @@
         Dim e = al[0]
         Dim p = ObjPtr(e) As ULONG_PTR
-        OutputDebugString(ToTCStr(Str$(p)))
     End Sub