Changeset 655 for trunk/ab5.0/ablib/src/Classes/System/IO/StringReader.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/StringReader.ab (modified) (5 diffs)

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

@@ -23 +23 @@
             Throw New ArgumentNullException("str")
         End If
-        s = str
+        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
     End Sub
@@ -32 +36 @@
     */
     Override Function Peek() As Long
-        If i = s.Length Then
+        If i = len Then
             Peek = -1
         Else
@@ -44 +48 @@
     */
     Override Function Read() As Long
-        If i = s.Length Then
-            Read = -1
-        Else
-            Read = s[i]
-            i++
-        End If
+        Read = Peek()
+        i++
     End Function
 
@@ -56 +56 @@
     @auther Egtra
     */
+/*
     Override Function ReadToEnd() As String
         ReadToEnd = s.Substring(i)
         i = s.Length
     End Function
-
+*/
 Protected
     /*
@@ -75 +76 @@
     @auther Egtra
     */
-    Override Function ReadImpl(buffer As *Char, index As Long, count As Long) As Long
-        ReadImpl = Math.Min(count, s.Length - i)
-        ActiveBasic.Strings.ChrCopy(VarPtr(buffer[index]) As *Char, (StrPtr(s) + i * SizeOf (Char)) As *Char, ReadImpl As SIZE_T) 'ToDo: ポインタに対する+演算
+    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 String
+    s As *WCHAR
+    len As Long
     i As Long
 End Class