Changeset 452 for trunk

Timestamp:

Mar 3, 2008, 10:15:06 PM (17 years ago)

Author:

dai

Message:

System/Xml/Serialization/XmlSerializer.abを追加。
まずはシリアライズ処理を動くようにした。
※逆シリアライズは未実装なので、ActiveBasic.Xml.Parserクラスを実装してから対応すること。

Location:

trunk

Files:

• Include/Classes/ActiveBasic/Core/TypeInfo.ab (modified) (4 diffs)
• Include/Classes/ActiveBasic/Xml (added)
• Include/Classes/ActiveBasic/Xml/Parser.ab (added)
• Include/Classes/System/Reflection/MemberInfo.ab (modified) (3 diffs)
• Include/Classes/System/Xml/Serialization (added)
• Include/Classes/System/Xml/Serialization/XmlSerializer.ab (added)
• Include/Classes/System/Xml/XmlDocument.ab (modified) (2 diffs)
• Include/Classes/index.ab (modified) (2 diffs)
• bin/BasicCompiler32.exe (modified) ( previous)

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

@@ -17 +17 @@
     memberNames As *String              ' 名前リスト
     memberTypeFullNames As *String      ' 型名リスト
+    memberOffsets As *LONG_PTR          ' クラスの先頭ポインタからのオフセット値
     memberCounts As Long                ' 個数
     memberInfosCache As System.Collections.Generic.List<System.Reflection.MemberInfo>
@@ -46 +47 @@
         Dim result = New TypeBaseImpl( strNamespace, name, fullName )
         result.SetBaseType( baseType )
-        result.SetMembers( memberNames, memberTypeFullNames, memberCounts )
+        result.SetMembers( memberNames, memberTypeFullNames, memberOffsets, memberCounts )
         result.memberInfosCache = This.memberInfosCache
         result.ptrLevel = This.ptrLevel
@@ -54 +55 @@
 Public
 
-    Sub SetMembers( memberNames As *String, memberTypeFullNames As *String, num As Long )
+    Sub SetMembers( memberNames As *String, memberTypeFullNames As *String, memberOffsets As *LONG_PTR, num As Long )
         This.memberNames = memberNames
         This.memberTypeFullNames = memberTypeFullNames
+        This.memberOffsets = memberOffsets
         This.memberCounts = num
 
@@ -146 +148 @@
             Dim i As Long
             For i=0 To ELM(memberCounts)
-                memberInfosCache.Add( New System.Reflection.MemberInfo( memberNames[i], _System_TypeBase_Search( memberTypeFullNames[i] ) ) )
+                memberInfosCache.Add( New System.Reflection.MemberInfo( memberNames[i], _System_TypeBase_Search( memberTypeFullNames[i] ), memberOffsets[i] ) )
             Next
         End If

trunk/Include/Classes/System/Reflection/MemberInfo.ab

@@ -9 +9 @@
     name As String
     memberType As TypeInfo
+    offset As LONG_PTR
 Public
 
@@ -16 +17 @@
             memberType メンバの型
     */
-    Sub MemberInfo( name As String, memberType As TypeInfo )
+    Sub MemberInfo( name As String, memberType As TypeInfo, offset As LONG_PTR )
         This.name = name
         This.memberType = memberType
+        This.offset = offset
     End Sub
 
     /*!
-    @brief  メンバの名前を取得する
-    @return メンバの名前
+    @brief  メンバの名前を取得する。
+    @return メンバの名前。
     */
     Function Name() As String
@@ -30 +32 @@
 
     /*!
-    @brief  メンバの型を取得する
-    @return メンバの型
+    @brief  メンバの型を取得する。
+    @return メンバの型。
     */
     Function MemberType() As TypeInfo
         Return memberType
+    End Function
+
+    /*!
+    @brief  クラスの先頭ポインタからのオフセット値を取得する。
+    @return クラスの先頭ポインタからのオフセット値。
+    */
+    Function _System_Offset() As LONG_PTR
+        Return offset
     End Function
 End Class

trunk/Include/Classes/System/Xml/XmlDocument.ab

@@ -94 +94 @@
 
     /*!
+    @brief  指定したストリームからXML文書を読み込む。
+    @param  stream 読み込み先のストリーム。
+    */
+    Virtual Sub Load( inStream As System.IO.Stream )
+        Dim length = inStream.Length As DWord
+        Dim xmlBuffer = calloc( length + 1 ) As *StrChar
+        inStream.Read( xmlBuffer As *Byte, 0, length )
+        Dim xmlString = New String( xmlBuffer )
+        free( xmlBuffer )
+
+        This.RemoveAll()
+        ActiveBasic.Xml.Parser.Parse( xmlString, This )
+    End Sub
+
+    /*!
+    @brief  指定したファイルからXML文書を読み込む。
+    @param  ファイルパス。
+    */
+    Virtual Sub Load( filename As String )
+        Dim fileStream As System.IO.FileStream( filename, System.IO.FileMode.Open, System.IO.FileAccess.Read )
+        Load( fileStream )
+    End Sub
+
+    /*!
     @brief  指定したストリームにXML文書を保存する。
     @param  stream 保存先のストリーム。
@@ -107 +131 @@
     */
     Virtual Sub Save( filename As String )
-        Dim fileStream As System.IO.FileStream( filename, System.IO.FileMode.Create )
+        Dim fileStream As System.IO.FileStream( filename, System.IO.FileMode.Create, System.IO.FileAccess.Write )
         Save( fileStream )
     End Sub
 
+Private
+    Sub LoadXmlString( xmlString As String)
+    End Sub
 End Class
 

trunk/Include/Classes/index.ab

@@ -9 +9 @@
 #require "./ActiveBasic/Windows/WindowHandle.sbp"
 #require "./ActiveBasic/Windows/Windows.ab"
+#require "./ActiveBasic/Xml/Parser.ab"
 #require "./System/Blittable.ab"
 #require "./System/Console.ab"
@@ -105 +106 @@
 #require "./System/Xml/XmlNode.ab"
 #require "./System/Xml/XmlText.ab"
+#require "./System/Xml/Serialization/XmlSerializer.ab"