Changeset 426 for trunk/Include/Classes/System/IO/TextReader.ab

Timestamp:

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

Author:

イグトランス (egtra)

Message:

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

File:

• trunk/Include/Classes/System/IO/TextReader.ab (modified) (1 diff)

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