Changeset 352 for trunk/Include/Classes/System

Timestamp:

Oct 4, 2007, 2:50:09 AM (17 years ago)

Author:

dai

Message:

System.Collections.Generic.List.RemoveAtメソッドを追加
デリゲート型に対する"-"演算子を追加

Location:

trunk/Include/Classes/System

Files:

• Collections/Generic/List.ab (modified) (1 diff)
• Delegate.ab (modified) (2 diffs)

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

@@ -109 +109 @@
             Return False
         End If
+
+        RemoveAt( index )
+        Return True
+    End Function
+
+    /*!
+    @brief  List内の指定したインデックスの要素を削除する
+    @author Daisuke Yamamoto
+    @date   2007/10/03
+    @return 値が削除されたときはTrue、されなかったときはFlaseが返る
+    */
+    Sub RemoveAt( index As Long )
         memmove( items + index*SizeOf(VoidPtr), items + (index+1)*SizeOf(VoidPtr), (size-(index+1))*SizeOf(VoidPtr) )
         Realloc( size - 1 )
         size--
-        Return True
-    End Function
+    End Sub
 End Class
 

trunk/Include/Classes/System/Delegate.ab

@@ -18 +18 @@
         This.methodPtr = methodPtr
     End Sub
+
+    Function IsEqual( sd As _SimpleDelegate ) As Boolean
+        Return ( This.hasThisPtr = sd.hasThisPtr and ObjPtr(This.object) = ObjPtr(sd.object) and This.methodPtr = sd.methodPtr )
+    End Function
 End Class
 
@@ -28 +32 @@
         For i=0 To ELM(dg.simpleDelegates.Count)
             simpleDelegates.Add( dg.simpleDelegates[i] )
+        Next
+    End Sub
+
+    Sub _Delete( dg As DelegateBase )
+        Dim i As Long
+        For i=0 To ELM(This.simpleDelegates.Count)
+            Dim i2 As Long
+            Dim isExist = False
+            For i2=0 To ELM(dg.simpleDelegates.Count)
+                If This.simpleDelegates[i].IsEqual( dg.simpleDelegates[i2] ) Then
+                    isExist = True
+                End If
+            Next
+            If isExist Then
+                This.simpleDelegates.RemoveAt( i )
+            End If
         Next
     End Sub