Changeset 312 for trunk/Include/Classes/System/Collections

Timestamp:

Aug 27, 2007, 12:38:43 AM (17 years ago)

Author:

イグトランス (egtra)

Message:

getter側のItemの戻り値の型をTにした版（Pairをジェネリクス化）。注意：現在のコンパイラではコンパイルできない。

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
+    Class Pair<TKey, T>
     Public
-        Sub Pair(key As Object, value As Object)
+        Sub Pair(key As TKey, value As T)
             Key = key
             Value = value
         End Sub
 
-        Key As Object
-        Value As Object
+        Key As TKey
+        Value As T
     End Class
 End Namespace 'Detail
@@ -39 +39 @@
 '   End Function
 
-'   Virtual Function Item(key As Key) As T
-    Virtual Function Item(key As Key) As Object
+    Virtual Function Item(key As Key) As T
         Imports System.Collections.Generic.Detail
 
@@ -54 +53 @@
             Dim i As Long
             For i = 0 To ELM(a.Count)
-                Dim pair = a[i] As Pair
+                Dim pair = a[i] As Pair<T, Key>
                 If pair.Key.Equals(key) Then
                     Return pair.Value
@@ -82 +81 @@
             Dim i As Long
             For i = 0 To ELM(a.Count)
-                Dim pair = a[i] As Pair
+                Dim pair = a[i] As Pair<T, Key>
                 If pair.Key.Equals(key) Then
                     pair.Value = value
@@ -89 +88 @@
         End If
 
-        a.Add(New Pair(key, value))
+        a.Add(New Pair<T, Key>(key, value))
     End Sub
 
@@ -96 +95 @@
 /*
     'Operators
-'   Function Operator [](key As Key) As T
-    Function Operator [](key As Key) As Object
+    Function Operator [](key As Key) As T
         Return Item[key]
     End Function
@@ -123 +121 @@
             Dim i As Long
             For i = 0 To ELM(a.Count)
-                Dim pair = a[i] As Pair
+                Dim pair = a[i] As Pair<T, Key>
                 If pair.Key.Equals(key) Then
                     'Throw ArgumentError
@@ -130 +128 @@
         End If
 
-        a.Add(New Pair(key, value))
+        a.Add(New Pair<T, Key>(key, value))
     End Sub