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

Timestamp:

Jan 13, 2009, 2:01:38 AM (15 years ago)

Author:

イグトランス (egtra)

Message:

#231に関連して、エンコーディング周りを見直し、Encoder/Decoderをストリーム用に特化。
UTF8Encodingをコンパイル可能にし、ビルドに含めるようにした。ただし、実装が不完全なためテストは不可。
(#231)

File:

• trunk/ab5.0/ablib/src/Classes/System/IO/StreamWriter.ab (modified) (3 diffs)

trunk/ab5.0/ablib/src/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
+        Flush(False)
+    End Sub
+
+    Sub Flush(last As Boolean)
+#ifdef UNICODE
+        encoder.Encode(StrPtr(buf), buf.Length As SIZE_T, s, last)
+        buf.Remove(0, buf.Length As SIZE_T)
+#else
+        Dim p = StrPtr(buf)
+        Dim i = 0 As SIZE_T
+        Dim mbLen = 0 As SIZE_T
+        While i <= buf.Length
+            mbLen = i
+            'ヌル文字で終わっていないので、CharNextは使えない
+            If IsDBCSLeadByte(p[i]) Then
+                i += 2
+            Else
+                i += 1
+            End If
+        Wend
+        Dim wcBuf As PCWSTR
+        Dim wcLen = GetStr(p, mbLen, wcBuf)
+        encoder.Encode(wcBuf, wcLen, s, last)
+        buf.Remove(0, mbLen)
+        If last Then
+            If buf.Length <> 0 Then
+                s.WriteByte(Asc("?"))
+                buf.Length = 0  
+            End If
+        End If
+#endif
     End Sub
 
@@ -62 +77 @@
     Override Sub Dispose(disposing As Boolean)
         If disposing Then
-            Flush()
-            flushLast()
+            Flush(True)
             s.Dispose()
         End If
@@ -73 +87 @@
         buf = New Text.StringBuilder(4096)
         '暫定。正式版ではUTF-8を標準とする。
-        encoding = New Text.Detail.WindowsCodePageEncoding(CP_ACP)
-        encoder = encoding.GetEncoder()
+        encoder = New Text.Detail.WindowsCodePageEncoder(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
-    End Sub
-
-    encoding As Text.Encoding
     encoder As Text.Encoder
     s As System.IO.Stream