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

Timestamp:

Nov 3, 2008, 11:42:22 PM (15 years ago)

Author:

イグトランス (egtra)

Message:

TextWriter及びその派生クラスをEncodingを用いるように変更。UTF8EncodingをEncodingの変更に追従させていないので、それ関連を一時的にコメントアウト。

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 len = buf.Length
-        If len > 0 Then
-            s.Write(StrPtr(buf) As *Byte, 0, len)
-            buf.Length = 0
-        End If
-    End Sub
-
-    Override Sub Write(str As String)
-        buf.Append(str)
-        Dim len = buf.Length
-        If len >= 2048 Then
-            s.Write(StrPtr(buf) As *Byte, 0, len)
-            buf.Length = 0
-        End If
-    End Sub
-
-    Override Sub Write(x As Boolean)
-        buf.Append(x)
-    End Sub
-    
-    Override Sub Write(x As Char)
-        buf.Append(x)
-    End Sub
-
-    Override Sub Write(x As Byte)
-        buf.Append(x)
-    End Sub
-#ifdef UNICODE
-    Override Sub Write(x As SByte)
-        buf.Append(x)
-    End Sub
-#else
-    Override Sub Write(x As Word)
-        buf.Append(x)
-    End Sub
-#endif
-    Override Sub Write(x As Integer)
-        buf.Append(x)
-    End Sub
-
-    Override Sub Write(x As DWord)
-        buf.Append(x)
-    End Sub
-
-    Override Sub Write(x As Long)
-        buf.Append(x)
-    End Sub
-
-    Override Sub Write(x As QWord)
-        buf.Append(x)
-    End Sub
-
-    Override Sub Write(x As Int64)
-        buf.Append(x)
-    End Sub
-
-    Override Sub Write(x As Single)
-        buf.Append(x)
-    End Sub
-
-    Override Sub Write(x As Double)
-        buf.Append(x)
-    End Sub
-
-    Override Sub Write(x As Object)
-        Write(x.ToString)
+        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
     End Sub
 
@@ -112 +62 @@
     Override Sub Dispose(disposing As Boolean)
         If disposing Then
-            Dim len = buf.Length
-            If len > 0 Then
-                s.Write(StrPtr(buf) As *Byte, 0, len)
-            End If
+            Flush()
+            flushLast()
             s.Dispose()
         End If
@@ -123 +71 @@
     Sub init(stream As Stream)
         s = stream
-        buf = New System.Text.StringBuilder(4096)
+        buf = New Text.StringBuilder(4096)
+        '暫定。正式版ではUTF-8を標準とする。
+        encoding = New Text.Detail.WindowsCodePageEncoding(CP_ACP)
+        encoder = encoding.GetEncoder()
     End Sub
 
-    buf As Text.StringBuilder
+    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
 End Class