Changeset 673 for branch/egtra-stream-without-en_dec/Classes/System/IO/StreamWriter.ab

Timestamp:

Jan 5, 2009, 1:40:11 AM (15 years ago)

Author:

イグトランス (egtra)

Message:

Encoder/Decoderを排除した実装（UTF8Encodingは修正していません）。

File:

• branch/egtra-stream-without-en_dec/Classes/System/IO/StreamWriter.ab (modified) (3 diffs)

branch/egtra-stream-without-en_dec/Classes/System/IO/StreamWriter.ab

@@ -41 +41 @@
 
     Override Sub Flush()
-        Dim buf = Buffer()
-        Dim pws As PCWSTR
-        Dim size = GetWCStr(buf.ToString(), pws)
-        Dim pwsEnd = VarPtr(pws[size])
-        Dim charConverted As Long
-        Dim byteBuf[4095] As Byte
-        Dim byteSize As Long
-        Dim completed As Boolean
-        Do
-            Dim converted As Long
-            encoder.Convert(pws, size, byteBuf, Len(byteBuf), False, charConverted, byteSize, completed)
-            s.Write(byteBuf, 0, byteSize)
-            pws = VarPtr(pws[charConverted])
-            size -= charConverted
-        Loop Until pws = pwsEnd
-        buf.Length = 0
+        softFlush()
+        s.Flush()
+    End Sub
+
+    Override Sub WriteLine()
+        Super.WriteLine()
+        softFlush()
     End Sub
 
@@ -63 +54 @@
         If disposing Then
             Flush()
-            flushLast()
             s.Dispose()
         End If
@@ -73 +63 @@
         buf = New Text.StringBuilder(4096)
         '暫定。正式版ではUTF-8を標準とする。
-        encoding = New Text.Detail.WindowsCodePageEncoding(CP_ACP)
-        encoder = encoding.GetEncoder()
+        e = New Text.Detail.WindowsCodePageEncoding(CP_ACP)
     End Sub
 
-    Sub flushLast()
-        Dim charConverted As Long
-        Dim byteBuf[63] As Byte
-        Dim byteSize As Long
-        Dim completed As Boolean
-        Do
-            encoder.Convert(0, 0, byteBuf, Len(byteBuf), False, charConverted, byteSize, completed)
-            s.Write(byteBuf, 0, byteSize)
-        Loop Until completed
+    Sub softFlush()
+        Dim buf = Buffer()
+        Dim pws As PCWSTR
+        Dim wcSize = GetWCStr(buf.ToString(), pws)
+        Dim mbMaxSize = e.GetMaxByteCount(wcSize)
+        Dim mbBuf = GC_malloc_atomic(mbMaxSize) As *Byte
+        Dim mbBufSize = e.GetBytes(pws, wcSize, mbBuf, mbMaxSize)
+        s.Write(mbBuf, 0, mbBufSize)
     End Sub
 
-    encoding As Text.Encoding
-    encoder As Text.Encoder
+    e As Text.Encoding
     s As System.IO.Stream
 End Class