Changeset 119 for Include/Classes/System/IO

Timestamp:

Feb 23, 2007, 11:00:24 PM (18 years ago)

Author:

イグトランス (egtra)

Message:

Unicode (#50) 前準備
Byte→Char (#51) 型名は殆ど完了、ただし中身までは手を付けていないものが多い

File:

• Include/Classes/System/IO/Stream.ab (modified) (2 diffs)

Include/Classes/System/IO/Stream.ab

@@ +1 @@
+
+#require <Classes/System/misc.ab>
 
 Class Stream
-Public
+Public 'Protected
     Sub Stream():   End Sub
 Public
-    Virtual Function CanRead() As Boolean:  End Function
-    Virtual Function CanSeek() As Boolean:  End Function
-    Virtual Function CanTimeout() As Boolean:   End Function
-    Virtual Function CanWrite() As Boolean: End Function
-    Virtual Function Length() As Int64: End Function
-    Virtual Sub Position(value As Int64):   End Sub
-    Virtual Function Position() As Int64:   End Function
-    Virtual Sub ReadTimeout(value As Long): End Sub
-    Virtual Function ReadTimeout() As Long: End Function
-    Virtual Sub WriteTimeout(value As Long):    End Sub
-    Virtual Function WriteTimeout() As Long:    End Function
+    Virtual Sub ~Stream()
+        Close()
+    End Sub
+Public
+    Abstract Function CanRead() As Boolean
+    Abstract Function CanSeek() As Boolean
+
+    Virtual Function CanTimeout() As Boolean
+        Return True
+    End Function
+
+    Abstract Function CanWrite() As Boolean
+    Abstract Function Length() As Int64
+    Abstract Sub Position(value As Int64)
+    Abstract Function Position() As Int64
+
+    Virtual Sub ReadTimeout(value As Long)
+        ' Throw InvalidOperationException
+    End Sub
+
+    Virtual Function ReadTimeout() As Long
+        ' Throw InvalidOperationException
+    End Function
+
+    Virtual Sub WriteTimeout(value As Long)
+        ' Throw InvalidOperationException
+    End Sub
+
+    Virtual Function WriteTimeout() As Long
+        ' Throw InvalidOperationException
+    End Function
 
 Public
@@ -22 +44 @@
     Virtual Function EndRead(ByRef asyncResult As IAsyncResult) As Long:    End Function
     Virtual Sub EndWrite(ByRef asyncResult As IAsyncResult):    End Sub
-    Virtual Sub Flush():    End Sub
-    Virtual Function Read(ByRef buffer[] As Byte, offset As Long, count As Long) As Long:   End Function
-    Virtual Function ReadByte() As Long:    End Function
-    Virtual Function Seek(offset As Int64, origin As SeekOrigin) As Long:   End Function
-    Virtual Sub SetLength(value As Int64):  End Sub
-    Virtual Sub Write (ByRef buffer[] As Byte, offset As Long, count As Long):  End Sub
-    Virtual Sub WriteByte(value As Byte):   End Sub
+    Abstract Sub Flush()
+    Abstract Function Read(ByRef buffer[] As Byte, offset As Long, count As Long) As Long
 
+    Virtual Function ReadByte() As Long
+        Dim b As Byte
+        Dim ret = Read(VarPtr(b), 0, 1)
+        If ret <> 0 Then
+            Return b
+        Else
+            Return -1
+        End If
+    End Function
+
+    Abstract Function Seek(offset As Int64, origin As SeekOrigin) As Long
+    Abstract Sub SetLength(value As Int64): End Sub
+    Abstract Sub Write(ByRef buffer[] As Byte, offset As Long, count As Long)
+
+    Virtual Sub WriteByte(b As Byte)
+        Write(VarPtr(b), 0, 1)
+    End Sub
 Protected
     Virtual Function CreateWaitHandle() As WaitHandle:  End Function