Changeset 537 for trunk

Timestamp:

Jul 12, 2008, 2:14:23 PM (16 years ago)

Author:

イグトランス (egtra)

Message:

Dictionary.Removeとテストを追加。#promptでコンパイルできない問題を修正。

Location:

trunk/ab5.0/ablib

Files:

• TestCase/SimpleTestCase/CollectionTest.ab (added)
• TestCase/SimpleTestCase/SimpleTestCase.idx (modified) (1 diff)
• TestCase/SimpleTestCase/SimpleTestCase.pj (modified) (1 diff)
• src/Classes/System/Collections/Generic/Dictionary.ab (modified) (5 diffs)
• src/basic/prompt.sbp (modified) (2 diffs)

trunk/ab5.0/ablib/TestCase/SimpleTestCase/SimpleTestCase.idx

@@ -40 +40 @@
 #include "SerializeTest.ab"
 _ClearNamespaceImported
+#include ".\CollectionTest.ab"
+_ClearNamespaceImported
 
 'リソースファイル

trunk/ab5.0/ablib/TestCase/SimpleTestCase/SimpleTestCase.pj

@@ -43 +43 @@
 XmlTest.ab
 SerializeTest.ab
+.\CollectionTest.ab

trunk/ab5.0/ablib/src/Classes/System/Collections/Generic/Dictionary.ab

@@ -40 +40 @@
 
     Virtual Function Item(key As Key) As T
-        If Object.ReferenceEquals(key, Nothing) Then
+        If ActiveBasic.IsNothing(key) Then
             Throw New ArgumentNullException("key")
         End If
@@ -61 +61 @@
 
     Virtual Sub Item(key As Key, value As T)
-        If Object.ReferenceEquals(key, Nothing) Then
-            'Throw ArgumentNullError
-            Exit Sub
+        If ActiveBasic.IsNothing(key) Then
+            Throw New ArgumentNullException("key")
         End If
 
@@ -100 +99 @@
     'Methods
     Sub Add(key As Key, value As T)
-        If Object.ReferenceEquals(key, Nothing) Then
-            'Throw ArgumentNullError
-            Exit Sub
+        If ActiveBasic.IsNothing(key) Then
+            Throw New ArgumentNullException("key")
         End If
 
@@ -108 +106 @@
         Dim a = al[hash] As ArrayList
 
-        If Object.ReferenceEquals(a, Nothing) Then
+        If ActiveBasic.IsNothing(a) Then
             a = New ArrayList
             al[hash] = a
@@ -142 +140 @@
 '   End Function
 '   Function GetEnumerator() As Enumerator
-'   Function Remove(key As Key) As Boolean
-'   End Function
+
+    /*!
+    @biref  指定されたキーの要素を削除する。
+    @date   2008/07/11
+    @param[in] key  削除対象のキー
+    @retval True    対象要素が見つかって削除されたとき
+    @retval False   見つからず削除されなかったとき
+    @author Egtra
+    */
+    Function Remove(key As Key) As Boolean
+        Remove = False
+        If Not ActiveBasic.IsNothing(key) Then
+            Dim hash = getHash(key)
+            Dim a = al[hash] As ArrayList
+            If Not ActiveBasic.IsNothing(a) Then
+                Dim i As Long
+                For i = 0 To ELM(a.Count)
+                    Dim pair = a[i] As Detail.Pair
+                    If pair.Key.Equals(key) Then
+                        a.RemoveAt(i)
+                        Remove = True
+                        count--
+                        Exit Function
+                    End If
+                Next
+            End If
+        End If
+    End Function
+
 '   Function TryGetValue(key As Key, ByRef value As T) As Boolean
 '   End Function

trunk/ab5.0/ablib/src/basic/prompt.sbp

@@ -124 +124 @@
                     SetBkMode(hDC, TRANSPARENT)
                 Else
-                    Debug
+'                   Debug
                     ret = SetBkMode(hDC, OPAQUE)
                     ret = SetBkColor(hDC, currentLineCharInfo[i2].BackColor)
@@ -454 +454 @@
 End Function
 
-Function PromptMain(dwData As Long) As Long
+Function PromptMain(data As VoidPtr) As DWord
     Dim i As Long
     'Allocate