Changeset 665 for trunk/ab5.0/ablib/src/Classes/System/IO/StringReader.ab

Timestamp:

Dec 28, 2008, 12:18:53 AM (15 years ago)

Author:

イグトランス (egtra)

Message:

TextWriter同様TextReaderでバッファリングし、StreamReaderはMultiByteToWideChar固定で仮実装。これで、マルチバイトモードでもStringReaderが使えるようにした。
(#235)

File:

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

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

@@ -23 +23 @@
             Throw New ArgumentNullException("str")
         End If
-        Dim length = GetStr(str, s)
-        If length > LONG_MAX Then
-            Throw New ArgumentException("Must be Length <= LONG_MAX", "str")
-        End If
-        len = length As Long
-        i = 0
+        Buffer.Append(str)
     End Sub
 
-    /*
-    @date 2008/02/26
-    @auther Egtra
-    */
-    Override Function Peek() As Long
-        If i >= len Then
-            Peek = -1
-        Else
-            Peek = s[i]
-        End If
-    End Function
 
-    /*
-    @date 2008/02/26
-    @auther Egtra
-    */
-    Override Function Read() As Long
-        Read = Peek()
-        i++
-    End Function
-
-    /*
-    @date 2008/02/26
-    @auther Egtra
-    */
-/*
-    Override Function ReadToEnd() As String
-        ReadToEnd = s.Substring(i)
-        i = s.Length
-    End Function
-*/
 Protected
     /*
@@ -68 +33 @@
     */
     Override Sub Dispose(disposing As Boolean)
-        s = Nothing
-        i = 0
     End Sub
-
-    /*
-    @date 2008/02/26
-    @auther Egtra
-    */
-    Override Function ReadImpl(buffer As *WCHAR, count As Long) As Long
-        ReadImpl = Math.Min(count, len - i)
-        ActiveBasic.Strings.ChrCopy(buffer, VarPtr(s[i]), ReadImpl As SIZE_T) 'ToDo: ポインタに対する+演算
-    End Function
-
-Private
-    s As *WCHAR
-    len As Long
-    i As Long
 End Class