Changeset 426 for trunk/Include/Classes/System/IO

Timestamp:

Feb 26, 2008, 3:33:49 AM (17 years ago)

Author:

イグトランス (egtra)

Message:

StreamReaderの実装開始。
Stringの+演算子で右辺がNullのときに起こるアクセス違反を回避。

Location:

trunk/Include/Classes/System/IO

Files:

• FileStream.ab (modified) (5 diffs)
• StreamReader.ab (modified) (1 diff)
• TextReader.ab (modified) (1 diff)

trunk/Include/Classes/System/IO/FileStream.ab

@@ -76 +76 @@
 
         op = options As DWord
-        If Not Environment.OSVersion.Platform = PlatformID.Win32NT Then
+'       If (Environment.OSVersion.Platform As DWord) <> (PlatformID.Win32NT As DWord) Then 'ToDo: なぜかアクセス違反になる
             op And= Not FILE_FLAG_OVERLAPPED
-        End If
+'       End If
 
         This.handle=CreateFile(ToTCStr(path),ac,sh,ByVal NULL,mo,op,0)
@@ -305 +305 @@
     End Sub
 
-    Override Function Read( buffer As *Byte, offset As Long, count As Long) As Long
+    Override Function Read(buffer As *Byte, offset As Long, count As Long) As Long
         disposedCheck()
         If buffer = 0 Then
-'           Throw ArgumentNullException("FileStream.Read: An argument is null value.", "buffer")
+            Throw New ArgumentNullException("FileStream.Read: An argument is null value.", "buffer")
         ElseIf Not This.CanRead() Then
-'           Throw NotSupportedException("FileStream.Read: This stream is not readable.")
+            Throw New NotSupportedException("FileStream.Read: This stream is not readable.")
         End If
 
@@ -320 +320 @@
             overlapped.hEvent = CreateEvent(0, TRUE, FALSE, 0)
             If overlapped.hEvent = 0 Then
-'               Throw OutOfMemoryException("FileStream.Read: Failed to create an event object.")
+                Throw New OutOfMemoryException("FileStream.Read: Failed to create an event object.")
             End If
             Try
@@ -327 +327 @@
                     Dim error = GetLastError()
                     If error <> ERROR_IO_PENDING Then
-'                       Detail.ThrowWinIOException("FileStream.Read: Failed to read.", error)
+                        Detail.ThrowWinIOException("FileStream.Read: Failed to read.", error)
                     End If
                 End If
                 ret = GetOverlappedResult(This.handle, overlapped, readBytes, TRUE)
                 If ret = FALSE Then
-'                   Detail.ThrowWinLastErrorIOException("FileStream.Read: Failed to read.")
+                    Detail.ThrowWinLastErrorIOException("FileStream.Read: Failed to read.")
                 End If
                 offset += Read
@@ -341 +341 @@
             ret = ReadFile(This.handle,VarPtr(buffer[offset]),count,VarPtr(readBytes),ByVal NULL)
             If ret = FALSE Then
-'               Detail.ThrowWinLastErrorIOException("FileStream.Read: Failed to read.")
+                Detail.ThrowWinLastErrorIOException("FileStream.Read: Failed to read.")
             End If
         End If

trunk/Include/Classes/System/IO/StreamReader.ab

@@ -2 +2 @@
 Namespace IO
 
+Class StreamReader
+    Inherits TextReader
+Public
+    Sub StreamReader(path As String)
+        init(New FileStream(path, FileMode.Open, FileAccess.Read, FileShare.Read))
+    End Sub
 
