Changeset 682 for trunk/ab5.0/ablib/src/Classes/System/IO

Timestamp:

Feb 16, 2009, 4:26:24 PM (15 years ago)

Author:

イグトランス (egtra)

Message:

UTF8Encodingクラスをとりあえず使える状態に。ただし、BOM出力はまだ不可能。
(#231)

Location:

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

Files:

• MemoryStream.ab (modified) (1 diff)
• Stream.ab (modified) (1 diff)
• StreamWriter.ab (modified) (3 diffs)

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

@@ -339 +339 @@
     End Function*/
 
+    Function ToPointer() As VoidPtr
+        ToPointer = pointer
+    End Function
+
     /*!
     @brief  ストリームの内容全体をまるごと別のストリームに書き込みます。

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

@@ -155 +155 @@
 End Class
 
+/*!
+@brief 書き込みバイト数を記憶するヌルストリーム
+Encoding関連で使用
+@date 2009/02/16
+@auther Egtra
+*/
+Class WriteCountingNullStream
+    Inherits NullStream
+Public
+    Sub WriteCountingNullStream()
+        writeCount = 0
+    End Sub
+
+    Override Sub Write(buffer As *Byte, offset As Long, count As Long)
+        If count < 0 Then
+            Throw New ArgumentOutOfRangeException("count")
+        End If
+        writeCount += count
+    End Sub
+
+    Override Sub WriteByte(b As Byte)
+        writeCount++
+    End Sub
+
+    /*!
+    @brief 書き込まれたバイト数を返す。
+    */
+    Function WriteCount() As Long
+        WriteCount = writeCount
+    End Function
+
+Private
+    writeCount As Long
+End Class
+
 End Namespace
 

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

@@ -20 +20 @@
     */
     Sub StreamWriter(path As String)
-        init(New FileStream(path, FileMode.Create, FileAccess.Write, FileShare.None))
+        init(New FileStream(path, FileMode.Create, FileAccess.Write, FileShare.None), Nothing)
     End Sub
 
@@ -28 +28 @@
     */
     Sub StreamWriter(stream As Stream)
-        init(stream)
+        init(stream, Nothing)
+    End Sub
+
+    /*
+    @date 2009/02/16
+    @auther Egtra
+    */
+    Sub StreamWriter(stream As Stream, encoding As Text.Encoding)
+        init(stream, encoding)
     End Sub
 
@@ -83 +91 @@
 
 Private
-    Sub init(stream As Stream)
+    Sub init(stream As Stream, e As Text.Encoding)
         s = stream
         buf = New Text.StringBuilder(4096)
-        '暫定。正式版ではUTF-8を標準とする。
-        encoder = New Text.Detail.WindowsCodePageEncoder(CP_ACP)
+        If ActiveBasic.IsNothing(e) Then
+            '暫定。正式版ではUTF-8を標準とする。
+            encoder = New Text.Detail.WindowsCodePageEncoder(CP_ACP)
+        Else
+            encoder = e.GetEncoder()
+        End If
     End Sub