Changeset 702 for trunk

Timestamp:

2009/04/06 21:14:03 (3 years ago)

Author:

egtra

Message:

テキスト読み取り時、EOF周りの扱いの誤りを修正

Location:

trunk/ab5.0/ablib/src/Classes/System

Files:

• IO/TextReader.ab (modified) (1 diff)
• Text/Encoding.ab (modified) (2 diffs)

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

@@ -24 +24 @@
             buf.Length = 0
             pos = 0
-            If Not Underflow() Then
+            Underflow()
+            If buf.Length = 0 Then
                 Peek = -1
                 Exit Function

trunk/ab5.0/ablib/src/Classes/System/Text/Encoding.ab

@@ -361 +361 @@
 Class Decoder
 Public
-    Function Decode(dst As Collections.Generic.List<WCHAR>, st As IO.Stream) As Boolean
-        Decode = DecodeImpl(dst, st)
+    /*!
+    @brief 復号する。
+    @param[out] dst 出力先
+    @param[in] s 入力元
+    @return sを最後 (EOF) まで読んだらFalse、まだあればTrue。
+    */
+    Function Decode(dst As Collections.Generic.List<WCHAR>, s As IO.Stream) As Boolean
+        Decode = DecodeImpl(dst, s)
     End Function
 
@@ -529 +535 @@
                 If t = -1 Then
                     dst.Add(&hfffd As WCHAR)
-                    DecodeImpl = False
-                    Exit For
+                    Exit Function
                 End If
                 buf[1] = t As CHAR