Changeset 340 for trunk/Include

Timestamp:

Sep 28, 2007, 3:32:25 AM (17 years ago)

Author:

dai

Message:

デリゲートを試験実装
【現状のデリゲート制約】
・ダイナミックメソッド限定
・パラメータ相違チェックは行っていない

GCHandle.allocatedメンバをListクラスに変更。
List.Removeメソッドを追加

Location:

trunk/Include/Classes/System

Files:

• Collections/Generic/List.ab (modified) (1 diff)
• Delegate.ab (modified) (3 diffs)
• Runtime/InteropServices/GCHandle.ab (modified) (2 diffs)

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

@@ -97 +97 @@
         size++
     End Sub
+
+    /*!
+    @brief  List内で最初に出現する値を削除する
+    @author Daisuke Yamamoto
+    @date   2007/09/28
+    @return 値が削除されたときはTrue、されなかったときはFlaseが返る
+    */
+    Function Remove( item As T ) As Boolean
+        Dim index = IndexOf( item )
+        If index = -1 Then
+            Return False
+        End If
+        memmove( items + index*SizeOf(VoidPtr), items + (index+1)*SizeOf(VoidPtr), (size-(index+1))*SizeOf(VoidPtr) )
+        Realloc( size - 1 )
+        Return True
+    End Function
 End Class
 

trunk/Include/Classes/System/Delegate.ab

@@ -1 +1 @@
 Namespace System
+
 
 Class _SimpleDelegate
 Public
+    hasThisPtr As Boolean
     object As Object
     methodPtr As VoidPtr
 
     Sub _SimpleDelegate( object As Object, methodPtr As VoidPtr )
+        This.hasThisPtr = True
         This.object = object
+        This.methodPtr = methodPtr
+    End Sub
+    Sub _SimpleDelegate( methodPtr As VoidPtr )
+        This.hasThisPtr = False
+        This.object = Nothing
         This.methodPtr = methodPtr
     End Sub
@@ -16 +24 @@
     simpleDelegates As System.Collections.Generic.List<_SimpleDelegate>
 
+    Sub _Add( dg As DelegateBase )
+        Dim i As Long
+        For i=0 To ELM(dg.simpleDelegates.Count)
+            simpleDelegates.Add( dg.simpleDelegates[i] )
+        Next
+    End Sub
+
 Public
     Sub DelegateBase()
         simpleDelegates = New System.Collections.Generic.List<_SimpleDelegate>()
     End Sub
-    Sub Add( sd As System._SimpleDelegate )
-        simpleDelegates.Add( sd )
-    End Sub
+
+/*
+    Sub Operator + ( sd As System._SimpleDelegate )
+        Add( sd )
+    End Sub*/
 Public
 End Class
@@ -28 +45 @@
 
 End Namespace
+
+
+Function _System_CreateSimpleDynamicDelegate( object As Object, methodPtr As VoidPtr ) As System._SimpleDelegate
+    Return New System._SimpleDelegate( object, methodPtr )
+End Function
+Function _System_CreateSimpleStaticDelegate( methodPtr As VoidPtr ) As System._SimpleDelegate
+    Return New System._SimpleDelegate( methodPtr )
+End Function

trunk/Include/Classes/System/Runtime/InteropServices/GCHandle.ab

@@ -1 +1 @@
 ' Classes/System/Runtime/InteropServices/GCHandle.ab
-
-#require <Classes/System/Collections/ArrayList.ab>
 
 Namespace System
@@ -69 +67 @@
     handle As VoidPtr
 
-    Static allocated As /*System.Collections.*/ArrayList
+    Static allocated = New System.Collections.Generic.List<Object>
 End Class