Changeset 475 for trunk/Include/Classes/ActiveBasic/Core

Timestamp:

Mar 13, 2008, 9:44:51 AM (16 years ago)

Author:

dai

Message:

・XmlSerializer.Deserializeメソッドを実装（仮実装なため、数値メンバのシリアライズのみに留まっている）。
・XmlNode.LastChildメソッドを追加。
・XmlNode.NextSiblingメソッドを追加。
・XmlNode.PreviouseSiblingメソッドを追加。

File:

• trunk/Include/Classes/ActiveBasic/Core/TypeInfo.ab (modified) (4 diffs)

trunk/Include/Classes/ActiveBasic/Core/TypeInfo.ab

@@ -73 +73 @@
     End Sub
 
+    Sub SetBaseType( baseType As System.TypeInfo )
+        This.baseType = baseType
+    End Sub
+
     Function GetPtrType() As TypeBaseImpl
         If Object.ReferenceEquals( ptrType, Nothing ) Then
@@ -91 +95 @@
         Return baseType
     End Function
-
-    Sub SetBaseType( baseType As System.TypeInfo )
-        This.baseType = baseType
-    End Sub
 
     Override Function FullName() As String
@@ -171 +171 @@
 End Class
 
+TypeDef _SYSTEM_CONSTRUCTOR_PROC = *Sub( pThis As *Object )
+TypeDef _SYSTEM_DESTRUCTOR_PROC = *Sub( pThis As *Object )
+
 ' クラスを管理するためのクラス
 Class _System_TypeForClass
     Inherits TypeBaseImpl
 
+    Static Const _SYSTEM_OBJECT_HEAD_SIZE = SizeOf(LONG_PTR) * 4
+
+    size As SIZE_T
+    comVtbl As VoidPtr
+    vtblList As VoidPtr
+    pDefaultConstructor As _SYSTEM_CONSTRUCTOR_PROC
+    pDestructor As _SYSTEM_DESTRUCTOR_PROC
+
 Public
     referenceOffsets As *Long
@@ -191 +202 @@
     End Sub
 
+    Sub SetClassInfo( size As SIZE_T, comVtbl As VoidPtr, vtblList As VoidPtr, pDefaultConstructor As _SYSTEM_CONSTRUCTOR_PROC, pDestructor As _SYSTEM_DESTRUCTOR_PROC )
+        This.size = size
+        This.comVtbl = comVtbl
+        This.vtblList = vtblList
+        This.pDefaultConstructor = pDefaultConstructor
+        This.pDestructor = pDestructor
+    End Sub
+
     Override Function IsClass() As Boolean
         Return True
+    End Function
+
+
+    Static Function _System_New( typeForClass As ActiveBasic.Core._System_TypeForClass ) As Object
+        If typeForClass.pDefaultConstructor = NULL Then
+            Throw New System.SystemException( "デフォルトコンストラクタを持たないクラスに対して_System_New関数は使えません。" )
+        End If
+
+        ' まずはメモリを確保
+        Dim pPtr = _System_GC_malloc_ForObject( typeForClass.size + _SYSTEM_OBJECT_HEAD_SIZE ) As VoidPtr
+
+        ' pPtr[0]=オブジェクトの個数
+        Set_LONG_PTR( pPtr, 1 )
+        pPtr += SizeOf(LONG_PTR)
+
+        ' pPtr[1]=オブジェクトのサイズ
+        Set_LONG_PTR( pPtr, typeForClass.size )
+        pPtr += SizeOf(LONG_PTR)
+
+        ' pPtr[2]=デストラクタの関数ポインタ
+        Set_LONG_PTR( pPtr, typeForClass.pDestructor As LONG_PTR )
+        pPtr += SizeOf(LONG_PTR)
+
+        ' pPtr[3]=reserve
+        pPtr += SizeOf(LONG_PTR)
+
+        Dim pObject = pPtr As *Object
+
+        ' com_vtblをセット
+        Set_LONG_PTR( pObject, typeForClass.comVtbl As LONG_PTR )
+
+        ' vtbl_listをセット
+        Set_LONG_PTR( pObject + SizeOf(LONG_PTR), typeForClass.vtblList As LONG_PTR )
+
+        ' 動的型情報をセットする
+        pObject->_System_SetType( typeForClass )
+
+        ' コンストラクタを呼び出す
+        Dim proc = typeForClass.pDefaultConstructor
+        proc( pObject )
+
+        Return ByVal pObject
     End Function
 End Class