Changeset 393 for trunk/Include/Classes/System/Collections/Generic/Dictionary.ab

Timestamp:

Dec 8, 2007, 11:16:57 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

Dictionaryで、keyのGetHashCodeが負の値を返した場合でも問題なく動作するようにした。

File:

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

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

@@ -40 +40 @@
 
     Virtual Function Item(key As Key) As T
-        Imports System.Collections.Generic.Detail
-
         If Object.ReferenceEquals(key, Nothing) Then
             'Throw ArgumentNullError
@@ -48 +46 @@
         End If
 
-        Dim hash = key.GetHashCode Mod al.Count
+        Dim hash = getHash(key)
         Dim a = al[hash] As ArrayList
 
@@ -54 +52 @@
             Dim i As Long
             For i = 0 To ELM(a.Count)
-                Dim pair = a[i] As Pair
+                Dim pair = a[i] As Detail.Pair
                 If pair.Key.Equals(key) Then
                     Return pair.Value
@@ -63 +61 @@
         'KeyNotFoundException
         Return Nothing
-
     End Function
 
     Virtual Sub Item(key As Key, value As T)
-        Imports System.Collections.Generic.Detail
-
         If Object.ReferenceEquals(key, Nothing) Then
             'Throw ArgumentNullError
@@ -74 +69 @@
         End If
 
-        Dim hash = key.GetHashCode Mod al.Count
+        Dim hash = getHash(key)
         Dim a = al[hash] As ArrayList
 
@@ -83 +78 @@
             Dim i As Long
             For i = 0 To ELM(a.Count)
-                Dim pair = a[i] As Pair
+                Dim pair = a[i] As Detail.Pair
                 If pair.Key.Equals(key) Then
                     pair.Value = value
@@ -90 +85 @@
         End If
 
-        a.Add(New Pair(key, value))
+        a.Add(New Detail.Pair(key, value))
     End Sub
 
@@ -108 +103 @@
     'Methods
     Sub Add(key As Key, value As T)
-        Imports System.Collections.Generic.Detail
-
         If Object.ReferenceEquals(key, Nothing) Then
             'Throw ArgumentNullError
@@ -115 +108 @@
         End If
 
-        Dim hash = key.GetHashCode Mod al.Count
+        Dim hash = getHash(key)
         Dim a = al[hash] As ArrayList
 
@@ -124 +117 @@
             Dim i As Long
             For i = 0 To ELM(a.Count)
-                Dim pair = a[i] As Pair
+                Dim pair = a[i] As Detail.Pair
                 If pair.Key.Equals(key) Then
                     'Throw ArgumentError
@@ -131 +124 @@
         End If
 
-        a.Add(New Pair(key, value))
+        a.Add(New Detail.Pair(key, value))
 
-        count ++
+        count++
     End Sub
 
@@ -168 +161 @@
     Sub initialize(c As Long)
         al = ArrayList.Repeat(Nothing, c)
-        Dim e = al[0]
-        Dim p = ObjPtr(e) As ULONG_PTR
-
         count = 0
     End Sub
+
+    Function getHash(key As Object) As Long
+        Return (key.GetHashCode As DWord) Mod al.Count
+    End Function
 
     al As ArrayList