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

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

Location:

branch/egtra-stream-without-en_dec/Classes/System/IO

Files:

• StreamReader.ab (modified) (2 diffs)
• StreamWriter.ab (modified) (3 diffs)
• TextWriter.ab (modified) (1 diff)

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

@@ -58 +58 @@
     */
     Override Function Underflow() As Boolean
-        Dim wcBuf[4095] As WCHAR
-        Dim mbBuf[4095] As SByte
-        Dim pNext = mbBuf As PSTR
-        Dim mbBufSize = Len(buf)
-        If leadByte <> 0 Then
-            pNext[0] = leadByte
-            leadByte = 0
-            pNext++
-            mbBufSize--
-        End If
-        Dim mbLen = s.Read(pNext As *Byte, 0, mbBufSize)
-        If mbLen = 0 Then
+        Dim nextRead As *Byte
+        Dim readSize = s.Read(mbBuf + bufSize, 0, bufCapacity - bufSize)
+        If readSize = 0 Then
+            If bufSize <> 0 Then
+#ifdef UNCODE
+                Buffer.Append(&hfffd As WCHAR)
+#else
+                Buffer.Append("?")
+#endif
+            End If
             Underflow = False
             Exit Function
         End If
+        Dim mbLen = bufSize + readSize
+        '文字全体が揃っている部分を抽出する。
+        Dim pNext = mbBuf
         Do
-            Dim q = CharNextExA(cp, pNext, 0)
+            Dim q = e.NextChar(pNext, ((mbBuf + mbLen) - pNext) As Long)
             If q = pNext Then
                 Exit Do
             End If
-            pNext = q As PSTR
+            pNext = q
         Loop
-        If pNext <> mbBuf + mbLen Then
-            leadByte = mbBuf[mbLen - 1]
+        '文字全体が揃っている部分を変換しTextReaderのバッファに送る。
+        Dim wcBufCapacity = e.GetMaxCharCount(mbLen)
+        Dim wcBuf = GC_malloc_atomic(wcBufCapacity * SizeOf (WCHAR)) As *WCHAR
+        Dim wcLen = e.GetChars(mbBuf, (pNext - mbBuf) As Long, wcBuf, wcBufCapacity)
+        Dim appendStr As PCTSTR
+        Dim appendLen = GetStr(wcBuf, wcLen As SIZE_T, appendStr)
+        Dim readerBuffer = Buffer
+        readerBuffer.Append(appendStr, 0, appendLen)
+        'マルチバイトの揃っていない部分を手前に連れてくる。
+        bufSize = ((mbBuf + mbLen) - pNext) As Long
+        If bufSize <> 0 Then
+            memmove(mbBuf, mbBuf + mbLen, bufSize)
         End If
-        Dim wcLen = MultiByteToWideChar(cp, 0, mbBuf, (pNext - mbBuf) As Long, wcBuf, 4095)
-        Dim s = New String(wcBuf, wcLen)
-        Dim buf = Buffer
-        buf.Append(s)
         Underflow = True
     End Function
@@ -97 +104 @@
     Sub init(str As Stream)
         s = str
-        cp  = CP_ACP '暫定。
-        leadByte = 0
+        e = New Text.Detail.WindowsCodePageEncoding(CP_ACP) '暫定。
+        bufCapacity = 8192
+        mbBuf = GC_malloc_atomic(bufCapacity) As *Byte
+        bufSize = 0
     End Sub
 
     s As Stream
-    cp As Word
-    leadByte As Byte
+    e As Text.Encoding
+    mbBuf As *Byte
+    bufSize As Long
+    bufCapacity As Long
 End Class
 

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

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

@@ -86 +86 @@
     End Sub
 
-    Sub WriteLine()
+    Virtual Sub WriteLine()
         Write(Environment.NewLine)
     End Sub