Changeset 655 for trunk/ab5.0/ablib/src/Classes/System/IO/StreamReader.ab

Timestamp:

Nov 9, 2008, 2:21:49 PM (15 years ago)

Author:

イグトランス (egtra)

Message:

#161完了。StreamReaderのUnicode対応。

File:

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

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

@@ -43 +43 @@
     */
     Override Function Peek() As Long
-        If cur = last Then
-            last = s.Read(buf As *Byte, 0, size)
-            cur = 0
-            If last = 0 Then
+        If charSize = charCur Then
+            fillCharBuf()
+            If charSize = charCur Then
                 Peek = -1
                 Exit Function
             End If
         End If
-        Peek = buf[cur]
+        Peek = charBuf[charCur]
     End Function
 
@@ -61 +60 @@
         Read = Peek()
         If Read <> -1 Then
-            cur++
+            charCur++
         End If
-    End Function
-
-    /*
-    @date 2008/02/26
-    @auther Egtra
-    */
-    Override Function ReadToEnd() As String
-        Dim sb = New Text.StringBuilder(65536)
-        sb.Append(buf, cur, last - cur)
-        Do
-            Dim read = Read(buf, 0, size)
-            sb.Append(buf, 0, read)
-            If read < size Then
-                ReadToEnd = sb.ToString
-                Exit Function
-            End If
-        Loop
     End Function
 
@@ -94 +76 @@
         End If
         s = Nothing
-        size = 0
-        cur = 0
-        last = 0
     End Sub
 
@@ -103 +82 @@
     @auther Egtra
     */
-    Override Function ReadImpl(buffer As *Char, index As Long, count As Long) As Long
-        Dim n = last - cur
-        If count <= n Then
-            ReadImpl = ReadFromBuffer(buffer, index, count)
+    Override Function ReadImpl(buffer As *WCHAR, count As Long) As Long
+        Dim n = charSize - charCur '現在のバッファに溜まっている文字数
+        If count <= n And charEof <> False Then
+            ReadImpl = readFromBuffer(buffer, count)
             Exit Function
         End If
-        Dim p = VarPtr(buffer[index])
-        ReadImpl = ReadFromBuffer(p, 0, n)
+        ReadImpl = readFromBuffer(buffer, n)
         If ReadImpl = count Then 'バッファの中身で足りた場合
             Exit Function
         End If
-        p = VarPtr(p[n])
-        count -= n
-        If count > size Then
-            n = (count \ size) * size 'sizeの倍数分だけは直接bufferへ読み込ませる
-            Dim read = s.Read(p As *Byte, 0, n)
-            If read = 0 Then 'EOF
-                Exit Function
-            End If
-            p = VarPtr(p[n])
-            ReadImpl += n
-            count -= n
-        End If
-        last = s.Read(buffer As *Byte, 0, size)
-        cur = 0
-        If last = 0 Then 'EOF
-            Exit Function
-        End If
-        ReadImpl += ReadFromBuffer(p, 0, Math.Min(last, count))
+        fillCharBuf()
+        ReadImpl += ReadImpl(VarPtr(buffer[n]), count - n)
     End Function
 
@@ -141 +103 @@
     Sub init(str As Stream)
         s = str
-        size = 4096
-        last = 0
-        cur = 0
-        buf = GC_malloc(size)
+        '暫定。正式版ではUTF-8を標準とする。
+        encoding = New Text.Detail.WindowsCodePageEncoding(CP_ACP)
+        decoder = encoding.GetDecoder()
+        charCapacity = 4096
+        byteCapacity = 4096
+        charBuf = GC_malloc(charCapacity * SizeOf(WCHAR))
+        byteBuf = GC_malloc(byteCapacity)
+        charCur = 0
+        byteCur = 0
+        charSize = 0
+        byteSize = 0
+        charEof = False
+        byteEof = False
     End Sub
 
@@ -153 +124 @@
     文字数が足りなくても、元のストリームまで読みには行かない。
     */
-    Function ReadFromBuffer(p As *Char, index As Long, count As Long) As Long
-        memcpy(VarPtr(p[index]), VarPtr(buf[cur]), count * SizeOf (Char))
-        cur += count
-        ReadFromBuffer = count
+    Function readFromBuffer(p As *WCHAR, count As Long) As Long
+        memcpy(p, VarPtr(charBuf[charCur]), count * SizeOf (WCHAR))
+        charCur += count
+        readFromBuffer = count
     End Function
 
+    /*!
+    @brief byteBufを基にcharBufを埋める。charBufが空になったときに用いる。
+    @date 2008/11/08
+    @auther Egtra
+    */
+    Sub fillCharBuf()
+        charCur = 0
+        charSize = 0
+        If charEof = False Then
+            If byteCur = byteSize Then
+                byteSize = s.Read(byteBuf, 0, byteCapacity)
+                byteCur = 0
+                If byteSize = 0 Then
+                    byteEof = True
+                End If
+            End If
+            Dim charUsed As Long
+            Dim byteUsed As Long
+            decoder.Convert(VarPtr(byteBuf[byteCur]), byteSize - byteCur,
+                VarPtr(charBuf[charSize]), charCapacity - charSize,
+                byteEof, charUsed, byteUsed, charEof)
+            byteCur += byteUsed
+            charSize += charUsed
+        End If
+    End Sub
+
     s As Stream
-    size As Long
-    cur As Long
-    last As Long '中身の終わり
-    buf As *SByte '暫定
+    encoding As Text.Encoding
+    decoder As Text.Decoder
+    charBuf As *WCHAR
+    byteBuf As *Byte
+    charCur As Long '読み取っていないデータの開始位置
+    byteCur As Long
+    charSize As Long 'Bufの内、有効なデータの数
+    byteSize As Long
+    charCapacity As Long '確保済み容量 = GC_mallocしたときの引数の値
+    byteCapacity As Long
+    charEof As Boolean 'Trueのとき、次にcur = sizeになるまでしかデータがことを示す
+    byteEof As Boolean
+    '常に0 <= cur <= size <= capacity
 End Class