-Class StreamReader
-    Inherits System.IO.TextReader
-    ' TODO: 実装
+    Sub StreamReader(stream As Stream)
+        init(stream)
+    End Sub
+
+    Override Sub Dispose(disposing As Boolean)
+        s.Dispose(disposing)
+        size = 0
+        cur = 0
+        last = 0
+    End Sub
+
+    Override Function Peek() As Long
+        If cur = last Then
+            last = s.Read(buf, 0, size)
+            cur = 0
+            If last = 0 Then
+                Peek = -1
+                Exit Function
+            End If
+        End If
+        Peek = buf[cur]
+    End Function
+
+    Override Function Read() As Long
+        Read = Peek()
+        cur++
+    End Function
+
+    Override Function Read(buffer As *StrChar, index As Long, count As Long) As Long
+        If buffer = 0 Then
+        ElseIf index < 0 Then
+        ElseIf count < 0 Then
+        End If
+
+        Dim n = last - cur
+        If count <= n Then
+            Read = ReadFromBuffer(buffer, index, count)
+            Exit Function
+        End If
+        Dim p = VarPtr(buffer[index])
+        Read = ReadFromBuffer(p, 0, n)
+        If Read = 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, 0, n)
+            If read = 0 Then 'EOF
+                Exit Function
+            End If
+            p = VarPtr(p[n])
+            Read += n
+            count -= n
+        End If
+        last = s.Read(buffer, 0, size)
+        cur = 0
+        If last = 0 Then 'EOF
+            Exit Function
+        End If
+        Read += ReadFromBuffer(p, 0, Math.Min(last, count))
+    End Function
+
+    Override Function ReadLine() As String
+        Dim sb = New Text.StringBuilder(256)
+        Do
+            Dim ch = Read()
+            If ch = &h0D Then
+                If Peek() = &h0A Then
+                    Read() 'CR LFの場合
+                End If
+                Exit Do
+            End If
+            Select Case ch
+                Case -1 'EOF
+                    Exit Do
+                Case &h0A 'LF
+                    Exit Do
+                Case &h0B 'VT
+                    Exit Do
+                Case &h0C 'FF
+                    Exit Do
+                Case &h0D 'CR
+                    Exit Do
+'               Case &h85 'NEL
+'                   Exit Do
+'               Case &h2028 'LS
+'                   Exit Do
+'               Case &h2029 'PS
+'                   Exit Do
+            End Select
+            sb.Append(ch As StrChar) 'ToDo キャスト不要にすべきというチケットを書くこと
+        Loop
+        ReadLine = sb.ToString
+    End Function
+
+    Override Function ReadToEnd() As String
+    End Function
+
+Private
+    Sub init(str As Stream)
+        s = str
+        size = 4096
+        last = 0
+        cur = 0
+        buf = GC_malloc(size)
+    End Sub
+
+    /**
+    @brief バッファの中身から読み取る。
+    文字数が足りなくても、元のストリームまで読みには行かない。
+    */
+    Function ReadFromBuffer(p As *StrChar, index As Long, count As Long) As Long
+        memcpy(VarPtr(p[index]), VarPtr(buf[cur]), count * SizeOf (StrChar))
+        cur += count
+        ReadFromBuffer = count
+    End Function
+
+    s As Stream
+    size As Long
+    cur As Long
+    last As Long '中身の終わり
+    buf As *Byte '暫定
 End Class
-
 
 End Namespace

trunk/Include/Classes/System/IO/TextReader.ab

@@ -6 +6 @@
 
 Public
-    Virtual Sub TextReader()    :End Sub
-    Virtual Sub ~TextReader()   :End Sub
+'Protected
+    Sub TextReader()
+    End Sub
+Public
+    Virtual Sub ~TextReader()
+        Dispose(False)
+    End Sub
 
-/* Null*/
+'   Static Null = StreamReader.Null As TextReader
 
 Public
-    Virtual Sub Close()
-        This.Dispose()
+    Sub Close()
+        Dispose(True)
     End Sub
-/*  CreateObjRef*/
-/*  Dispose*/
-/*  Equals*/
-/*  GetHashCode*/
-/*  GetLifetimeService*/
-/*  GetType*/
-/*  InitializeLifetimeService*/
+
+    Sub Dispose()
+        Dispose(True)
+    End Sub
+
+    Abstract Sub Dispose(disposing As Boolean)
+
     Abstract Function Peek() As Long
     Abstract Function Read() As Long
-    Abstract Function Read(buffer As LPTSTR, index As Long, count As Long) As Long
-    Abstract Function ReadBlock(buffer As LPTSTR, index As Long, count As Long) As Long
+    Abstract Function Read(buffer As *StrChar, index As Long, count As Long) As Long
+    Virtual Function ReadBlock(buffer As *StrChar, index As Long, count As Long) As Long
+        ReadBlock = Read(buffer, index, count)
+    End Function
     Abstract Function ReadLine() As String
     Abstract Function ReadToEnd() As String
-/*  ReferenceEquals*/
-/*  Synchronized*/
-/*  ToString*/
-/*  Dispose*/
-/*  Finalize*/
-/*  MemberwiseClone*/
 End Class