Changeset 553 for trunk

Timestamp:

Jul 19, 2008, 2:26:09 AM (16 years ago)

Author:

NoWest

Message:

BinaryReaderとBinaryWriterを文字列操作以外は一応実装完了。

Location:

trunk/ab5.0/ablib/src/Classes

Files:

• System/IO/BinaryReader.ab (modified) (3 diffs)
• System/IO/BinaryWriter.ab (modified) (19 diffs)
• index.ab (modified) (1 diff)

trunk/ab5.0/ablib/src/Classes/System/IO/BinaryReader.ab

@@ -13 +13 @@
     Sub BinaryReader(input As Stream)
         stream = input
-        coding = New System.Text.UTF8Encoding()
+        enc = New System.Text.UTF8Encoding()
     End Sub
     /*!
@@ -24 +24 @@
     Sub BinaryReader(input As Stream, encoding As System.Text.Encoding)
         This.stream = input
-        This.coding = encoding
+        This.enc = encoding
     End Sub
 
@@ -280 +280 @@
 Private
     stream As Stream
-    coding As System.Text.Encoding
+    enc As System.Text.Encoding
 End Class
 

trunk/ab5.0/ablib/src/Classes/System/IO/BinaryWriter.ab

@@ -4 +4 @@
 
 Class BinaryWriter
-    Implements IDisposable
+    Implements System.IDisposable
 
 Public 'constructor
@@ -18 +18 @@
     */
     Sub BinaryWriter(output As System.IO.Stream)
+        This.OutStream=output
     End Sub
 
@@ -24 +25 @@
     */
     Sub BinaryWriter(output As System.IO.Stream, encoding As System.Text.Encoding)
+        This.OutStream=output
+        This.Enc = encoding
     End Sub
 
@@ -55 +58 @@
     */
     Sub Close()
-        This.Disposed()
+        This.Dispose(True)
     End Sub
 
@@ -76 +79 @@
     */
     Sub Write(value As Boolean)
+        This.OutStream.Write( VarPtr(value) As *Byte, 0, SizeOf(Boolean))
     End Sub
  
@@ -82 +86 @@
     */
     Sub WriteByte(value As Byte)
+        This.OutStream.Write( VarPtr(value) As *Byte, 0, SizeOf(Byte))
     End Sub
  
@@ -95 +100 @@
     */
     Sub Write(value As Char)
+        This.OutStream.Write( VarPtr(value) As *Byte, 0, SizeOf(Char))
     End Sub
  
@@ -115 +121 @@
     */
     Sub Write(value As Double)
+        This.OutStream.Write( VarPtr(value) As *Byte, 0, SizeOf(Double))
     End Sub
  
@@ -121 +128 @@
     */
     Sub Write(value As Integer)
+        This.OutStream.Write( VarPtr(value) As *Byte, 0, SizeOf(Integer))
     End Sub
  
@@ -127 +135 @@
     */
     Sub Write(value As Long)
+        This.OutStream.Write( VarPtr(value) As *Byte, 0, SizeOf(Long))
     End Sub
  
@@ -133 +142 @@
     */
     Sub Write(value As Int64)
+        This.OutStream.Write( VarPtr(value) As *Byte, 0, SizeOf(Int64))
     End Sub
  
@@ -139 +149 @@
     */
     Sub WriteSByte(value As SByte)
+        This.OutStream.Write( VarPtr(value) As *Byte, 0, SizeOf(SByte))
     End Sub
  
@@ -145 +156 @@
     */
     Sub Write(value As Single)
+        This.OutStream.Write( VarPtr(value) As *Byte, 0, SizeOf(Single))
     End Sub
  
@@ -151 +163 @@
     */
     Sub Write(value As String)
+        This.OutStream.Write( ToTCStr(value) As *Byte, 0, value.Length()*SizeOf(TCHAR))
     End Sub
  
@@ -157 +170 @@
     */
     Sub Write(value As Word)
+        This.OutStream.Write( VarPtr(value) As *Byte, 0, SizeOf(Word))
     End Sub
  
@@ -163 +177 @@
     */
     Sub Write(value As DWord)
+        This.OutStream.Write( VarPtr(value) As *Byte, 0, SizeOf(DWord))
     End Sub
  
@@ -169 +184 @@
     */
     Sub Write(value As QWord)
+        This.OutStream.Write( VarPtr(value) As *Byte, 0, SizeOf(QWord))
     End Sub
  
@@ -175 +191 @@
     */
     Sub Write(buffer As *Byte, index As Long, count As Long)
+        This.OutStream.Write( VarPtr(buffer[index]) As *Byte, 0, count)
     End Sub
  
@@ -180 +197 @@
         現在のストリームに文字配列の特定の領域を書き込み、使用した Encoding とストリームに書き込んだ特定の文字に従ってストリームの現在位置を進めます。
     */
-    Sub Write(chars As *Char, index As Long, count As Long)
-    End Sub 
+/*  Sub Write(chars As *Char, index As Long, count As Long)
+    End Sub*/
 
     /*
     32 ビット整数を圧縮形式で書き込みます。
     */
-    Sub Write7BitEncodedInt()
-    End Sub
+/*  Sub Write7BitEncodedInt()
+    End Sub*/
 
     /*
     BinaryWriter によって使用されているアンマネージ リソースを解放し、オプションでマネージ リソースも解放します。
     */
-    Sub Dispose()
+
+Protected
+    Virtual Sub Dispose(disposing As Boolean)
         This.OutStream.Close()
     End Sub

trunk/ab5.0/ablib/src/Classes/index.ab

@@ -55 +55 @@
 '#require "./System/Drawing/Imaging/misc.ab"
 '#require "./System/Drawing/Text/misc.ab"
+#require "./System/IO/BinaryReader.ab"
+#require "./System/IO/BinaryWriter.ab"
 #require "./System/IO/Directory.ab"
 #require "./System/IO/DirectoryInfo.ab"